From 4a7602b0d090dcc0bc3042c51c4ab7c547a1b4e9 Mon Sep 17 00:00:00 2001 From: "robin.bygrave" Date: Thu, 7 Dec 2023 17:24:08 +1300 Subject: [PATCH] Update for postgis.jdbc version 2021.1.0 --- ebean-postgis-types/pom.xml | 2 +- .../io/ebean/postgis/PostgisGeoTypeBinder.java | 16 ++++++++-------- .../io/ebean/postgis/ScalarTypePgisBase.java | 10 +++++----- .../ebean/postgis/ScalarTypePgisLineString.java | 2 +- .../postgis/ScalarTypePgisMultiLineString.java | 2 +- .../ebean/postgis/ScalarTypePgisMultiPoint.java | 2 +- .../postgis/ScalarTypePgisMultiPolygon.java | 2 +- .../io/ebean/postgis/ScalarTypePgisPoint.java | 2 +- .../io/ebean/postgis/ScalarTypePgisPolygon.java | 2 +- .../postgis/latte/ScalarTypeGeoLatteBase.java | 6 +++--- .../test/java/org/example/domain/CachedBean.java | 4 ++-- .../src/test/java/org/example/domain/MyBean.java | 12 ++++++------ .../example/domain/TestCacheSerialization.java | 4 ++-- .../java/org/example/domain/TestInsertQuery.java | 12 ++++++------ .../test/java/org/example/domain/TestQuery.java | 16 ++++++++-------- .../src/test/resources/application-test.yml | 2 +- 16 files changed, 48 insertions(+), 48 deletions(-) diff --git a/ebean-postgis-types/pom.xml b/ebean-postgis-types/pom.xml index c65375d8f..47a0e3623 100644 --- a/ebean-postgis-types/pom.xml +++ b/ebean-postgis-types/pom.xml @@ -11,7 +11,7 @@ ebean-postgis-types - 2.5.1 + 2021.1.0 diff --git a/ebean-postgis-types/src/main/java/io/ebean/postgis/PostgisGeoTypeBinder.java b/ebean-postgis-types/src/main/java/io/ebean/postgis/PostgisGeoTypeBinder.java index 32765036b..bc710f72a 100644 --- a/ebean-postgis-types/src/main/java/io/ebean/postgis/PostgisGeoTypeBinder.java +++ b/ebean-postgis-types/src/main/java/io/ebean/postgis/PostgisGeoTypeBinder.java @@ -2,9 +2,9 @@ package io.ebean.postgis; import io.ebean.core.type.DataBinder; import io.ebeaninternal.server.type.GeoTypeBinder; +import net.postgis.jdbc.PGgeometryLW; +import net.postgis.jdbc.geometry.Geometry; import org.geolatte.geom.codec.Wkt; -import org.postgis.Geometry; -import org.postgis.PGgeometryLW; import java.sql.SQLException; @@ -18,15 +18,15 @@ class PostgisGeoTypeBinder implements GeoTypeBinder { @Override public void bind(DataBinder binder, int dataType, Object data) throws SQLException { - if (data instanceof Geometry) { - binder.setObject(new PGgeometryLW((Geometry) data)); - } else if (withGeolatte) { - binder.setObject(new PGgeometryLW(toWktString(data))); - } + if (data instanceof Geometry) { + binder.setObject(new PGgeometryLW((Geometry) data)); + } else if (withGeolatte) { + binder.setObject(new PGgeometryLW(toWktString(data))); + } } private String toWktString(Object data) { - org.geolatte.geom.Geometry geoLatte = (org.geolatte.geom.Geometry)data; + org.geolatte.geom.Geometry geoLatte = (org.geolatte.geom.Geometry) data; return Wkt.newEncoder(Wkt.Dialect.POSTGIS_EWKT_1).encode(geoLatte); } } diff --git a/ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisBase.java b/ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisBase.java index 243b8cba7..3156a0c85 100644 --- a/ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisBase.java +++ b/ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisBase.java @@ -6,11 +6,11 @@ import io.ebean.core.type.DataBinder; import io.ebean.core.type.DataReader; import io.ebean.core.type.DocPropertyType; import io.ebean.core.type.ScalarType; -import org.postgis.Geometry; -import org.postgis.GeometryBuilder; -import org.postgis.PGgeometry; -import org.postgis.PGgeometryLW; -import org.postgis.binary.BinaryParser; +import net.postgis.jdbc.geometry.Geometry; +import net.postgis.jdbc.geometry.GeometryBuilder; +import net.postgis.jdbc.geometry.binary.BinaryParser; +import net.postgis.jdbc.PGgeometry; +import net.postgis.jdbc.PGgeometryLW; import org.postgresql.util.PGobject; import java.io.DataInput; diff --git a/ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisLineString.java b/ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisLineString.java index 33e843a17..4fa4ff2f7 100644 --- a/ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisLineString.java +++ b/ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisLineString.java @@ -1,7 +1,7 @@ package io.ebean.postgis; import io.ebean.config.dbplatform.ExtraDbTypes; -import org.postgis.LineString; +import net.postgis.jdbc.geometry.LineString; import java.sql.SQLException; diff --git a/ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisMultiLineString.java b/ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisMultiLineString.java index 8ddf0505b..777c6583e 100644 --- a/ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisMultiLineString.java +++ b/ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisMultiLineString.java @@ -1,7 +1,7 @@ package io.ebean.postgis; import io.ebean.config.dbplatform.ExtraDbTypes; -import org.postgis.MultiLineString; +import net.postgis.jdbc.geometry.MultiLineString; import java.sql.SQLException; diff --git a/ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisMultiPoint.java b/ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisMultiPoint.java index 2e88d5564..44b6a461b 100644 --- a/ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisMultiPoint.java +++ b/ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisMultiPoint.java @@ -1,7 +1,7 @@ package io.ebean.postgis; import io.ebean.config.dbplatform.ExtraDbTypes; -import org.postgis.MultiPoint; +import net.postgis.jdbc.geometry.MultiPoint; import java.sql.SQLException; diff --git a/ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisMultiPolygon.java b/ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisMultiPolygon.java index f4d590ef4..26b9f3970 100644 --- a/ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisMultiPolygon.java +++ b/ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisMultiPolygon.java @@ -1,7 +1,7 @@ package io.ebean.postgis; import io.ebean.config.dbplatform.ExtraDbTypes; -import org.postgis.MultiPolygon; +import net.postgis.jdbc.geometry.MultiPolygon; import java.sql.SQLException; diff --git a/ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisPoint.java b/ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisPoint.java index 6a61607ed..3f9e81b70 100644 --- a/ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisPoint.java +++ b/ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisPoint.java @@ -1,7 +1,7 @@ package io.ebean.postgis; import io.ebean.config.dbplatform.ExtraDbTypes; -import org.postgis.Point; +import net.postgis.jdbc.geometry.Point; import java.sql.SQLException; diff --git a/ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisPolygon.java b/ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisPolygon.java index 10cefde44..6727e7c0e 100644 --- a/ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisPolygon.java +++ b/ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisPolygon.java @@ -1,7 +1,7 @@ package io.ebean.postgis; import io.ebean.config.dbplatform.ExtraDbTypes; -import org.postgis.Polygon; +import net.postgis.jdbc.geometry.Polygon; import java.sql.SQLException; diff --git a/ebean-postgis-types/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteBase.java b/ebean-postgis-types/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteBase.java index cd6a74054..f0cc27779 100644 --- a/ebean-postgis-types/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteBase.java +++ b/ebean-postgis-types/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteBase.java @@ -8,8 +8,8 @@ import io.ebean.core.type.DocPropertyType; import io.ebean.core.type.ScalarType; import org.geolatte.geom.Geometry; import org.geolatte.geom.codec.Wkt; -import org.postgis.PGgeometry; -import org.postgis.PGgeometryLW; +import net.postgis.jdbc.PGgeometry; +import net.postgis.jdbc.PGgeometryLW; import java.io.DataInput; import java.io.DataOutput; @@ -61,7 +61,7 @@ abstract class ScalarTypeGeoLatteBase implements ScalarType< return null; } if (object instanceof PGgeometry) { - org.postgis.Geometry geometry = ((PGgeometry) object).getGeometry(); + net.postgis.jdbc.geometry.Geometry geometry = ((PGgeometry) object).getGeometry(); return (T) Wkt.newDecoder(Wkt.Dialect.POSTGIS_EWKT_1).decode(geometry.toString()); } throw new IllegalStateException("Received object of type " + object.getClass().getCanonicalName()); diff --git a/ebean-postgis-types/src/test/java/org/example/domain/CachedBean.java b/ebean-postgis-types/src/test/java/org/example/domain/CachedBean.java index a67a74488..1ecadfb76 100644 --- a/ebean-postgis-types/src/test/java/org/example/domain/CachedBean.java +++ b/ebean-postgis-types/src/test/java/org/example/domain/CachedBean.java @@ -1,8 +1,8 @@ package org.example.domain; import io.ebean.annotation.Cache; -import org.postgis.Point; -import org.postgis.Polygon; +import net.postgis.jdbc.geometry.Point; +import net.postgis.jdbc.geometry.Polygon; import jakarta.persistence.Entity; import jakarta.persistence.Table; diff --git a/ebean-postgis-types/src/test/java/org/example/domain/MyBean.java b/ebean-postgis-types/src/test/java/org/example/domain/MyBean.java index 6ad51f8a9..6b414a071 100644 --- a/ebean-postgis-types/src/test/java/org/example/domain/MyBean.java +++ b/ebean-postgis-types/src/test/java/org/example/domain/MyBean.java @@ -1,11 +1,11 @@ package org.example.domain; -import org.postgis.LineString; -import org.postgis.MultiLineString; -import org.postgis.MultiPoint; -import org.postgis.MultiPolygon; -import org.postgis.Point; -import org.postgis.Polygon; +import net.postgis.jdbc.geometry.LineString; +import net.postgis.jdbc.geometry.MultiLineString; +import net.postgis.jdbc.geometry.MultiPoint; +import net.postgis.jdbc.geometry.MultiPolygon; +import net.postgis.jdbc.geometry.Point; +import net.postgis.jdbc.geometry.Polygon; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/ebean-postgis-types/src/test/java/org/example/domain/TestCacheSerialization.java b/ebean-postgis-types/src/test/java/org/example/domain/TestCacheSerialization.java index 4494e72fc..50ada4afd 100644 --- a/ebean-postgis-types/src/test/java/org/example/domain/TestCacheSerialization.java +++ b/ebean-postgis-types/src/test/java/org/example/domain/TestCacheSerialization.java @@ -2,8 +2,8 @@ package org.example.domain; import io.ebean.DB; import org.junit.jupiter.api.Test; -import org.postgis.Point; -import org.postgis.Polygon; +import net.postgis.jdbc.geometry.Point; +import net.postgis.jdbc.geometry.Polygon; import java.sql.SQLException; diff --git a/ebean-postgis-types/src/test/java/org/example/domain/TestInsertQuery.java b/ebean-postgis-types/src/test/java/org/example/domain/TestInsertQuery.java index c12d1765e..48f85ba20 100644 --- a/ebean-postgis-types/src/test/java/org/example/domain/TestInsertQuery.java +++ b/ebean-postgis-types/src/test/java/org/example/domain/TestInsertQuery.java @@ -2,12 +2,12 @@ package org.example.domain; import io.ebean.DB; import org.junit.jupiter.api.Test; -import org.postgis.LineString; -import org.postgis.MultiLineString; -import org.postgis.MultiPoint; -import org.postgis.MultiPolygon; -import org.postgis.Point; -import org.postgis.Polygon; +import net.postgis.jdbc.geometry.LineString; +import net.postgis.jdbc.geometry.MultiLineString; +import net.postgis.jdbc.geometry.MultiPoint; +import net.postgis.jdbc.geometry.MultiPolygon; +import net.postgis.jdbc.geometry.Point; +import net.postgis.jdbc.geometry.Polygon; import java.sql.SQLException; import java.util.List; diff --git a/ebean-postgis-types/src/test/java/org/example/domain/TestQuery.java b/ebean-postgis-types/src/test/java/org/example/domain/TestQuery.java index b135d1709..af173f466 100644 --- a/ebean-postgis-types/src/test/java/org/example/domain/TestQuery.java +++ b/ebean-postgis-types/src/test/java/org/example/domain/TestQuery.java @@ -181,7 +181,7 @@ public class TestQuery { .find(MyBean.class) .where() .raw("st_distance(wgs84Point, ?) < 0.011", toWkt(geolatteClosePoint)) - .raw("st_distance(wgs84Point, ?) < 0.011", new org.postgis.Point(toWkt(geolatteClosePoint))) + .raw("st_distance(wgs84Point, ?) < 0.011", new net.postgis.jdbc.geometry.Point(toWkt(geolatteClosePoint))) .findOne() ); @@ -190,7 +190,7 @@ public class TestQuery { .find(MyBean.class) .where() .raw("st_distance(wgs84Point, ?) < 0.009", toWkt(geolatteClosePoint)) - .raw("st_distance(wgs84Point, ?) < 0.009", new org.postgis.Point(toWkt(geolatteClosePoint))) + .raw("st_distance(wgs84Point, ?) < 0.009", new net.postgis.jdbc.geometry.Point(toWkt(geolatteClosePoint))) .findOne() ); @@ -199,7 +199,7 @@ public class TestQuery { .find(MyBean.class) .where() .raw("ST_Within(wgs84Point, ST_GeomFromText(?))", toWkt(enclosingPolygon)) - .raw("ST_Within(wgs84Point, ?)", new org.postgis.Polygon(toWkt(enclosingPolygon))) + .raw("ST_Within(wgs84Point, ?)", new net.postgis.jdbc.geometry.Polygon(toWkt(enclosingPolygon))) .findOne() ); @@ -207,7 +207,7 @@ public class TestQuery { DB.find(MyBean.class) .where() .raw("wgs84Point = ST_PointN(ST_GeomFromText(?), 2)", toWkt(lineString)) - .raw("wgs84Point = ST_PointN(?, 2)", new org.postgis.LineString(toWkt(lineString))) + .raw("wgs84Point = ST_PointN(?, 2)", new net.postgis.jdbc.geometry.LineString(toWkt(lineString))) .findOne() ); @@ -215,7 +215,7 @@ public class TestQuery { DB.find(OtherBeanGeoLatte.class) .where() .raw("wgs84Point = ST_PointN(ST_LineFromMultiPoint(ST_GeomFromText(?)), 2)", toWkt(multiPoint)) - .raw("wgs84Point = ST_PointN(ST_LineFromMultiPoint(?), 2)", new org.postgis.MultiPoint(toWkt(multiPoint))) + .raw("wgs84Point = ST_PointN(ST_LineFromMultiPoint(?), 2)", new net.postgis.jdbc.geometry.MultiPoint(toWkt(multiPoint))) .findOne() ); @@ -223,7 +223,7 @@ public class TestQuery { DB.find(OtherBeanGeoLatte.class) .where() .raw("wgs84Point = ST_PointN(ST_LineFromMultiPoint(ST_GeomFromText(?)), 2)", toWkt(multiPoint)) - .raw("wgs84Point = ST_PointN(ST_LineFromMultiPoint(?), 2)", new org.postgis.MultiPoint(toWkt(multiPoint))) + .raw("wgs84Point = ST_PointN(ST_LineFromMultiPoint(?), 2)", new net.postgis.jdbc.geometry.MultiPoint(toWkt(multiPoint))) .findOne() ); @@ -232,7 +232,7 @@ public class TestQuery { .find(MyBean.class) .where() .raw("ST_Within(wgs84Point, ST_GeomFromText(?))", toWkt(multiPolygon)) - .raw("ST_Within(wgs84Point, ?)", new org.postgis.MultiPolygon(toWkt(multiPolygon))) + .raw("ST_Within(wgs84Point, ?)", new net.postgis.jdbc.geometry.MultiPolygon(toWkt(multiPolygon))) .findOne() ); @@ -240,7 +240,7 @@ public class TestQuery { DB.find(OtherBeanGeoLatte.class) .where() .raw("ST_Intersects(wgs84Point, ST_GeomFromText(?))", toWkt(multiLineString)) - .raw("ST_Intersects(wgs84Point, ?)", new org.postgis.MultiLineString(toWkt(multiLineString))) + .raw("ST_Intersects(wgs84Point, ?)", new net.postgis.jdbc.geometry.MultiLineString(toWkt(multiLineString))) .findOne() ); } diff --git a/ebean-postgis-types/src/test/resources/application-test.yml b/ebean-postgis-types/src/test/resources/application-test.yml index d8e0224ff..aa3d636f0 100644 --- a/ebean-postgis-types/src/test/resources/application-test.yml +++ b/ebean-postgis-types/src/test/resources/application-test.yml @@ -15,4 +15,4 @@ ebean: image: ghcr.io/baosystems/postgis:15 # extensions: postgis # url: jdbc:postgresql_lwgis://localhost:6432/mygisapp -# driver: org.postgis.DriverWrapperLW + driver: net.postgis.jdbc.DriverWrapperLW