elastic · nknize · Apr 23, 2020 · Apr 20, 2020 · Apr 23, 2020 · Apr 23, 2020
diff --git a/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/SpatialPlugin.java b/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/SpatialPlugin.java
@@ -19,14 +19,14 @@
 import org.elasticsearch.search.aggregations.support.ValuesSourceRegistry;
 import org.elasticsearch.xpack.core.action.XPackInfoFeatureAction;
 import org.elasticsearch.xpack.core.action.XPackUsageFeatureAction;
-import org.elasticsearch.xpack.spatial.aggregations.metrics.GeoShapeBoundsAggregator;
-import org.elasticsearch.xpack.spatial.index.mapper.GeoShapeValuesSource;
-import org.elasticsearch.xpack.spatial.index.mapper.GeoShapeValuesSourceType;
+import org.elasticsearch.xpack.spatial.search.aggregations.metrics.GeoShapeBoundsAggregator;
 import org.elasticsearch.xpack.spatial.index.mapper.GeoShapeWithDocValuesFieldMapper;
 import org.elasticsearch.xpack.spatial.index.mapper.PointFieldMapper;
 import org.elasticsearch.xpack.spatial.index.mapper.ShapeFieldMapper;
 import org.elasticsearch.xpack.spatial.index.query.ShapeQueryBuilder;
 import org.elasticsearch.xpack.spatial.ingest.CircleProcessor;
+import org.elasticsearch.xpack.spatial.search.aggregations.support.GeoShapeValuesSource;
+import org.elasticsearch.xpack.spatial.search.aggregations.support.GeoShapeValuesSourceType;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -71,7 +71,7 @@ public Map<String, Processor.Factory> getProcessors(Processor.Parameters paramet
     }
 
     public static void registerGeoShapeBoundsAggregator(ValuesSourceRegistry valuesSourceRegistry) {
-        valuesSourceRegistry.register(GeoBoundsAggregationBuilder.NAME, GeoShapeValuesSourceType.INSTANCE,
+        valuesSourceRegistry.register(GeoBoundsAggregationBuilder.NAME, GeoShapeValuesSourceType.instance(),
             (GeoBoundsAggregatorSupplier) (name, aggregationContext, parent, valuesSource, wrapLongitude, metadata)
                 -> new GeoShapeBoundsAggregator(name, aggregationContext, parent, (GeoShapeValuesSource) valuesSource,
                 wrapLongitude, metadata));

diff --git a/.../spatial/index/mapper/CartesianPoint.java → .../xpack/spatial/common/CartesianPoint.java b/.../spatial/index/mapper/CartesianPoint.java → .../xpack/spatial/common/CartesianPoint.java
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-package org.elasticsearch.xpack.spatial.index.mapper;
+package org.elasticsearch.xpack.spatial.common;
 
 import org.elasticsearch.ElasticsearchParseException;
 import org.elasticsearch.common.ParseField;
@@ -19,6 +19,7 @@
 import org.elasticsearch.geometry.ShapeType;
 import org.elasticsearch.geometry.utils.StandardValidator;
 import org.elasticsearch.geometry.utils.WellKnownText;
+import org.elasticsearch.xpack.spatial.index.mapper.PointFieldMapper;
 
 import java.io.IOException;
 import java.util.Collections;

diff --git a/...pack/spatial/index/mapper/ShapeUtils.java → ...arch/xpack/spatial/common/ShapeUtils.java b/...pack/spatial/index/mapper/ShapeUtils.java → ...arch/xpack/spatial/common/ShapeUtils.java
@@ -3,19 +3,21 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-package org.elasticsearch.xpack.spatial.index.mapper;
+package org.elasticsearch.xpack.spatial.common;
 
 import org.elasticsearch.geometry.Circle;
 import org.elasticsearch.geometry.Line;
 import org.elasticsearch.geometry.Point;
 import org.elasticsearch.geometry.Polygon;
 import org.elasticsearch.geometry.Rectangle;
 
-
 /**
  * Utility class that transforms Elasticsearch geometry objects to the Lucene representation
  */
 public class ShapeUtils {
+    // no instance:
+    private ShapeUtils() {
+    }
 
     public static org.apache.lucene.geo.XYPolygon toLuceneXYPolygon(Polygon polygon) {
         org.apache.lucene.geo.XYPolygon[] holes = new org.apache.lucene.geo.XYPolygon[polygon.getNumberOfHoles()];
@@ -54,9 +56,6 @@ public static org.apache.lucene.geo.XYCircle toLuceneXYCircle(Circle circle) {
         return new org.apache.lucene.geo.XYCircle((float) circle.getX(), (float) circle.getY(), (float) circle.getRadiusMeters());
     }
 
-    private ShapeUtils() {
-    }
-
     private static float[] doubleArrayToFloatArray(double[] array) {
         float[] result = new float[array.length];
         for (int i = 0; i < array.length; ++i) {

diff --git a/...AbstractAtomicGeoShapeShapeFieldData.java → ...AbstractAtomicGeoShapeShapeFieldData.java b/...AbstractAtomicGeoShapeShapeFieldData.java → ...AbstractAtomicGeoShapeShapeFieldData.java
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-package org.elasticsearch.xpack.spatial.index.mapper;
+package org.elasticsearch.xpack.spatial.index.fielddata;
 
 import org.apache.lucene.util.Accountable;
 import org.elasticsearch.index.fielddata.ScriptDocValues;

diff --git a/.../AbstractLatLonShapeDVIndexFieldData.java → .../AbstractLatLonShapeDVIndexFieldData.java b/.../AbstractLatLonShapeDVIndexFieldData.java → .../AbstractLatLonShapeDVIndexFieldData.java
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-package org.elasticsearch.xpack.spatial.index.mapper;
+package org.elasticsearch.xpack.spatial.index.fielddata;
 
 import org.apache.lucene.index.DocValuesType;
 import org.apache.lucene.index.FieldInfo;

diff --git a/...tial/index/mapper/CentroidCalculator.java → ...l/index/fielddata/CentroidCalculator.java b/...tial/index/mapper/CentroidCalculator.java → ...l/index/fielddata/CentroidCalculator.java
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-package org.elasticsearch.xpack.spatial.index.mapper;
+package org.elasticsearch.xpack.spatial.index.fielddata;
 
 import org.elasticsearch.common.geo.GeoUtils;
 import org.elasticsearch.geometry.Circle;
@@ -23,7 +23,7 @@
 
 /**
  * This class keeps a running Kahan-sum of coordinates
- * that are to be averaged in {@link TriangleTreeWriter} for use
+ * that are to be averaged in {@code TriangleTreeWriter} for use
  * as the centroid of a shape.
  */
 public class CentroidCalculator {

diff --git a/...atial/index/mapper/CoordinateEncoder.java → ...al/index/fielddata/CoordinateEncoder.java b/...atial/index/mapper/CoordinateEncoder.java → ...al/index/fielddata/CoordinateEncoder.java
@@ -4,13 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-package org.elasticsearch.xpack.spatial.index.mapper;
+package org.elasticsearch.xpack.spatial.index.fielddata;
 
 /**
  * Interface for classes that help encode double-valued spatial coordinates x/y to
  * their integer-encoded serialized form and decode them back
  */
-public interface CoordinateEncoder {
+interface CoordinateEncoder {
     int encodeX(double x);
     int encodeY(double y);
     double decodeX(int x);

diff --git a/...al/index/mapper/DimensionalShapeType.java → ...index/fielddata/DimensionalShapeType.java b/...al/index/mapper/DimensionalShapeType.java → ...index/fielddata/DimensionalShapeType.java
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-package org.elasticsearch.xpack.spatial.index.mapper;
+package org.elasticsearch.xpack.spatial.index.fielddata;
 
 import org.apache.lucene.store.ByteArrayDataInput;
 import org.apache.lucene.store.ByteBuffersDataOutput;

diff --git a/...ch/xpack/spatial/index/mapper/Extent.java → ...xpack/spatial/index/fielddata/Extent.java b/...ch/xpack/spatial/index/mapper/Extent.java → ...xpack/spatial/index/fielddata/Extent.java
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-package org.elasticsearch.xpack.spatial.index.mapper;
+package org.elasticsearch.xpack.spatial.index.fielddata;
 
 import org.apache.lucene.store.ByteArrayDataInput;
 import org.apache.lucene.store.ByteBuffersDataOutput;
@@ -15,7 +15,7 @@
 /**
  * Object representing the extent of a geometry object within a {@link TriangleTreeWriter}.
  */
-public class Extent {
+class Extent {
 
     public int top;
     public int bottom;
@@ -31,7 +31,7 @@ public class Extent {
     private static final byte ALL_SET = 4;
 
 
-    public Extent() {
+    Extent() {
         this.top = Integer.MIN_VALUE;
         this.bottom = Integer.MAX_VALUE;
         this.negLeft = Integer.MAX_VALUE;
@@ -40,7 +40,7 @@ public Extent() {
         this.posRight = Integer.MIN_VALUE;
     }
 
-    public Extent(int top, int bottom, int negLeft, int negRight, int posLeft, int posRight) {
+    Extent(int top, int bottom, int negLeft, int negRight, int posLeft, int posRight) {
         this.top = top;
         this.bottom = bottom;
         this.negLeft = negLeft;

diff --git a/...ack/spatial/index/mapper/GeoRelation.java → .../spatial/index/fielddata/GeoRelation.java b/...ack/spatial/index/mapper/GeoRelation.java → .../spatial/index/fielddata/GeoRelation.java
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-package org.elasticsearch.xpack.spatial.index.mapper;
+package org.elasticsearch.xpack.spatial.index.fielddata;
 
 /**
  * Enum for capturing relationships between a shape

diff --git a/...dex/mapper/GeoShapeCoordinateEncoder.java → .../fielddata/GeoShapeCoordinateEncoder.java b/...dex/mapper/GeoShapeCoordinateEncoder.java → .../fielddata/GeoShapeCoordinateEncoder.java
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-package org.elasticsearch.xpack.spatial.index.mapper;
+package org.elasticsearch.xpack.spatial.index.fielddata;
 
 import org.apache.lucene.geo.GeoEncodingUtils;
 

diff --git a/.../index/mapper/IndexGeoShapeFieldData.java → ...dex/fielddata/IndexGeoShapeFieldData.java b/.../index/mapper/IndexGeoShapeFieldData.java → ...dex/fielddata/IndexGeoShapeFieldData.java
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-package org.elasticsearch.xpack.spatial.index.mapper;
+package org.elasticsearch.xpack.spatial.index.fielddata;
 
 
 import org.elasticsearch.index.fielddata.IndexFieldData;

diff --git a/...er/LatLonShapeDVAtomicShapeFieldData.java → ...ta/LatLonShapeDVAtomicShapeFieldData.java b/...er/LatLonShapeDVAtomicShapeFieldData.java → ...ta/LatLonShapeDVAtomicShapeFieldData.java
@@ -4,14 +4,15 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-package org.elasticsearch.xpack.spatial.index.mapper;
+package org.elasticsearch.xpack.spatial.index.fielddata;
 
 import org.apache.lucene.index.BinaryDocValues;
 import org.apache.lucene.index.DocValues;
 import org.apache.lucene.index.LeafReader;
 import org.apache.lucene.util.Accountable;
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.search.aggregations.support.ValuesSourceType;
+import org.elasticsearch.xpack.spatial.search.aggregations.support.GeoShapeValuesSourceType;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -62,7 +63,7 @@ public int docValueCount() {
 
                 @Override
                 public ValuesSourceType valuesSourceType() {
-                    return GeoShapeValuesSourceType.INSTANCE;
+                    return GeoShapeValuesSourceType.instance();
                 }
 
                 @Override

diff --git a/...l/index/mapper/LeafGeoShapeFieldData.java → ...ndex/fielddata/LeafGeoShapeFieldData.java b/...l/index/mapper/LeafGeoShapeFieldData.java → ...ndex/fielddata/LeafGeoShapeFieldData.java
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-package org.elasticsearch.xpack.spatial.index.mapper;
+package org.elasticsearch.xpack.spatial.index.fielddata;
 
 import org.elasticsearch.index.fielddata.LeafFieldData;
 

diff --git a/...ial/index/mapper/MultiGeoShapeValues.java → .../index/fielddata/MultiGeoShapeValues.java b/...ial/index/mapper/MultiGeoShapeValues.java → .../index/fielddata/MultiGeoShapeValues.java
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-package org.elasticsearch.xpack.spatial.index.mapper;
+package org.elasticsearch.xpack.spatial.index.fielddata;
 
 import org.apache.lucene.document.ShapeField;
 import org.apache.lucene.index.IndexableField;
@@ -17,6 +17,7 @@
 import org.elasticsearch.geometry.utils.WellKnownText;
 import org.elasticsearch.index.mapper.GeoShapeIndexer;
 import org.elasticsearch.search.aggregations.support.ValuesSourceType;
+import org.elasticsearch.xpack.spatial.search.aggregations.support.GeoShapeValuesSourceType;
 
 import java.io.IOException;
 import java.text.ParseException;
@@ -40,7 +41,8 @@
  */
 public abstract class MultiGeoShapeValues {
 
-    static MultiGeoShapeValues EMPTY = new MultiGeoShapeValues() {
+    public static MultiGeoShapeValues EMPTY = new MultiGeoShapeValues() {
+        private GeoShapeValuesSourceType DEFAULT_VALUES_SOURCE_TYPE = GeoShapeValuesSourceType.instance();
         @Override
         public boolean advanceExact(int doc) {
             return false;
@@ -53,7 +55,7 @@ public int docValueCount() {
 
         @Override
         public ValuesSourceType valuesSourceType() {
-            return GeoShapeValuesSourceType.INSTANCE;
+            return DEFAULT_VALUES_SOURCE_TYPE;
         }
 
         @Override

diff --git a/...tial/index/mapper/TriangleTreeReader.java → ...l/index/fielddata/TriangleTreeReader.java b/...tial/index/mapper/TriangleTreeReader.java → ...l/index/fielddata/TriangleTreeReader.java
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-package org.elasticsearch.xpack.spatial.index.mapper;
+package org.elasticsearch.xpack.spatial.index.fielddata;
 
 import org.apache.lucene.store.ByteArrayDataInput;
 import org.apache.lucene.util.BytesRef;
@@ -38,15 +38,15 @@
  * -----------------------------------------
  * -----------------------------------------
  */
-public class TriangleTreeReader {
+class TriangleTreeReader {
     private final ByteArrayDataInput input;
     private final CoordinateEncoder coordinateEncoder;
     private final Tile2D tile2D;
     private final Extent extent;
     private int treeOffset;
     private int docValueOffset;
 
-    public TriangleTreeReader(CoordinateEncoder coordinateEncoder) {
+    TriangleTreeReader(CoordinateEncoder coordinateEncoder) {
         this.coordinateEncoder = coordinateEncoder;
         this.tile2D = new Tile2D();
         this.extent = new Extent();

diff --git a/...tial/index/mapper/TriangleTreeWriter.java → ...l/index/fielddata/TriangleTreeWriter.java b/...tial/index/mapper/TriangleTreeWriter.java → ...l/index/fielddata/TriangleTreeWriter.java
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-package org.elasticsearch.xpack.spatial.index.mapper;
+package org.elasticsearch.xpack.spatial.index.fielddata;
 
 import org.apache.lucene.document.ShapeField;
 import org.apache.lucene.store.ByteBuffersDataOutput;

diff --git a/.../main/java/org/elasticsearch/xpack/spatial/index/mapper/BinaryGeoShapeDocValuesField.java b/.../main/java/org/elasticsearch/xpack/spatial/index/mapper/BinaryGeoShapeDocValuesField.java
@@ -11,6 +11,9 @@
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.index.mapper.CustomDocValuesField;
+import org.elasticsearch.xpack.spatial.index.fielddata.CentroidCalculator;
+import org.elasticsearch.xpack.spatial.index.fielddata.GeoShapeCoordinateEncoder;
+import org.elasticsearch.xpack.spatial.index.fielddata.TriangleTreeWriter;
 
 import java.io.IOException;
 import java.util.ArrayList;

diff --git a/...n/java/org/elasticsearch/xpack/spatial/index/mapper/GeoShapeWithDocValuesFieldMapper.java b/...n/java/org/elasticsearch/xpack/spatial/index/mapper/GeoShapeWithDocValuesFieldMapper.java
@@ -36,6 +36,9 @@
 import org.elasticsearch.index.query.QueryShardContext;
 import org.elasticsearch.index.query.VectorGeoShapeQueryProcessor;
 import org.elasticsearch.search.aggregations.support.ValuesSourceType;
+import org.elasticsearch.xpack.spatial.index.fielddata.AbstractLatLonShapeDVIndexFieldData;
+import org.elasticsearch.xpack.spatial.index.fielddata.CentroidCalculator;
+import org.elasticsearch.xpack.spatial.search.aggregations.support.GeoShapeValuesSourceType;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -173,7 +176,7 @@ public Query existsQuery(QueryShardContext context) {
 
         @Override
         public ValuesSourceType getValuesSourceType() {
-            return GeoShapeValuesSourceType.INSTANCE;
+            return GeoShapeValuesSourceType.instance();
         }
 
         @Override

diff --git a/.../spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/PointFieldMapper.java b/.../spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/PointFieldMapper.java
@@ -32,6 +32,7 @@
 import org.elasticsearch.index.mapper.ParseContext;
 import org.elasticsearch.index.query.QueryShardContext;
 import org.elasticsearch.index.query.QueryShardException;
+import org.elasticsearch.xpack.spatial.common.CartesianPoint;
 import org.elasticsearch.xpack.spatial.index.query.ShapeQueryPointProcessor;
 
 import java.io.IOException;

diff --git a/...ugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/ShapeIndexer.java b/...ugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/ShapeIndexer.java
@@ -21,6 +21,7 @@
 import org.elasticsearch.geometry.Rectangle;
 import org.elasticsearch.index.mapper.AbstractGeometryFieldMapper;
 import org.elasticsearch.index.mapper.ParseContext;
+import org.elasticsearch.xpack.spatial.common.ShapeUtils;
 
 import java.util.ArrayList;
 import java.util.Arrays;

diff --git a/...l/src/main/java/org/elasticsearch/xpack/spatial/index/query/ShapeQueryPointProcessor.java b/...l/src/main/java/org/elasticsearch/xpack/spatial/index/query/ShapeQueryPointProcessor.java
@@ -31,7 +31,7 @@
 import org.elasticsearch.index.query.QueryShardContext;
 import org.elasticsearch.index.query.QueryShardException;
 import org.elasticsearch.xpack.spatial.index.mapper.PointFieldMapper;
-import org.elasticsearch.xpack.spatial.index.mapper.ShapeUtils;
+import org.elasticsearch.xpack.spatial.common.ShapeUtils;
 
 
 public class ShapeQueryPointProcessor implements AbstractSearchableGeometryFieldType.QueryProcessor {

diff --git a/...patial/src/main/java/org/elasticsearch/xpack/spatial/index/query/ShapeQueryProcessor.java b/...patial/src/main/java/org/elasticsearch/xpack/spatial/index/query/ShapeQueryProcessor.java
@@ -28,7 +28,7 @@
 import org.elasticsearch.index.query.QueryShardContext;
 import org.elasticsearch.index.query.QueryShardException;
 import org.elasticsearch.xpack.spatial.index.mapper.ShapeFieldMapper;
-import org.elasticsearch.xpack.spatial.index.mapper.ShapeUtils;
+import org.elasticsearch.xpack.spatial.common.ShapeUtils;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...ons/metrics/GeoShapeBoundsAggregator.java → ...ons/metrics/GeoShapeBoundsAggregator.java b/...ons/metrics/GeoShapeBoundsAggregator.java → ...ons/metrics/GeoShapeBoundsAggregator.java
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-package org.elasticsearch.xpack.spatial.aggregations.metrics;
+package org.elasticsearch.xpack.spatial.search.aggregations.metrics;
 
 import org.apache.lucene.index.LeafReaderContext;
 import org.elasticsearch.common.lease.Releasables;
@@ -17,8 +17,8 @@
 import org.elasticsearch.search.aggregations.metrics.InternalGeoBounds;
 import org.elasticsearch.search.aggregations.metrics.MetricsAggregator;
 import org.elasticsearch.search.internal.SearchContext;
-import org.elasticsearch.xpack.spatial.index.mapper.GeoShapeValuesSource;
-import org.elasticsearch.xpack.spatial.index.mapper.MultiGeoShapeValues;
+import org.elasticsearch.xpack.spatial.index.fielddata.MultiGeoShapeValues;
+import org.elasticsearch.xpack.spatial.search.aggregations.support.GeoShapeValuesSource;
 
 import java.io.IOException;
 import java.util.Map;