-
Notifications
You must be signed in to change notification settings - Fork 109
update geotools 20 to 34 #952
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,192 @@ | ||||||||||||||
| # | ||||||||||||||
| # Copyright 2025 the original author or authors. | ||||||||||||||
| # <p> | ||||||||||||||
| # Licensed under the Moderne Source Available License (the "License"); | ||||||||||||||
| # you may not use this file except in compliance with the License. | ||||||||||||||
| # You may obtain a copy of the License at | ||||||||||||||
| # <p> | ||||||||||||||
| # https://docs.moderne.io/licensing/moderne-source-available-license | ||||||||||||||
| # <p> | ||||||||||||||
| # Unless required by applicable law or agreed to in writing, software | ||||||||||||||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||||||||||||||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||||||||||||||
| # See the License for the specific language governing permissions and | ||||||||||||||
| # limitations under the License. | ||||||||||||||
| # | ||||||||||||||
|
|
||||||||||||||
| --- | ||||||||||||||
| type: specs.openrewrite.org/v1beta/recipe | ||||||||||||||
| name: org.geotools.20migrateTo34 | ||||||||||||||
| displayName: Migrate geotools20 to geotools34 | ||||||||||||||
| description: Migrate geotools20 to geotools34 | ||||||||||||||
| tags: | ||||||||||||||
| - jdk | ||||||||||||||
| - jetty | ||||||||||||||
| recipeList: | ||||||||||||||
| - org.openrewrite.java.dependencies.UpgradeDependencyVersion: | ||||||||||||||
| groupId: org.geotools | ||||||||||||||
| artifactId: "*" | ||||||||||||||
| newVersion: 34.x | ||||||||||||||
| - org.openrewrite.java.ChangeType: | ||||||||||||||
| oldFullyQualifiedTypeName: org.geotools.styling.StyleAttributeExtractor | ||||||||||||||
| newFullyQualifiedTypeName: org.geotools.renderer.style.StyleAttributeExtractor | ||||||||||||||
| - org.openrewrite.java.ChangeType: | ||||||||||||||
| oldFullyQualifiedTypeName: org.geotools.styling.GraphicalSymbol | ||||||||||||||
| newFullyQualifiedTypeName: org.geotools.api.style.GraphicalSymbol | ||||||||||||||
| - org.openrewrite.java.ChangeType: | ||||||||||||||
| oldFullyQualifiedTypeName: org.geotools.styling.PointSymbolizer | ||||||||||||||
| newFullyQualifiedTypeName: org.geotools.api.style.PointSymbolizer | ||||||||||||||
| - org.openrewrite.java.ChangeType: | ||||||||||||||
| oldFullyQualifiedTypeName: org.geotools.styling.RasterSymbolizer | ||||||||||||||
| newFullyQualifiedTypeName: org.geotools.api.style.RasterSymbolizer | ||||||||||||||
| - org.openrewrite.java.ChangeType: | ||||||||||||||
| oldFullyQualifiedTypeName: org.geotools.styling.Rule | ||||||||||||||
| newFullyQualifiedTypeName: org.geotools.api.style.Rule | ||||||||||||||
| - org.openrewrite.java.ChangeType: | ||||||||||||||
| oldFullyQualifiedTypeName: org.geotools.styling.FeatureTypeStyle | ||||||||||||||
| newFullyQualifiedTypeName: org.geotools.api.style.FeatureTypeStyle | ||||||||||||||
| - org.openrewrite.java.ChangeType: | ||||||||||||||
| oldFullyQualifiedTypeName: org.geotools.styling.Symbolizer | ||||||||||||||
| newFullyQualifiedTypeName: org.geotools.api.style.Symbolizer | ||||||||||||||
| - org.openrewrite.java.ChangeType: | ||||||||||||||
| oldFullyQualifiedTypeName: org.geotools.styling.TextSymbolizer | ||||||||||||||
| newFullyQualifiedTypeName: org.geotools.api.style.TextSymbolizer | ||||||||||||||
| - org.openrewrite.java.ChangeType: | ||||||||||||||
| oldFullyQualifiedTypeName: org.geotools.styling.LineSymbolizer | ||||||||||||||
| newFullyQualifiedTypeName: org.geotools.api.style.LineSymbolizer | ||||||||||||||
| - org.openrewrite.java.ChangeType: | ||||||||||||||
| oldFullyQualifiedTypeName: org.geotools.styling.PolygonSymbolizer | ||||||||||||||
| newFullyQualifiedTypeName: org.geotools.api.style.PolygonSymbolizer | ||||||||||||||
| - org.openrewrite.java.ChangeType: | ||||||||||||||
| oldFullyQualifiedTypeName: org.geotools.styling.ExternalGraphic | ||||||||||||||
| newFullyQualifiedTypeName: org.geotools.api.style.ExternalGraphic | ||||||||||||||
| - org.openrewrite.java.ChangeType: | ||||||||||||||
| oldFullyQualifiedTypeName: org.geotools.styling.Fill | ||||||||||||||
| newFullyQualifiedTypeName: org.geotools.api.style.Fill | ||||||||||||||
| - org.openrewrite.java.ChangeType: | ||||||||||||||
| oldFullyQualifiedTypeName: org.geotools.styling.Font | ||||||||||||||
| newFullyQualifiedTypeName: org.geotools.api.style.Font | ||||||||||||||
| - org.openrewrite.java.ChangeType: | ||||||||||||||
| oldFullyQualifiedTypeName: org.geotools.styling.Graphic | ||||||||||||||
| newFullyQualifiedTypeName: org.geotools.api.style.Graphic | ||||||||||||||
| - org.openrewrite.java.ChangeType: | ||||||||||||||
| oldFullyQualifiedTypeName: org.geotools.styling.Halo | ||||||||||||||
| newFullyQualifiedTypeName: org.geotools.api.style.Halo | ||||||||||||||
| - org.openrewrite.java.ChangeType: | ||||||||||||||
| oldFullyQualifiedTypeName: org.geotools.styling.LabelPlacement | ||||||||||||||
| newFullyQualifiedTypeName: org.geotools.api.style.LabelPlacement | ||||||||||||||
| - org.openrewrite.java.ChangeType: | ||||||||||||||
| oldFullyQualifiedTypeName: org.geotools.styling.LinePlacement | ||||||||||||||
| newFullyQualifiedTypeName: org.geotools.api.style.LinePlacement | ||||||||||||||
| - org.openrewrite.java.ChangeType: | ||||||||||||||
| oldFullyQualifiedTypeName: org.geotools.styling.Graphic | ||||||||||||||
| newFullyQualifiedTypeName: org.geotools.api.style.Graphic | ||||||||||||||
| - org.openrewrite.java.ChangeType: | ||||||||||||||
| oldFullyQualifiedTypeName: org.geotools.styling.Mark | ||||||||||||||
| newFullyQualifiedTypeName: org.geotools.api.style.Mark | ||||||||||||||
| - org.openrewrite.java.ChangeType: | ||||||||||||||
| oldFullyQualifiedTypeName: org.geotools.styling.Stroke | ||||||||||||||
| newFullyQualifiedTypeName: org.geotools.api.style.Stroke | ||||||||||||||
| - org.openrewrite.java.ChangeType: | ||||||||||||||
| oldFullyQualifiedTypeName: org.geotools.styling.StyleFactory | ||||||||||||||
| newFullyQualifiedTypeName: org.geotools.api.style.StyleFactory | ||||||||||||||
| - org.openrewrite.java.ChangeType: | ||||||||||||||
| oldFullyQualifiedTypeName: org.geotools.styling.StyledLayer | ||||||||||||||
| newFullyQualifiedTypeName: org.geotools.api.style.StyledLayer | ||||||||||||||
| - org.openrewrite.java.ChangeType: | ||||||||||||||
| oldFullyQualifiedTypeName: org.geotools.styling.StyledLayerDescriptor | ||||||||||||||
| newFullyQualifiedTypeName: org.geotools.api.style.StyledLayerDescriptor | ||||||||||||||
| - org.openrewrite.java.ChangeType: | ||||||||||||||
| oldFullyQualifiedTypeName: org.geotools.styling.Style | ||||||||||||||
| newFullyQualifiedTypeName: org.geotools.api.style.Style | ||||||||||||||
| - org.openrewrite.java.ChangeType: | ||||||||||||||
| oldFullyQualifiedTypeName: org.geotools.styling.Displacement | ||||||||||||||
| newFullyQualifiedTypeName: org.geotools.api.style.Displacement | ||||||||||||||
| - org.openrewrite.java.ChangeType: | ||||||||||||||
| oldFullyQualifiedTypeName: org.geotools.styling.AnchorPoint | ||||||||||||||
| newFullyQualifiedTypeName: org.geotools.api.style.AnchorPoint | ||||||||||||||
| - org.openrewrite.java.ChangePackage: | ||||||||||||||
| oldPackageName: org.opengis | ||||||||||||||
| newPackageName: org.geotools.api | ||||||||||||||
| recursive: true | ||||||||||||||
| - org.openrewrite.java.ChangePackage: | ||||||||||||||
| oldPackageName: org.geotools.util | ||||||||||||||
| newPackageName: org.geotools.data.util | ||||||||||||||
| recursive: true | ||||||||||||||
| - org.openrewrite.java.ChangeType: | ||||||||||||||
| oldFullyQualifiedTypeName: org.geotools.data.util.WeakCollectionCleaner | ||||||||||||||
| newFullyQualifiedTypeName: org.geotools.util.WeakCollectionCleaner | ||||||||||||||
| - org.openrewrite.java.ChangeType: | ||||||||||||||
| oldFullyQualifiedTypeName: org.geotools.factory.FactoryNotFoundException | ||||||||||||||
| newFullyQualifiedTypeName: org.geotools.util.factory.FactoryNotFoundException | ||||||||||||||
| - org.openrewrite.java.ChangeType: | ||||||||||||||
| oldFullyQualifiedTypeName: org.geotools.data.FeatureSource | ||||||||||||||
| newFullyQualifiedTypeName: org.geotools.api.data.FeatureSource | ||||||||||||||
| - org.openrewrite.java.ChangeType: | ||||||||||||||
| oldFullyQualifiedTypeName: org.geotools.data.Query | ||||||||||||||
| newFullyQualifiedTypeName: org.geotools.api.data.Query | ||||||||||||||
| - org.openrewrite.java.ChangeType: | ||||||||||||||
| oldFullyQualifiedTypeName: org.geotools.data.QueryCapabilities | ||||||||||||||
| newFullyQualifiedTypeName: org.geotools.api.data.QueryCapabilities | ||||||||||||||
| - org.openrewrite.java.ChangeType: | ||||||||||||||
| oldFullyQualifiedTypeName: org.geotools.data.FeatureWriter | ||||||||||||||
| newFullyQualifiedTypeName: org.geotools.api.data.FeatureWriter | ||||||||||||||
| - org.openrewrite.java.ChangeType: | ||||||||||||||
| oldFullyQualifiedTypeName: org.geotools.data.Transaction | ||||||||||||||
| newFullyQualifiedTypeName: org.geotools.api.data.Transaction | ||||||||||||||
| - org.openrewrite.java.ChangeType: | ||||||||||||||
| oldFullyQualifiedTypeName: org.geotools.data.DataStoreFinder | ||||||||||||||
| newFullyQualifiedTypeName: org.geotools.api.data.DataStoreFinder | ||||||||||||||
| - org.openrewrite.java.ChangeType: | ||||||||||||||
| oldFullyQualifiedTypeName: org.geotools.data.DataAccess | ||||||||||||||
| newFullyQualifiedTypeName: org.geotools.api.data.DataAccess | ||||||||||||||
| - org.openrewrite.java.ChangeType: | ||||||||||||||
| oldFullyQualifiedTypeName: org.geotools.data.DataStore | ||||||||||||||
| newFullyQualifiedTypeName: org.geotools.api.data.DataStore | ||||||||||||||
| - org.openrewrite.java.ChangeType: | ||||||||||||||
| oldFullyQualifiedTypeName: org.geotools.data.FileDataStoreFinder | ||||||||||||||
| newFullyQualifiedTypeName: org.geotools.api.data.FileDataStoreFinder | ||||||||||||||
|
Comment on lines
+122
to
+148
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I wonder if all of these can be replaced with
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The reason why I list it this way is that what is not listed does not need to be modified. |
||||||||||||||
| - org.openrewrite.java.ChangeType: | ||||||||||||||
| oldFullyQualifiedTypeName: org.geotools.api.data.Join | ||||||||||||||
| newFullyQualifiedTypeName: org.geotools.data.Join | ||||||||||||||
|
Comment on lines
+149
to
+151
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Judging by the others I'm seeing, isn't this the wrong way round?
Suggested change
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This might be the class I previously identified that didn't need modification; we can remove it for now. |
||||||||||||||
| - org.openrewrite.java.ChangeType: | ||||||||||||||
| oldFullyQualifiedTypeName: org.geotools.data.simple.SimpleFeatureSource | ||||||||||||||
| newFullyQualifiedTypeName: org.geotools.api.data.SimpleFeatureSource | ||||||||||||||
| - org.openrewrite.java.ChangeType: | ||||||||||||||
| oldFullyQualifiedTypeName: org.geotools.data.simple.SimpleFeatureStore | ||||||||||||||
| newFullyQualifiedTypeName: org.geotools.api.data.SimpleFeatureStore | ||||||||||||||
| - org.openrewrite.java.ChangeType: | ||||||||||||||
| oldFullyQualifiedTypeName: org.geotools.data.simple.SimpleFeatureIterator | ||||||||||||||
| newFullyQualifiedTypeName: org.geotools.api.data.SimpleFeatureIterator | ||||||||||||||
| - org.openrewrite.java.ChangeType: | ||||||||||||||
| oldFullyQualifiedTypeName: org.geotools.factory.Hints | ||||||||||||||
| newFullyQualifiedTypeName: org.geotools.util.factory.Hints | ||||||||||||||
| - org.openrewrite.java.ChangeType: | ||||||||||||||
| oldFullyQualifiedTypeName: org.geotools.data.simple.SimpleFeatureIterator | ||||||||||||||
| newFullyQualifiedTypeName: org.geotools.api.data.SimpleFeatureIterator | ||||||||||||||
| - org.openrewrite.java.ChangeType: | ||||||||||||||
| oldFullyQualifiedTypeName: org.geotools.renderer.ScreenMap | ||||||||||||||
| newFullyQualifiedTypeName: org.geotools.data.util.ScreenMap | ||||||||||||||
| - org.openrewrite.java.ChangePackage: | ||||||||||||||
| oldPackageName: org.geotools.resources | ||||||||||||||
| newPackageName: org.geotools | ||||||||||||||
| recursive: true | ||||||||||||||
| - org.openrewrite.java.ChangeType: | ||||||||||||||
| oldFullyQualifiedTypeName: org.geotools.api.geometry.Envelope | ||||||||||||||
| newFullyQualifiedTypeName: org.geotools.api.geometry.Bounds | ||||||||||||||
| - org.openrewrite.java.ChangeType: | ||||||||||||||
| oldFullyQualifiedTypeName: org.geotools.geometry.DirectPosition2D | ||||||||||||||
| newFullyQualifiedTypeName: org.geotools.geometry.Position2D | ||||||||||||||
| - org.openrewrite.java.ChangeType: | ||||||||||||||
| oldFullyQualifiedTypeName: org.geotools.XArray | ||||||||||||||
| newFullyQualifiedTypeName: org.geotools.util.XArray | ||||||||||||||
| - org.openrewrite.java.ChangeType: | ||||||||||||||
| oldFullyQualifiedTypeName: org.geotools.NIOUtilities | ||||||||||||||
| newFullyQualifiedTypeName: org.geotools.util.NIOUtilities | ||||||||||||||
| - org.openrewrite.java.ChangeType: | ||||||||||||||
| oldFullyQualifiedTypeName: org.geotools.api.filter.FilterFactory2 | ||||||||||||||
| newFullyQualifiedTypeName: org.geotools.api.filter.FilterFactory | ||||||||||||||
| - org.openrewrite.java.ChangePackage: | ||||||||||||||
| oldPackageName: org.geotools.sql | ||||||||||||||
| newPackageName: org.geotools.jdbc.util | ||||||||||||||
| recursive: true | ||||||||||||||
Uh oh!
There was an error while loading. Please reload this page.