[Rename] refactor modules/mapper-extras. (#329)

Refactor the the module `modules/mapper-extras` to rename from`org.elasticsearch.index.mapper` to `org.opensearch.index.mapper` in package names and references. Signed-off-by: Rabi Panda <adnapibar@gmail.com>
opensearch-project · Mar 22, 2021 · 7930576 · 7930576
1 parent 8c2bcbb
commit 7930576
Show file tree

Hide file tree

Showing 28 changed files with 100 additions and 100 deletions.
diff --git a/modules/mapper-extras/build.gradle b/modules/mapper-extras/build.gradle
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-apply plugin: 'elasticsearch.yaml-rest-test'
-apply plugin: 'elasticsearch.java-rest-test'
+apply plugin: 'opensearch.yaml-rest-test'
+apply plugin: 'opensearch.java-rest-test'
 
 esplugin {
   description 'Adds advanced field mappers'
-  classname 'org.elasticsearch.index.mapper.MapperExtrasPlugin'
+  classname 'org.opensearch.index.mapper.MapperExtrasPlugin'
   hasClientJar = true
 }
 

diff --git a/...r/TokenCountFieldMapperIntegrationIT.java → ...r/TokenCountFieldMapperIntegrationIT.java b/...r/TokenCountFieldMapperIntegrationIT.java → ...r/TokenCountFieldMapperIntegrationIT.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.index.mapper;
+package org.opensearch.index.mapper;
 
 import com.carrotsearch.randomizedtesting.annotations.Name;
 import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;

diff --git a/...arch/index/mapper/MapperExtrasPlugin.java → ...arch/index/mapper/MapperExtrasPlugin.java b/...arch/index/mapper/MapperExtrasPlugin.java → ...arch/index/mapper/MapperExtrasPlugin.java
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package org.elasticsearch.index.mapper;
+package org.opensearch.index.mapper;
 
-import org.elasticsearch.index.mapper.MetadataFieldMapper.TypeParser;
-import org.elasticsearch.index.query.RankFeatureQueryBuilder;
-import org.elasticsearch.plugins.MapperPlugin;
-import org.elasticsearch.plugins.Plugin;
-import org.elasticsearch.plugins.SearchPlugin;
+import org.opensearch.index.mapper.MetadataFieldMapper.TypeParser;
+import org.opensearch.index.query.RankFeatureQueryBuilder;
+import org.opensearch.plugins.MapperPlugin;
+import org.opensearch.plugins.Plugin;
+import org.opensearch.plugins.SearchPlugin;
 
 import java.util.Collections;
 import java.util.LinkedHashMap;

diff --git a/.../index/mapper/RankFeatureFieldMapper.java → .../index/mapper/RankFeatureFieldMapper.java b/.../index/mapper/RankFeatureFieldMapper.java → .../index/mapper/RankFeatureFieldMapper.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.index.mapper;
+package org.opensearch.index.mapper;
 
 import org.apache.lucene.document.FeatureField;
 import org.apache.lucene.document.FieldType;
@@ -27,8 +27,8 @@
 import org.apache.lucene.search.TermQuery;
 import org.elasticsearch.common.lucene.Lucene;
 import org.elasticsearch.common.xcontent.XContentParser.Token;
-import org.elasticsearch.index.fielddata.IndexFieldData;
-import org.elasticsearch.index.query.QueryShardContext;
+import org.opensearch.index.fielddata.IndexFieldData;
+import org.opensearch.index.query.QueryShardContext;
 import org.opensearch.search.lookup.SearchLookup;
 
 import java.io.IOException;

diff --git a/...ex/mapper/RankFeatureMetaFieldMapper.java → ...ex/mapper/RankFeatureMetaFieldMapper.java b/...ex/mapper/RankFeatureMetaFieldMapper.java → ...ex/mapper/RankFeatureMetaFieldMapper.java
@@ -17,17 +17,17 @@
  * under the License.
  */
 
-package org.elasticsearch.index.mapper;
+package org.opensearch.index.mapper;
 
 import org.apache.lucene.search.Query;
-import org.elasticsearch.index.query.QueryShardContext;
+import org.opensearch.index.query.QueryShardContext;
 import org.opensearch.search.lookup.SearchLookup;
 
 import java.util.Collections;
 
 /**
  * This meta field only exists because rank feature fields index everything into a
- * common _feature field and Elasticsearch has a custom codec that complains
+ * common _feature field and OpenSearch has a custom codec that complains
  * when fields exist in the index and not in mappings.
  */
 public class RankFeatureMetaFieldMapper extends MetadataFieldMapper {

diff --git a/...index/mapper/RankFeaturesFieldMapper.java → ...index/mapper/RankFeaturesFieldMapper.java b/...index/mapper/RankFeaturesFieldMapper.java → ...index/mapper/RankFeaturesFieldMapper.java
@@ -17,15 +17,15 @@
  * under the License.
  */
 
-package org.elasticsearch.index.mapper;
+package org.opensearch.index.mapper;
 
 import org.apache.lucene.document.FeatureField;
 import org.apache.lucene.index.IndexOptions;
 import org.apache.lucene.search.Query;
 import org.elasticsearch.common.lucene.Lucene;
 import org.elasticsearch.common.xcontent.XContentParser.Token;
-import org.elasticsearch.index.fielddata.IndexFieldData;
-import org.elasticsearch.index.query.QueryShardContext;
+import org.opensearch.index.fielddata.IndexFieldData;
+import org.opensearch.index.query.QueryShardContext;
 import org.opensearch.search.lookup.SearchLookup;
 
 import java.io.IOException;

diff --git a/.../index/mapper/ScaledFloatFieldMapper.java → .../index/mapper/ScaledFloatFieldMapper.java b/.../index/mapper/ScaledFloatFieldMapper.java → .../index/mapper/ScaledFloatFieldMapper.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.index.mapper;
+package org.opensearch.index.mapper;
 
 import org.apache.lucene.document.Field;
 import org.apache.lucene.index.DocValues;
@@ -33,16 +33,16 @@
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.common.xcontent.XContentParser.Token;
 import org.elasticsearch.common.xcontent.support.XContentMapValues;
-import org.elasticsearch.index.fielddata.FieldData;
-import org.elasticsearch.index.fielddata.IndexFieldData;
-import org.elasticsearch.index.fielddata.IndexNumericFieldData;
-import org.elasticsearch.index.fielddata.LeafNumericFieldData;
-import org.elasticsearch.index.fielddata.NumericDoubleValues;
-import org.elasticsearch.index.fielddata.ScriptDocValues;
-import org.elasticsearch.index.fielddata.SortedBinaryDocValues;
-import org.elasticsearch.index.fielddata.SortedNumericDoubleValues;
-import org.elasticsearch.index.fielddata.plain.SortedNumericIndexFieldData;
-import org.elasticsearch.index.query.QueryShardContext;
+import org.opensearch.index.fielddata.FieldData;
+import org.opensearch.index.fielddata.IndexFieldData;
+import org.opensearch.index.fielddata.IndexNumericFieldData;
+import org.opensearch.index.fielddata.LeafNumericFieldData;
+import org.opensearch.index.fielddata.NumericDoubleValues;
+import org.opensearch.index.fielddata.ScriptDocValues;
+import org.opensearch.index.fielddata.SortedBinaryDocValues;
+import org.opensearch.index.fielddata.SortedNumericDoubleValues;
+import org.opensearch.index.fielddata.plain.SortedNumericIndexFieldData;
+import org.opensearch.index.query.QueryShardContext;
 import org.elasticsearch.search.DocValueFormat;
 import org.elasticsearch.search.aggregations.support.ValuesSourceType;
 import org.opensearch.search.lookup.SearchLookup;

diff --git a/...ex/mapper/SearchAsYouTypeFieldMapper.java → ...ex/mapper/SearchAsYouTypeFieldMapper.java b/...ex/mapper/SearchAsYouTypeFieldMapper.java → ...ex/mapper/SearchAsYouTypeFieldMapper.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.index.mapper;
+package org.opensearch.index.mapper;
 
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.AnalyzerWrapper;
@@ -47,11 +47,11 @@
 import org.apache.lucene.util.automaton.Automaton;
 import org.apache.lucene.util.automaton.Operations;
 import org.opensearch.common.collect.Iterators;
-import org.elasticsearch.index.analysis.AnalyzerScope;
-import org.elasticsearch.index.analysis.IndexAnalyzers;
-import org.elasticsearch.index.analysis.NamedAnalyzer;
-import org.elasticsearch.index.query.QueryShardContext;
-import org.elasticsearch.index.similarity.SimilarityProvider;
+import org.opensearch.index.analysis.AnalyzerScope;
+import org.opensearch.index.analysis.IndexAnalyzers;
+import org.opensearch.index.analysis.NamedAnalyzer;
+import org.opensearch.index.query.QueryShardContext;
+import org.opensearch.index.similarity.SimilarityProvider;
 import org.opensearch.search.lookup.SearchLookup;
 
 import java.io.IOException;
@@ -63,7 +63,7 @@
 import java.util.Map;
 import java.util.Objects;
 
-import static org.elasticsearch.index.mapper.TextFieldMapper.TextFieldType.hasGaps;
+import static org.opensearch.index.mapper.TextFieldMapper.TextFieldType.hasGaps;
 
 /**
  * Mapper for a text field that optimizes itself for as-you-type completion by indexing its content into subfields. Each subfield

diff --git a/...h/index/mapper/TokenCountFieldMapper.java → ...h/index/mapper/TokenCountFieldMapper.java b/...h/index/mapper/TokenCountFieldMapper.java → ...h/index/mapper/TokenCountFieldMapper.java
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package org.elasticsearch.index.mapper;
+package org.opensearch.index.mapper;
 
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
-import org.elasticsearch.index.analysis.NamedAnalyzer;
+import org.opensearch.index.analysis.NamedAnalyzer;
 import org.opensearch.search.lookup.SearchLookup;
 
 import java.io.IOException;

diff --git a/.../index/query/RankFeatureQueryBuilder.java → .../index/query/RankFeatureQueryBuilder.java b/.../index/query/RankFeatureQueryBuilder.java → .../index/query/RankFeatureQueryBuilder.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.index.query;
+package org.opensearch.index.query;
 
 import org.apache.lucene.document.FeatureField;
 import org.apache.lucene.search.MatchNoDocsQuery;
@@ -27,10 +27,10 @@
 import org.opensearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.xcontent.ConstructingObjectParser;
 import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.index.mapper.RankFeatureFieldMapper.RankFeatureFieldType;
-import org.elasticsearch.index.mapper.RankFeatureMetaFieldMapper;
-import org.elasticsearch.index.mapper.RankFeaturesFieldMapper.RankFeaturesFieldType;
-import org.elasticsearch.index.mapper.MappedFieldType;
+import org.opensearch.index.mapper.RankFeatureFieldMapper.RankFeatureFieldType;
+import org.opensearch.index.mapper.RankFeatureMetaFieldMapper;
+import org.opensearch.index.mapper.RankFeaturesFieldMapper.RankFeaturesFieldType;
+import org.opensearch.index.mapper.MappedFieldType;
 
 import java.io.IOException;
 import java.util.Arrays;

diff --git a/...index/query/RankFeatureQueryBuilders.java → ...index/query/RankFeatureQueryBuilders.java b/...index/query/RankFeatureQueryBuilders.java → ...index/query/RankFeatureQueryBuilders.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.index.query;
+package org.opensearch.index.query;
 
 public final class RankFeatureQueryBuilders {
     private RankFeatureQueryBuilders() {}

diff --git a/...search/index/mapper/BWCTemplateTests.java → ...search/index/mapper/BWCTemplateTests.java b/...search/index/mapper/BWCTemplateTests.java → ...search/index/mapper/BWCTemplateTests.java
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package org.elasticsearch.index.mapper;
+package org.opensearch.index.mapper;
 
 import org.elasticsearch.common.xcontent.XContentType;
-import org.elasticsearch.index.mapper.MapperExtrasPlugin;
+import org.opensearch.index.mapper.MapperExtrasPlugin;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.test.ESSingleNodeTestCase;
 
@@ -39,9 +39,9 @@ protected Collection<Class<? extends Plugin>> getPlugins() {
     }
 
     public void testBeatsTemplatesBWC() throws Exception {
-        byte[] metricBeat = copyToBytesFromClasspath("/org/elasticsearch/index/mapper/metricbeat-6.0.template.json");
-        byte[] packetBeat = copyToBytesFromClasspath("/org/elasticsearch/index/mapper/packetbeat-6.0.template.json");
-        byte[] fileBeat = copyToBytesFromClasspath("/org/elasticsearch/index/mapper/filebeat-6.0.template.json");
+        byte[] metricBeat = copyToBytesFromClasspath("/org/opensearch/index/mapper/metricbeat-6.0.template.json");
+        byte[] packetBeat = copyToBytesFromClasspath("/org/opensearch/index/mapper/packetbeat-6.0.template.json");
+        byte[] fileBeat = copyToBytesFromClasspath("/org/opensearch/index/mapper/filebeat-6.0.template.json");
         client().admin().indices().preparePutTemplate("metricbeat").setSource(metricBeat, XContentType.JSON).get();
         client().admin().indices().preparePutTemplate("packetbeat").setSource(packetBeat, XContentType.JSON).get();
         client().admin().indices().preparePutTemplate("filebeat").setSource(fileBeat, XContentType.JSON).get();

diff --git a/...x/mapper/RankFeatureFieldMapperTests.java → ...x/mapper/RankFeatureFieldMapperTests.java b/...x/mapper/RankFeatureFieldMapperTests.java → ...x/mapper/RankFeatureFieldMapperTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.index.mapper;
+package org.opensearch.index.mapper;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.tokenattributes.TermFrequencyAttribute;

diff --git a/...dex/mapper/RankFeatureFieldTypeTests.java → ...dex/mapper/RankFeatureFieldTypeTests.java b/...dex/mapper/RankFeatureFieldTypeTests.java → ...dex/mapper/RankFeatureFieldTypeTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.index.mapper;
+package org.opensearch.index.mapper;
 
 import org.opensearch.Version;
 import org.opensearch.cluster.metadata.IndexMetadata;

diff --git a/...pper/RankFeatureMetaFieldMapperTests.java → ...pper/RankFeatureMetaFieldMapperTests.java b/...pper/RankFeatureMetaFieldMapperTests.java → ...pper/RankFeatureMetaFieldMapperTests.java
@@ -17,15 +17,15 @@
  * under the License.
  */
 
-package org.elasticsearch.index.mapper;
+package org.opensearch.index.mapper;
 
 import org.opensearch.common.Strings;
 import org.opensearch.common.bytes.BytesReference;
 import org.opensearch.common.compress.CompressedXContent;
 import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.common.xcontent.XContentType;
-import org.elasticsearch.index.IndexService;
-import org.elasticsearch.plugins.Plugin;
+import org.opensearch.index.IndexService;
+import org.opensearch.plugins.Plugin;
 import org.elasticsearch.test.ESSingleNodeTestCase;
 import org.junit.Before;
 

diff --git a/.../mapper/RankFeaturesFieldMapperTests.java → .../mapper/RankFeaturesFieldMapperTests.java b/.../mapper/RankFeaturesFieldMapperTests.java → .../mapper/RankFeaturesFieldMapperTests.java
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package org.elasticsearch.index.mapper;
+package org.opensearch.index.mapper;
 
 import org.apache.lucene.document.FeatureField;
 import org.apache.lucene.index.IndexableField;
 import org.opensearch.common.Strings;
 import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.plugins.Plugin;
+import org.opensearch.plugins.Plugin;
 import org.hamcrest.Matchers;
 
 import java.io.IOException;

diff --git a/...ex/mapper/RankFeaturesFieldTypeTests.java → ...ex/mapper/RankFeaturesFieldTypeTests.java b/...ex/mapper/RankFeaturesFieldTypeTests.java → ...ex/mapper/RankFeaturesFieldTypeTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.index.mapper;
+package org.opensearch.index.mapper;
 
 import java.util.Collections;
 

diff --git a/...x/mapper/ScaledFloatFieldMapperTests.java → ...x/mapper/ScaledFloatFieldMapperTests.java b/...x/mapper/ScaledFloatFieldMapperTests.java → ...x/mapper/ScaledFloatFieldMapperTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.index.mapper;
+package org.opensearch.index.mapper;
 
 import org.apache.lucene.index.DocValuesType;
 import org.apache.lucene.index.IndexableField;
@@ -26,7 +26,7 @@
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.common.xcontent.XContentType;
-import org.elasticsearch.plugins.Plugin;
+import org.opensearch.plugins.Plugin;
 
 import java.io.IOException;
 import java.util.Arrays;

diff --git a/...dex/mapper/ScaledFloatFieldTypeTests.java → ...dex/mapper/ScaledFloatFieldTypeTests.java b/...dex/mapper/ScaledFloatFieldTypeTests.java → ...dex/mapper/ScaledFloatFieldTypeTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.index.mapper;
+package org.opensearch.index.mapper;
 
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.DoublePoint;
@@ -33,9 +33,9 @@
 import org.opensearch.cluster.metadata.IndexMetadata;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.core.internal.io.IOUtils;
-import org.elasticsearch.index.fielddata.IndexNumericFieldData;
-import org.elasticsearch.index.fielddata.LeafNumericFieldData;
-import org.elasticsearch.index.fielddata.SortedNumericDoubleValues;
+import org.opensearch.index.fielddata.IndexNumericFieldData;
+import org.opensearch.index.fielddata.LeafNumericFieldData;
+import org.opensearch.index.fielddata.SortedNumericDoubleValues;
 
 import java.io.IOException;
 import java.util.Arrays;

diff --git a/.../mapper/SearchAsYouTypeAnalyzerTests.java → .../mapper/SearchAsYouTypeAnalyzerTests.java b/.../mapper/SearchAsYouTypeAnalyzerTests.java → .../mapper/SearchAsYouTypeAnalyzerTests.java
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package org.elasticsearch.index.mapper;
+package org.opensearch.index.mapper;
 
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.core.SimpleAnalyzer;
 import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
-import org.elasticsearch.index.mapper.SearchAsYouTypeFieldMapper.SearchAsYouTypeAnalyzer;
+import org.opensearch.index.mapper.SearchAsYouTypeFieldMapper.SearchAsYouTypeAnalyzer;
 import org.elasticsearch.test.ESTestCase;
 
 import java.io.IOException;