Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Rename] refactor libs/geo. #258

Merged
merged 2 commits into from
Mar 11, 2021
Merged

[Rename] refactor libs/geo. #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1934c95
[Rename] refactor libs/geo.
adnapibar Mar 10, 2021
648386e
Merge remote-tracking branch 'upstream/rename/opensearch' into rename…
adnapibar Mar 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions libs/geo/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}

Expand Down
6 changes: 3 additions & 3 deletions ...va/org/elasticsearch/geometry/Circle.java → .../java/org/opensearch/geometry/Circle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions .../org/elasticsearch/geometry/Geometry.java → ...ava/org/opensearch/geometry/Geometry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
4 changes: 2 additions & 2 deletions ...icsearch/geometry/GeometryCollection.java → ...ensearch/geometry/GeometryCollection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...asticsearch/geometry/GeometryVisitor.java → .../opensearch/geometry/GeometryVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions ...java/org/elasticsearch/geometry/Line.java → ...in/java/org/opensearch/geometry/Line.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...rg/elasticsearch/geometry/LinearRing.java → ...a/org/opensearch/geometry/LinearRing.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* under the License.
*/

package org.elasticsearch.geometry;
package org.opensearch.geometry;

import java.util.Arrays;

Expand Down
2 changes: 1 addition & 1 deletion ...org/elasticsearch/geometry/MultiLine.java → ...va/org/opensearch/geometry/MultiLine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* under the License.
*/

package org.elasticsearch.geometry;
package org.opensearch.geometry;

import java.util.List;

Expand Down
2 changes: 1 addition & 1 deletion ...rg/elasticsearch/geometry/MultiPoint.java → ...a/org/opensearch/geometry/MultiPoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* under the License.
*/

package org.elasticsearch.geometry;
package org.opensearch.geometry;

import java.util.List;

Expand Down
2 changes: 1 addition & 1 deletion .../elasticsearch/geometry/MultiPolygon.java → ...org/opensearch/geometry/MultiPolygon.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* under the License.
*/

package org.elasticsearch.geometry;
package org.opensearch.geometry;

import java.util.List;

Expand Down
4 changes: 2 additions & 2 deletions ...ava/org/elasticsearch/geometry/Point.java → ...n/java/org/opensearch/geometry/Point.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion ...a/org/elasticsearch/geometry/Polygon.java → ...java/org/opensearch/geometry/Polygon.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* under the License.
*/

package org.elasticsearch.geometry;
package org.opensearch.geometry;

import java.util.Collections;
import java.util.List;
Expand Down
4 changes: 2 additions & 2 deletions ...org/elasticsearch/geometry/Rectangle.java → ...va/org/opensearch/geometry/Rectangle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions ...org/elasticsearch/geometry/ShapeType.java → ...va/org/opensearch/geometry/ShapeType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion .../elasticsearch/geometry/package-info.java → ...org/opensearch/geometry/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@
/**
* Common Geometry classes
*/
package org.elasticsearch.geometry;
package org.opensearch.geometry;
2 changes: 1 addition & 1 deletion ...elasticsearch/geometry/utils/BitUtil.java → ...rg/opensearch/geometry/utils/BitUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
28 changes: 14 additions & 14 deletions ...ch/geometry/utils/GeographyValidator.java → ...ch/geometry/utils/GeographyValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions ...elasticsearch/geometry/utils/Geohash.java → ...rg/opensearch/geometry/utils/Geohash.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...rch/geometry/utils/GeometryValidator.java → ...rch/geometry/utils/GeometryValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
28 changes: 14 additions & 14 deletions ...rch/geometry/utils/StandardValidator.java → ...rch/geometry/utils/StandardValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
28 changes: 14 additions & 14 deletions ...csearch/geometry/utils/WellKnownText.java → ...nsearch/geometry/utils/WellKnownText.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions ...search/geometry/BaseGeometryTestCase.java → ...search/geometry/BaseGeometryTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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";
}

Expand Down
10 changes: 5 additions & 5 deletions ...g/elasticsearch/geometry/CircleTests.java → .../org/opensearch/geometry/CircleTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions ...rch/geometry/GeometryCollectionTests.java → ...rch/geometry/GeometryCollectionTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions ...arch/geometry/GeometryValidatorTests.java → ...arch/geometry/GeometryValidatorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading