From da0723f6258025c4bddc5213df4d5a82009d2008 Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Mon, 5 Feb 2024 12:52:04 +0100 Subject: [PATCH] Update Geotools v30 --- pom.xml | 15 +-------------- .../rutebanken/tiamat/geo/EnvelopeCreator.java | 4 ++-- .../tiamat/geo/GeometryTransformer.java | 10 +++++----- .../tiamat/geo/StopPlaceCentroidComputer.java | 2 +- .../tiamat/geo/ZoneDistanceChecker.java | 2 +- .../finder/NearbyStopsWithSameTypeFinder.java | 4 ++-- .../tiamat/importer/merging/QuayMerger.java | 2 +- .../importer/modifier/StopPlaceSplitter.java | 2 +- .../SimplePointVersionStructureConverter.java | 10 +++++----- .../tiamat/geo/EnvelopeCreatorTest.java | 4 ++-- .../finder/NearbyStopsWithSameTypeFinderTest.java | 4 ++-- 11 files changed, 23 insertions(+), 36 deletions(-) diff --git a/pom.xml b/pom.xml index f2ef6f382..02f76f4ef 100644 --- a/pom.xml +++ b/pom.xml @@ -51,7 +51,7 @@ 17 4.8.3 - 27.2 + 30.2 1.5.4 11.0 @@ -63,7 +63,6 @@ 1.19.0 - 24.6 2.12.2 --add-opens java.base/java.lang=ALL-UNNAMED 1.19.2 @@ -274,12 +273,6 @@ org.hibernate hibernate-spatial - - - com.vividsolutions - jts-core - - @@ -335,12 +328,6 @@ ${geotools.version} - - org.geotools - gt-jts-wrapper - ${geotools-gt-jts-wrapper.version} - - org.geotools gt-epsg-hsql diff --git a/src/main/java/org/rutebanken/tiamat/geo/EnvelopeCreator.java b/src/main/java/org/rutebanken/tiamat/geo/EnvelopeCreator.java index b0518376e..84f5bd5a9 100644 --- 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 index babd0a262..7b931ab93 100644 --- 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 index c3ba3e604..042c6b153 100644 --- 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 index 059c0a774..e0ce3965a 100644 --- 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 index 94166448e..0dd232b17 100644 --- 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 index a7aaf79ed..29cb363db 100644 --- 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 index 14925b204..c066ff2df 100644 --- 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/src/main/java/org/rutebanken/tiamat/netex/mapping/converter/SimplePointVersionStructureConverter.java b/src/main/java/org/rutebanken/tiamat/netex/mapping/converter/SimplePointVersionStructureConverter.java index 250fb5b02..6bfc50917 100644 --- a/src/main/java/org/rutebanken/tiamat/netex/mapping/converter/SimplePointVersionStructureConverter.java +++ b/src/main/java/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 index 07b6e5255..62a9fc28d 100644 --- 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 index de57ffaa3..62a46189a 100644 --- 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;