From 79305763f46227d14d6d8bec049826370bccddfa Mon Sep 17 00:00:00 2001 From: Rabi Panda Date: Tue, 16 Mar 2021 08:41:42 -0700 Subject: [PATCH] [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 --- modules/mapper-extras/build.gradle | 6 ++-- .../TokenCountFieldMapperIntegrationIT.java | 2 +- .../index/mapper/MapperExtrasPlugin.java | 12 +++---- .../index/mapper/RankFeatureFieldMapper.java | 6 ++-- .../mapper/RankFeatureMetaFieldMapper.java | 6 ++-- .../index/mapper/RankFeaturesFieldMapper.java | 6 ++-- .../index/mapper/ScaledFloatFieldMapper.java | 22 ++++++------- .../mapper/SearchAsYouTypeFieldMapper.java | 14 ++++---- .../index/mapper/TokenCountFieldMapper.java | 4 +-- .../index/query/RankFeatureQueryBuilder.java | 10 +++--- .../index/query/RankFeatureQueryBuilders.java | 2 +- .../index/mapper/BWCTemplateTests.java | 10 +++--- .../mapper/RankFeatureFieldMapperTests.java | 2 +- .../mapper/RankFeatureFieldTypeTests.java | 2 +- .../RankFeatureMetaFieldMapperTests.java | 6 ++-- .../mapper/RankFeaturesFieldMapperTests.java | 4 +-- .../mapper/RankFeaturesFieldTypeTests.java | 2 +- .../mapper/ScaledFloatFieldMapperTests.java | 4 +-- .../mapper/ScaledFloatFieldTypeTests.java | 8 ++--- .../mapper/SearchAsYouTypeAnalyzerTests.java | 4 +-- .../SearchAsYouTypeFieldMapperTests.java | 32 +++++++++---------- .../mapper/SearchAsYouTypeFieldTypeTests.java | 10 +++--- .../mapper/TokenCountFieldMapperTests.java | 12 +++---- .../query/RankFeatureQueryBuilderTests.java | 10 +++--- .../index/mapper/filebeat-6.0.template.json | 0 .../index/mapper/metricbeat-6.0.template.json | 2 +- .../index/mapper/packetbeat-6.0.template.json | 0 .../MapperExtrasClientYamlTestSuiteIT.java | 2 +- 28 files changed, 100 insertions(+), 100 deletions(-) rename modules/mapper-extras/src/javaRestTest/java/org/{elasticsearch => opensearch}/index/mapper/TokenCountFieldMapperIntegrationIT.java (99%) rename modules/mapper-extras/src/main/java/org/{elasticsearch => opensearch}/index/mapper/MapperExtrasPlugin.java (87%) rename modules/mapper-extras/src/main/java/org/{elasticsearch => opensearch}/index/mapper/RankFeatureFieldMapper.java (97%) rename modules/mapper-extras/src/main/java/org/{elasticsearch => opensearch}/index/mapper/RankFeatureMetaFieldMapper.java (93%) rename modules/mapper-extras/src/main/java/org/{elasticsearch => opensearch}/index/mapper/RankFeaturesFieldMapper.java (97%) rename modules/mapper-extras/src/main/java/org/{elasticsearch => opensearch}/index/mapper/ScaledFloatFieldMapper.java (96%) rename modules/mapper-extras/src/main/java/org/{elasticsearch => opensearch}/index/mapper/SearchAsYouTypeFieldMapper.java (98%) rename modules/mapper-extras/src/main/java/org/{elasticsearch => opensearch}/index/mapper/TokenCountFieldMapper.java (98%) rename modules/mapper-extras/src/main/java/org/{elasticsearch => opensearch}/index/query/RankFeatureQueryBuilder.java (97%) rename modules/mapper-extras/src/main/java/org/{elasticsearch => opensearch}/index/query/RankFeatureQueryBuilders.java (98%) rename modules/mapper-extras/src/test/java/org/{elasticsearch => opensearch}/index/mapper/BWCTemplateTests.java (82%) rename modules/mapper-extras/src/test/java/org/{elasticsearch => opensearch}/index/mapper/RankFeatureFieldMapperTests.java (99%) rename modules/mapper-extras/src/test/java/org/{elasticsearch => opensearch}/index/mapper/RankFeatureFieldTypeTests.java (97%) rename modules/mapper-extras/src/test/java/org/{elasticsearch => opensearch}/index/mapper/RankFeatureMetaFieldMapperTests.java (96%) rename modules/mapper-extras/src/test/java/org/{elasticsearch => opensearch}/index/mapper/RankFeaturesFieldMapperTests.java (98%) rename modules/mapper-extras/src/test/java/org/{elasticsearch => opensearch}/index/mapper/RankFeaturesFieldTypeTests.java (96%) rename modules/mapper-extras/src/test/java/org/{elasticsearch => opensearch}/index/mapper/ScaledFloatFieldMapperTests.java (99%) rename modules/mapper-extras/src/test/java/org/{elasticsearch => opensearch}/index/mapper/ScaledFloatFieldTypeTests.java (97%) rename modules/mapper-extras/src/test/java/org/{elasticsearch => opensearch}/index/mapper/SearchAsYouTypeAnalyzerTests.java (98%) rename modules/mapper-extras/src/test/java/org/{elasticsearch => opensearch}/index/mapper/SearchAsYouTypeFieldMapperTests.java (96%) rename modules/mapper-extras/src/test/java/org/{elasticsearch => opensearch}/index/mapper/SearchAsYouTypeFieldTypeTests.java (94%) rename modules/mapper-extras/src/test/java/org/{elasticsearch => opensearch}/index/mapper/TokenCountFieldMapperTests.java (96%) rename modules/mapper-extras/src/test/java/org/{elasticsearch => opensearch}/index/query/RankFeatureQueryBuilderTests.java (95%) rename modules/mapper-extras/src/test/resources/org/{elasticsearch => opensearch}/index/mapper/filebeat-6.0.template.json (100%) rename modules/mapper-extras/src/test/resources/org/{elasticsearch => opensearch}/index/mapper/metricbeat-6.0.template.json (99%) rename modules/mapper-extras/src/test/resources/org/{elasticsearch => opensearch}/index/mapper/packetbeat-6.0.template.json (100%) rename modules/mapper-extras/src/yamlRestTest/java/org/{elasticsearch => opensearch}/index/mapper/MapperExtrasClientYamlTestSuiteIT.java (97%) diff --git a/modules/mapper-extras/build.gradle b/modules/mapper-extras/build.gradle index 70e0048e4db49..190a64cc7021b 100644 --- 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/modules/mapper-extras/src/javaRestTest/java/org/elasticsearch/index/mapper/TokenCountFieldMapperIntegrationIT.java b/modules/mapper-extras/src/javaRestTest/java/org/opensearch/index/mapper/TokenCountFieldMapperIntegrationIT.java similarity index 99% rename from modules/mapper-extras/src/javaRestTest/java/org/elasticsearch/index/mapper/TokenCountFieldMapperIntegrationIT.java rename to modules/mapper-extras/src/javaRestTest/java/org/opensearch/index/mapper/TokenCountFieldMapperIntegrationIT.java index bf4048915582d..1137e4fd4c1cd 100644 --- a/modules/mapper-extras/src/javaRestTest/java/org/elasticsearch/index/mapper/TokenCountFieldMapperIntegrationIT.java +++ b/modules/mapper-extras/src/javaRestTest/java/org/opensearch/index/mapper/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/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/MapperExtrasPlugin.java b/modules/mapper-extras/src/main/java/org/opensearch/index/mapper/MapperExtrasPlugin.java similarity index 87% rename from modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/MapperExtrasPlugin.java rename to modules/mapper-extras/src/main/java/org/opensearch/index/mapper/MapperExtrasPlugin.java index bac4ff473cb30..177e7ef3570b9 100644 --- a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/MapperExtrasPlugin.java +++ b/modules/mapper-extras/src/main/java/org/opensearch/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/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/RankFeatureFieldMapper.java b/modules/mapper-extras/src/main/java/org/opensearch/index/mapper/RankFeatureFieldMapper.java similarity index 97% rename from modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/RankFeatureFieldMapper.java rename to modules/mapper-extras/src/main/java/org/opensearch/index/mapper/RankFeatureFieldMapper.java index 4eb4e0f2e6c08..822291bbc1d7f 100644 --- a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/RankFeatureFieldMapper.java +++ b/modules/mapper-extras/src/main/java/org/opensearch/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/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/RankFeatureMetaFieldMapper.java b/modules/mapper-extras/src/main/java/org/opensearch/index/mapper/RankFeatureMetaFieldMapper.java similarity index 93% rename from modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/RankFeatureMetaFieldMapper.java rename to modules/mapper-extras/src/main/java/org/opensearch/index/mapper/RankFeatureMetaFieldMapper.java index 677ee3b3b1f25..861f1d5198673 100644 --- a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/RankFeatureMetaFieldMapper.java +++ b/modules/mapper-extras/src/main/java/org/opensearch/index/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/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/RankFeaturesFieldMapper.java b/modules/mapper-extras/src/main/java/org/opensearch/index/mapper/RankFeaturesFieldMapper.java similarity index 97% rename from modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/RankFeaturesFieldMapper.java rename to modules/mapper-extras/src/main/java/org/opensearch/index/mapper/RankFeaturesFieldMapper.java index 0de8bf3834d30..1c25f293b23d7 100644 --- a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/RankFeaturesFieldMapper.java +++ b/modules/mapper-extras/src/main/java/org/opensearch/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/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/ScaledFloatFieldMapper.java b/modules/mapper-extras/src/main/java/org/opensearch/index/mapper/ScaledFloatFieldMapper.java similarity index 96% rename from modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/ScaledFloatFieldMapper.java rename to modules/mapper-extras/src/main/java/org/opensearch/index/mapper/ScaledFloatFieldMapper.java index 9a1435ef44c3c..f150e4ff54e4d 100644 --- a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/ScaledFloatFieldMapper.java +++ b/modules/mapper-extras/src/main/java/org/opensearch/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/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/SearchAsYouTypeFieldMapper.java b/modules/mapper-extras/src/main/java/org/opensearch/index/mapper/SearchAsYouTypeFieldMapper.java similarity index 98% rename from modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/SearchAsYouTypeFieldMapper.java rename to modules/mapper-extras/src/main/java/org/opensearch/index/mapper/SearchAsYouTypeFieldMapper.java index 95c06334aaeb8..edacb3a315692 100644 --- a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/SearchAsYouTypeFieldMapper.java +++ b/modules/mapper-extras/src/main/java/org/opensearch/index/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/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/TokenCountFieldMapper.java b/modules/mapper-extras/src/main/java/org/opensearch/index/mapper/TokenCountFieldMapper.java similarity index 98% rename from modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/TokenCountFieldMapper.java rename to modules/mapper-extras/src/main/java/org/opensearch/index/mapper/TokenCountFieldMapper.java index 0f96511dccb4f..1e683185a239a 100644 --- a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/TokenCountFieldMapper.java +++ b/modules/mapper-extras/src/main/java/org/opensearch/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/modules/mapper-extras/src/main/java/org/elasticsearch/index/query/RankFeatureQueryBuilder.java b/modules/mapper-extras/src/main/java/org/opensearch/index/query/RankFeatureQueryBuilder.java similarity index 97% rename from modules/mapper-extras/src/main/java/org/elasticsearch/index/query/RankFeatureQueryBuilder.java rename to modules/mapper-extras/src/main/java/org/opensearch/index/query/RankFeatureQueryBuilder.java index f07c9174b1172..b5aeaa4f9bcc3 100644 --- a/modules/mapper-extras/src/main/java/org/elasticsearch/index/query/RankFeatureQueryBuilder.java +++ b/modules/mapper-extras/src/main/java/org/opensearch/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/modules/mapper-extras/src/main/java/org/elasticsearch/index/query/RankFeatureQueryBuilders.java b/modules/mapper-extras/src/main/java/org/opensearch/index/query/RankFeatureQueryBuilders.java similarity index 98% rename from modules/mapper-extras/src/main/java/org/elasticsearch/index/query/RankFeatureQueryBuilders.java rename to modules/mapper-extras/src/main/java/org/opensearch/index/query/RankFeatureQueryBuilders.java index 35849d37adbbe..053563e78883e 100644 --- a/modules/mapper-extras/src/main/java/org/elasticsearch/index/query/RankFeatureQueryBuilders.java +++ b/modules/mapper-extras/src/main/java/org/opensearch/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/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/BWCTemplateTests.java b/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/BWCTemplateTests.java similarity index 82% rename from modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/BWCTemplateTests.java rename to modules/mapper-extras/src/test/java/org/opensearch/index/mapper/BWCTemplateTests.java index bacfc2b251f69..7da7109b39fc7 100644 --- a/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/BWCTemplateTests.java +++ b/modules/mapper-extras/src/test/java/org/opensearch/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> 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/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/RankFeatureFieldMapperTests.java b/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/RankFeatureFieldMapperTests.java similarity index 99% rename from modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/RankFeatureFieldMapperTests.java rename to modules/mapper-extras/src/test/java/org/opensearch/index/mapper/RankFeatureFieldMapperTests.java index 9e35e91bc7bf7..fb72ad6e261f4 100644 --- a/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/RankFeatureFieldMapperTests.java +++ b/modules/mapper-extras/src/test/java/org/opensearch/index/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/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/RankFeatureFieldTypeTests.java b/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/RankFeatureFieldTypeTests.java similarity index 97% rename from modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/RankFeatureFieldTypeTests.java rename to modules/mapper-extras/src/test/java/org/opensearch/index/mapper/RankFeatureFieldTypeTests.java index 4af13d03d068d..1537be3b13276 100644 --- a/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/RankFeatureFieldTypeTests.java +++ b/modules/mapper-extras/src/test/java/org/opensearch/index/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/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/RankFeatureMetaFieldMapperTests.java b/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/RankFeatureMetaFieldMapperTests.java similarity index 96% rename from modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/RankFeatureMetaFieldMapperTests.java rename to modules/mapper-extras/src/test/java/org/opensearch/index/mapper/RankFeatureMetaFieldMapperTests.java index 057183fc8e382..9c1086d2b2899 100644 --- a/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/RankFeatureMetaFieldMapperTests.java +++ b/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/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/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/RankFeaturesFieldMapperTests.java b/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/RankFeaturesFieldMapperTests.java similarity index 98% rename from modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/RankFeaturesFieldMapperTests.java rename to modules/mapper-extras/src/test/java/org/opensearch/index/mapper/RankFeaturesFieldMapperTests.java index 5c0b3b2f39121..02a67a4c76799 100644 --- a/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/RankFeaturesFieldMapperTests.java +++ b/modules/mapper-extras/src/test/java/org/opensearch/index/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/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/RankFeaturesFieldTypeTests.java b/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/RankFeaturesFieldTypeTests.java similarity index 96% rename from modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/RankFeaturesFieldTypeTests.java rename to modules/mapper-extras/src/test/java/org/opensearch/index/mapper/RankFeaturesFieldTypeTests.java index f93db83270b0b..4e4a5d7f4ce29 100644 --- a/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/RankFeaturesFieldTypeTests.java +++ b/modules/mapper-extras/src/test/java/org/opensearch/index/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/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/ScaledFloatFieldMapperTests.java b/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/ScaledFloatFieldMapperTests.java similarity index 99% rename from modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/ScaledFloatFieldMapperTests.java rename to modules/mapper-extras/src/test/java/org/opensearch/index/mapper/ScaledFloatFieldMapperTests.java index b41840630a7de..0929f8ec363ed 100644 --- a/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/ScaledFloatFieldMapperTests.java +++ b/modules/mapper-extras/src/test/java/org/opensearch/index/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/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/ScaledFloatFieldTypeTests.java b/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/ScaledFloatFieldTypeTests.java similarity index 97% rename from modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/ScaledFloatFieldTypeTests.java rename to modules/mapper-extras/src/test/java/org/opensearch/index/mapper/ScaledFloatFieldTypeTests.java index 9039ae9df52f2..a1f3b2ba39115 100644 --- a/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/ScaledFloatFieldTypeTests.java +++ b/modules/mapper-extras/src/test/java/org/opensearch/index/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/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/SearchAsYouTypeAnalyzerTests.java b/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/SearchAsYouTypeAnalyzerTests.java similarity index 98% rename from modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/SearchAsYouTypeAnalyzerTests.java rename to modules/mapper-extras/src/test/java/org/opensearch/index/mapper/SearchAsYouTypeAnalyzerTests.java index 6cf0dc83d9070..310f496df61ca 100644 --- a/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/SearchAsYouTypeAnalyzerTests.java +++ b/modules/mapper-extras/src/test/java/org/opensearch/index/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; diff --git a/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/SearchAsYouTypeFieldMapperTests.java b/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/SearchAsYouTypeFieldMapperTests.java similarity index 96% rename from modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/SearchAsYouTypeFieldMapperTests.java rename to modules/mapper-extras/src/test/java/org/opensearch/index/mapper/SearchAsYouTypeFieldMapperTests.java index ade429a741391..713e2552d62ca 100644 --- a/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/SearchAsYouTypeFieldMapperTests.java +++ b/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/SearchAsYouTypeFieldMapperTests.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.index.mapper; +package org.opensearch.index.mapper; import org.apache.lucene.analysis.core.KeywordAnalyzer; import org.apache.lucene.analysis.core.SimpleAnalyzer; @@ -40,21 +40,21 @@ import org.opensearch.common.Strings; import org.elasticsearch.common.lucene.search.MultiPhrasePrefixQuery; import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AnalyzerScope; -import org.elasticsearch.index.analysis.IndexAnalyzers; -import org.elasticsearch.index.analysis.NamedAnalyzer; -import org.elasticsearch.index.mapper.SearchAsYouTypeFieldMapper.PrefixFieldMapper; -import org.elasticsearch.index.mapper.SearchAsYouTypeFieldMapper.PrefixFieldType; -import org.elasticsearch.index.mapper.SearchAsYouTypeFieldMapper.SearchAsYouTypeAnalyzer; -import org.elasticsearch.index.mapper.SearchAsYouTypeFieldMapper.SearchAsYouTypeFieldType; -import org.elasticsearch.index.mapper.SearchAsYouTypeFieldMapper.ShingleFieldMapper; -import org.elasticsearch.index.mapper.SearchAsYouTypeFieldMapper.ShingleFieldType; -import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder; -import org.elasticsearch.index.query.MatchPhraseQueryBuilder; -import org.elasticsearch.index.query.MultiMatchQueryBuilder; -import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AnalyzerScope; +import org.opensearch.index.analysis.IndexAnalyzers; +import org.opensearch.index.analysis.NamedAnalyzer; +import org.opensearch.index.mapper.SearchAsYouTypeFieldMapper.PrefixFieldMapper; +import org.opensearch.index.mapper.SearchAsYouTypeFieldMapper.PrefixFieldType; +import org.opensearch.index.mapper.SearchAsYouTypeFieldMapper.SearchAsYouTypeAnalyzer; +import org.opensearch.index.mapper.SearchAsYouTypeFieldMapper.SearchAsYouTypeFieldType; +import org.opensearch.index.mapper.SearchAsYouTypeFieldMapper.ShingleFieldMapper; +import org.opensearch.index.mapper.SearchAsYouTypeFieldMapper.ShingleFieldType; +import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder; +import org.opensearch.index.query.MatchPhraseQueryBuilder; +import org.opensearch.index.query.MultiMatchQueryBuilder; +import org.opensearch.index.query.QueryShardContext; +import org.opensearch.plugins.Plugin; import java.io.IOException; import java.util.ArrayList; diff --git a/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/SearchAsYouTypeFieldTypeTests.java b/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/SearchAsYouTypeFieldTypeTests.java similarity index 94% rename from modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/SearchAsYouTypeFieldTypeTests.java rename to modules/mapper-extras/src/test/java/org/opensearch/index/mapper/SearchAsYouTypeFieldTypeTests.java index 8b9592fd2852f..28875b05aaf0c 100644 --- a/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/SearchAsYouTypeFieldTypeTests.java +++ b/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/SearchAsYouTypeFieldTypeTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.mapper; +package org.opensearch.index.mapper; import org.apache.lucene.document.FieldType; import org.apache.lucene.index.IndexOptions; @@ -29,10 +29,10 @@ import org.apache.lucene.util.BytesRef; import org.opensearch.OpenSearchException; import org.elasticsearch.common.lucene.Lucene; -import org.elasticsearch.index.mapper.SearchAsYouTypeFieldMapper.Defaults; -import org.elasticsearch.index.mapper.SearchAsYouTypeFieldMapper.PrefixFieldType; -import org.elasticsearch.index.mapper.SearchAsYouTypeFieldMapper.SearchAsYouTypeFieldType; -import org.elasticsearch.index.mapper.SearchAsYouTypeFieldMapper.ShingleFieldType; +import org.opensearch.index.mapper.SearchAsYouTypeFieldMapper.Defaults; +import org.opensearch.index.mapper.SearchAsYouTypeFieldMapper.PrefixFieldType; +import org.opensearch.index.mapper.SearchAsYouTypeFieldMapper.SearchAsYouTypeFieldType; +import org.opensearch.index.mapper.SearchAsYouTypeFieldMapper.ShingleFieldType; import java.io.IOException; import java.util.Collections; diff --git a/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/TokenCountFieldMapperTests.java b/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/TokenCountFieldMapperTests.java similarity index 96% rename from modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/TokenCountFieldMapperTests.java rename to modules/mapper-extras/src/test/java/org/opensearch/index/mapper/TokenCountFieldMapperTests.java index d92eec4887710..1a112bd45267f 100644 --- a/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/TokenCountFieldMapperTests.java +++ b/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/TokenCountFieldMapperTests.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.CannedTokenStream; @@ -27,11 +27,11 @@ import org.apache.lucene.analysis.core.KeywordAnalyzer; import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AnalyzerScope; -import org.elasticsearch.index.analysis.IndexAnalyzers; -import org.elasticsearch.index.analysis.NamedAnalyzer; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AnalyzerScope; +import org.opensearch.index.analysis.IndexAnalyzers; +import org.opensearch.index.analysis.NamedAnalyzer; +import org.opensearch.plugins.Plugin; import java.io.IOException; import java.util.Arrays; diff --git a/modules/mapper-extras/src/test/java/org/elasticsearch/index/query/RankFeatureQueryBuilderTests.java b/modules/mapper-extras/src/test/java/org/opensearch/index/query/RankFeatureQueryBuilderTests.java similarity index 95% rename from modules/mapper-extras/src/test/java/org/elasticsearch/index/query/RankFeatureQueryBuilderTests.java rename to modules/mapper-extras/src/test/java/org/opensearch/index/query/RankFeatureQueryBuilderTests.java index b89b1a97ea98d..8f6f61d7c4940 100644 --- a/modules/mapper-extras/src/test/java/org/elasticsearch/index/query/RankFeatureQueryBuilderTests.java +++ b/modules/mapper-extras/src/test/java/org/opensearch/index/query/RankFeatureQueryBuilderTests.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; @@ -25,10 +25,10 @@ import org.opensearch.action.admin.indices.mapping.put.PutMappingRequest; import org.opensearch.common.Strings; import org.opensearch.common.compress.CompressedXContent; -import org.elasticsearch.index.mapper.MapperExtrasPlugin; -import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.index.query.RankFeatureQueryBuilder.ScoreFunction; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.index.mapper.MapperExtrasPlugin; +import org.opensearch.index.mapper.MapperService; +import org.opensearch.index.query.RankFeatureQueryBuilder.ScoreFunction; +import org.opensearch.plugins.Plugin; import org.elasticsearch.test.AbstractQueryTestCase; import org.elasticsearch.test.TestGeoShapeFieldMapperPlugin; diff --git a/modules/mapper-extras/src/test/resources/org/elasticsearch/index/mapper/filebeat-6.0.template.json b/modules/mapper-extras/src/test/resources/org/opensearch/index/mapper/filebeat-6.0.template.json similarity index 100% rename from modules/mapper-extras/src/test/resources/org/elasticsearch/index/mapper/filebeat-6.0.template.json rename to modules/mapper-extras/src/test/resources/org/opensearch/index/mapper/filebeat-6.0.template.json diff --git a/modules/mapper-extras/src/test/resources/org/elasticsearch/index/mapper/metricbeat-6.0.template.json b/modules/mapper-extras/src/test/resources/org/opensearch/index/mapper/metricbeat-6.0.template.json similarity index 99% rename from modules/mapper-extras/src/test/resources/org/elasticsearch/index/mapper/metricbeat-6.0.template.json rename to modules/mapper-extras/src/test/resources/org/opensearch/index/mapper/metricbeat-6.0.template.json index 40545bdf83f0f..12e4b935ea92e 100644 --- a/modules/mapper-extras/src/test/resources/org/elasticsearch/index/mapper/metricbeat-6.0.template.json +++ b/modules/mapper-extras/src/test/resources/org/opensearch/index/mapper/metricbeat-6.0.template.json @@ -1240,7 +1240,7 @@ "dropwizard": { "properties": {} }, - "elasticsearch": { + "opensearch": { "properties": { "cluster": { "properties": { diff --git a/modules/mapper-extras/src/test/resources/org/elasticsearch/index/mapper/packetbeat-6.0.template.json b/modules/mapper-extras/src/test/resources/org/opensearch/index/mapper/packetbeat-6.0.template.json similarity index 100% rename from modules/mapper-extras/src/test/resources/org/elasticsearch/index/mapper/packetbeat-6.0.template.json rename to modules/mapper-extras/src/test/resources/org/opensearch/index/mapper/packetbeat-6.0.template.json diff --git a/modules/mapper-extras/src/yamlRestTest/java/org/elasticsearch/index/mapper/MapperExtrasClientYamlTestSuiteIT.java b/modules/mapper-extras/src/yamlRestTest/java/org/opensearch/index/mapper/MapperExtrasClientYamlTestSuiteIT.java similarity index 97% rename from modules/mapper-extras/src/yamlRestTest/java/org/elasticsearch/index/mapper/MapperExtrasClientYamlTestSuiteIT.java rename to modules/mapper-extras/src/yamlRestTest/java/org/opensearch/index/mapper/MapperExtrasClientYamlTestSuiteIT.java index e2f10791739f8..7b3dca48e6fad 100644 --- a/modules/mapper-extras/src/yamlRestTest/java/org/elasticsearch/index/mapper/MapperExtrasClientYamlTestSuiteIT.java +++ b/modules/mapper-extras/src/yamlRestTest/java/org/opensearch/index/mapper/MapperExtrasClientYamlTestSuiteIT.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;