Merge pull request #171 from entur/update_geotools_30

Update Geotools v30
entur · Apr 3, 2024 · f755714 · f755714
2 parents 23a09bb + da0723f
commit f755714
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 36 deletions.
diff --git a/pom.xml b/pom.xml
@@ -51,7 +51,7 @@
     <properties>
         <java.version>17</java.version>
         <spring-cloud-gcp.version>4.8.3</spring-cloud-gcp.version>
-        <geotools.version>27.2</geotools.version>
+        <geotools.version>30.2</geotools.version>
         <orika-core.version>1.5.4</orika-core.version>
         <graphql-java.version>20.2</graphql-java.version>
         <hazelcast-hibernate53.version>5.1.0</hazelcast-hibernate53.version>
@@ -62,7 +62,6 @@
         <jts-core.version>1.19.0</jts-core.version>
         <argLine/>
 
-        <geotools-gt-jts-wrapper.version>24.6</geotools-gt-jts-wrapper.version>
         <xercesImpl.version>2.12.2</xercesImpl.version>
         <maven.compiler.args>--add-opens java.base/java.lang=ALL-UNNAMED</maven.compiler.args>
         <testcontainers.version>1.19.2</testcontainers.version>
@@ -279,12 +278,6 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-spatial</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.vividsolutions</groupId>
-                    <artifactId>jts-core</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
@@ -340,12 +333,6 @@
             <version>${geotools.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.geotools</groupId>
-            <artifactId>gt-jts-wrapper</artifactId>
-            <version>${geotools-gt-jts-wrapper.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>org.geotools</groupId>
             <artifactId>gt-epsg-hsql</artifactId>

diff --git a/src/main/java/org/rutebanken/tiamat/geo/EnvelopeCreator.java b/src/main/java/org/rutebanken/tiamat/geo/EnvelopeCreator.java
@@ -19,8 +19,8 @@
 import org.locationtech.jts.geom.Geometry;
 import org.locationtech.jts.geom.GeometryFactory;
 import org.locationtech.jts.geom.Point;
-import org.opengis.referencing.FactoryException;
-import org.opengis.referencing.operation.TransformException;
+import org.geotools.api.referencing.FactoryException;
+import org.geotools.api.referencing.operation.TransformException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/src/main/java/org/rutebanken/tiamat/geo/GeometryTransformer.java b/src/main/java/org/rutebanken/tiamat/geo/GeometryTransformer.java
@@ -18,11 +18,11 @@
 import org.geotools.geometry.jts.JTS;
 import org.geotools.referencing.CRS;
 import org.locationtech.jts.geom.Geometry;
-import org.opengis.referencing.FactoryException;
-import org.opengis.referencing.crs.CRSAuthorityFactory;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.opengis.referencing.operation.MathTransform;
-import org.opengis.referencing.operation.TransformException;
+import org.geotools.api.referencing.FactoryException;
+import org.geotools.api.referencing.crs.CRSAuthorityFactory;
+import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
+import org.geotools.api.referencing.operation.MathTransform;
+import org.geotools.api.referencing.operation.TransformException;
 
 import static org.geotools.referencing.crs.DefaultGeographicCRS.WGS84;
 

diff --git a/src/main/java/org/rutebanken/tiamat/geo/StopPlaceCentroidComputer.java b/src/main/java/org/rutebanken/tiamat/geo/StopPlaceCentroidComputer.java
@@ -19,7 +19,7 @@
 import org.geotools.geometry.jts.JTS;
 import org.geotools.referencing.crs.DefaultGeographicCRS;
 import org.locationtech.jts.geom.Point;
-import org.opengis.referencing.operation.TransformException;
+import org.geotools.api.referencing.operation.TransformException;
 import org.rutebanken.tiamat.model.StopPlace;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/src/main/java/org/rutebanken/tiamat/geo/ZoneDistanceChecker.java b/src/main/java/org/rutebanken/tiamat/geo/ZoneDistanceChecker.java
@@ -18,7 +18,7 @@
 import org.geotools.geometry.jts.JTS;
 import org.geotools.referencing.crs.DefaultGeographicCRS;
 import org.jboss.logging.Logger;
-import org.opengis.referencing.operation.TransformException;
+import org.geotools.api.referencing.operation.TransformException;
 import org.rutebanken.tiamat.model.Zone_VersionStructure;
 import org.springframework.stereotype.Component;
 

diff --git a/src/main/java/org/rutebanken/tiamat/importer/finder/NearbyStopsWithSameTypeFinder.java b/src/main/java/org/rutebanken/tiamat/importer/finder/NearbyStopsWithSameTypeFinder.java
@@ -16,8 +16,8 @@
 package org.rutebanken.tiamat.importer.finder;
 
 import org.locationtech.jts.geom.Envelope;
-import org.opengis.referencing.FactoryException;
-import org.opengis.referencing.operation.TransformException;
+import org.geotools.api.referencing.FactoryException;
+import org.geotools.api.referencing.operation.TransformException;
 import org.rutebanken.tiamat.geo.EnvelopeCreator;
 import org.rutebanken.tiamat.model.StopPlace;
 import org.rutebanken.tiamat.model.StopTypeEnumeration;

diff --git a/src/main/java/org/rutebanken/tiamat/importer/merging/QuayMerger.java b/src/main/java/org/rutebanken/tiamat/importer/merging/QuayMerger.java
@@ -18,7 +18,7 @@
 import com.google.common.base.Strings;
 import org.geotools.geometry.jts.JTS;
 import org.geotools.referencing.crs.DefaultGeographicCRS;
-import org.opengis.referencing.operation.TransformException;
+import org.geotools.api.referencing.operation.TransformException;
 import org.rutebanken.tiamat.importer.matching.OriginalIdMatcher;
 import org.rutebanken.tiamat.model.MultilingualString;
 import org.rutebanken.tiamat.model.Quay;

diff --git a/src/main/java/org/rutebanken/tiamat/importer/modifier/StopPlaceSplitter.java b/src/main/java/org/rutebanken/tiamat/importer/modifier/StopPlaceSplitter.java
@@ -18,7 +18,7 @@
 import org.apache.commons.lang3.SerializationUtils;
 import org.geotools.geometry.jts.JTS;
 import org.geotools.referencing.crs.DefaultGeographicCRS;
-import org.opengis.referencing.operation.TransformException;
+import org.geotools.api.referencing.operation.TransformException;
 import org.rutebanken.tiamat.model.Quay;
 import org.rutebanken.tiamat.model.StopPlace;
 import org.slf4j.Logger;

diff --git a/...a/org/rutebanken/tiamat/netex/mapping/converter/SimplePointVersionStructureConverter.java b/...a/org/rutebanken/tiamat/netex/mapping/converter/SimplePointVersionStructureConverter.java
@@ -24,11 +24,11 @@
 import org.locationtech.jts.geom.Coordinate;
 import org.locationtech.jts.geom.GeometryFactory;
 import org.locationtech.jts.geom.Point;
-import org.opengis.referencing.FactoryException;
-import org.opengis.referencing.crs.CRSAuthorityFactory;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.opengis.referencing.operation.MathTransform;
-import org.opengis.referencing.operation.TransformException;
+import org.geotools.api.referencing.FactoryException;
+import org.geotools.api.referencing.crs.CRSAuthorityFactory;
+import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
+import org.geotools.api.referencing.operation.MathTransform;
+import org.geotools.api.referencing.operation.TransformException;
 import org.rutebanken.netex.model.LocationStructure;
 import org.rutebanken.netex.model.SimplePoint_VersionStructure;
 import org.slf4j.Logger;

diff --git a/src/test/java/org/rutebanken/tiamat/geo/EnvelopeCreatorTest.java b/src/test/java/org/rutebanken/tiamat/geo/EnvelopeCreatorTest.java
@@ -22,8 +22,8 @@
 import org.locationtech.jts.geom.Envelope;
 import org.locationtech.jts.geom.GeometryFactory;
 import org.locationtech.jts.geom.Point;
-import org.opengis.referencing.FactoryException;
-import org.opengis.referencing.operation.TransformException;
+import org.geotools.api.referencing.FactoryException;
+import org.geotools.api.referencing.operation.TransformException;
 import org.rutebanken.tiamat.config.GeometryFactoryConfig;
 
 import static org.assertj.core.api.Assertions.assertThat;

diff --git a/src/test/java/org/rutebanken/tiamat/importer/finder/NearbyStopsWithSameTypeFinderTest.java b/src/test/java/org/rutebanken/tiamat/importer/finder/NearbyStopsWithSameTypeFinderTest.java
@@ -20,8 +20,8 @@
 import org.junit.Test;
 import org.locationtech.jts.geom.Coordinate;
 import org.locationtech.jts.geom.Point;
-import org.opengis.referencing.FactoryException;
-import org.opengis.referencing.operation.TransformException;
+import org.geotools.api.referencing.FactoryException;
+import org.geotools.api.referencing.operation.TransformException;
 import org.rutebanken.tiamat.TiamatIntegrationTest;
 import org.rutebanken.tiamat.model.EmbeddableMultilingualString;
 import org.rutebanken.tiamat.model.StopPlace;