renovate

README.md

@@ -30,7 +30,7 @@ jooq-postgis-spatial
             <customType>
                 <name>Geometry</name>
                 <type>org.locationtech.jts.geom.Geometry</type>
-                <binding>net.dmitry.jooq.postgis.spatial.binding.PostgisGeometryBinding</binding>
+                <binding>net.dmitry.jooq.postgis.spatial.jts.PostgisGeometryBinding</binding>
             </customType>
         </customTypes>
         <forcedTypes>

pom.xml

@@ -63,14 +63,14 @@
                     <target>${compileSource}</target>
                 </configuration>
             </plugin>
+
             <plugin>
                 <groupId>org.jetbrains.kotlin</groupId>
                 <artifactId>kotlin-maven-plugin</artifactId>
                 <version>${kotlin.version}</version>
                 <executions>
                     <execution>
                         <id>compile</id>
-                        <phase>compile</phase>
                         <goals>
                             <goal>compile</goal>
                         </goals>
@@ -98,12 +98,12 @@
     </build>
 
     <properties>
-        <compileSource>1.8</compileSource>
+        <compileSource>16</compileSource>
         <kotlin.version>1.5.21</kotlin.version>
-        <postgresql.version>9.4-1201-jdbc4</postgresql.version>
-        <jooq.version>3.7.3</jooq.version>
-        <jts.version>1.18.1</jts.version>
-        <postgis-jdbc.version>2.2.0</postgis-jdbc.version>
+        <postgresql.version>42.2.14</postgresql.version>
+        <jooq.version>3.15.1</jooq.version>
+        <jts.version>1.18.2</jts.version>
+        <postgis-jdbc.version>2.5.1</postgis-jdbc.version>
     </properties>
 
 

src/main/java/net/dmitry/jooq/postgis/spatial/jts/PostgisGeometryBinding.java

@@ -0,0 +1,54 @@
+package net.dmitry.jooq.postgis.spatial.jts;
+
+import org.jooq.*;
+import org.jooq.impl.DSL;
+import org.locationtech.jts.geom.Geometry;
+//import org.postgis.Geometry;
+
+import java.sql.SQLException;
+
+public class PostgisGeometryBinding implements Binding<Object, Geometry> {
+    private final PostgisGeometryConverter geometryConverter = new PostgisGeometryConverter();
+
+
+    public Converter<Object, Geometry> converter() {
+        return geometryConverter;
+    }
+
+    @Override
+    public void sql(BindingSQLContext<Geometry> ctx) throws SQLException {
+        ctx.render().visit(DSL.sql("?::geometry"));
+    }
+
+    @Override
+    public void register(BindingRegisterContext<Geometry> ctx) throws SQLException {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void set(BindingSetStatementContext<Geometry> ctx) throws SQLException {
+        ctx.statement().setObject(ctx.index(),  ctx.convert(converter()).value());
+    }
+
+    @Override
+    public void set(BindingSetSQLOutputContext<Geometry> ctx) throws SQLException {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void get(BindingGetResultSetContext<Geometry> ctx) throws SQLException {
+        ctx.convert(converter()).value(ctx.resultSet().getObject(ctx.index()));
+    }
+
+    @Override
+    public void get(BindingGetStatementContext<Geometry> ctx) throws SQLException {
+        ctx.convert(converter()).value(ctx.statement().getObject(ctx.index()));
+    }
+
+    @Override
+    public void get(BindingGetSQLInputContext<Geometry> ctx) throws SQLException {
+        throw new UnsupportedOperationException();
+    }
+
+
+}

src/main/java/net/dmitry/jooq/postgis/spatial/jts/PostgisGeometryConverter.java

@@ -0,0 +1,56 @@
+package net.dmitry.jooq.postgis.spatial.jts;
+
+import net.dmitry.jooq.postgis.spatial.converter.JTSGeometryConverter;
+import org.jetbrains.annotations.NotNull;
+import org.jooq.Converter;
+import org.locationtech.jts.geom.Geometry;
+import org.postgis.PGgeometry;
+import org.postgresql.util.PGobject;
+
+import java.sql.SQLException;
+
+public class PostgisGeometryConverter implements Converter<Object, Geometry> {
+    @Override
+    public Geometry from(Object o) {
+        if (o == null) {
+            return null;
+        } else {
+            try {
+                org.postgis.Geometry g = new PGgeometry(o.toString()).getGeometry();
+                return new JTSGeometryConverter().toJTS(g);
+            } catch (SQLException throwables) {
+                throwables.printStackTrace();
+                return null;
+            }
+        }
+    }
+
+    @Override
+    public Object to(Geometry geom) {
+        if (geom == null) {
+            return null;
+        } else {
+            PGobject p = new PGobject();
+            p.setType("Geometry");
+            try {
+                p.setValue(geom.toText());
+            } catch (SQLException throwables) {
+                throwables.printStackTrace();
+                return null;
+            }
+            return p;
+        }
+    }
+
+    @Override
+    public @NotNull
+    Class<Object> fromType() {
+        return Object.class;
+    }
+
+    @Override
+    public @NotNull
+    Class<Geometry> toType() {
+        return Geometry.class;
+    }
+}

src/main/kotlin/net/dmitry/jooq/postgis/spatial/converter/JTSGeometryConverter.kt

@@ -4,6 +4,7 @@ import org.locationtech.jts.geom.Coordinate
 import org.locationtech.jts.geom.Geometry
 import org.locationtech.jts.geom.GeometryFactory
 import net.dmitry.jooq.postgis.spatial.jts.JTS
+import net.dmitry.jooq.postgis.spatial.jts.PostgisGeometryConverter
 import net.dmitry.jooq.postgis.spatial.jts.mgeom.MCoordinate
 import net.dmitry.jooq.postgis.spatial.jts.mgeom.MGeometry
 import net.dmitry.jooq.postgis.spatial.jts.mgeom.MGeometryFactory
@@ -17,7 +18,8 @@ import org.postgis.*
  */
 class JTSGeometryConverter : Converter<Any, Geometry> {
 
-    private val postgisGeometryConverter = PostgisGeometryConverter()
+    private val postgisGeometryConverter =
+        PostgisGeometryConverter()
 
     override fun from(obj: Any?): Geometry? = toJTS(postgisGeometryConverter.from(obj))
 
@@ -33,7 +35,7 @@ class JTSGeometryConverter : Converter<Any, Geometry> {
     }
 
 
-    fun toJTS(obj: Any?): Geometry? {
+    public fun toJTS(obj: Any?): Geometry? {
         var objNotNull = obj ?: return null
         // in some cases, Postgis returns not PGgeometry objects
         // but org.postgis.Geometry instances.
@@ -222,7 +224,7 @@ class JTSGeometryConverter : Converter<Any, Geometry> {
      * *
      * @return native database geometry object corresponding to jtsGeom.
      */
-    protected fun toNative(jtsGeom: Geometry): PGgeometry {
+    public fun toNative(jtsGeom: Geometry): PGgeometry {
         val jtsGeomNotNull = forceEmptyToGeometryCollection(jtsGeom)
         val geom: org.postgis.Geometry? = when (jtsGeomNotNull) {
             is org.locationtech.jts.geom.Point -> {