Update to JTS 1.15.1 (GEOS-8761)

* Update to JTS 1.15.1 * Setting the Jai-ext version to 1.1.0. Signed-off-by: Jim Hughes <jnh5y@ccri.com>
geoserver · Jun 29, 2018 · aac437b · aac437b
1 parent ce7aea6
commit aac437b
Show file tree

Hide file tree

Showing 303 changed files with 2,818 additions and 2,824 deletions.
diff --git a/...ckup-restore/core/src/test/java/org/geoserver/backuprestore/BackupRestoreTestSupport.java b/...ckup-restore/core/src/test/java/org/geoserver/backuprestore/BackupRestoreTestSupport.java
@@ -7,7 +7,7 @@
 import static org.easymock.EasyMock.expect;
 import static org.easymock.classextension.EasyMock.createNiceMock;
 
-import com.vividsolutions.jts.io.WKTReader;
+import org.locationtech.jts.io.WKTReader;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;

diff --git a/src/community/gdal/gdal-wps/src/test/java/org/geoserver/wps/gdal/GdalWpsTest.java b/src/community/gdal/gdal-wps/src/test/java/org/geoserver/wps/gdal/GdalWpsTest.java
@@ -9,7 +9,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-import com.vividsolutions.jts.geom.Envelope;
+import org.locationtech.jts.geom.Envelope;
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.util.zip.ZipEntry;

diff --git a/src/community/geofence-server/src/main/java/org/geoserver/geofence/web/GeofenceRulePage.java b/src/community/geofence-server/src/main/java/org/geoserver/geofence/web/GeofenceRulePage.java
@@ -4,11 +4,11 @@
  */
 package org.geoserver.geofence.web;
 
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.MultiPolygon;
-import com.vividsolutions.jts.geom.Polygon;
-import com.vividsolutions.jts.io.WKTReader;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.MultiPolygon;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.io.WKTReader;
 import java.io.IOException;
 import java.io.Serializable;
 import java.util.ArrayList;

diff --git a/...ommunity/geofence-server/src/main/java/org/geoserver/geofence/web/GeofenceRulesModel.java b/...ommunity/geofence-server/src/main/java/org/geoserver/geofence/web/GeofenceRulesModel.java
@@ -4,7 +4,7 @@
  */
 package org.geoserver.geofence.web;
 
-import com.vividsolutions.jts.geom.MultiPolygon;
+import org.locationtech.jts.geom.MultiPolygon;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;

diff --git a/...ty/geofence-server/src/test/java/org/geoserver/geofence/rest/MultiPolygonAdapterTest.java b/...ty/geofence-server/src/test/java/org/geoserver/geofence/rest/MultiPolygonAdapterTest.java
@@ -7,7 +7,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-import com.vividsolutions.jts.geom.MultiPolygon;
+import org.locationtech.jts.geom.MultiPolygon;
 import javax.xml.namespace.QName;
 import javax.xml.parsers.DocumentBuilderFactory;
 import org.geoserver.geofence.rest.xml.MultiPolygonAdapter;

diff --git a/src/community/geofence/src/main/java/org/geoserver/geofence/GeofenceAccessManager.java b/src/community/geofence/src/main/java/org/geoserver/geofence/GeofenceAccessManager.java
@@ -19,10 +19,10 @@
  */
 package org.geoserver.geofence;
 
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.MultiPolygon;
-import com.vividsolutions.jts.io.ParseException;
-import com.vividsolutions.jts.io.WKTReader;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.MultiPolygon;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.io.WKTReader;
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.URL;

diff --git a/src/community/geofence/src/main/java/org/geoserver/geofence/rest/xml/JaxbRule.java b/src/community/geofence/src/main/java/org/geoserver/geofence/rest/xml/JaxbRule.java
@@ -4,7 +4,7 @@
  */
 package org.geoserver.geofence.rest.xml;
 
-import com.vividsolutions.jts.geom.MultiPolygon;
+import org.locationtech.jts.geom.MultiPolygon;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;

diff --git a/...community/geofence/src/main/java/org/geoserver/geofence/rest/xml/MultiPolygonAdapter.java b/...community/geofence/src/main/java/org/geoserver/geofence/rest/xml/MultiPolygonAdapter.java
@@ -4,10 +4,10 @@
  */
 package org.geoserver.geofence.rest.xml;
 
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.GeometryCollection;
-import com.vividsolutions.jts.geom.MultiPolygon;
-import com.vividsolutions.jts.geom.Polygon;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.MultiPolygon;
+import org.locationtech.jts.geom.Polygon;
 import javax.xml.bind.annotation.adapters.XmlAdapter;
 import javax.xml.parsers.DocumentBuilderFactory;
 import org.geotools.gml3.v3_2.GMLConfiguration;

diff --git a/src/community/geofence/src/test/java/org/geoserver/geofence/AccessManagerTest.java b/src/community/geofence/src/test/java/org/geoserver/geofence/AccessManagerTest.java
@@ -4,8 +4,8 @@
  */
 package org.geoserver.geofence;
 
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.io.WKTReader;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.io.WKTReader;
 import java.util.*;
 import org.geoserver.catalog.*;
 import org.geoserver.catalog.impl.*;

diff --git a/src/community/geogig/src/main/java/org/geogig/geoserver/gwc/CompactMultiPoint.java b/src/community/geogig/src/main/java/org/geogig/geoserver/gwc/CompactMultiPoint.java
@@ -4,20 +4,20 @@
  */
 package org.geogig.geoserver.gwc;
 
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.CoordinateFilter;
-import com.vividsolutions.jts.geom.CoordinateSequence;
-import com.vividsolutions.jts.geom.CoordinateSequenceFilter;
-import com.vividsolutions.jts.geom.Dimension;
-import com.vividsolutions.jts.geom.Envelope;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.GeometryComponentFilter;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.GeometryFilter;
-import com.vividsolutions.jts.geom.MultiPoint;
-import com.vividsolutions.jts.geom.Point;
-import com.vividsolutions.jts.geom.PrecisionModel;
-import com.vividsolutions.jts.geom.impl.PackedCoordinateSequenceFactory;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateFilter;
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.CoordinateSequenceFilter;
+import org.locationtech.jts.geom.Dimension;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryComponentFilter;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.GeometryFilter;
+import org.locationtech.jts.geom.MultiPoint;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.geom.impl.PackedCoordinateSequenceFactory;
 
 /**
  * A growable {@link MultiPoint} that saves all points in a single {@link
@@ -111,7 +111,7 @@ public boolean equalsExact(Geometry other, double tolerance) {
     }
 
     @Override
-    public Object clone() {
+    public CompactMultiPoint copyInternal() {
         return new CompactMultiPoint(coordSeq.clone(), new Envelope(envelope));
     }
 

diff --git a/src/community/geogig/src/main/java/org/geogig/geoserver/gwc/GeometryTileRangeMask.java b/src/community/geogig/src/main/java/org/geogig/geoserver/gwc/GeometryTileRangeMask.java
@@ -4,8 +4,8 @@
  */
 package org.geogig.geoserver.gwc;
 
-import com.vividsolutions.jts.geom.Envelope;
-import com.vividsolutions.jts.geom.Geometry;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
 import org.geoserver.gwc.layer.GeoServerTileLayer;
 import org.geowebcache.grid.BoundingBox;
 import org.geowebcache.grid.GridSubset;

diff --git a/src/community/geogig/src/main/java/org/geogig/geoserver/gwc/GrowableCoordinateSequence.java b/src/community/geogig/src/main/java/org/geogig/geoserver/gwc/GrowableCoordinateSequence.java
@@ -7,9 +7,9 @@
 import static com.google.common.base.Preconditions.checkArgument;
 
 import com.google.common.primitives.Floats;
-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;
 
 /**
  * A {@link CoordinateSequence} that grows as needed when coordinates are {@link #add(double,

diff --git a/src/community/geogig/src/main/java/org/geogig/geoserver/gwc/MinimalDiffBounds.java b/src/community/geogig/src/main/java/org/geogig/geoserver/gwc/MinimalDiffBounds.java
@@ -9,7 +9,7 @@
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
-import com.vividsolutions.jts.geom.Geometry;
+import org.locationtech.jts.geom.Geometry;
 import org.locationtech.geogig.model.ObjectId;
 import org.locationtech.geogig.model.Ref;
 import org.locationtech.geogig.model.RevTree;

diff --git a/src/community/geogig/src/main/java/org/geogig/geoserver/gwc/MinimalDiffBoundsConsumer.java b/src/community/geogig/src/main/java/org/geogig/geoserver/gwc/MinimalDiffBoundsConsumer.java
@@ -4,9 +4,9 @@
  */
 package org.geogig.geoserver.gwc;
 
-import com.vividsolutions.jts.geom.Envelope;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.locks.Lock;

diff --git a/src/community/geogig/src/main/java/org/geogig/geoserver/gwc/TruncateHelper.java b/src/community/geogig/src/main/java/org/geogig/geoserver/gwc/TruncateHelper.java
@@ -7,11 +7,11 @@
 import com.google.common.base.Optional;
 import com.google.common.base.Stopwatch;
 import com.google.common.base.Throwables;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.io.WKTWriter;
-import com.vividsolutions.jts.operation.buffer.BufferOp;
-import com.vividsolutions.jts.operation.buffer.BufferParameters;
-import com.vividsolutions.jts.simplify.TopologyPreservingSimplifier;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.io.WKTWriter;
+import org.locationtech.jts.operation.buffer.BufferOp;
+import org.locationtech.jts.operation.buffer.BufferParameters;
+import org.locationtech.jts.simplify.TopologyPreservingSimplifier;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;

diff --git a/src/community/geogig/src/test/java/org/geogig/geoserver/gwc/GWCIntegrationTest.java b/src/community/geogig/src/test/java/org/geogig/geoserver/gwc/GWCIntegrationTest.java
@@ -9,7 +9,7 @@
 
 import com.mockrunner.mock.web.MockHttpServletRequest;
 import com.mockrunner.mock.web.MockHttpServletResponse;
-import com.vividsolutions.jts.geom.Envelope;
+import org.locationtech.jts.geom.Envelope;
 import java.util.Map;
 import org.geogig.geoserver.GeoGigTestData;
 import org.geogig.geoserver.GeoGigTestData.CatalogBuilder;