Clean imports

opendatasoft · Mar 18, 2022 · b2a568e · b2a568e
1 parent f231e5d
commit b2a568e
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 42 deletions.
diff --git a/src/main/java/org/opendatasoft/elasticsearch/ingest/GeoExtensionProcessor.java b/src/main/java/org/opendatasoft/elasticsearch/ingest/GeoExtensionProcessor.java
@@ -3,36 +3,32 @@
 
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.common.bytes.BytesReference;
-import org.elasticsearch.legacygeo.XShapeCollection;
-import org.elasticsearch.legacygeo.parsers.ShapeParser;
 import org.elasticsearch.common.regex.Regex;
-import org.elasticsearch.xcontent.XContentBuilder;
-import org.elasticsearch.xcontent.XContentParser;
-import org.elasticsearch.xcontent.NamedXContentRegistry;
-import org.elasticsearch.xcontent.DeprecationHandler;
-import org.elasticsearch.xcontent.json.JsonXContent;
 import org.elasticsearch.ingest.AbstractProcessor;
 import org.elasticsearch.ingest.ConfigurationUtils;
 import org.elasticsearch.ingest.IngestDocument;
 import org.elasticsearch.ingest.Processor;
-import org.locationtech.jts.geom.Geometry;
+import org.elasticsearch.legacygeo.XShapeCollection;
+import org.elasticsearch.legacygeo.builders.ShapeBuilder;
+import org.elasticsearch.legacygeo.parsers.ShapeParser;
+import org.elasticsearch.xcontent.DeprecationHandler;
+import org.elasticsearch.xcontent.NamedXContentRegistry;
+import org.elasticsearch.xcontent.XContentBuilder;
+import org.elasticsearch.xcontent.XContentParser;
+import org.elasticsearch.xcontent.json.JsonXContent;
 import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
 import org.locationtech.jts.geom.GeometryFactory;
-import org.locationtech.jts.geom.LineString;
-import org.locationtech.jts.geom.MultiPolygon;
 import org.locationtech.jts.geom.Point;
-import org.locationtech.jts.geom.Polygon;
 import org.locationtech.jts.geom.PrecisionModel;
 import org.locationtech.jts.io.ParseException;
 import org.locationtech.jts.io.WKBWriter;
 import org.locationtech.jts.io.WKTWriter;
 import org.locationtech.spatial4j.shape.Shape;
-import org.elasticsearch.legacygeo.builders.ShapeBuilder;
 import org.locationtech.spatial4j.shape.jts.JtsGeometry;
 import org.locationtech.spatial4j.shape.jts.JtsPoint;
 import org.opendatasoft.elasticsearch.plugin.GeoUtils;
 
-
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;

diff --git a/src/main/java/org/opendatasoft/elasticsearch/plugin/GeoExtensionPlugin.java b/src/main/java/org/opendatasoft/elasticsearch/plugin/GeoExtensionPlugin.java
@@ -1,23 +1,23 @@
 package org.opendatasoft.elasticsearch.plugin;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Map;
-
 import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.ingest.Processor;
 import org.elasticsearch.plugins.IngestPlugin;
 import org.elasticsearch.plugins.Plugin;
-import org.elasticsearch.plugins.SearchPlugin;
-import org.elasticsearch.ingest.Processor;
 import org.elasticsearch.plugins.ScriptPlugin;
+import org.elasticsearch.plugins.SearchPlugin;
 import org.elasticsearch.script.ScriptContext;
 import org.elasticsearch.script.ScriptEngine;
 import org.opendatasoft.elasticsearch.ingest.GeoExtensionProcessor;
 import org.opendatasoft.elasticsearch.script.ScriptGeoSimplify;
 import org.opendatasoft.elasticsearch.search.aggregations.bucket.geoshape.GeoShapeBuilder;
 import org.opendatasoft.elasticsearch.search.aggregations.bucket.geoshape.InternalGeoShape;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+
 
 public class GeoExtensionPlugin extends Plugin implements IngestPlugin, ScriptPlugin, SearchPlugin {
     // Ingest plugin method

diff --git a/src/main/java/org/opendatasoft/elasticsearch/plugin/GeoUtils.java b/src/main/java/org/opendatasoft/elasticsearch/plugin/GeoUtils.java
@@ -5,11 +5,9 @@
 import org.elasticsearch.common.hash.MurmurHash3;
 import org.locationtech.jts.geom.Coordinate;
 import org.locationtech.jts.geom.Geometry;
-import org.locationtech.jts.geom.Polygon;
-import org.locationtech.jts.geom.MultiPolygon;
-import org.locationtech.jts.geom.CoordinateList;
 import org.locationtech.jts.geom.GeometryCollection;
-import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.MultiPolygon;
+import org.locationtech.jts.geom.Polygon;
 import org.locationtech.jts.io.ParseException;
 import org.locationtech.jts.io.WKBReader;
 import org.locationtech.jts.io.WKBWriter;

diff --git a/...rg/opendatasoft/elasticsearch/search/aggregations/bucket/geoshape/GeoShapeAggregator.java b/...rg/opendatasoft/elasticsearch/search/aggregations/bucket/geoshape/GeoShapeAggregator.java
@@ -7,22 +7,20 @@
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
-import org.elasticsearch.core.Releasables;
 import org.elasticsearch.common.util.BytesRefHash;
-import org.elasticsearch.search.aggregations.Aggregation;
-import org.elasticsearch.search.aggregations.support.AggregationContext;
-import org.elasticsearch.xcontent.ToXContentFragment;
-import org.elasticsearch.xcontent.XContentBuilder;
+import org.elasticsearch.core.Releasables;
 import org.elasticsearch.index.fielddata.SortedBinaryDocValues;
 import org.elasticsearch.search.aggregations.Aggregator;
 import org.elasticsearch.search.aggregations.AggregatorFactories;
 import org.elasticsearch.search.aggregations.CardinalityUpperBound;
+import org.elasticsearch.search.aggregations.InternalAggregation;
 import org.elasticsearch.search.aggregations.LeafBucketCollector;
 import org.elasticsearch.search.aggregations.LeafBucketCollectorBase;
-import org.elasticsearch.search.aggregations.InternalAggregation;
 import org.elasticsearch.search.aggregations.bucket.BucketsAggregator;
+import org.elasticsearch.search.aggregations.support.AggregationContext;
 import org.elasticsearch.search.aggregations.support.ValuesSource;
-import org.elasticsearch.search.internal.SearchContext;
+import org.elasticsearch.xcontent.ToXContentFragment;
+import org.elasticsearch.xcontent.XContentBuilder;
 import org.locationtech.jts.geom.Geometry;
 import org.locationtech.jts.geom.GeometryFactory;
 import org.locationtech.jts.io.ParseException;

diff --git a/...datasoft/elasticsearch/search/aggregations/bucket/geoshape/GeoShapeAggregatorFactory.java b/...datasoft/elasticsearch/search/aggregations/bucket/geoshape/GeoShapeAggregatorFactory.java
@@ -1,7 +1,5 @@
 package org.opendatasoft.elasticsearch.search.aggregations.bucket.geoshape;
 
-import org.elasticsearch.index.query.SearchExecutionContext;
-import org.elasticsearch.search.aggregations.Aggregation;
 import org.elasticsearch.search.aggregations.Aggregator;
 import org.elasticsearch.search.aggregations.AggregatorFactories;
 import org.elasticsearch.search.aggregations.AggregatorFactory;
@@ -12,7 +10,6 @@
 import org.elasticsearch.search.aggregations.support.ValuesSource;
 import org.elasticsearch.search.aggregations.support.ValuesSourceAggregatorFactory;
 import org.elasticsearch.search.aggregations.support.ValuesSourceConfig;
-import org.elasticsearch.search.internal.SearchContext;
 import org.opendatasoft.elasticsearch.plugin.GeoUtils;
 
 import java.io.IOException;

diff --git a/...atasoft/elasticsearch/search/aggregations/bucket/geoshape/GeoShapeAggregatorSupplier.java b/...atasoft/elasticsearch/search/aggregations/bucket/geoshape/GeoShapeAggregatorSupplier.java
@@ -5,7 +5,6 @@
 import org.elasticsearch.search.aggregations.CardinalityUpperBound;
 import org.elasticsearch.search.aggregations.support.AggregationContext;
 import org.elasticsearch.search.aggregations.support.ValuesSource;
-import org.elasticsearch.search.internal.SearchContext;
 import org.opendatasoft.elasticsearch.plugin.GeoUtils;
 
 import java.io.IOException;

diff --git a/...a/org/opendatasoft/elasticsearch/search/aggregations/bucket/geoshape/GeoShapeBuilder.java b/...a/org/opendatasoft/elasticsearch/search/aggregations/bucket/geoshape/GeoShapeBuilder.java
@@ -1,24 +1,23 @@
 package org.opendatasoft.elasticsearch.search.aggregations.bucket.geoshape;
 
 import org.elasticsearch.Version;
-import org.elasticsearch.index.query.SearchExecutionContext;
-import org.elasticsearch.search.aggregations.support.AggregationContext;
-import org.elasticsearch.xcontent.ParseField;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
-import org.elasticsearch.xcontent.ObjectParser;
-import org.elasticsearch.xcontent.XContentBuilder;
-import org.elasticsearch.xcontent.XContentParser;
 import org.elasticsearch.search.aggregations.AggregationBuilder;
 import org.elasticsearch.search.aggregations.AggregatorFactories;
 import org.elasticsearch.search.aggregations.AggregatorFactories.Builder;
 import org.elasticsearch.search.aggregations.AggregatorFactory;
+import org.elasticsearch.search.aggregations.support.AggregationContext;
 import org.elasticsearch.search.aggregations.support.CoreValuesSourceType;
 import org.elasticsearch.search.aggregations.support.ValuesSourceAggregationBuilder;
 import org.elasticsearch.search.aggregations.support.ValuesSourceAggregatorFactory;
 import org.elasticsearch.search.aggregations.support.ValuesSourceConfig;
 import org.elasticsearch.search.aggregations.support.ValuesSourceRegistry;
 import org.elasticsearch.search.aggregations.support.ValuesSourceType;
+import org.elasticsearch.xcontent.ObjectParser;
+import org.elasticsearch.xcontent.ParseField;
+import org.elasticsearch.xcontent.XContentBuilder;
+import org.elasticsearch.xcontent.XContentParser;
 import org.opendatasoft.elasticsearch.plugin.GeoUtils;
 
 import java.io.IOException;

diff --git a/.../org/opendatasoft/elasticsearch/search/aggregations/bucket/geoshape/InternalGeoShape.java b/.../org/opendatasoft/elasticsearch/search/aggregations/bucket/geoshape/InternalGeoShape.java
@@ -5,14 +5,14 @@
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.util.LongObjectPagedHashMap;
-import org.elasticsearch.xcontent.XContentBuilder;
 import org.elasticsearch.search.aggregations.Aggregation;
 import org.elasticsearch.search.aggregations.Aggregations;
 import org.elasticsearch.search.aggregations.InternalAggregation;
 import org.elasticsearch.search.aggregations.InternalAggregations;
 import org.elasticsearch.search.aggregations.InternalMultiBucketAggregation;
 import org.elasticsearch.search.aggregations.KeyComparable;
 import org.elasticsearch.search.aggregations.bucket.MultiBucketsAggregation;
+import org.elasticsearch.xcontent.XContentBuilder;
 import org.locationtech.jts.io.ParseException;
 import org.locationtech.jts.io.geojson.GeoJsonWriter;
 import org.opendatasoft.elasticsearch.plugin.GeoUtils;