From b3e56a5db71110d07a095762a788c53ef258bd01 Mon Sep 17 00:00:00 2001 From: Karel Maesen Date: Wed, 19 Sep 2018 20:06:56 +0200 Subject: [PATCH] HHH-12144 - Upgrade JTS spatial library to 1.16 --- .../chapters/query/spatial/Spatial.adoc | 2 +- .../userguide/spatial/SpatialTest.java | 8 +++--- gradle/libraries.gradle | 2 +- .../GeolatteGeometryJavaTypeDescriptor.java | 6 ++--- .../JTSGeometryJavaTypeDescriptor.java | 6 ++--- .../hibernate/spatial/JTSGeometryType.java | 18 ++++++------- .../spatial/criterion/DWithinExpression.java | 2 +- .../spatial/criterion/SpatialFilter.java | 4 +-- .../criterion/SpatialRelateExpression.java | 2 +- .../criterion/SpatialRestrictions.java | 4 +-- .../spatial/dialect/h2geodb/GeoDbWkb.java | 8 +++--- .../criterion/OracleSpatialRestrictions.java | 2 +- .../spatial/jts/EnvelopeAdapter.java | 10 +++---- .../hana/TestHANASpatialFunctions.java | 8 +++--- .../integration/TestSpatialFunctions.java | 2 +- .../spatial/integration/jts/GeomEntity.java | 4 +-- .../jts/TestStoreRetrieveUsingJTS.java | 4 +-- .../testing/AbstractExpectationsFactory.java | 10 +++---- .../spatial/testing/JTSGeometryEquality.java | 6 ++--- .../testing/SpatialFunctionalTestCase.java | 2 +- .../dialects/db2/DB2ExpectationsFactory.java | 4 +-- .../h2geodb/GeoDBExpectationsFactory.java | 26 +++++++++---------- .../h2geodb/GeoDBGeometryEquality.java | 4 +-- .../GeoDBNoSRIDExpectationsFactory.java | 4 +-- .../hana/HANAExpectationsFactory.java | 10 +++---- .../mysql/MySQL56ExpectationsFactory.java | 2 +- .../mysql/MySQLExpectationsFactory.java | 4 +-- .../dialects/mysql/MySQLGeometryEquality.java | 4 +-- .../SDOGeometryExpectationsFactory.java | 4 +-- .../postgis/PostgisExpectationsFactory.java | 4 +-- .../SqlServerExpectationsFactory.java | 4 +-- 31 files changed, 90 insertions(+), 90 deletions(-) diff --git a/documentation/src/main/asciidoc/userguide/chapters/query/spatial/Spatial.adoc b/documentation/src/main/asciidoc/userguide/chapters/query/spatial/Spatial.adoc index 226c079343..e348fec902 100644 --- a/documentation/src/main/asciidoc/userguide/chapters/query/spatial/Spatial.adoc +++ b/documentation/src/main/asciidoc/userguide/chapters/query/spatial/Spatial.adoc @@ -252,7 +252,7 @@ create transform for db2gse.st_geometry db2_program ( Hibernate Spatial comes with the following types: jts_geometry:: - Handled by `org.hibernate.spatial.JTSGeometryType` it maps a database geometry column type to a `com.vividsolutions.jts.geom.Geometry` entity property type. + Handled by `org.hibernate.spatial.JTSGeometryType` it maps a database geometry column type to a `org.locationtech.jts.geom.Geometry` entity property type. geolatte_geometry:: Handled by `org.hibernate.spatial.GeolatteGeometryType`, it maps a database geometry column type to an `org.geolatte.geom.Geometry` entity property type. diff --git a/documentation/src/test/java/org/hibernate/userguide/spatial/SpatialTest.java b/documentation/src/test/java/org/hibernate/userguide/spatial/SpatialTest.java index 70b55cfe13..66e0aec1e8 100644 --- a/documentation/src/test/java/org/hibernate/userguide/spatial/SpatialTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/spatial/SpatialTest.java @@ -16,13 +16,13 @@ import org.hibernate.spatial.dialect.postgis.PostgisPG95Dialect; import org.hibernate.testing.RequiresDialect; import org.junit.Test; -import com.vividsolutions.jts.geom.Coordinate; +import org.locationtech.jts.geom.Coordinate; //tag::spatial-types-mapping-example[] -import com.vividsolutions.jts.geom.Point; +import org.locationtech.jts.geom.Point; //end::spatial-types-mapping-example[] -import com.vividsolutions.jts.geom.GeometryFactory; -import com.vividsolutions.jts.geom.Polygon; +import org.locationtech.jts.geom.GeometryFactory; +import org.locationtech.jts.geom.Polygon; import static org.junit.Assert.assertEquals; diff --git a/gradle/libraries.gradle b/gradle/libraries.gradle index 2039fb4682..fe8c0da817 100644 --- a/gradle/libraries.gradle +++ b/gradle/libraries.gradle @@ -25,7 +25,7 @@ ext { javassistVersion = '3.23.1-GA' byteBuddyVersion = '1.8.17' // Now with JDK10 compatibility and preliminary support for JDK11 - geolatteVersion = '1.3.0' + geolatteVersion = '1.4.0' // Wildfly version targeted by module ZIP; Arquillian/Shrinkwrap versions used for CDI testing and testing the module ZIP wildflyVersion = '13.0.0.Final' diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/GeolatteGeometryJavaTypeDescriptor.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/GeolatteGeometryJavaTypeDescriptor.java index 4c817ef1b6..3ed15912fb 100644 --- a/hibernate-spatial/src/main/java/org/hibernate/spatial/GeolatteGeometryJavaTypeDescriptor.java +++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/GeolatteGeometryJavaTypeDescriptor.java @@ -63,7 +63,7 @@ public class GeolatteGeometryJavaTypeDescriptor extends AbstractTypeDescriptorCriterion constraining a geometry property to have a bounding box that overlaps with diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/criterion/SpatialRelateExpression.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/criterion/SpatialRelateExpression.java index 145e3009a9..cd9f677526 100644 --- a/hibernate-spatial/src/main/java/org/hibernate/spatial/criterion/SpatialRelateExpression.java +++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/criterion/SpatialRelateExpression.java @@ -15,7 +15,7 @@ import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.TypedValue; import org.hibernate.spatial.SpatialDialect; -import com.vividsolutions.jts.geom.Geometry; +import org.locationtech.jts.geom.Geometry; /** * A {@code Criterion} constraining a {@code Geometry} property to have specific spatial relation diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/criterion/SpatialRestrictions.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/criterion/SpatialRestrictions.java index 242ff6ec6d..c9916ce76c 100644 --- a/hibernate-spatial/src/main/java/org/hibernate/spatial/criterion/SpatialRestrictions.java +++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/criterion/SpatialRestrictions.java @@ -9,8 +9,8 @@ package org.hibernate.spatial.criterion; import org.hibernate.criterion.Criterion; import org.hibernate.spatial.SpatialRelation; -import com.vividsolutions.jts.geom.Envelope; -import com.vividsolutions.jts.geom.Geometry; +import org.locationtech.jts.geom.Envelope; +import org.locationtech.jts.geom.Geometry; /** * A factory for spatial criteria. diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/h2geodb/GeoDbWkb.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/h2geodb/GeoDbWkb.java index 7fd1bdab66..a95c752969 100644 --- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/h2geodb/GeoDbWkb.java +++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/h2geodb/GeoDbWkb.java @@ -76,8 +76,8 @@ public class GeoDbWkb { } try { - if ( object instanceof com.vividsolutions.jts.geom.Geometry ) { - return JTS.from( (com.vividsolutions.jts.geom.Geometry) object ); + if ( object instanceof org.locationtech.jts.geom.Geometry ) { + return JTS.from( (org.locationtech.jts.geom.Geometry) object ); } final WkbDecoder decoder = Wkb.newDecoder( Wkb.Dialect.POSTGIS_EWKB_1 ); if ( object instanceof Blob ) { @@ -86,8 +86,8 @@ public class GeoDbWkb { else if ( object instanceof byte[] ) { return decoder.decode( ByteBuffer.from( (byte[]) object ) ); } - else if ( object instanceof com.vividsolutions.jts.geom.Envelope ) { - return toPolygon( JTS.from( (com.vividsolutions.jts.geom.Envelope) object ) ); + else if ( object instanceof org.locationtech.jts.geom.Envelope ) { + return toPolygon( JTS.from( (org.locationtech.jts.geom.Envelope) object ) ); } else { throw new IllegalArgumentException( diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/criterion/OracleSpatialRestrictions.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/criterion/OracleSpatialRestrictions.java index 9cca8906d0..dee6ff2acf 100644 --- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/criterion/OracleSpatialRestrictions.java +++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/criterion/OracleSpatialRestrictions.java @@ -12,7 +12,7 @@ import org.hibernate.criterion.CriteriaQuery; import org.hibernate.criterion.Criterion; import org.hibernate.engine.spi.TypedValue; -import com.vividsolutions.jts.geom.Geometry; +import org.locationtech.jts.geom.Geometry; /** * A static factory class for spatial criteria using the Oracle Spatial native spatial operators diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/jts/EnvelopeAdapter.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/jts/EnvelopeAdapter.java index 1045faf8ff..9fe0975691 100644 --- a/hibernate-spatial/src/main/java/org/hibernate/spatial/jts/EnvelopeAdapter.java +++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/jts/EnvelopeAdapter.java @@ -6,11 +6,11 @@ */ package org.hibernate.spatial.jts; -import com.vividsolutions.jts.geom.Coordinate; -import com.vividsolutions.jts.geom.Envelope; -import com.vividsolutions.jts.geom.GeometryFactory; -import com.vividsolutions.jts.geom.LinearRing; -import com.vividsolutions.jts.geom.Polygon; +import org.locationtech.jts.geom.Coordinate; +import org.locationtech.jts.geom.Envelope; +import org.locationtech.jts.geom.GeometryFactory; +import org.locationtech.jts.geom.LinearRing; +import org.locationtech.jts.geom.Polygon; /** * Converts an {@code Envelope} to a {@code Polygon} diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/hana/TestHANASpatialFunctions.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/hana/TestHANASpatialFunctions.java index f1d9c9270b..6e551362fb 100644 --- a/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/hana/TestHANASpatialFunctions.java +++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/hana/TestHANASpatialFunctions.java @@ -14,10 +14,10 @@ import org.hibernate.testing.RequiresDialect; import org.jboss.logging.Logger; import org.junit.Test; -import com.vividsolutions.jts.geom.Geometry; -import com.vividsolutions.jts.geom.Point; -import com.vividsolutions.jts.io.WKBWriter; -import com.vividsolutions.jts.io.WKTWriter; +import org.locationtech.jts.geom.Geometry; +import org.locationtech.jts.geom.Point; +import org.locationtech.jts.io.WKBWriter; +import org.locationtech.jts.io.WKTWriter; @RequiresDialect(value = HANASpatialDialect.class, comment = "This test tests the HANA spatial functions not covered by Hibernate Spatial", jiraKey = "HHH-12426") public class TestHANASpatialFunctions extends TestSpatialFunctions { diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/TestSpatialFunctions.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/TestSpatialFunctions.java index f69a37012e..d4d4aa283a 100644 --- a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/TestSpatialFunctions.java +++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/TestSpatialFunctions.java @@ -28,7 +28,7 @@ import org.junit.Test; import org.jboss.logging.Logger; -import com.vividsolutions.jts.geom.Geometry; +import org.locationtech.jts.geom.Geometry; import static java.lang.String.format; diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/jts/GeomEntity.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/jts/GeomEntity.java index 8e226f924b..a1567db928 100644 --- a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/jts/GeomEntity.java +++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/jts/GeomEntity.java @@ -15,8 +15,8 @@ import org.hibernate.dialect.Dialect; import org.hibernate.spatial.integration.GeomEntityLike; import org.hibernate.spatial.testing.TestDataElement; -import com.vividsolutions.jts.geom.Geometry; -import com.vividsolutions.jts.io.ParseException; +import org.locationtech.jts.geom.Geometry; +import org.locationtech.jts.io.ParseException; import org.geolatte.geom.codec.WktDecoder; import org.geolatte.geom.jts.JTS; diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/jts/TestStoreRetrieveUsingJTS.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/jts/TestStoreRetrieveUsingJTS.java index 4bea28f434..cbacfc45cc 100644 --- a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/jts/TestStoreRetrieveUsingJTS.java +++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/jts/TestStoreRetrieveUsingJTS.java @@ -18,8 +18,8 @@ import org.hibernate.testing.Skip; import org.jboss.logging.Logger; -import com.vividsolutions.jts.geom.Geometry; -import com.vividsolutions.jts.io.ParseException; +import org.locationtech.jts.geom.Geometry; +import org.locationtech.jts.io.ParseException; /** * This testsuite-suite class verifies whether the Geometrys retrieved diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/AbstractExpectationsFactory.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/AbstractExpectationsFactory.java index 73d6fc0c97..7753de9167 100644 --- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/AbstractExpectationsFactory.java +++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/AbstractExpectationsFactory.java @@ -19,11 +19,11 @@ import org.hibernate.spatial.HSMessageLogger; import org.jboss.logging.Logger; -import com.vividsolutions.jts.geom.Geometry; -import com.vividsolutions.jts.geom.Point; -import com.vividsolutions.jts.geom.Polygon; -import com.vividsolutions.jts.io.ParseException; -import com.vividsolutions.jts.io.WKTReader; +import org.locationtech.jts.geom.Geometry; +import org.locationtech.jts.geom.Point; +import org.locationtech.jts.geom.Polygon; +import org.locationtech.jts.io.ParseException; +import org.locationtech.jts.io.WKTReader; /** * An AbstractExpectationsFactory provides the expected diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/JTSGeometryEquality.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/JTSGeometryEquality.java index 87ac8e5889..082a222039 100644 --- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/JTSGeometryEquality.java +++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/JTSGeometryEquality.java @@ -7,9 +7,9 @@ package org.hibernate.spatial.testing; -import com.vividsolutions.jts.geom.Coordinate; -import com.vividsolutions.jts.geom.Geometry; -import com.vividsolutions.jts.geom.GeometryCollection; +import org.locationtech.jts.geom.Coordinate; +import org.locationtech.jts.geom.Geometry; +import org.locationtech.jts.geom.GeometryCollection; /** * This class tests for the equality between geometries. diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/SpatialFunctionalTestCase.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/SpatialFunctionalTestCase.java index 2ca820f9a1..8453e64b37 100644 --- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/SpatialFunctionalTestCase.java +++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/SpatialFunctionalTestCase.java @@ -24,7 +24,7 @@ import org.hibernate.spatial.SpatialFunction; import org.hibernate.testing.AfterClassOnce; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; -import com.vividsolutions.jts.geom.Geometry; +import org.locationtech.jts.geom.Geometry; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/db2/DB2ExpectationsFactory.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/db2/DB2ExpectationsFactory.java index c23873824e..99185d223c 100644 --- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/db2/DB2ExpectationsFactory.java +++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/db2/DB2ExpectationsFactory.java @@ -29,8 +29,8 @@ import org.hibernate.spatial.testing.AbstractExpectationsFactory; import org.hibernate.spatial.testing.DataSourceUtils; import org.hibernate.spatial.testing.NativeSQLStatement; -import com.vividsolutions.jts.geom.Geometry; -import com.vividsolutions.jts.geom.Point; +import org.locationtech.jts.geom.Geometry; +import org.locationtech.jts.geom.Point; import org.geolatte.geom.jts.JTS; /** diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/h2geodb/GeoDBExpectationsFactory.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/h2geodb/GeoDBExpectationsFactory.java index 6ab3ee0933..52589a924b 100644 --- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/h2geodb/GeoDBExpectationsFactory.java +++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/h2geodb/GeoDBExpectationsFactory.java @@ -14,8 +14,8 @@ import org.hibernate.spatial.dialect.h2geodb.GeoDbWkb; import org.hibernate.spatial.testing.AbstractExpectationsFactory; import org.hibernate.spatial.testing.NativeSQLStatement; -import com.vividsolutions.jts.geom.Geometry; -import com.vividsolutions.jts.geom.Point; +import org.locationtech.jts.geom.Geometry; +import org.locationtech.jts.geom.Point; import org.geolatte.geom.jts.JTS; @@ -115,7 +115,7 @@ public class GeoDBExpectationsFactory extends AbstractExpectationsFactory { * (non-Javadoc) * * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# - * createNativeDistanceStatement(com.vividsolutions.jts.geom.Geometry) + * createNativeDistanceStatement(org.locationtech.jts.geom.Geometry) */ @Override @@ -142,7 +142,7 @@ public class GeoDBExpectationsFactory extends AbstractExpectationsFactory { * (non-Javadoc) * * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# - * createNativeEqualsStatement(com.vividsolutions.jts.geom.Geometry) + * createNativeEqualsStatement(org.locationtech.jts.geom.Geometry) */ @Override @@ -157,7 +157,7 @@ public class GeoDBExpectationsFactory extends AbstractExpectationsFactory { * (non-Javadoc) * * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# - * createNativeFilterStatement(com.vividsolutions.jts.geom.Geometry) + * createNativeFilterStatement(org.locationtech.jts.geom.Geometry) */ @Override @@ -171,7 +171,7 @@ public class GeoDBExpectationsFactory extends AbstractExpectationsFactory { * (non-Javadoc) * * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# - * createNativeGeomUnionStatement(com.vividsolutions.jts.geom.Geometry) + * createNativeGeomUnionStatement(org.locationtech.jts.geom.Geometry) */ @Override @@ -198,7 +198,7 @@ public class GeoDBExpectationsFactory extends AbstractExpectationsFactory { * (non-Javadoc) * * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# - * createNativeIntersectionStatement(com.vividsolutions.jts.geom.Geometry) + * createNativeIntersectionStatement(org.locationtech.jts.geom.Geometry) */ @Override @@ -213,7 +213,7 @@ public class GeoDBExpectationsFactory extends AbstractExpectationsFactory { * (non-Javadoc) * * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# - * createNativeIntersectsStatement(com.vividsolutions.jts.geom.Geometry) + * createNativeIntersectsStatement(org.locationtech.jts.geom.Geometry) */ @Override @@ -257,7 +257,7 @@ public class GeoDBExpectationsFactory extends AbstractExpectationsFactory { * (non-Javadoc) * * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# - * createNativeOverlapsStatement(com.vividsolutions.jts.geom.Geometry) + * createNativeOverlapsStatement(org.locationtech.jts.geom.Geometry) */ @Override @@ -272,7 +272,7 @@ public class GeoDBExpectationsFactory extends AbstractExpectationsFactory { * (non-Javadoc) * * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# - * createNativeRelateStatement(com.vividsolutions.jts.geom.Geometry, + * createNativeRelateStatement(org.locationtech.jts.geom.Geometry, * java.lang.String) */ @@ -311,7 +311,7 @@ public class GeoDBExpectationsFactory extends AbstractExpectationsFactory { * (non-Javadoc) * * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# - * createNativeSymDifferenceStatement(com.vividsolutions.jts.geom.Geometry) + * createNativeSymDifferenceStatement(org.locationtech.jts.geom.Geometry) */ @Override @@ -327,7 +327,7 @@ public class GeoDBExpectationsFactory extends AbstractExpectationsFactory { * (non-Javadoc) * * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# - * createNativeTouchesStatement(com.vividsolutions.jts.geom.Geometry) + * createNativeTouchesStatement(org.locationtech.jts.geom.Geometry) */ @Override @@ -342,7 +342,7 @@ public class GeoDBExpectationsFactory extends AbstractExpectationsFactory { * (non-Javadoc) * * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# - * createNativeWithinStatement(com.vividsolutions.jts.geom.Geometry) + * createNativeWithinStatement(org.locationtech.jts.geom.Geometry) */ @Override diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/h2geodb/GeoDBGeometryEquality.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/h2geodb/GeoDBGeometryEquality.java index f5bd4b7e82..c018cc5680 100644 --- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/h2geodb/GeoDBGeometryEquality.java +++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/h2geodb/GeoDBGeometryEquality.java @@ -12,8 +12,8 @@ package org.hibernate.spatial.testing.dialects.h2geodb; import org.hibernate.spatial.testing.JTSGeometryEquality; -import com.vividsolutions.jts.geom.Coordinate; -import com.vividsolutions.jts.geom.Geometry; +import org.locationtech.jts.geom.Coordinate; +import org.locationtech.jts.geom.Geometry; /** * Extends the test for {@link Geometry} equality, because GeoDB uses JTS diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/h2geodb/GeoDBNoSRIDExpectationsFactory.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/h2geodb/GeoDBNoSRIDExpectationsFactory.java index ba886c5dc6..dd6950d0f2 100644 --- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/h2geodb/GeoDBNoSRIDExpectationsFactory.java +++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/h2geodb/GeoDBNoSRIDExpectationsFactory.java @@ -13,8 +13,8 @@ package org.hibernate.spatial.testing.dialects.h2geodb; import org.hibernate.spatial.testing.AbstractExpectationsFactory; import org.hibernate.spatial.testing.NativeSQLStatement; -import com.vividsolutions.jts.geom.Geometry; -import com.vividsolutions.jts.geom.Point; +import org.locationtech.jts.geom.Geometry; +import org.locationtech.jts.geom.Point; import org.geolatte.geom.ByteBuffer; import org.geolatte.geom.codec.Wkb; import org.geolatte.geom.jts.JTS; diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/hana/HANAExpectationsFactory.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/hana/HANAExpectationsFactory.java index 5b7a26ab5e..f305127bca 100644 --- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/hana/HANAExpectationsFactory.java +++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/hana/HANAExpectationsFactory.java @@ -12,11 +12,11 @@ import org.hibernate.spatial.testing.AbstractExpectationsFactory; import org.hibernate.spatial.testing.DataSourceUtils; import org.hibernate.spatial.testing.NativeSQLStatement; -import com.vividsolutions.jts.geom.Geometry; -import com.vividsolutions.jts.geom.Point; -import com.vividsolutions.jts.geom.Polygon; -import com.vividsolutions.jts.io.ParseException; -import com.vividsolutions.jts.io.WKTReader; +import org.locationtech.jts.geom.Geometry; +import org.locationtech.jts.geom.Point; +import org.locationtech.jts.geom.Polygon; +import org.locationtech.jts.io.ParseException; +import org.locationtech.jts.io.WKTReader; import java.sql.SQLException; import java.util.Map; diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mysql/MySQL56ExpectationsFactory.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mysql/MySQL56ExpectationsFactory.java index ec84da6a40..a3a5185449 100644 --- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mysql/MySQL56ExpectationsFactory.java +++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mysql/MySQL56ExpectationsFactory.java @@ -9,7 +9,7 @@ package org.hibernate.spatial.testing.dialects.mysql; import org.hibernate.spatial.testing.DataSourceUtils; import org.hibernate.spatial.testing.NativeSQLStatement; -import com.vividsolutions.jts.geom.Geometry; +import org.locationtech.jts.geom.Geometry; /** * @author Karel Maesen, Geovise BVBA diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mysql/MySQLExpectationsFactory.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mysql/MySQLExpectationsFactory.java index d21082e3d6..c389f66357 100644 --- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mysql/MySQLExpectationsFactory.java +++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mysql/MySQLExpectationsFactory.java @@ -11,8 +11,8 @@ import org.hibernate.spatial.testing.AbstractExpectationsFactory; import org.hibernate.spatial.testing.DataSourceUtils; import org.hibernate.spatial.testing.NativeSQLStatement; -import com.vividsolutions.jts.geom.Geometry; -import com.vividsolutions.jts.geom.Point; +import org.locationtech.jts.geom.Geometry; +import org.locationtech.jts.geom.Point; import org.geolatte.geom.ByteBuffer; import org.geolatte.geom.codec.Wkb; import org.geolatte.geom.codec.WkbDecoder; diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mysql/MySQLGeometryEquality.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mysql/MySQLGeometryEquality.java index e737f553ed..00bf6728b6 100644 --- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mysql/MySQLGeometryEquality.java +++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mysql/MySQLGeometryEquality.java @@ -9,8 +9,8 @@ package org.hibernate.spatial.testing.dialects.mysql; import org.hibernate.spatial.testing.JTSGeometryEquality; -import com.vividsolutions.jts.geom.Coordinate; -import com.vividsolutions.jts.geom.Geometry; +import org.locationtech.jts.geom.Coordinate; +import org.locationtech.jts.geom.Geometry; /** * Extends the test for geometry equality, because diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/oracle/SDOGeometryExpectationsFactory.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/oracle/SDOGeometryExpectationsFactory.java index e014237cf9..dd8df841e0 100644 --- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/oracle/SDOGeometryExpectationsFactory.java +++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/oracle/SDOGeometryExpectationsFactory.java @@ -13,8 +13,8 @@ import org.hibernate.spatial.testing.AbstractExpectationsFactory; import org.hibernate.spatial.testing.DataSourceUtils; import org.hibernate.spatial.testing.NativeSQLStatement; -import com.vividsolutions.jts.geom.Geometry; -import com.vividsolutions.jts.geom.Point; +import org.locationtech.jts.geom.Geometry; +import org.locationtech.jts.geom.Point; import org.geolatte.geom.jts.JTS; /** diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/postgis/PostgisExpectationsFactory.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/postgis/PostgisExpectationsFactory.java index dfe83b99dc..21b4b9b8d0 100644 --- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/postgis/PostgisExpectationsFactory.java +++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/postgis/PostgisExpectationsFactory.java @@ -15,8 +15,8 @@ import org.hibernate.spatial.testing.NativeSQLStatement; import org.jboss.logging.Logger; -import com.vividsolutions.jts.geom.Geometry; -import com.vividsolutions.jts.geom.Point; +import org.locationtech.jts.geom.Geometry; +import org.locationtech.jts.geom.Point; import org.geolatte.geom.jts.JTS; /** diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/sqlserver/SqlServerExpectationsFactory.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/sqlserver/SqlServerExpectationsFactory.java index f183f1862b..0a9baa0191 100644 --- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/sqlserver/SqlServerExpectationsFactory.java +++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/sqlserver/SqlServerExpectationsFactory.java @@ -11,8 +11,8 @@ import org.hibernate.spatial.testing.AbstractExpectationsFactory; import org.hibernate.spatial.testing.DataSourceUtils; import org.hibernate.spatial.testing.NativeSQLStatement; -import com.vividsolutions.jts.geom.Geometry; -import com.vividsolutions.jts.geom.Point; +import org.locationtech.jts.geom.Geometry; +import org.locationtech.jts.geom.Point; import org.geolatte.geom.codec.db.sqlserver.Decoders; import org.geolatte.geom.jts.JTS;