HHH-12144 - Upgrade JTS spatial library to 1.16

bziobrowski · Sep 19, 2018 · b3e56a5 · b3e56a5
1 parent a9fd8ef
commit b3e56a5
Show file tree

Hide file tree

Showing 31 changed files with 90 additions and 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
@@ -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
@@ -16,13 +16,13 @@
 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
@@ -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/...rnate-spatial/src/main/java/org/hibernate/spatial/GeolatteGeometryJavaTypeDescriptor.java b/...rnate-spatial/src/main/java/org/hibernate/spatial/GeolatteGeometryJavaTypeDescriptor.java
@@ -63,7 +63,7 @@ public <X> X unwrap(Geometry value, Class<X> type, WrapperOptions options) {
 			return (X) value;
 		}
 
-		if ( com.vividsolutions.jts.geom.Geometry.class.isAssignableFrom( type ) ) {
+		if ( org.locationtech.jts.geom.Geometry.class.isAssignableFrom( type ) ) {
 			return (X) JTS.to( value );
 		}
 
@@ -85,8 +85,8 @@ public <X> Geometry wrap(X value, WrapperOptions options) {
 			return fromString( (String) value );
 		}
 
-		if ( com.vividsolutions.jts.geom.Geometry.class.isInstance( value ) ) {
-			return JTS.from( (com.vividsolutions.jts.geom.Geometry) value );
+		if ( org.locationtech.jts.geom.Geometry.class.isInstance( value ) ) {
+			return JTS.from( (org.locationtech.jts.geom.Geometry) value );
 		}
 
 		throw unknownWrap( value.getClass() );

diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/JTSGeometryJavaTypeDescriptor.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/JTSGeometryJavaTypeDescriptor.java
@@ -12,9 +12,9 @@
 import org.hibernate.type.descriptor.java.JavaTypeDescriptor;
 import org.hibernate.type.descriptor.java.JavaTypeDescriptorRegistry;
 
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.io.ParseException;
-import com.vividsolutions.jts.io.WKTReader;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.io.WKTReader;
 import org.geolatte.geom.jts.JTS;
 
 /**

diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/JTSGeometryType.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/JTSGeometryType.java
@@ -9,7 +9,7 @@
 import org.hibernate.type.AbstractSingleColumnStandardBasicType;
 import org.hibernate.type.descriptor.sql.SqlTypeDescriptor;
 
-import com.vividsolutions.jts.geom.Geometry;
+import org.locationtech.jts.geom.Geometry;
 
 /**
  * A {@code Type} that maps between the database geometry type and JTS {@code Geometry}.
@@ -30,14 +30,14 @@ public JTSGeometryType(SqlTypeDescriptor sqlTypeDescriptor) {
 	@Override
 	public String[] getRegistrationKeys() {
 		return new String[] {
-				com.vividsolutions.jts.geom.Geometry.class.getCanonicalName(),
-				com.vividsolutions.jts.geom.Point.class.getCanonicalName(),
-				com.vividsolutions.jts.geom.Polygon.class.getCanonicalName(),
-				com.vividsolutions.jts.geom.MultiPolygon.class.getCanonicalName(),
-				com.vividsolutions.jts.geom.LineString.class.getCanonicalName(),
-				com.vividsolutions.jts.geom.MultiLineString.class.getCanonicalName(),
-				com.vividsolutions.jts.geom.MultiPoint.class.getCanonicalName(),
-				com.vividsolutions.jts.geom.GeometryCollection.class.getCanonicalName(),
+				org.locationtech.jts.geom.Geometry.class.getCanonicalName(),
+				org.locationtech.jts.geom.Point.class.getCanonicalName(),
+				org.locationtech.jts.geom.Polygon.class.getCanonicalName(),
+				org.locationtech.jts.geom.MultiPolygon.class.getCanonicalName(),
+				org.locationtech.jts.geom.LineString.class.getCanonicalName(),
+				org.locationtech.jts.geom.MultiLineString.class.getCanonicalName(),
+				org.locationtech.jts.geom.MultiPoint.class.getCanonicalName(),
+				org.locationtech.jts.geom.GeometryCollection.class.getCanonicalName(),
 				"jts_geometry"
 		};
 	}

diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/criterion/DWithinExpression.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/criterion/DWithinExpression.java
@@ -17,7 +17,7 @@
 import org.hibernate.spatial.dialect.oracle.OracleSpatial10gDialect;
 import org.hibernate.type.StandardBasicTypes;
 
-import com.vividsolutions.jts.geom.Geometry;
+import org.locationtech.jts.geom.Geometry;
 
 /**
  * A {@code Criterion} constraining a geometry property to be within a specified distance of a search geometry.

diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/criterion/SpatialFilter.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/criterion/SpatialFilter.java
@@ -16,8 +16,8 @@
 import org.hibernate.spatial.SpatialDialect;
 import org.hibernate.spatial.jts.EnvelopeAdapter;
 
-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 <code>Criterion</code> 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
@@ -15,7 +15,7 @@
 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
@@ -9,8 +9,8 @@
 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
@@ -76,8 +76,8 @@ public static Geometry from(Object object) {
 		}
 		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 static Geometry from(Object object) {
 			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/...c/main/java/org/hibernate/spatial/dialect/oracle/criterion/OracleSpatialRestrictions.java b/...c/main/java/org/hibernate/spatial/dialect/oracle/criterion/OracleSpatialRestrictions.java
@@ -12,7 +12,7 @@
 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
@@ -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/...te-spatial/src/test/java/org/hibernate/spatial/dialect/hana/TestHANASpatialFunctions.java b/...te-spatial/src/test/java/org/hibernate/spatial/dialect/hana/TestHANASpatialFunctions.java
@@ -14,10 +14,10 @@
 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
@@ -28,7 +28,7 @@
 
 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
@@ -15,8 +15,8 @@
 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/...patial/src/test/java/org/hibernate/spatial/integration/jts/TestStoreRetrieveUsingJTS.java b/...patial/src/test/java/org/hibernate/spatial/integration/jts/TestStoreRetrieveUsingJTS.java
@@ -18,8 +18,8 @@
 
 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 <code>Geometry</code>s retrieved

diff --git a/...nate-spatial/src/test/java/org/hibernate/spatial/testing/AbstractExpectationsFactory.java b/...nate-spatial/src/test/java/org/hibernate/spatial/testing/AbstractExpectationsFactory.java
@@ -19,11 +19,11 @@
 
 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 <code>AbstractExpectationsFactory</code> 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
@@ -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
@@ -24,7 +24,7 @@
 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/...tial/src/test/java/org/hibernate/spatial/testing/dialects/db2/DB2ExpectationsFactory.java b/...tial/src/test/java/org/hibernate/spatial/testing/dialects/db2/DB2ExpectationsFactory.java
@@ -29,8 +29,8 @@
 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/...rc/test/java/org/hibernate/spatial/testing/dialects/h2geodb/GeoDBExpectationsFactory.java b/...rc/test/java/org/hibernate/spatial/testing/dialects/h2geodb/GeoDBExpectationsFactory.java
@@ -14,8 +14,8 @@
 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 @@ protected NativeSQLStatement createNativeHavingSRIDStatement(int srid) {
 	 * (non-Javadoc)
 	 *
 	 * @seeorg.hibernatespatial.test.AbstractExpectationsFactory#
-	 * createNativeDistanceStatement(com.vividsolutions.jts.geom.Geometry)
+	 * createNativeDistanceStatement(org.locationtech.jts.geom.Geometry)
 	 */
 
 	@Override
@@ -142,7 +142,7 @@ protected NativeSQLStatement createNativeEnvelopeStatement() {
 	 * (non-Javadoc)
 	 *
 	 * @seeorg.hibernatespatial.test.AbstractExpectationsFactory#
-	 * createNativeEqualsStatement(com.vividsolutions.jts.geom.Geometry)
+	 * createNativeEqualsStatement(org.locationtech.jts.geom.Geometry)
 	 */
 
 	@Override
@@ -157,7 +157,7 @@ protected NativeSQLStatement createNativeEqualsStatement(Geometry geom) {
 	 * (non-Javadoc)
 	 *
 	 * @seeorg.hibernatespatial.test.AbstractExpectationsFactory#
-	 * createNativeFilterStatement(com.vividsolutions.jts.geom.Geometry)
+	 * createNativeFilterStatement(org.locationtech.jts.geom.Geometry)
 	 */
 
 	@Override
@@ -171,7 +171,7 @@ protected NativeSQLStatement createNativeFilterStatement(Geometry geom) {
 	 * (non-Javadoc)
 	 *
 	 * @seeorg.hibernatespatial.test.AbstractExpectationsFactory#
-	 * createNativeGeomUnionStatement(com.vividsolutions.jts.geom.Geometry)
+	 * createNativeGeomUnionStatement(org.locationtech.jts.geom.Geometry)
 	 */
 
 	@Override
@@ -198,7 +198,7 @@ protected NativeSQLStatement createNativeGeometryTypeStatement() {
 	 * (non-Javadoc)
 	 *
 	 * @seeorg.hibernatespatial.test.AbstractExpectationsFactory#
-	 * createNativeIntersectionStatement(com.vividsolutions.jts.geom.Geometry)
+	 * createNativeIntersectionStatement(org.locationtech.jts.geom.Geometry)
 	 */
 
 	@Override
@@ -213,7 +213,7 @@ protected NativeSQLStatement createNativeIntersectionStatement(Geometry geom) {
 	 * (non-Javadoc)
 	 *
 	 * @seeorg.hibernatespatial.test.AbstractExpectationsFactory#
-	 * createNativeIntersectsStatement(com.vividsolutions.jts.geom.Geometry)
+	 * createNativeIntersectsStatement(org.locationtech.jts.geom.Geometry)
 	 */
 
 	@Override
@@ -257,7 +257,7 @@ protected NativeSQLStatement createNativeIsSimpleStatement() {
 	 * (non-Javadoc)
 	 *
 	 * @seeorg.hibernatespatial.test.AbstractExpectationsFactory#
-	 * createNativeOverlapsStatement(com.vividsolutions.jts.geom.Geometry)
+	 * createNativeOverlapsStatement(org.locationtech.jts.geom.Geometry)
 	 */
 
 	@Override
@@ -272,7 +272,7 @@ protected NativeSQLStatement createNativeOverlapsStatement(Geometry geom) {
 	 * (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 @@ protected NativeSQLStatement createNativeSridStatement() {
 	 * (non-Javadoc)
 	 *
 	 * @seeorg.hibernatespatial.test.AbstractExpectationsFactory#
-	 * createNativeSymDifferenceStatement(com.vividsolutions.jts.geom.Geometry)
+	 * createNativeSymDifferenceStatement(org.locationtech.jts.geom.Geometry)
 	 */
 
 	@Override
@@ -327,7 +327,7 @@ protected NativeSQLStatement createNativeSymDifferenceStatement(
 	 * (non-Javadoc)
 	 *
 	 * @seeorg.hibernatespatial.test.AbstractExpectationsFactory#
-	 * createNativeTouchesStatement(com.vividsolutions.jts.geom.Geometry)
+	 * createNativeTouchesStatement(org.locationtech.jts.geom.Geometry)
 	 */
 
 	@Override
@@ -342,7 +342,7 @@ protected NativeSQLStatement createNativeTouchesStatement(Geometry geom) {
 	 * (non-Javadoc)
 	 *
 	 * @seeorg.hibernatespatial.test.AbstractExpectationsFactory#
-	 * createNativeWithinStatement(com.vividsolutions.jts.geom.Geometry)
+	 * createNativeWithinStatement(org.locationtech.jts.geom.Geometry)
 	 */
 
 	@Override