Move orientation enum out of ShapeBuilder (#73824)

Author: iverase

server/src/internalClusterTest/java/org/elasticsearch/search/geo/GeoShapeIntegrationIT.java

@@ -13,8 +13,8 @@
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.routing.IndexShardRoutingTable;
 import org.elasticsearch.common.Strings;
+import org.elasticsearch.common.geo.Orientation;
 import org.elasticsearch.common.geo.builders.PointBuilder;
-import org.elasticsearch.common.geo.builders.ShapeBuilder;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.common.xcontent.XContentType;
@@ -84,10 +84,10 @@ public void testOrientationPersistence() throws Exception {
         assertThat(fieldType, instanceOf(GeoShapeFieldMapper.GeoShapeFieldType.class));
 
         GeoShapeFieldMapper.GeoShapeFieldType gsfm = (GeoShapeFieldMapper.GeoShapeFieldType)fieldType;
-        ShapeBuilder.Orientation orientation = gsfm.orientation();
-        assertThat(orientation, equalTo(ShapeBuilder.Orientation.CLOCKWISE));
-        assertThat(orientation, equalTo(ShapeBuilder.Orientation.LEFT));
-        assertThat(orientation, equalTo(ShapeBuilder.Orientation.CW));
+        Orientation orientation = gsfm.orientation();
+        assertThat(orientation, equalTo(Orientation.CLOCKWISE));
+        assertThat(orientation, equalTo(Orientation.LEFT));
+        assertThat(orientation, equalTo(Orientation.CW));
 
         // right orientation test
         indicesService = internalCluster().getInstance(IndicesService.class, findNodeName(idxName+"2"));
@@ -97,9 +97,9 @@ public void testOrientationPersistence() throws Exception {
 
         gsfm = (GeoShapeFieldMapper.GeoShapeFieldType)fieldType;
         orientation = gsfm.orientation();
-        assertThat(orientation, equalTo(ShapeBuilder.Orientation.COUNTER_CLOCKWISE));
-        assertThat(orientation, equalTo(ShapeBuilder.Orientation.RIGHT));
-        assertThat(orientation, equalTo(ShapeBuilder.Orientation.CCW));
+        assertThat(orientation, equalTo(Orientation.COUNTER_CLOCKWISE));
+        assertThat(orientation, equalTo(Orientation.RIGHT));
+        assertThat(orientation, equalTo(Orientation.CCW));
     }
 
     /**

server/src/internalClusterTest/java/org/elasticsearch/search/geo/LegacyGeoShapeIntegrationIT.java

@@ -14,7 +14,7 @@
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.routing.IndexShardRoutingTable;
 import org.elasticsearch.common.Strings;
-import org.elasticsearch.common.geo.builders.ShapeBuilder;
+import org.elasticsearch.common.geo.Orientation;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.ToXContent;
 import org.elasticsearch.common.xcontent.XContentFactory;
@@ -80,10 +80,10 @@ public void testOrientationPersistence() throws Exception {
         assertThat(fieldType, instanceOf(LegacyGeoShapeFieldMapper.GeoShapeFieldType.class));
 
         LegacyGeoShapeFieldMapper.GeoShapeFieldType gsfm = (LegacyGeoShapeFieldMapper.GeoShapeFieldType)fieldType;
-        ShapeBuilder.Orientation orientation = gsfm.orientation();
-        assertThat(orientation, equalTo(ShapeBuilder.Orientation.CLOCKWISE));
-        assertThat(orientation, equalTo(ShapeBuilder.Orientation.LEFT));
-        assertThat(orientation, equalTo(ShapeBuilder.Orientation.CW));
+        Orientation orientation = gsfm.orientation();
+        assertThat(orientation, equalTo(Orientation.CLOCKWISE));
+        assertThat(orientation, equalTo(Orientation.LEFT));
+        assertThat(orientation, equalTo(Orientation.CW));
 
         // right orientation test
         indicesService = internalCluster().getInstance(IndicesService.class, findNodeName(idxName+"2"));
@@ -93,9 +93,9 @@ public void testOrientationPersistence() throws Exception {
 
         gsfm = (LegacyGeoShapeFieldMapper.GeoShapeFieldType)fieldType;
         orientation = gsfm.orientation();
-        assertThat(orientation, equalTo(ShapeBuilder.Orientation.COUNTER_CLOCKWISE));
-        assertThat(orientation, equalTo(ShapeBuilder.Orientation.RIGHT));
-        assertThat(orientation, equalTo(ShapeBuilder.Orientation.CCW));
+        assertThat(orientation, equalTo(Orientation.COUNTER_CLOCKWISE));
+        assertThat(orientation, equalTo(Orientation.RIGHT));
+        assertThat(orientation, equalTo(Orientation.CCW));
     }
 
     /**

server/src/main/java/org/elasticsearch/common/geo/GeoShapeType.java

@@ -19,7 +19,6 @@
 import org.elasticsearch.common.geo.builders.PointBuilder;
 import org.elasticsearch.common.geo.builders.PolygonBuilder;
 import org.elasticsearch.common.geo.builders.ShapeBuilder;
-import org.elasticsearch.common.geo.builders.ShapeBuilder.Orientation;
 import org.elasticsearch.common.geo.parsers.CoordinateNode;
 import org.elasticsearch.common.io.stream.NamedWriteableRegistry.Entry;
 import org.elasticsearch.common.unit.DistanceUnit;
@@ -288,7 +287,7 @@ public static GeoShapeType forName(String geoshapename) {
     }
 
     public abstract ShapeBuilder<?, ?, ?> getBuilder(CoordinateNode coordinates, DistanceUnit.Distance radius,
-                                            ShapeBuilder.Orientation orientation, boolean coerce);
+                                            Orientation orientation, boolean coerce);
     abstract CoordinateNode validate(CoordinateNode coordinates, boolean coerce);
 
     /** wkt shape name */

server/src/main/java/org/elasticsearch/common/geo/Orientation.java

@@ -0,0 +1,53 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+package org.elasticsearch.common.geo;
+
+import org.elasticsearch.common.io.stream.StreamInput;
+import org.elasticsearch.common.io.stream.StreamOutput;
+
+import java.io.IOException;
+import java.util.Locale;
+
+public enum Orientation {
+    LEFT,
+    RIGHT;
+
+    public static final Orientation CLOCKWISE = Orientation.LEFT;
+    public static final Orientation COUNTER_CLOCKWISE = Orientation.RIGHT;
+    public static final Orientation CW = Orientation.LEFT;
+    public static final Orientation CCW = Orientation.RIGHT;
+
+    public void writeTo (StreamOutput out) throws IOException {
+        out.writeBoolean(this == Orientation.RIGHT);
+    }
+
+    public static Orientation readFrom (StreamInput in) throws IOException {
+        return in.readBoolean() ? Orientation.RIGHT : Orientation.LEFT;
+    }
+
+    public boolean getAsBoolean() {
+        return this == Orientation.RIGHT;
+    }
+
+    public static Orientation fromString(String orientation) {
+        orientation = orientation.toLowerCase(Locale.ROOT);
+        switch (orientation) {
+            case "right":
+            case "counterclockwise":
+            case "ccw":
+                return Orientation.RIGHT;
+            case "left":
+            case "clockwise":
+            case "cw":
+                return Orientation.LEFT;
+            default:
+                throw new IllegalArgumentException("Unknown orientation [" + orientation + "]");
+        }
+    }
+}

server/src/main/java/org/elasticsearch/common/geo/builders/MultiPolygonBuilder.java

@@ -10,6 +10,7 @@
 
 import org.elasticsearch.common.geo.GeoShapeType;
 import org.elasticsearch.common.geo.XShapeCollection;
+import org.elasticsearch.common.geo.Orientation;
 import org.elasticsearch.common.geo.parsers.GeoWKTParser;
 import org.elasticsearch.common.geo.parsers.ShapeParser;
 import org.elasticsearch.common.io.stream.StreamInput;

server/src/main/java/org/elasticsearch/common/geo/builders/PolygonBuilder.java

@@ -10,6 +10,7 @@
 
 import org.elasticsearch.core.Tuple;
 import org.elasticsearch.common.geo.GeoShapeType;
+import org.elasticsearch.common.geo.Orientation;
 import org.elasticsearch.common.geo.parsers.ShapeParser;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;

server/src/main/java/org/elasticsearch/common/geo/builders/ShapeBuilder.java

@@ -33,7 +33,6 @@
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.List;
-import java.util.Locale;
 import java.util.Objects;
 
 /**
@@ -430,44 +429,6 @@ public int compare(Edge o1, Edge o2) {
         }
     }
 
-    public enum Orientation {
-        LEFT,
-        RIGHT;
-
-        public static final Orientation CLOCKWISE = Orientation.LEFT;
-        public static final Orientation COUNTER_CLOCKWISE = Orientation.RIGHT;
-        public static final Orientation CW = Orientation.LEFT;
-        public static final Orientation CCW = Orientation.RIGHT;
-
-        public void writeTo (StreamOutput out) throws IOException {
-            out.writeBoolean(this == Orientation.RIGHT);
-        }
-
-        public static Orientation readFrom (StreamInput in) throws IOException {
-            return in.readBoolean() ? Orientation.RIGHT : Orientation.LEFT;
-        }
-
-        public boolean getAsBoolean() {
-            return this == Orientation.RIGHT;
-        }
-
-        public static Orientation fromString(String orientation) {
-            orientation = orientation.toLowerCase(Locale.ROOT);
-            switch (orientation) {
-                case "right":
-                case "counterclockwise":
-                case "ccw":
-                    return Orientation.RIGHT;
-                case "left":
-                case "clockwise":
-                case "cw":
-                    return Orientation.LEFT;
-                default:
-                    throw new IllegalArgumentException("Unknown orientation [" + orientation + "]");
-            }
-        }
-    }
-
     protected static final boolean debugEnabled() {
         return LOGGER.isDebugEnabled() || DEBUG;
     }

server/src/main/java/org/elasticsearch/common/geo/parsers/GeoJsonParser.java

@@ -10,10 +10,10 @@
 import org.elasticsearch.ElasticsearchParseException;
 import org.elasticsearch.common.geo.GeoPoint;
 import org.elasticsearch.common.geo.GeoShapeType;
+import org.elasticsearch.common.geo.Orientation;
 import org.elasticsearch.common.geo.builders.CircleBuilder;
 import org.elasticsearch.common.geo.builders.GeometryCollectionBuilder;
 import org.elasticsearch.common.geo.builders.ShapeBuilder;
-import org.elasticsearch.common.geo.builders.ShapeBuilder.Orientation;
 import org.elasticsearch.common.unit.DistanceUnit;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.common.xcontent.XContentSubParser;
@@ -92,7 +92,7 @@ protected static ShapeBuilder parse(XContentParser parser, AbstractShapeGeometry
                             malformedException = "cannot have [" + ShapeParser.FIELD_ORIENTATION + "] with type set to [" + shapeType + "]";
                         }
                         subParser.nextToken();
-                        orientation = ShapeBuilder.Orientation.fromString(subParser.text());
+                        orientation = Orientation.fromString(subParser.text());
                     } else {
                         subParser.nextToken();
                         subParser.skipChildren();

server/src/main/java/org/elasticsearch/common/geo/parsers/GeoWKTParser.java

@@ -20,6 +20,7 @@
 import org.elasticsearch.common.geo.builders.PointBuilder;
 import org.elasticsearch.common.geo.builders.PolygonBuilder;
 import org.elasticsearch.common.geo.builders.ShapeBuilder;
+import org.elasticsearch.common.geo.Orientation;
 import org.elasticsearch.common.logging.Loggers;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.index.mapper.AbstractShapeGeometryFieldMapper;
@@ -245,7 +246,7 @@ private static PolygonBuilder parsePolygon(StreamTokenizer stream, final boolean
             return null;
         }
         PolygonBuilder builder = new PolygonBuilder(parseLinearRing(stream, ignoreZValue, coerce),
-            ShapeBuilder.Orientation.RIGHT);
+            Orientation.RIGHT);
         while (nextCloserOrComma(stream).equals(COMMA)) {
             builder.hole(parseLinearRing(stream, ignoreZValue, coerce));
         }

server/src/main/java/org/elasticsearch/index/mapper/AbstractShapeGeometryFieldMapper.java

@@ -8,8 +8,7 @@
 package org.elasticsearch.index.mapper;
 
 import org.elasticsearch.common.Explicit;
-import org.elasticsearch.common.geo.builders.ShapeBuilder;
-import org.elasticsearch.common.geo.builders.ShapeBuilder.Orientation;
+import org.elasticsearch.common.geo.Orientation;
 import org.elasticsearch.index.analysis.NamedAnalyzer;
 
 import java.util.Collections;
@@ -29,7 +28,7 @@ public static Parameter<Explicit<Boolean>> coerceParam(Function<FieldMapper, Exp
     public static Parameter<Explicit<Orientation>> orientationParam(Function<FieldMapper, Explicit<Orientation>> initializer) {
         return new Parameter<>("orientation", true,
             () -> new Explicit<>(Orientation.RIGHT, false),
-            (n, c, o) -> new Explicit<>(ShapeBuilder.Orientation.fromString(o.toString()), true),
+            (n, c, o) -> new Explicit<>(Orientation.fromString(o.toString()), true),
             initializer)
             .setSerializer((b, f, v) -> b.field(f, v.value()), v -> v.value().toString());
     }