From 3b73223abb5111f2204812c3c30975fe1f708ee4 Mon Sep 17 00:00:00 2001 From: Rabi Panda Date: Thu, 4 Mar 2021 16:05:19 -0800 Subject: [PATCH] [Rename] modules/geo (#201) This commit refactors the geo module as part of the Elasticsearch to OpenSearch renaming. Signed-off-by: Rabi Panda --- modules/geo/build.gradle | 6 +++--- .../org/{elasticsearch => opensearch}/geo/GeoPlugin.java | 2 +- .../geo/GeoClientYamlTestSuiteIT.java | 2 +- .../elasticsearch/percolator/PercolatorQuerySearchIT.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) rename modules/geo/src/main/java/org/{elasticsearch => opensearch}/geo/GeoPlugin.java (97%) rename modules/geo/src/yamlRestTest/java/org/{elasticsearch => opensearch}/geo/GeoClientYamlTestSuiteIT.java (97%) diff --git a/modules/geo/build.gradle b/modules/geo/build.gradle index 5381d0e4a04..a4e60ae270e 100644 --- a/modules/geo/build.gradle +++ b/modules/geo/build.gradle @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -apply plugin: 'elasticsearch.yaml-rest-test' +apply plugin: 'opensearch.yaml-rest-test' esplugin { - description 'Placeholder plugin for geospatial features in ES. only registers geo_shape field mapper for now' - classname 'org.elasticsearch.geo.GeoPlugin' + description 'Placeholder plugin for geospatial features in OpenSearch. only registers geo_shape field mapper for now' + classname 'org.opensearch.geo.GeoPlugin' } restResources { diff --git a/modules/geo/src/main/java/org/elasticsearch/geo/GeoPlugin.java b/modules/geo/src/main/java/org/opensearch/geo/GeoPlugin.java similarity index 97% rename from modules/geo/src/main/java/org/elasticsearch/geo/GeoPlugin.java rename to modules/geo/src/main/java/org/opensearch/geo/GeoPlugin.java index a3c7b4ae19b..4d64c18fe8c 100644 --- a/modules/geo/src/main/java/org/elasticsearch/geo/GeoPlugin.java +++ b/modules/geo/src/main/java/org/opensearch/geo/GeoPlugin.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.geo; +package org.opensearch.geo; import org.elasticsearch.index.mapper.GeoShapeFieldMapper; import org.elasticsearch.index.mapper.Mapper; diff --git a/modules/geo/src/yamlRestTest/java/org/elasticsearch/geo/GeoClientYamlTestSuiteIT.java b/modules/geo/src/yamlRestTest/java/org/opensearch/geo/GeoClientYamlTestSuiteIT.java similarity index 97% rename from modules/geo/src/yamlRestTest/java/org/elasticsearch/geo/GeoClientYamlTestSuiteIT.java rename to modules/geo/src/yamlRestTest/java/org/opensearch/geo/GeoClientYamlTestSuiteIT.java index 5835e2114b0..e76f013450f 100644 --- a/modules/geo/src/yamlRestTest/java/org/elasticsearch/geo/GeoClientYamlTestSuiteIT.java +++ b/modules/geo/src/yamlRestTest/java/org/opensearch/geo/GeoClientYamlTestSuiteIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.geo; +package org.opensearch.geo; import com.carrotsearch.randomizedtesting.annotations.Name; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; diff --git a/modules/percolator/src/internalClusterTest/java/org/elasticsearch/percolator/PercolatorQuerySearchIT.java b/modules/percolator/src/internalClusterTest/java/org/elasticsearch/percolator/PercolatorQuerySearchIT.java index e7bcc9ebb9b..df1a5fe3db8 100644 --- a/modules/percolator/src/internalClusterTest/java/org/elasticsearch/percolator/PercolatorQuerySearchIT.java +++ b/modules/percolator/src/internalClusterTest/java/org/elasticsearch/percolator/PercolatorQuerySearchIT.java @@ -31,7 +31,7 @@ import org.elasticsearch.common.unit.DistanceUnit; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.geo.GeoPlugin; +import org.opensearch.geo.GeoPlugin; import org.elasticsearch.index.mapper.MapperParsingException; import org.elasticsearch.index.query.MatchPhraseQueryBuilder; import org.elasticsearch.index.query.MultiMatchQueryBuilder;