[Rename] refactor libs/geo. (#258)

Refactor the `libs/geo` module to rename the package name from `org.elasticsearch.geometry` to `org.opensearch.geometry` as part of the rename to OpenSearch work. Signed-off-by: Rabi Panda <adnapibar@gmail.com>
opensearch-project · Mar 22, 2021 · 9eb511d · 9eb511d
1 parent eae9b05
commit 9eb511d
Show file tree

Hide file tree

Showing 100 changed files with 420 additions and 419 deletions.
diff --git a/libs/geo/build.gradle b/libs/geo/build.gradle
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-apply plugin: 'elasticsearch.build'
-apply plugin: 'elasticsearch.publish'
+apply plugin: 'opensearch.build'
+apply plugin: 'opensearch.publish'
 
 dependencies {
   testImplementation(project(":test:framework")) {
-    exclude group: 'org.elasticsearch', module: 'elasticsearch-geo'
+    exclude group: 'org.opensearch', module: 'opensearch-geo'
   }
 }
 

diff --git a/...va/org/elasticsearch/geometry/Circle.java → .../java/org/opensearch/geometry/Circle.java b/...va/org/elasticsearch/geometry/Circle.java → .../java/org/opensearch/geometry/Circle.java
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package org.elasticsearch.geometry;
+package org.opensearch.geometry;
 
-import org.elasticsearch.geometry.utils.WellKnownText;
+import org.opensearch.geometry.utils.WellKnownText;
 
 /**
- * Circle geometry (not part of WKT standard, but used in elasticsearch) defined by lat/lon coordinates of the center in degrees
+ * Circle geometry (not part of WKT standard, but used in opensearch) defined by lat/lon coordinates of the center in degrees
  * and optional altitude in meters.
  */
 public class Circle implements Geometry {

diff --git a/.../org/elasticsearch/geometry/Geometry.java → ...ava/org/opensearch/geometry/Geometry.java b/.../org/elasticsearch/geometry/Geometry.java → ...ava/org/opensearch/geometry/Geometry.java
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package org.elasticsearch.geometry;
+package org.opensearch.geometry;
 
 /**
- * Base class for all Geometry objects supported by elasticsearch
+ * Base class for all Geometry objects supported by opensearch
  */
 public interface Geometry {
 

diff --git a/...icsearch/geometry/GeometryCollection.java → ...ensearch/geometry/GeometryCollection.java b/...icsearch/geometry/GeometryCollection.java → ...ensearch/geometry/GeometryCollection.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.geometry;
+package org.opensearch.geometry;
 
-import org.elasticsearch.geometry.utils.WellKnownText;
+import org.opensearch.geometry.utils.WellKnownText;
 
 import java.util.Collections;
 import java.util.Iterator;

diff --git a/...asticsearch/geometry/GeometryVisitor.java → .../opensearch/geometry/GeometryVisitor.java b/...asticsearch/geometry/GeometryVisitor.java → .../opensearch/geometry/GeometryVisitor.java
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package org.elasticsearch.geometry;
+package org.opensearch.geometry;
 
-import org.elasticsearch.geometry.utils.WellKnownText;
+import org.opensearch.geometry.utils.WellKnownText;
 
 /**
  * Support class for creating Geometry Visitors.

diff --git a/...java/org/elasticsearch/geometry/Line.java → ...in/java/org/opensearch/geometry/Line.java b/...java/org/elasticsearch/geometry/Line.java → ...in/java/org/opensearch/geometry/Line.java
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package org.elasticsearch.geometry;
+package org.opensearch.geometry;
 
-import org.elasticsearch.geometry.utils.WellKnownText;
+import org.opensearch.geometry.utils.WellKnownText;
 
 import java.util.Arrays;
 

diff --git a/...rg/elasticsearch/geometry/LinearRing.java → ...a/org/opensearch/geometry/LinearRing.java b/...rg/elasticsearch/geometry/LinearRing.java → ...a/org/opensearch/geometry/LinearRing.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.geometry;
+package org.opensearch.geometry;
 
 import java.util.Arrays;
 

diff --git a/...org/elasticsearch/geometry/MultiLine.java → ...va/org/opensearch/geometry/MultiLine.java b/...org/elasticsearch/geometry/MultiLine.java → ...va/org/opensearch/geometry/MultiLine.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.geometry;
+package org.opensearch.geometry;
 
 import java.util.List;
 

diff --git a/...rg/elasticsearch/geometry/MultiPoint.java → ...a/org/opensearch/geometry/MultiPoint.java b/...rg/elasticsearch/geometry/MultiPoint.java → ...a/org/opensearch/geometry/MultiPoint.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.geometry;
+package org.opensearch.geometry;
 
 import java.util.List;
 

diff --git a/.../elasticsearch/geometry/MultiPolygon.java → ...org/opensearch/geometry/MultiPolygon.java b/.../elasticsearch/geometry/MultiPolygon.java → ...org/opensearch/geometry/MultiPolygon.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.geometry;
+package org.opensearch.geometry;
 
 import java.util.List;
 

diff --git a/...ava/org/elasticsearch/geometry/Point.java → ...n/java/org/opensearch/geometry/Point.java b/...ava/org/elasticsearch/geometry/Point.java → ...n/java/org/opensearch/geometry/Point.java
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package org.elasticsearch.geometry;
+package org.opensearch.geometry;
 
-import org.elasticsearch.geometry.utils.WellKnownText;
+import org.opensearch.geometry.utils.WellKnownText;
 
 /**
  * Represents a Point on the earth's surface in decimal degrees and optional altitude in meters.

diff --git a/...a/org/elasticsearch/geometry/Polygon.java → ...java/org/opensearch/geometry/Polygon.java b/...a/org/elasticsearch/geometry/Polygon.java → ...java/org/opensearch/geometry/Polygon.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.geometry;
+package org.opensearch.geometry;
 
 import java.util.Collections;
 import java.util.List;

diff --git a/...org/elasticsearch/geometry/Rectangle.java → ...va/org/opensearch/geometry/Rectangle.java b/...org/elasticsearch/geometry/Rectangle.java → ...va/org/opensearch/geometry/Rectangle.java
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package org.elasticsearch.geometry;
+package org.opensearch.geometry;
 
-import org.elasticsearch.geometry.utils.WellKnownText;
+import org.opensearch.geometry.utils.WellKnownText;
 
 /**
  * Represents a lat/lon rectangle in decimal degrees and optional altitude in meters.

diff --git a/...org/elasticsearch/geometry/ShapeType.java → ...va/org/opensearch/geometry/ShapeType.java b/...org/elasticsearch/geometry/ShapeType.java → ...va/org/opensearch/geometry/ShapeType.java
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package org.elasticsearch.geometry;
+package org.opensearch.geometry;
 
 import java.util.Locale;
 
 /**
- * Shape types supported by elasticsearch
+ * Shape types supported by opensearch
  */
 public enum ShapeType {
     POINT,

diff --git a/.../elasticsearch/geometry/package-info.java → ...org/opensearch/geometry/package-info.java b/.../elasticsearch/geometry/package-info.java → ...org/opensearch/geometry/package-info.java
@@ -21,4 +21,4 @@
 /**
  * Common Geometry classes
  */
-package org.elasticsearch.geometry;
+package org.opensearch.geometry;
diff --git a/...elasticsearch/geometry/utils/BitUtil.java → ...rg/opensearch/geometry/utils/BitUtil.java b/...elasticsearch/geometry/utils/BitUtil.java → ...rg/opensearch/geometry/utils/BitUtil.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.geometry.utils;
+package org.opensearch.geometry.utils;
 
 /**
  * Utilities for common Bit twiddling methods. Borrowed heavily from Lucene (org.apache.lucene.util.BitUtil).

diff --git a/...ch/geometry/utils/GeographyValidator.java → ...ch/geometry/utils/GeographyValidator.java b/...ch/geometry/utils/GeographyValidator.java → ...ch/geometry/utils/GeographyValidator.java
@@ -17,20 +17,20 @@
  * under the License.
  */
 
-package org.elasticsearch.geometry.utils;
-
-import org.elasticsearch.geometry.Circle;
-import org.elasticsearch.geometry.Geometry;
-import org.elasticsearch.geometry.GeometryCollection;
-import org.elasticsearch.geometry.GeometryVisitor;
-import org.elasticsearch.geometry.Line;
-import org.elasticsearch.geometry.LinearRing;
-import org.elasticsearch.geometry.MultiLine;
-import org.elasticsearch.geometry.MultiPoint;
-import org.elasticsearch.geometry.MultiPolygon;
-import org.elasticsearch.geometry.Point;
-import org.elasticsearch.geometry.Polygon;
-import org.elasticsearch.geometry.Rectangle;
+package org.opensearch.geometry.utils;
+
+import org.opensearch.geometry.Circle;
+import org.opensearch.geometry.Geometry;
+import org.opensearch.geometry.GeometryCollection;
+import org.opensearch.geometry.GeometryVisitor;
+import org.opensearch.geometry.Line;
+import org.opensearch.geometry.LinearRing;
+import org.opensearch.geometry.MultiLine;
+import org.opensearch.geometry.MultiPoint;
+import org.opensearch.geometry.MultiPolygon;
+import org.opensearch.geometry.Point;
+import org.opensearch.geometry.Polygon;
+import org.opensearch.geometry.Rectangle;
 
 /**
  * Validator that checks that lats are between -90 and +90 and lons are between -180 and +180 and altitude is present only if

diff --git a/...elasticsearch/geometry/utils/Geohash.java → ...rg/opensearch/geometry/utils/Geohash.java b/...elasticsearch/geometry/utils/Geohash.java → ...rg/opensearch/geometry/utils/Geohash.java
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.geometry.utils;
+package org.opensearch.geometry.utils;
 
-import org.elasticsearch.geometry.Point;
-import org.elasticsearch.geometry.Rectangle;
+import org.opensearch.geometry.Point;
+import org.opensearch.geometry.Rectangle;
 
 import java.util.ArrayList;
 import java.util.Collection;

diff --git a/...rch/geometry/utils/GeometryValidator.java → ...rch/geometry/utils/GeometryValidator.java b/...rch/geometry/utils/GeometryValidator.java → ...rch/geometry/utils/GeometryValidator.java
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package org.elasticsearch.geometry.utils;
+package org.opensearch.geometry.utils;
 
-import org.elasticsearch.geometry.Geometry;
+import org.opensearch.geometry.Geometry;
 
 /**
  * Generic geometry validator that can be used by the parser to verify the validity of the parsed geometry

diff --git a/...rch/geometry/utils/StandardValidator.java → ...rch/geometry/utils/StandardValidator.java b/...rch/geometry/utils/StandardValidator.java → ...rch/geometry/utils/StandardValidator.java
@@ -17,20 +17,20 @@
  * under the License.
  */
 
-package org.elasticsearch.geometry.utils;
-
-import org.elasticsearch.geometry.Circle;
-import org.elasticsearch.geometry.Geometry;
-import org.elasticsearch.geometry.GeometryCollection;
-import org.elasticsearch.geometry.GeometryVisitor;
-import org.elasticsearch.geometry.Line;
-import org.elasticsearch.geometry.LinearRing;
-import org.elasticsearch.geometry.MultiLine;
-import org.elasticsearch.geometry.MultiPoint;
-import org.elasticsearch.geometry.MultiPolygon;
-import org.elasticsearch.geometry.Point;
-import org.elasticsearch.geometry.Polygon;
-import org.elasticsearch.geometry.Rectangle;
+package org.opensearch.geometry.utils;
+
+import org.opensearch.geometry.Circle;
+import org.opensearch.geometry.Geometry;
+import org.opensearch.geometry.GeometryCollection;
+import org.opensearch.geometry.GeometryVisitor;
+import org.opensearch.geometry.Line;
+import org.opensearch.geometry.LinearRing;
+import org.opensearch.geometry.MultiLine;
+import org.opensearch.geometry.MultiPoint;
+import org.opensearch.geometry.MultiPolygon;
+import org.opensearch.geometry.Point;
+import org.opensearch.geometry.Polygon;
+import org.opensearch.geometry.Rectangle;
 
 /**
  * Validator that only checks that altitude only shows up if ignoreZValue is set to true.

diff --git a/...csearch/geometry/utils/WellKnownText.java → ...nsearch/geometry/utils/WellKnownText.java b/...csearch/geometry/utils/WellKnownText.java → ...nsearch/geometry/utils/WellKnownText.java
@@ -17,20 +17,20 @@
  * under the License.
  */
 
-package org.elasticsearch.geometry.utils;
-
-import org.elasticsearch.geometry.Circle;
-import org.elasticsearch.geometry.Geometry;
-import org.elasticsearch.geometry.GeometryCollection;
-import org.elasticsearch.geometry.GeometryVisitor;
-import org.elasticsearch.geometry.Line;
-import org.elasticsearch.geometry.LinearRing;
-import org.elasticsearch.geometry.MultiLine;
-import org.elasticsearch.geometry.MultiPoint;
-import org.elasticsearch.geometry.MultiPolygon;
-import org.elasticsearch.geometry.Point;
-import org.elasticsearch.geometry.Polygon;
-import org.elasticsearch.geometry.Rectangle;
+package org.opensearch.geometry.utils;
+
+import org.opensearch.geometry.Circle;
+import org.opensearch.geometry.Geometry;
+import org.opensearch.geometry.GeometryCollection;
+import org.opensearch.geometry.GeometryVisitor;
+import org.opensearch.geometry.Line;
+import org.opensearch.geometry.LinearRing;
+import org.opensearch.geometry.MultiLine;
+import org.opensearch.geometry.MultiPoint;
+import org.opensearch.geometry.MultiPolygon;
+import org.opensearch.geometry.Point;
+import org.opensearch.geometry.Polygon;
+import org.opensearch.geometry.Rectangle;
 
 import java.io.IOException;
 import java.io.StreamTokenizer;

diff --git a/...search/geometry/BaseGeometryTestCase.java → ...search/geometry/BaseGeometryTestCase.java b/...search/geometry/BaseGeometryTestCase.java → ...search/geometry/BaseGeometryTestCase.java
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package org.elasticsearch.geometry;
+package org.opensearch.geometry;
 
 import org.elasticsearch.OpenSearchException;
 import org.elasticsearch.Version;
-import org.elasticsearch.geometry.utils.GeographyValidator;
-import org.elasticsearch.geometry.utils.WellKnownText;
+import org.opensearch.geometry.utils.GeographyValidator;
+import org.opensearch.geometry.utils.WellKnownText;
 import org.elasticsearch.test.AbstractWireTestCase;
 
 import java.io.IOException;
@@ -63,7 +63,7 @@ public static void testVisitor(Geometry geom) {
             private Object verify(Geometry geometry, String expectedClass) {
                 assertFalse("Visitor should be called only once", called.getAndSet(true));
                 assertSame(geom, geometry);
-                assertEquals(geometry.getClass().getName(), "org.elasticsearch.geometry." + expectedClass);
+                assertEquals(geometry.getClass().getName(), "org.opensearch.geometry." + expectedClass);
                 return "result";
             }
 

diff --git a/...g/elasticsearch/geometry/CircleTests.java → .../org/opensearch/geometry/CircleTests.java b/...g/elasticsearch/geometry/CircleTests.java → .../org/opensearch/geometry/CircleTests.java
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package org.elasticsearch.geometry;
+package org.opensearch.geometry;
 
-import org.elasticsearch.geometry.utils.GeographyValidator;
-import org.elasticsearch.geometry.utils.GeometryValidator;
-import org.elasticsearch.geometry.utils.StandardValidator;
-import org.elasticsearch.geometry.utils.WellKnownText;
+import org.opensearch.geometry.utils.GeographyValidator;
+import org.opensearch.geometry.utils.GeometryValidator;
+import org.opensearch.geometry.utils.StandardValidator;
+import org.opensearch.geometry.utils.WellKnownText;
 
 import java.io.IOException;
 import java.text.ParseException;

diff --git a/...rch/geometry/GeometryCollectionTests.java → ...rch/geometry/GeometryCollectionTests.java b/...rch/geometry/GeometryCollectionTests.java → ...rch/geometry/GeometryCollectionTests.java
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package org.elasticsearch.geometry;
+package org.opensearch.geometry;
 
 import org.elasticsearch.geo.GeometryTestUtils;
-import org.elasticsearch.geometry.utils.GeographyValidator;
-import org.elasticsearch.geometry.utils.StandardValidator;
-import org.elasticsearch.geometry.utils.WellKnownText;
+import org.opensearch.geometry.utils.GeographyValidator;
+import org.opensearch.geometry.utils.StandardValidator;
+import org.opensearch.geometry.utils.WellKnownText;
 
 import java.io.IOException;
 import java.text.ParseException;

diff --git a/...arch/geometry/GeometryValidatorTests.java → ...arch/geometry/GeometryValidatorTests.java b/...arch/geometry/GeometryValidatorTests.java → ...arch/geometry/GeometryValidatorTests.java
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package org.elasticsearch.geometry;
+package org.opensearch.geometry;
 
-import org.elasticsearch.geometry.utils.GeographyValidator;
-import org.elasticsearch.geometry.utils.GeometryValidator;
-import org.elasticsearch.geometry.utils.WellKnownText;
+import org.opensearch.geometry.utils.GeographyValidator;
+import org.opensearch.geometry.utils.GeometryValidator;
+import org.opensearch.geometry.utils.WellKnownText;
 import org.elasticsearch.test.ESTestCase;
 
 public class GeometryValidatorTests extends ESTestCase {