Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-12144 - Upgrade JTS spatial library to 1.16

This commit is contained in:
Karel Maesen 2018-09-19 20:06:56 +02:00
parent a9fd8efe33
commit b3e56a5db7
31 changed files with 90 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
documentation/src/main/asciidoc/userguide/chapters/query/spatial/Spatial.adoc
View File

@ -252,7 +252,7 @@ create transform for db2gse.st_geometry db2_program (
Hibernate Spatial comes with the following types: Hibernate Spatial comes with the following types:
jts_geometry:: 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:: geolatte_geometry::
Handled by `org.hibernate.spatial.GeolatteGeometryType`, it maps a database geometry column type to an `org.geolatte.geom.Geometry` entity property type. Handled by `org.hibernate.spatial.GeolatteGeometryType`, it maps a database geometry column type to an `org.geolatte.geom.Geometry` entity property type.

8
documentation/src/test/java/org/hibernate/userguide/spatial/SpatialTest.java
View File

@ -16,13 +16,13 @@ import org.hibernate.spatial.dialect.postgis.PostgisPG95Dialect;
import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.RequiresDialect;
import org.junit.Test; import org.junit.Test;
import com.vividsolutions.jts.geom.Coordinate; import org.locationtech.jts.geom.Coordinate;
//tag::spatial-types-mapping-example[] //tag::spatial-types-mapping-example[]
import com.vividsolutions.jts.geom.Point; import org.locationtech.jts.geom.Point;
//end::spatial-types-mapping-example[] //end::spatial-types-mapping-example[]
import com.vividsolutions.jts.geom.GeometryFactory; import org.locationtech.jts.geom.GeometryFactory;
import com.vividsolutions.jts.geom.Polygon; import org.locationtech.jts.geom.Polygon;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;

2
gradle/libraries.gradle
View File

@ -25,7 +25,7 @@ ext {
javassistVersion = '3.23.1-GA' javassistVersion = '3.23.1-GA'
byteBuddyVersion = '1.8.17' // Now with JDK10 compatibility and preliminary support for JDK11 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 // Wildfly version targeted by module ZIP; Arquillian/Shrinkwrap versions used for CDI testing and testing the module ZIP
wildflyVersion = '13.0.0.Final' wildflyVersion = '13.0.0.Final'

6
hibernate-spatial/src/main/java/org/hibernate/spatial/GeolatteGeometryJavaTypeDescriptor.java
View File

@ -63,7 +63,7 @@ public class GeolatteGeometryJavaTypeDescriptor extends AbstractTypeDescriptor<G
return (X) value; 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 ); return (X) JTS.to( value );
} }
@ -85,8 +85,8 @@ public class GeolatteGeometryJavaTypeDescriptor extends AbstractTypeDescriptor<G
return fromString( (String) value ); return fromString( (String) value );
} }
if ( com.vividsolutions.jts.geom.Geometry.class.isInstance( value ) ) { if ( org.locationtech.jts.geom.Geometry.class.isInstance( value ) ) {
return JTS.from( (com.vividsolutions.jts.geom.Geometry) value ); return JTS.from( (org.locationtech.jts.geom.Geometry) value );
} }
throw unknownWrap( value.getClass() ); throw unknownWrap( value.getClass() );

6
hibernate-spatial/src/main/java/org/hibernate/spatial/JTSGeometryJavaTypeDescriptor.java
View File

@ -12,9 +12,9 @@ import org.hibernate.type.descriptor.java.AbstractTypeDescriptor;
import org.hibernate.type.descriptor.java.JavaTypeDescriptor; import org.hibernate.type.descriptor.java.JavaTypeDescriptor;
import org.hibernate.type.descriptor.java.JavaTypeDescriptorRegistry; import org.hibernate.type.descriptor.java.JavaTypeDescriptorRegistry;
import com.vividsolutions.jts.geom.Geometry; import org.locationtech.jts.geom.Geometry;
import com.vividsolutions.jts.io.ParseException; import org.locationtech.jts.io.ParseException;
import com.vividsolutions.jts.io.WKTReader; import org.locationtech.jts.io.WKTReader;
import org.geolatte.geom.jts.JTS; import org.geolatte.geom.jts.JTS;
/** /**

18
hibernate-spatial/src/main/java/org/hibernate/spatial/JTSGeometryType.java
View File

@ -9,7 +9,7 @@ package org.hibernate.spatial;
import org.hibernate.type.AbstractSingleColumnStandardBasicType; import org.hibernate.type.AbstractSingleColumnStandardBasicType;
import org.hibernate.type.descriptor.sql.SqlTypeDescriptor; 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}. * A {@code Type} that maps between the database geometry type and JTS {@code Geometry}.
@ -30,14 +30,14 @@ public class JTSGeometryType extends AbstractSingleColumnStandardBasicType<Geome
@Override @Override
public String[] getRegistrationKeys() { public String[] getRegistrationKeys() {
return new String[] { return new String[] {
com.vividsolutions.jts.geom.Geometry.class.getCanonicalName(), org.locationtech.jts.geom.Geometry.class.getCanonicalName(),
com.vividsolutions.jts.geom.Point.class.getCanonicalName(), org.locationtech.jts.geom.Point.class.getCanonicalName(),
com.vividsolutions.jts.geom.Polygon.class.getCanonicalName(), org.locationtech.jts.geom.Polygon.class.getCanonicalName(),
com.vividsolutions.jts.geom.MultiPolygon.class.getCanonicalName(), org.locationtech.jts.geom.MultiPolygon.class.getCanonicalName(),
com.vividsolutions.jts.geom.LineString.class.getCanonicalName(), org.locationtech.jts.geom.LineString.class.getCanonicalName(),
com.vividsolutions.jts.geom.MultiLineString.class.getCanonicalName(), org.locationtech.jts.geom.MultiLineString.class.getCanonicalName(),
com.vividsolutions.jts.geom.MultiPoint.class.getCanonicalName(), org.locationtech.jts.geom.MultiPoint.class.getCanonicalName(),
com.vividsolutions.jts.geom.GeometryCollection.class.getCanonicalName(), org.locationtech.jts.geom.GeometryCollection.class.getCanonicalName(),
"jts_geometry" "jts_geometry"
}; };
} }

2
hibernate-spatial/src/main/java/org/hibernate/spatial/criterion/DWithinExpression.java
View File

@ -17,7 +17,7 @@ import org.hibernate.spatial.SpatialFunction;
import org.hibernate.spatial.dialect.oracle.OracleSpatial10gDialect; import org.hibernate.spatial.dialect.oracle.OracleSpatial10gDialect;
import org.hibernate.type.StandardBasicTypes; 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. * A {@code Criterion} constraining a geometry property to be within a specified distance of a search geometry.

4
hibernate-spatial/src/main/java/org/hibernate/spatial/criterion/SpatialFilter.java
View File

@ -16,8 +16,8 @@ import org.hibernate.engine.spi.TypedValue;
import org.hibernate.spatial.SpatialDialect; import org.hibernate.spatial.SpatialDialect;
import org.hibernate.spatial.jts.EnvelopeAdapter; import org.hibernate.spatial.jts.EnvelopeAdapter;
import com.vividsolutions.jts.geom.Envelope; import org.locationtech.jts.geom.Envelope;
import com.vividsolutions.jts.geom.Geometry; import org.locationtech.jts.geom.Geometry;
/** /**
* A <code>Criterion</code> constraining a geometry property to have a bounding box that overlaps with * A <code>Criterion</code> constraining a geometry property to have a bounding box that overlaps with

2
hibernate-spatial/src/main/java/org/hibernate/spatial/criterion/SpatialRelateExpression.java
View File

@ -15,7 +15,7 @@ import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.engine.spi.TypedValue; import org.hibernate.engine.spi.TypedValue;
import org.hibernate.spatial.SpatialDialect; 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 * A {@code Criterion} constraining a {@code Geometry} property to have specific spatial relation

4
hibernate-spatial/src/main/java/org/hibernate/spatial/criterion/SpatialRestrictions.java
View File

@ -9,8 +9,8 @@ package org.hibernate.spatial.criterion;
import org.hibernate.criterion.Criterion; import org.hibernate.criterion.Criterion;
import org.hibernate.spatial.SpatialRelation; import org.hibernate.spatial.SpatialRelation;
import com.vividsolutions.jts.geom.Envelope; import org.locationtech.jts.geom.Envelope;
import com.vividsolutions.jts.geom.Geometry; import org.locationtech.jts.geom.Geometry;
/** /**
* A factory for spatial criteria. * A factory for spatial criteria.

8
hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/h2geodb/GeoDbWkb.java
View File

@ -76,8 +76,8 @@ public class GeoDbWkb {
} }
try { try {
if ( object instanceof com.vividsolutions.jts.geom.Geometry ) { if ( object instanceof org.locationtech.jts.geom.Geometry ) {
return JTS.from( (com.vividsolutions.jts.geom.Geometry) object ); return JTS.from( (org.locationtech.jts.geom.Geometry) object );
} }
final WkbDecoder decoder = Wkb.newDecoder( Wkb.Dialect.POSTGIS_EWKB_1 ); final WkbDecoder decoder = Wkb.newDecoder( Wkb.Dialect.POSTGIS_EWKB_1 );
if ( object instanceof Blob ) { if ( object instanceof Blob ) {
@ -86,8 +86,8 @@ public class GeoDbWkb {
else if ( object instanceof byte[] ) { else if ( object instanceof byte[] ) {
return decoder.decode( ByteBuffer.from( (byte[]) object ) ); return decoder.decode( ByteBuffer.from( (byte[]) object ) );
} }
else if ( object instanceof com.vividsolutions.jts.geom.Envelope ) { else if ( object instanceof org.locationtech.jts.geom.Envelope ) {
return toPolygon( JTS.from( (com.vividsolutions.jts.geom.Envelope) object ) ); return toPolygon( JTS.from( (org.locationtech.jts.geom.Envelope) object ) );
} }
else { else {
throw new IllegalArgumentException( throw new IllegalArgumentException(

2
hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/criterion/OracleSpatialRestrictions.java
View File

@ -12,7 +12,7 @@ import org.hibernate.criterion.CriteriaQuery;
import org.hibernate.criterion.Criterion; import org.hibernate.criterion.Criterion;
import org.hibernate.engine.spi.TypedValue; 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 * A static factory class for spatial criteria using the Oracle Spatial native spatial operators

10
hibernate-spatial/src/main/java/org/hibernate/spatial/jts/EnvelopeAdapter.java
View File

@ -6,11 +6,11 @@
*/ */
package org.hibernate.spatial.jts; package org.hibernate.spatial.jts;
import com.vividsolutions.jts.geom.Coordinate; import org.locationtech.jts.geom.Coordinate;
import com.vividsolutions.jts.geom.Envelope; import org.locationtech.jts.geom.Envelope;
import com.vividsolutions.jts.geom.GeometryFactory; import org.locationtech.jts.geom.GeometryFactory;
import com.vividsolutions.jts.geom.LinearRing; import org.locationtech.jts.geom.LinearRing;
import com.vividsolutions.jts.geom.Polygon; import org.locationtech.jts.geom.Polygon;
/** /**
* Converts an {@code Envelope} to a {@code Polygon} * Converts an {@code Envelope} to a {@code Polygon}

8
hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/hana/TestHANASpatialFunctions.java
View File

@ -14,10 +14,10 @@ import org.hibernate.testing.RequiresDialect;
import org.jboss.logging.Logger; import org.jboss.logging.Logger;
import org.junit.Test; import org.junit.Test;
import com.vividsolutions.jts.geom.Geometry; import org.locationtech.jts.geom.Geometry;
import com.vividsolutions.jts.geom.Point; import org.locationtech.jts.geom.Point;
import com.vividsolutions.jts.io.WKBWriter; import org.locationtech.jts.io.WKBWriter;
import com.vividsolutions.jts.io.WKTWriter; 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") @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 { public class TestHANASpatialFunctions extends TestSpatialFunctions {

2
hibernate-spatial/src/test/java/org/hibernate/spatial/integration/TestSpatialFunctions.java
View File

@ -28,7 +28,7 @@ import org.junit.Test;
import org.jboss.logging.Logger; import org.jboss.logging.Logger;
import com.vividsolutions.jts.geom.Geometry; import org.locationtech.jts.geom.Geometry;
import static java.lang.String.format; import static java.lang.String.format;

4
hibernate-spatial/src/test/java/org/hibernate/spatial/integration/jts/GeomEntity.java
View File

@ -15,8 +15,8 @@ import org.hibernate.dialect.Dialect;
import org.hibernate.spatial.integration.GeomEntityLike; import org.hibernate.spatial.integration.GeomEntityLike;
import org.hibernate.spatial.testing.TestDataElement; import org.hibernate.spatial.testing.TestDataElement;
import com.vividsolutions.jts.geom.Geometry; import org.locationtech.jts.geom.Geometry;
import com.vividsolutions.jts.io.ParseException; import org.locationtech.jts.io.ParseException;
import org.geolatte.geom.codec.WktDecoder; import org.geolatte.geom.codec.WktDecoder;
import org.geolatte.geom.jts.JTS; import org.geolatte.geom.jts.JTS;

4
hibernate-spatial/src/test/java/org/hibernate/spatial/integration/jts/TestStoreRetrieveUsingJTS.java
View File

@ -18,8 +18,8 @@ import org.hibernate.testing.Skip;
import org.jboss.logging.Logger; import org.jboss.logging.Logger;
import com.vividsolutions.jts.geom.Geometry; import org.locationtech.jts.geom.Geometry;
import com.vividsolutions.jts.io.ParseException; import org.locationtech.jts.io.ParseException;
/** /**
* This testsuite-suite class verifies whether the <code>Geometry</code>s retrieved * This testsuite-suite class verifies whether the <code>Geometry</code>s retrieved

10
hibernate-spatial/src/test/java/org/hibernate/spatial/testing/AbstractExpectationsFactory.java
View File

@ -19,11 +19,11 @@ import org.hibernate.spatial.HSMessageLogger;
import org.jboss.logging.Logger; import org.jboss.logging.Logger;
import com.vividsolutions.jts.geom.Geometry; import org.locationtech.jts.geom.Geometry;
import com.vividsolutions.jts.geom.Point; import org.locationtech.jts.geom.Point;
import com.vividsolutions.jts.geom.Polygon; import org.locationtech.jts.geom.Polygon;
import com.vividsolutions.jts.io.ParseException; import org.locationtech.jts.io.ParseException;
import com.vividsolutions.jts.io.WKTReader; import org.locationtech.jts.io.WKTReader;
/** /**
* An <code>AbstractExpectationsFactory</code> provides the expected * An <code>AbstractExpectationsFactory</code> provides the expected

6
hibernate-spatial/src/test/java/org/hibernate/spatial/testing/JTSGeometryEquality.java
View File

@ -7,9 +7,9 @@
package org.hibernate.spatial.testing; package org.hibernate.spatial.testing;
import com.vividsolutions.jts.geom.Coordinate; import org.locationtech.jts.geom.Coordinate;
import com.vividsolutions.jts.geom.Geometry; import org.locationtech.jts.geom.Geometry;
import com.vividsolutions.jts.geom.GeometryCollection; import org.locationtech.jts.geom.GeometryCollection;
/** /**
* This class tests for the equality between geometries. * This class tests for the equality between geometries.

2
hibernate-spatial/src/test/java/org/hibernate/spatial/testing/SpatialFunctionalTestCase.java
View File

@ -24,7 +24,7 @@ import org.hibernate.spatial.SpatialFunction;
import org.hibernate.testing.AfterClassOnce; import org.hibernate.testing.AfterClassOnce;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; 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.assertArrayEquals;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;

4
hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/db2/DB2ExpectationsFactory.java
View File

@ -29,8 +29,8 @@ import org.hibernate.spatial.testing.AbstractExpectationsFactory;
import org.hibernate.spatial.testing.DataSourceUtils; import org.hibernate.spatial.testing.DataSourceUtils;
import org.hibernate.spatial.testing.NativeSQLStatement; import org.hibernate.spatial.testing.NativeSQLStatement;
import com.vividsolutions.jts.geom.Geometry; import org.locationtech.jts.geom.Geometry;
import com.vividsolutions.jts.geom.Point; import org.locationtech.jts.geom.Point;
import org.geolatte.geom.jts.JTS; import org.geolatte.geom.jts.JTS;
/** /**

26
hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/h2geodb/GeoDBExpectationsFactory.java
View File

@ -14,8 +14,8 @@ import org.hibernate.spatial.dialect.h2geodb.GeoDbWkb;
import org.hibernate.spatial.testing.AbstractExpectationsFactory; import org.hibernate.spatial.testing.AbstractExpectationsFactory;
import org.hibernate.spatial.testing.NativeSQLStatement; import org.hibernate.spatial.testing.NativeSQLStatement;
import com.vividsolutions.jts.geom.Geometry; import org.locationtech.jts.geom.Geometry;
import com.vividsolutions.jts.geom.Point; import org.locationtech.jts.geom.Point;
import org.geolatte.geom.jts.JTS; import org.geolatte.geom.jts.JTS;
@ -115,7 +115,7 @@ public class GeoDBExpectationsFactory extends AbstractExpectationsFactory {
* (non-Javadoc) * (non-Javadoc)
* *
* @seeorg.hibernatespatial.test.AbstractExpectationsFactory# * @seeorg.hibernatespatial.test.AbstractExpectationsFactory#
* createNativeDistanceStatement(com.vividsolutions.jts.geom.Geometry) * createNativeDistanceStatement(org.locationtech.jts.geom.Geometry)
*/ */
@Override @Override
@ -142,7 +142,7 @@ public class GeoDBExpectationsFactory extends AbstractExpectationsFactory {
* (non-Javadoc) * (non-Javadoc)
* *
* @seeorg.hibernatespatial.test.AbstractExpectationsFactory# * @seeorg.hibernatespatial.test.AbstractExpectationsFactory#
* createNativeEqualsStatement(com.vividsolutions.jts.geom.Geometry) * createNativeEqualsStatement(org.locationtech.jts.geom.Geometry)
*/ */
@Override @Override
@ -157,7 +157,7 @@ public class GeoDBExpectationsFactory extends AbstractExpectationsFactory {
* (non-Javadoc) * (non-Javadoc)
* *
* @seeorg.hibernatespatial.test.AbstractExpectationsFactory# * @seeorg.hibernatespatial.test.AbstractExpectationsFactory#
* createNativeFilterStatement(com.vividsolutions.jts.geom.Geometry) * createNativeFilterStatement(org.locationtech.jts.geom.Geometry)
*/ */
@Override @Override
@ -171,7 +171,7 @@ public class GeoDBExpectationsFactory extends AbstractExpectationsFactory {
* (non-Javadoc) * (non-Javadoc)
* *
* @seeorg.hibernatespatial.test.AbstractExpectationsFactory# * @seeorg.hibernatespatial.test.AbstractExpectationsFactory#
* createNativeGeomUnionStatement(com.vividsolutions.jts.geom.Geometry) * createNativeGeomUnionStatement(org.locationtech.jts.geom.Geometry)
*/ */
@Override @Override
@ -198,7 +198,7 @@ public class GeoDBExpectationsFactory extends AbstractExpectationsFactory {
* (non-Javadoc) * (non-Javadoc)
* *
* @seeorg.hibernatespatial.test.AbstractExpectationsFactory# * @seeorg.hibernatespatial.test.AbstractExpectationsFactory#
* createNativeIntersectionStatement(com.vividsolutions.jts.geom.Geometry) * createNativeIntersectionStatement(org.locationtech.jts.geom.Geometry)
*/ */
@Override @Override
@ -213,7 +213,7 @@ public class GeoDBExpectationsFactory extends AbstractExpectationsFactory {
* (non-Javadoc) * (non-Javadoc)
* *
* @seeorg.hibernatespatial.test.AbstractExpectationsFactory# * @seeorg.hibernatespatial.test.AbstractExpectationsFactory#
* createNativeIntersectsStatement(com.vividsolutions.jts.geom.Geometry) * createNativeIntersectsStatement(org.locationtech.jts.geom.Geometry)
*/ */
@Override @Override
@ -257,7 +257,7 @@ public class GeoDBExpectationsFactory extends AbstractExpectationsFactory {
* (non-Javadoc) * (non-Javadoc)
* *
* @seeorg.hibernatespatial.test.AbstractExpectationsFactory# * @seeorg.hibernatespatial.test.AbstractExpectationsFactory#
* createNativeOverlapsStatement(com.vividsolutions.jts.geom.Geometry) * createNativeOverlapsStatement(org.locationtech.jts.geom.Geometry)
*/ */
@Override @Override
@ -272,7 +272,7 @@ public class GeoDBExpectationsFactory extends AbstractExpectationsFactory {
* (non-Javadoc) * (non-Javadoc)
* *
* @seeorg.hibernatespatial.test.AbstractExpectationsFactory# * @seeorg.hibernatespatial.test.AbstractExpectationsFactory#
* createNativeRelateStatement(com.vividsolutions.jts.geom.Geometry, * createNativeRelateStatement(org.locationtech.jts.geom.Geometry,
* java.lang.String) * java.lang.String)
*/ */
@ -311,7 +311,7 @@ public class GeoDBExpectationsFactory extends AbstractExpectationsFactory {
* (non-Javadoc) * (non-Javadoc)
* *
* @seeorg.hibernatespatial.test.AbstractExpectationsFactory# * @seeorg.hibernatespatial.test.AbstractExpectationsFactory#
* createNativeSymDifferenceStatement(com.vividsolutions.jts.geom.Geometry) * createNativeSymDifferenceStatement(org.locationtech.jts.geom.Geometry)
*/ */
@Override @Override
@ -327,7 +327,7 @@ public class GeoDBExpectationsFactory extends AbstractExpectationsFactory {
* (non-Javadoc) * (non-Javadoc)
* *
* @seeorg.hibernatespatial.test.AbstractExpectationsFactory# * @seeorg.hibernatespatial.test.AbstractExpectationsFactory#
* createNativeTouchesStatement(com.vividsolutions.jts.geom.Geometry) * createNativeTouchesStatement(org.locationtech.jts.geom.Geometry)
*/ */
@Override @Override
@ -342,7 +342,7 @@ public class GeoDBExpectationsFactory extends AbstractExpectationsFactory {
* (non-Javadoc) * (non-Javadoc)
* *
* @seeorg.hibernatespatial.test.AbstractExpectationsFactory# * @seeorg.hibernatespatial.test.AbstractExpectationsFactory#
* createNativeWithinStatement(com.vividsolutions.jts.geom.Geometry) * createNativeWithinStatement(org.locationtech.jts.geom.Geometry)
*/ */
@Override @Override

4
hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/h2geodb/GeoDBGeometryEquality.java
View File

@ -12,8 +12,8 @@ package org.hibernate.spatial.testing.dialects.h2geodb;
import org.hibernate.spatial.testing.JTSGeometryEquality; import org.hibernate.spatial.testing.JTSGeometryEquality;
import com.vividsolutions.jts.geom.Coordinate; import org.locationtech.jts.geom.Coordinate;
import com.vividsolutions.jts.geom.Geometry; import org.locationtech.jts.geom.Geometry;
/** /**
* Extends the test for {@link Geometry} equality, because GeoDB uses JTS * Extends the test for {@link Geometry} equality, because GeoDB uses JTS

4
hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/h2geodb/GeoDBNoSRIDExpectationsFactory.java
View File

@ -13,8 +13,8 @@ package org.hibernate.spatial.testing.dialects.h2geodb;
import org.hibernate.spatial.testing.AbstractExpectationsFactory; import org.hibernate.spatial.testing.AbstractExpectationsFactory;
import org.hibernate.spatial.testing.NativeSQLStatement; import org.hibernate.spatial.testing.NativeSQLStatement;
import com.vividsolutions.jts.geom.Geometry; import org.locationtech.jts.geom.Geometry;
import com.vividsolutions.jts.geom.Point; import org.locationtech.jts.geom.Point;
import org.geolatte.geom.ByteBuffer; import org.geolatte.geom.ByteBuffer;
import org.geolatte.geom.codec.Wkb; import org.geolatte.geom.codec.Wkb;
import org.geolatte.geom.jts.JTS; import org.geolatte.geom.jts.JTS;

10
hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/hana/HANAExpectationsFactory.java
View File

@ -12,11 +12,11 @@ import org.hibernate.spatial.testing.AbstractExpectationsFactory;
import org.hibernate.spatial.testing.DataSourceUtils; import org.hibernate.spatial.testing.DataSourceUtils;
import org.hibernate.spatial.testing.NativeSQLStatement; import org.hibernate.spatial.testing.NativeSQLStatement;
import com.vividsolutions.jts.geom.Geometry; import org.locationtech.jts.geom.Geometry;
import com.vividsolutions.jts.geom.Point; import org.locationtech.jts.geom.Point;
import com.vividsolutions.jts.geom.Polygon; import org.locationtech.jts.geom.Polygon;
import com.vividsolutions.jts.io.ParseException; import org.locationtech.jts.io.ParseException;
import com.vividsolutions.jts.io.WKTReader; import org.locationtech.jts.io.WKTReader;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.Map; import java.util.Map;

2
hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mysql/MySQL56ExpectationsFactory.java
View File

@ -9,7 +9,7 @@ package org.hibernate.spatial.testing.dialects.mysql;
import org.hibernate.spatial.testing.DataSourceUtils; import org.hibernate.spatial.testing.DataSourceUtils;
import org.hibernate.spatial.testing.NativeSQLStatement; import org.hibernate.spatial.testing.NativeSQLStatement;
import com.vividsolutions.jts.geom.Geometry; import org.locationtech.jts.geom.Geometry;
/** /**
* @author Karel Maesen, Geovise BVBA * @author Karel Maesen, Geovise BVBA

4
hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mysql/MySQLExpectationsFactory.java
View File

@ -11,8 +11,8 @@ import org.hibernate.spatial.testing.AbstractExpectationsFactory;
import org.hibernate.spatial.testing.DataSourceUtils; import org.hibernate.spatial.testing.DataSourceUtils;
import org.hibernate.spatial.testing.NativeSQLStatement; import org.hibernate.spatial.testing.NativeSQLStatement;
import com.vividsolutions.jts.geom.Geometry; import org.locationtech.jts.geom.Geometry;
import com.vividsolutions.jts.geom.Point; import org.locationtech.jts.geom.Point;
import org.geolatte.geom.ByteBuffer; import org.geolatte.geom.ByteBuffer;
import org.geolatte.geom.codec.Wkb; import org.geolatte.geom.codec.Wkb;
import org.geolatte.geom.codec.WkbDecoder; import org.geolatte.geom.codec.WkbDecoder;

4
hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mysql/MySQLGeometryEquality.java
View File

@ -9,8 +9,8 @@ package org.hibernate.spatial.testing.dialects.mysql;
import org.hibernate.spatial.testing.JTSGeometryEquality; import org.hibernate.spatial.testing.JTSGeometryEquality;
import com.vividsolutions.jts.geom.Coordinate; import org.locationtech.jts.geom.Coordinate;
import com.vividsolutions.jts.geom.Geometry; import org.locationtech.jts.geom.Geometry;
/** /**
* Extends the test for geometry equality, because * Extends the test for geometry equality, because

4
hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/oracle/SDOGeometryExpectationsFactory.java
View File

@ -13,8 +13,8 @@ import org.hibernate.spatial.testing.AbstractExpectationsFactory;
import org.hibernate.spatial.testing.DataSourceUtils; import org.hibernate.spatial.testing.DataSourceUtils;
import org.hibernate.spatial.testing.NativeSQLStatement; import org.hibernate.spatial.testing.NativeSQLStatement;
import com.vividsolutions.jts.geom.Geometry; import org.locationtech.jts.geom.Geometry;
import com.vividsolutions.jts.geom.Point; import org.locationtech.jts.geom.Point;
import org.geolatte.geom.jts.JTS; import org.geolatte.geom.jts.JTS;
/** /**

4
hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/postgis/PostgisExpectationsFactory.java
View File

@ -15,8 +15,8 @@ import org.hibernate.spatial.testing.NativeSQLStatement;
import org.jboss.logging.Logger; import org.jboss.logging.Logger;
import com.vividsolutions.jts.geom.Geometry; import org.locationtech.jts.geom.Geometry;
import com.vividsolutions.jts.geom.Point; import org.locationtech.jts.geom.Point;
import org.geolatte.geom.jts.JTS; import org.geolatte.geom.jts.JTS;
/** /**

4
hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/sqlserver/SqlServerExpectationsFactory.java
View File

@ -11,8 +11,8 @@ import org.hibernate.spatial.testing.AbstractExpectationsFactory;
import org.hibernate.spatial.testing.DataSourceUtils; import org.hibernate.spatial.testing.DataSourceUtils;
import org.hibernate.spatial.testing.NativeSQLStatement; import org.hibernate.spatial.testing.NativeSQLStatement;
import com.vividsolutions.jts.geom.Geometry; import org.locationtech.jts.geom.Geometry;
import com.vividsolutions.jts.geom.Point; import org.locationtech.jts.geom.Point;
import org.geolatte.geom.codec.db.sqlserver.Decoders; import org.geolatte.geom.codec.db.sqlserver.Decoders;
import org.geolatte.geom.jts.JTS; import org.geolatte.geom.jts.JTS;