[refactor] Update the Spatial Index to use the latest version of GeoT…

…ools (chasing out a dependency on Xalan)
eXist-db · Dec 8, 2022 · 7e14d4e · 7e14d4e
1 parent 61831ba
commit 7e14d4e
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 47 deletions.
diff --git a/extensions/indexes/spatial/pom.xml b/extensions/indexes/spatial/pom.xml
@@ -46,7 +46,8 @@
   </scm>
 
     <properties>
-        <geotools.version>2.4.5</geotools.version>
+        <geotools.api.version>20.5</geotools.api.version>
+        <geotools.version>27.2</geotools.version>
     </properties>
 
     <dependencies>
@@ -62,47 +63,25 @@
         </dependency>
 
         <dependency>
-            <groupId>org.opengis</groupId>
-            <artifactId>geoapi-nogenerics</artifactId>
-            <version>2.1.1</version>
+            <groupId>org.geotools</groupId>
+            <artifactId>gt-api</artifactId>
+            <version>${geotools.api.version}</version>
         </dependency>
         <dependency>
             <groupId>org.geotools</groupId>
-            <artifactId>gt2-api</artifactId>
+            <artifactId>gt-main</artifactId>
             <version>${geotools.version}</version>
         </dependency>
         <dependency>
             <groupId>org.geotools</groupId>
-            <artifactId>gt2-main</artifactId>
+            <artifactId>gt-referencing</artifactId>
             <version>${geotools.version}</version>
         </dependency>
         <dependency>
             <groupId>org.geotools</groupId>
-            <artifactId>gt2-referencing</artifactId>
+            <artifactId>gt-xml</artifactId>
             <version>${geotools.version}</version>
         </dependency>
-        <!--
-            <dependency>
-                <groupId>org.geotools</groupId>
-                <artifactId>gt2-epsg-extension</artifactId>
-                <version>${geotools.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.geotools</groupId>
-                <artifactId>gt2-metadata</artifactId>
-                <version>${geotools.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.geotools</groupId>
-                <artifactId>gt2-xml</artifactId>
-                <version>${geotools.version}</version>
-            </dependency>
-        -->
-        <dependency>
-            <groupId>com.vividsolutions</groupId>
-            <artifactId>jts</artifactId>
-            <version>1.13</version>
-        </dependency>
         <dependency>
             <groupId>org.hsqldb</groupId>
             <artifactId>hsqldb</artifactId>
@@ -111,7 +90,7 @@
 
         <dependency>
             <groupId>org.geotools</groupId>
-            <artifactId>gt2-epsg-wkt</artifactId>
+            <artifactId>gt-epsg-wkt</artifactId>
             <version>${geotools.version}</version>
             <scope>runtime</scope>
         </dependency>

diff --git a/.../indexes/spatial/src/main/java/org/exist/indexing/spatial/AbstractGMLJDBCIndexWorker.java b/.../indexes/spatial/src/main/java/org/exist/indexing/spatial/AbstractGMLJDBCIndexWorker.java
@@ -21,11 +21,11 @@
  */
 package org.exist.indexing.spatial;
 
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.io.WKBReader;
-import com.vividsolutions.jts.io.WKBWriter;
-import com.vividsolutions.jts.io.WKTReader;
-import com.vividsolutions.jts.io.WKTWriter;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.io.WKBReader;
+import org.locationtech.jts.io.WKBWriter;
+import org.locationtech.jts.io.WKTReader;
+import org.locationtech.jts.io.WKTWriter;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.exist.collections.Collection;
@@ -56,7 +56,6 @@
 import org.geotools.gml.producer.GeometryTransformer;
 import org.geotools.referencing.CRS;
 import org.opengis.referencing.FactoryException;
-import org.opengis.referencing.NoSuchAuthorityCodeException;
 import org.opengis.referencing.operation.MathTransform;
 import org.opengis.referencing.operation.OperationNotFoundException;
 import org.opengis.referencing.operation.TransformException;

diff --git a/extensions/indexes/spatial/src/main/java/org/exist/indexing/spatial/GMLHSQLIndexWorker.java b/extensions/indexes/spatial/src/main/java/org/exist/indexing/spatial/GMLHSQLIndexWorker.java
@@ -45,8 +45,8 @@
 import org.exist.xquery.value.StringValue;
 import org.exist.xquery.value.ValueSequence;
 
-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.apache.commons.io.input.UnsynchronizedByteArrayInputStream;
 import org.exist.xquery.XQueryContext;
 import org.exist.xquery.value.Base64BinaryValueType;

diff --git a/...sions/indexes/spatial/src/main/java/org/exist/xquery/modules/spatial/FunGMLProducers.java b/...sions/indexes/spatial/src/main/java/org/exist/xquery/modules/spatial/FunGMLProducers.java
@@ -47,10 +47,10 @@
 import org.exist.xquery.value.Type;
 import org.w3c.dom.Element;
 
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.io.ParseException;
-import com.vividsolutions.jts.io.WKTReader;
-import com.vividsolutions.jts.operation.buffer.BufferOp;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.io.WKTReader;
+import org.locationtech.jts.operation.buffer.BufferOp;
 
 /**
  * @author <a href="mailto:pierrick.brihaye@free.fr">Pierrick Brihaye</a>

diff --git a/...ndexes/spatial/src/main/java/org/exist/xquery/modules/spatial/FunGeometricProperties.java b/...ndexes/spatial/src/main/java/org/exist/xquery/modules/spatial/FunGeometricProperties.java
@@ -48,9 +48,9 @@
 import org.exist.xquery.value.Type;
 import org.w3c.dom.Element;
 
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.io.WKBWriter;
-import com.vividsolutions.jts.io.WKTWriter;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.io.WKBWriter;
+import org.locationtech.jts.io.WKTWriter;
 
 /**
   * @author <a href="mailto:pierrick.brihaye@free.fr">Pierrick Brihaye</a>

diff --git a/...ions/indexes/spatial/src/main/java/org/exist/xquery/modules/spatial/FunSpatialSearch.java b/...ions/indexes/spatial/src/main/java/org/exist/xquery/modules/spatial/FunSpatialSearch.java
@@ -44,7 +44,7 @@
 import org.exist.xquery.value.Type;
 import org.w3c.dom.Element;
 
-import com.vividsolutions.jts.geom.Geometry;
+import org.locationtech.jts.geom.Geometry;
 
 /**
  * @author <a href="mailto:pierrick.brihaye@free.fr">Pierrick Brihaye</a>

diff --git a/extensions/indexes/spatial/src/test/java/org/exist/indexing/spatial/GMLIndexTest.java b/extensions/indexes/spatial/src/test/java/org/exist/indexing/spatial/GMLIndexTest.java
@@ -67,7 +67,7 @@
 import org.xml.sax.*;
 import org.xml.sax.helpers.XMLFilterImpl;
 
-import com.vividsolutions.jts.geom.Geometry;
+import org.locationtech.jts.geom.Geometry;
 
 import static org.junit.Assert.*;