update to locationtech geotools opentripplanner#2538

this is based on work by @innovimax in PR opentripplanner#2690 this now compiles and passes all tests under JDK 11 this is simplified by the fact that R5 and gtfs-lib dependencies are eliminated in the branch this is based on
mfdz · Jan 23, 2019 · 2d53fbc · 2d53fbc
1 parent c6e0fcd
commit 2d53fbc
Show file tree

Hide file tree

Showing 199 changed files with 514 additions and 599 deletions.
diff --git a/.gitignore b/.gitignore
@@ -28,3 +28,4 @@ gen-py/
 _site/
 /otp
 /otp-batch-analyst
+*.DS_Store
diff --git a/pom.xml b/pom.xml
@@ -78,7 +78,8 @@
     </scm>
 
     <properties>
-        <geotools.version>10.5</geotools.version>
+        <geotools.version>20.1</geotools.version>
+        <geotools.wfs.version>16.5</geotools.wfs.version>
         <jackson.version>2.9.7</jackson.version>
         <jersey.version>2.18</jersey.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -523,9 +524,14 @@
         </dependency>
         <dependency>
             <groupId>org.geotools</groupId>
-            <artifactId>gt-wfs</artifactId>
+            <artifactId>gt-opengis</artifactId>
             <version>${geotools.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.geotools</groupId>
+            <artifactId>gt-wfs</artifactId>
+            <version>${geotools.wfs.version}</version>
+        </dependency>
         <!-- provides EPSG database for projections (shapefile loading) -->
         <dependency>
             <groupId>org.geotools</groupId>

diff --git a/src/main/java/org/opensphere/geometry/algorithm/ConcaveHull.java b/src/main/java/org/opensphere/geometry/algorithm/ConcaveHull.java
@@ -13,22 +13,22 @@
 import org.opensphere.geometry.triangulation.model.Triangle;
 import org.opensphere.geometry.triangulation.model.Vertex;
 
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.GeometryCollection;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.LineSegment;
-import com.vividsolutions.jts.geom.LineString;
-import com.vividsolutions.jts.geom.LinearRing;
-import com.vividsolutions.jts.geom.Point;
-import com.vividsolutions.jts.geom.Polygon;
-import com.vividsolutions.jts.geom.impl.CoordinateArraySequence;
-import com.vividsolutions.jts.operation.linemerge.LineMerger;
-import com.vividsolutions.jts.triangulate.ConformingDelaunayTriangulationBuilder;
-import com.vividsolutions.jts.triangulate.quadedge.QuadEdge;
-import com.vividsolutions.jts.triangulate.quadedge.QuadEdgeSubdivision;
-import com.vividsolutions.jts.triangulate.quadedge.QuadEdgeTriangle;
-import com.vividsolutions.jts.util.UniqueCoordinateArrayFilter;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineSegment;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.geom.impl.CoordinateArraySequence;
+import org.locationtech.jts.operation.linemerge.LineMerger;
+import org.locationtech.jts.triangulate.ConformingDelaunayTriangulationBuilder;
+import org.locationtech.jts.triangulate.quadedge.QuadEdge;
+import org.locationtech.jts.triangulate.quadedge.QuadEdgeSubdivision;
+import org.locationtech.jts.triangulate.quadedge.QuadEdgeTriangle;
+import org.locationtech.jts.util.UniqueCoordinateArrayFilter;
 
 /**
  * Computes a concave hull of a {@link Geometry} which is
@@ -179,11 +179,11 @@ private Geometry concaveHull() {
 
 		Collection<QuadEdge> quadEdges = qes.getEdges();
 		List<QuadEdgeTriangle> qeTriangles = QuadEdgeTriangle.createOn(qes);
-		Collection<com.vividsolutions.jts.triangulate.quadedge.Vertex> qeVertices = 
+		Collection<org.locationtech.jts.triangulate.quadedge.Vertex> qeVertices =
 			qes.getVertices(false);
 
 		int iV = 0;
-		for (com.vividsolutions.jts.triangulate.quadedge.Vertex v : qeVertices) {
+		for (org.locationtech.jts.triangulate.quadedge.Vertex v : qeVertices) {
 			this.coordinates.put(v.getCoordinate(), iV);
 			this.vertices.put(iV, new Vertex(iV, v.getCoordinate()));
 			iV++;

diff --git a/src/main/java/org/opensphere/geometry/triangulation/DoubleComparator.java b/src/main/java/org/opensphere/geometry/triangulation/DoubleComparator.java
@@ -4,7 +4,7 @@
 import java.util.Comparator;
 import java.util.Map;
 
-import com.vividsolutions.jts.triangulate.quadedge.QuadEdge;
+import org.locationtech.jts.triangulate.quadedge.QuadEdge;
 
 /**
  * Comparator of a map containing QuadEdge as key

diff --git a/src/main/java/org/opensphere/geometry/triangulation/model/Edge.java b/src/main/java/org/opensphere/geometry/triangulation/model/Edge.java
@@ -4,7 +4,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import com.vividsolutions.jts.geom.LineSegment;
+import org.locationtech.jts.geom.LineSegment;
 
 /**
  * Edge.

diff --git a/src/main/java/org/opensphere/geometry/triangulation/model/Vertex.java b/src/main/java/org/opensphere/geometry/triangulation/model/Vertex.java
@@ -1,7 +1,7 @@
 /* This file is based on code copied from project OpenSphere, see the LICENSE file for further information. */
 package org.opensphere.geometry.triangulation.model;
 
-import com.vividsolutions.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Coordinate;
 
 /**
  * Vertex.

diff --git a/src/main/java/org/opentripplanner/analyst/PointFeature.java b/src/main/java/org/opentripplanner/analyst/PointFeature.java
@@ -10,10 +10,10 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.MultiPolygon;
-import com.vividsolutions.jts.geom.Point;
-import com.vividsolutions.jts.geom.Polygon;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.MultiPolygon;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Polygon;
 
 public class PointFeature implements Serializable {
 

diff --git a/src/main/java/org/opentripplanner/analyst/PointSet.java b/src/main/java/org/opentripplanner/analyst/PointSet.java
@@ -9,10 +9,10 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.MappingJsonFactory;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.Envelope;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.Polygon;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.Polygon;
 import gnu.trove.map.TObjectIntMap;
 import gnu.trove.map.hash.TObjectIntHashMap;
 import org.geojson.LngLatAlt;

diff --git a/src/main/java/org/opentripplanner/analyst/TimeSurface.java b/src/main/java/org/opentripplanner/analyst/TimeSurface.java
@@ -1,6 +1,6 @@
 package org.opentripplanner.analyst;
 
-import com.vividsolutions.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Coordinate;
 import gnu.trove.iterator.TObjectIntIterator;
 import gnu.trove.map.TObjectIntMap;
 import gnu.trove.map.hash.TObjectIntHashMap;

diff --git a/src/main/java/org/opentripplanner/analyst/batch/GraphGeographicFilter.java b/src/main/java/org/opentripplanner/analyst/batch/GraphGeographicFilter.java
@@ -13,11 +13,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.Envelope;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.Point;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.Point;
 
 public class GraphGeographicFilter implements IndividualFilter {
 

diff --git a/src/main/java/org/opentripplanner/analyst/batch/ShapefilePopulation.java b/src/main/java/org/opentripplanner/analyst/batch/ShapefilePopulation.java
@@ -14,10 +14,10 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.MultiPolygon;
-import com.vividsolutions.jts.geom.Point;
-import com.vividsolutions.jts.geom.Polygon;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.MultiPolygon;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Polygon;
 
 public class ShapefilePopulation extends BasicPopulation {
 

diff --git a/src/main/java/org/opentripplanner/analyst/core/GeometryIndex.java b/src/main/java/org/opentripplanner/analyst/core/GeometryIndex.java
@@ -19,9 +19,9 @@
 
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Maps;
-import com.vividsolutions.jts.geom.Envelope;
-import com.vividsolutions.jts.geom.LineString;
-import com.vividsolutions.jts.index.strtree.STRtree;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.index.strtree.STRtree;
 
 /**
  * This index is used in Analyst and does not need to be instantiated if you are not performing

diff --git a/src/main/java/org/opentripplanner/analyst/core/GeometryIndexService.java b/src/main/java/org/opentripplanner/analyst/core/GeometryIndexService.java
@@ -5,7 +5,7 @@
 import org.opengis.geometry.BoundingBox;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
 
-import com.vividsolutions.jts.geom.Envelope;
+import org.locationtech.jts.geom.Envelope;
 
 public interface GeometryIndexService {
 

diff --git a/src/main/java/org/opentripplanner/analyst/core/IsochroneData.java b/src/main/java/org/opentripplanner/analyst/core/IsochroneData.java
@@ -1,7 +1,7 @@
 package org.opentripplanner.analyst.core;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.vividsolutions.jts.geom.Geometry;
+import org.locationtech.jts.geom.Geometry;
 
 import java.io.Serializable;
 

diff --git a/src/main/java/org/opentripplanner/analyst/request/IsoChroneRequest.java b/src/main/java/org/opentripplanner/analyst/request/IsoChroneRequest.java
@@ -3,7 +3,7 @@
 import java.util.Arrays;
 import java.util.List;
 
-import com.vividsolutions.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Coordinate;
 
 /**
  * A request for an isochrone vector.

diff --git a/src/main/java/org/opentripplanner/analyst/request/IsoChroneSPTRendererRecursiveGrid.java b/src/main/java/org/opentripplanner/analyst/request/IsoChroneSPTRendererRecursiveGrid.java
@@ -19,7 +19,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.vividsolutions.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Coordinate;
 
 /**
  * Compute isochrones out of a shortest path tree request (RecursiveGrid isoline algorithm).

diff --git a/src/main/java/org/opentripplanner/analyst/request/SampleFactory.java b/src/main/java/org/opentripplanner/analyst/request/SampleFactory.java
@@ -1,10 +1,10 @@
 package org.opentripplanner.analyst.request;
 
 import com.google.common.collect.Iterables;
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.CoordinateSequence;
-import com.vividsolutions.jts.geom.Envelope;
-import com.vividsolutions.jts.geom.LineString;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.LineString;
 import gnu.trove.map.TIntDoubleMap;
 import gnu.trove.map.hash.TIntDoubleHashMap;
 import org.opentripplanner.analyst.core.Sample;

diff --git a/src/main/java/org/opentripplanner/analyst/request/SampleGridRenderer.java b/src/main/java/org/opentripplanner/analyst/request/SampleGridRenderer.java
@@ -25,7 +25,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.vividsolutions.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Coordinate;
 
 /**
  * Compute a sample grid from a SPT request.

diff --git a/src/main/java/org/opentripplanner/analyst/request/SampleGridRequest.java b/src/main/java/org/opentripplanner/analyst/request/SampleGridRequest.java
@@ -1,6 +1,6 @@
 package org.opentripplanner.analyst.request;
 
-import com.vividsolutions.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Coordinate;
 
 /**
  * A request for a sample grid (of a SPT).

diff --git a/src/main/java/org/opentripplanner/analyst/scenario/AddTripPattern.java b/src/main/java/org/opentripplanner/analyst/scenario/AddTripPattern.java
@@ -2,8 +2,8 @@
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.LineString;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.LineString;
 
 import org.onebusaway.gtfs.model.Route;
 import org.opentripplanner.analyst.core.Sample;

diff --git a/src/main/java/org/opentripplanner/api/adapters/LineStringAdapter.java b/src/main/java/org/opentripplanner/api/adapters/LineStringAdapter.java
@@ -8,8 +8,8 @@
 import org.opentripplanner.util.PolylineEncoder;
 import org.opentripplanner.util.model.EncodedPolylineBean;
 
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.LineString;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.LineString;
 
 public class LineStringAdapter extends XmlAdapter<EncodedPolylineBean, LineString>{
 

diff --git a/src/main/java/org/opentripplanner/api/model/GeometryAdapter.java b/src/main/java/org/opentripplanner/api/model/GeometryAdapter.java
@@ -4,9 +4,9 @@
 
 import org.opentripplanner.common.geometry.GeometryUtils;
 
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.io.WKTReader;
-import com.vividsolutions.jts.io.gml2.GMLWriter;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.io.WKTReader;
+import org.locationtech.jts.io.gml2.GMLWriter;
 
 public class GeometryAdapter extends XmlAdapter<String,Geometry> {
     public Geometry unmarshal(String val) throws Exception {

diff --git a/src/main/java/org/opentripplanner/api/model/RouterInfo.java b/src/main/java/org/opentripplanner/api/model/RouterInfo.java
@@ -10,14 +10,14 @@
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.vividsolutions.jts.geom.Geometry;
+import org.locationtech.jts.geom.Geometry;
 
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
-import com.vividsolutions.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Coordinate;
 import org.opentripplanner.routing.bike_rental.BikeRentalStationService;
 import org.opentripplanner.routing.core.TraverseMode;
 import org.opentripplanner.routing.graph.Graph;

diff --git a/src/main/java/org/opentripplanner/api/parameter/BoundingBox.java b/src/main/java/org/opentripplanner/api/parameter/BoundingBox.java
@@ -4,8 +4,8 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
 
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.Envelope;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
 
 public class BoundingBox {
 

diff --git a/src/main/java/org/opentripplanner/api/parameter/BoundingCircle.java b/src/main/java/org/opentripplanner/api/parameter/BoundingCircle.java
@@ -4,8 +4,8 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
 
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.Envelope;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
 
 public class BoundingCircle {
 

diff --git a/src/main/java/org/opentripplanner/api/resource/BikeRental.java b/src/main/java/org/opentripplanner/api/resource/BikeRental.java
@@ -20,7 +20,7 @@
 import org.opentripplanner.standalone.OTPServer;
 import org.opentripplanner.standalone.Router;
 
-import com.vividsolutions.jts.geom.Envelope;
+import org.locationtech.jts.geom.Envelope;
 import org.opentripplanner.util.ResourceBundleSingleton;
 
 @Path("/routers/{routerId}/bike_rental")

diff --git a/src/main/java/org/opentripplanner/api/resource/CoordinateArrayListSequence.java b/src/main/java/org/opentripplanner/api/resource/CoordinateArrayListSequence.java
@@ -3,9 +3,9 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.CoordinateSequence;
-import com.vividsolutions.jts.geom.Envelope;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.Envelope;
 
 /** An instance of CoordinateSequence that can be efficiently extended */
 public class CoordinateArrayListSequence implements CoordinateSequence, Cloneable {
@@ -124,4 +124,17 @@ public void add(Coordinate newCoordinate) {
     public void clear() {
     	coordinates = new ArrayList<Coordinate>();
     }
+
+    @Override
+    public CoordinateSequence copy() {
+        CoordinateArrayListSequence clone;
+        try {
+            clone = (CoordinateArrayListSequence) super.clone();
+        } catch (CloneNotSupportedException e) {
+            /* never happens since super is Object */
+            throw new RuntimeException(e);
+        }
+        clone.coordinates = (ArrayList<Coordinate>) coordinates.clone();
+        return clone;
+    }
 }
diff --git a/src/main/java/org/opentripplanner/api/resource/ExternalGeocoderResource.java b/src/main/java/org/opentripplanner/api/resource/ExternalGeocoderResource.java
@@ -13,7 +13,7 @@
 import org.opentripplanner.geocoder.Geocoder;
 import org.opentripplanner.geocoder.GeocoderResults;
 
-import com.vividsolutions.jts.geom.Envelope;
+import org.locationtech.jts.geom.Envelope;
 
 /**
  * Maybe the internal geocoder resource should just chain to defined external geocoders?

diff --git a/src/main/java/org/opentripplanner/api/resource/GraphPathToTripPlanConverter.java b/src/main/java/org/opentripplanner/api/resource/GraphPathToTripPlanConverter.java
@@ -1,8 +1,8 @@
 package org.opentripplanner.api.resource;
 
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.LineString;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.LineString;
 import org.opentripplanner.api.model.*;
 import org.opentripplanner.common.geometry.DirectionUtils;
 import org.opentripplanner.common.geometry.GeometryUtils;
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,3 +28,4 @@ gen-py/ @@
     _site/
     /otp
     /otp-batch-analyst
+    *.DS_Store