From 236de25ffbae61a2af285893c0169922eed3fb98 Mon Sep 17 00:00:00 2001 From: Harold Wang <74381974+harold-wang@users.noreply.github.com> Date: Thu, 18 Mar 2021 16:04:35 -0700 Subject: [PATCH] Rename remaining org.elasticsearch.plugins (#401) Signed-off-by: Harold Wang --- .../java/org/elasticsearch/index/IndexServiceTests.java | 2 +- .../elasticsearch/index/analysis/AnalysisRegistryTests.java | 4 ++-- .../index/analysis/CoreAnalysisFactoryTests.java | 2 +- .../elasticsearch/index/analysis/CustomNormalizerTests.java | 2 +- .../elasticsearch/index/analysis/PreBuiltAnalyzerTests.java | 2 +- .../test/java/org/elasticsearch/index/codec/CodecTests.java | 2 +- .../index/mapper/ExternalFieldMapperTests.java | 2 +- .../elasticsearch/index/mapper/ExternalMapperPlugin.java | 4 ++-- .../index/mapper/FieldFilterMapperPluginTests.java | 4 ++-- .../index/mapper/GeoShapeFieldMapperTests.java | 2 +- .../elasticsearch/index/mapper/IndexFieldMapperTests.java | 2 +- .../elasticsearch/index/mapper/KeywordFieldMapperTests.java | 4 ++-- .../index/mapper/LegacyGeoShapeFieldMapperTests.java | 2 +- .../org/elasticsearch/index/mapper/MapperServiceTests.java | 4 ++-- .../index/mapper/MockMetadataMapperPlugin.java | 4 ++-- .../elasticsearch/index/mapper/NestedObjectMapperTests.java | 2 +- .../org/elasticsearch/index/mapper/ObjectMapperTests.java | 2 +- .../elasticsearch/index/mapper/SourceFieldMapperTests.java | 2 +- .../elasticsearch/index/mapper/TypeFieldMapperTests.java | 2 +- .../org/elasticsearch/index/mapper/UpdateMappingTests.java | 2 +- .../index/query/TermsSetQueryBuilderTests.java | 2 +- .../query/functionscore/FunctionScoreQueryBuilderTests.java | 4 ++-- .../index/query/plugin/DummyQueryParserPlugin.java | 4 ++-- .../org/elasticsearch/index/similarity/SimilarityTests.java | 2 +- .../org/opensearch/common/network/NetworkModuleTests.java | 2 +- .../java/org/opensearch/indices/IndicesServiceTests.java | 6 +++--- .../opensearch/indices/analysis/AnalysisModuleTests.java | 2 +- server/src/test/java/org/opensearch/node/NodeTests.java | 4 ++-- .../java/org/opensearch/bootstrap/BootstrapForTesting.java | 6 +++--- .../java/org/opensearch/index/MockEngineFactoryPlugin.java | 4 ++-- .../org/opensearch/index/analysis/AnalysisTestsHelper.java | 2 +- .../org/opensearch/index/mapper/MapperServiceTestCase.java | 6 +++--- .../org/opensearch/index/mapper/MockFieldFilterPlugin.java | 4 ++-- .../indices/analysis/AnalysisFactoryTestCase.java | 2 +- .../main/java/org/opensearch/ingest/IngestTestPlugin.java | 4 ++-- .../src/main/java/org/opensearch/node/MockNode.java | 2 +- .../src/main/java/org/opensearch/node/NodeMocksPlugin.java | 2 +- .../opensearch/node/RecoverySettingsChunkSizePlugin.java | 2 +- .../main/java/org/opensearch/search/MockSearchService.java | 2 +- .../aggregations/BasePipelineAggregationTestCase.java | 2 +- .../org/opensearch/test/AbstractMultiClustersTestCase.java | 2 +- .../java/org/opensearch/test/InternalSettingsPlugin.java | 2 +- .../main/java/org/opensearch/test/InternalTestCluster.java | 2 +- .../main/java/org/opensearch/test/MockHttpTransport.java | 2 +- .../java/org/opensearch/test/MockIndexEventListener.java | 2 +- .../main/java/org/opensearch/test/MockKeywordPlugin.java | 4 ++-- .../java/org/opensearch/test/NodeConfigurationSource.java | 2 +- .../org/opensearch/test/OpenSearchSingleNodeTestCase.java | 2 +- .../org/opensearch/test/TestGeoShapeFieldMapperPlugin.java | 4 ++-- .../org/opensearch/test/disruption/NetworkDisruptionIT.java | 2 +- 50 files changed, 70 insertions(+), 70 deletions(-) diff --git a/server/src/test/java/org/elasticsearch/index/IndexServiceTests.java b/server/src/test/java/org/elasticsearch/index/IndexServiceTests.java index 35798684421..9158a5ccae7 100644 --- a/server/src/test/java/org/elasticsearch/index/IndexServiceTests.java +++ b/server/src/test/java/org/elasticsearch/index/IndexServiceTests.java @@ -37,7 +37,7 @@ import org.elasticsearch.index.shard.IndexShard; import org.opensearch.index.shard.IndexShardTestCase; import org.elasticsearch.index.translog.Translog; import org.elasticsearch.indices.IndicesService; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import org.opensearch.test.OpenSearchSingleNodeTestCase; import org.opensearch.test.InternalSettingsPlugin; import org.opensearch.threadpool.ThreadPool; diff --git a/server/src/test/java/org/elasticsearch/index/analysis/AnalysisRegistryTests.java b/server/src/test/java/org/elasticsearch/index/analysis/AnalysisRegistryTests.java index 591adb1a488..8101fc79ea9 100644 --- a/server/src/test/java/org/elasticsearch/index/analysis/AnalysisRegistryTests.java +++ b/server/src/test/java/org/elasticsearch/index/analysis/AnalysisRegistryTests.java @@ -39,8 +39,8 @@ import org.elasticsearch.index.mapper.MapperException; import org.elasticsearch.indices.analysis.AnalysisModule; import org.elasticsearch.indices.analysis.AnalysisModule.AnalysisProvider; import org.elasticsearch.indices.analysis.PreBuiltAnalyzers; -import org.elasticsearch.plugins.AnalysisPlugin; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.AnalysisPlugin; +import org.opensearch.plugins.Plugin; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.IndexSettingsModule; import org.opensearch.test.VersionUtils; diff --git a/server/src/test/java/org/elasticsearch/index/analysis/CoreAnalysisFactoryTests.java b/server/src/test/java/org/elasticsearch/index/analysis/CoreAnalysisFactoryTests.java index 43be8413079..d718460ab08 100644 --- a/server/src/test/java/org/elasticsearch/index/analysis/CoreAnalysisFactoryTests.java +++ b/server/src/test/java/org/elasticsearch/index/analysis/CoreAnalysisFactoryTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.index.analysis; import org.opensearch.indices.analysis.AnalysisFactoryTestCase; -import org.elasticsearch.plugins.AnalysisPlugin; +import org.opensearch.plugins.AnalysisPlugin; /** * Checks on the analysis components that are part of core to make sure that any that are added diff --git a/server/src/test/java/org/elasticsearch/index/analysis/CustomNormalizerTests.java b/server/src/test/java/org/elasticsearch/index/analysis/CustomNormalizerTests.java index 8345c5b547e..93f8e0b0497 100644 --- a/server/src/test/java/org/elasticsearch/index/analysis/CustomNormalizerTests.java +++ b/server/src/test/java/org/elasticsearch/index/analysis/CustomNormalizerTests.java @@ -25,7 +25,7 @@ import org.apache.lucene.util.BytesRef; import org.opensearch.common.settings.Settings; import org.elasticsearch.env.Environment; import org.elasticsearch.indices.analysis.AnalysisModule.AnalysisProvider; -import org.elasticsearch.plugins.AnalysisPlugin; +import org.opensearch.plugins.AnalysisPlugin; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.OpenSearchTokenStreamTestCase; import org.opensearch.index.analysis.AnalysisTestsHelper; diff --git a/server/src/test/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerTests.java b/server/src/test/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerTests.java index b9687d9327d..4a6fd4cea16 100644 --- a/server/src/test/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerTests.java +++ b/server/src/test/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerTests.java @@ -27,7 +27,7 @@ import org.opensearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.indices.analysis.PreBuiltAnalyzers; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import org.opensearch.test.OpenSearchSingleNodeTestCase; import org.opensearch.test.InternalSettingsPlugin; diff --git a/server/src/test/java/org/elasticsearch/index/codec/CodecTests.java b/server/src/test/java/org/elasticsearch/index/codec/CodecTests.java index 68d5269975b..5328cbccb19 100644 --- a/server/src/test/java/org/elasticsearch/index/codec/CodecTests.java +++ b/server/src/test/java/org/elasticsearch/index/codec/CodecTests.java @@ -38,7 +38,7 @@ import org.elasticsearch.index.analysis.IndexAnalyzers; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.similarity.SimilarityService; import org.elasticsearch.indices.mapper.MapperRegistry; -import org.elasticsearch.plugins.MapperPlugin; +import org.opensearch.plugins.MapperPlugin; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.IndexSettingsModule; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/ExternalFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/ExternalFieldMapperTests.java index 7ab65aa03aa..a4a21d37b4a 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/ExternalFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/ExternalFieldMapperTests.java @@ -22,7 +22,7 @@ package org.elasticsearch.index.mapper; import org.apache.lucene.index.IndexableField; import org.apache.lucene.util.BytesRef; import org.opensearch.common.geo.GeoPoint; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import org.opensearch.index.mapper.MapperServiceTestCase; import java.util.Collection; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/ExternalMapperPlugin.java b/server/src/test/java/org/elasticsearch/index/mapper/ExternalMapperPlugin.java index 0d4bf429fe7..ae7237b5b30 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/ExternalMapperPlugin.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/ExternalMapperPlugin.java @@ -25,8 +25,8 @@ import java.util.Map; import org.elasticsearch.index.mapper.Mapper; import org.elasticsearch.index.mapper.MetadataFieldMapper; -import org.elasticsearch.plugins.MapperPlugin; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.MapperPlugin; +import org.opensearch.plugins.Plugin; public class ExternalMapperPlugin extends Plugin implements MapperPlugin { diff --git a/server/src/test/java/org/elasticsearch/index/mapper/FieldFilterMapperPluginTests.java b/server/src/test/java/org/elasticsearch/index/mapper/FieldFilterMapperPluginTests.java index a9b45470ab3..2a24b9cfbe5 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/FieldFilterMapperPluginTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/FieldFilterMapperPluginTests.java @@ -30,8 +30,8 @@ import org.opensearch.cluster.metadata.MappingMetadata; import org.opensearch.common.collect.ImmutableOpenMap; import org.opensearch.common.xcontent.XContentType; import org.elasticsearch.indices.IndicesModule; -import org.elasticsearch.plugins.MapperPlugin; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.MapperPlugin; +import org.opensearch.plugins.Plugin; import org.opensearch.test.OpenSearchSingleNodeTestCase; import org.opensearch.test.TestGeoShapeFieldMapperPlugin; import org.junit.Before; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/GeoShapeFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/GeoShapeFieldMapperTests.java index 223c48ab4b3..505c8624bf6 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/GeoShapeFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/GeoShapeFieldMapperTests.java @@ -24,7 +24,7 @@ import org.opensearch.common.collect.List; import org.opensearch.common.geo.builders.ShapeBuilder; import org.opensearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.XContentBuilder; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import org.opensearch.test.TestGeoShapeFieldMapperPlugin; import org.junit.Before; import org.opensearch.index.mapper.FieldMapperTestCase2; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/IndexFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/IndexFieldMapperTests.java index 2e6a9edf101..c4f71702abc 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/IndexFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/IndexFieldMapperTests.java @@ -24,7 +24,7 @@ import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.compress.CompressedXContent; import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import org.opensearch.test.OpenSearchSingleNodeTestCase; import org.opensearch.test.InternalSettingsPlugin; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java index edb38ec0be6..cd85a7d8f89 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java @@ -45,8 +45,8 @@ import org.elasticsearch.index.analysis.TokenFilterFactory; import org.elasticsearch.index.analysis.TokenizerFactory; import org.elasticsearch.index.termvectors.TermVectorsService; import org.elasticsearch.indices.analysis.AnalysisModule; -import org.elasticsearch.plugins.AnalysisPlugin; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.AnalysisPlugin; +import org.opensearch.plugins.Plugin; import org.opensearch.index.mapper.MapperTestCase; import java.io.IOException; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/LegacyGeoShapeFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/LegacyGeoShapeFieldMapperTests.java index 5796728be78..b85d94fbb38 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/LegacyGeoShapeFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/LegacyGeoShapeFieldMapperTests.java @@ -35,7 +35,7 @@ import org.opensearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.geometry.Point; import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import org.opensearch.test.TestGeoShapeFieldMapperPlugin; import org.opensearch.index.mapper.FieldMapperTestCase2; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/MapperServiceTests.java b/server/src/test/java/org/elasticsearch/index/mapper/MapperServiceTests.java index 2b2d691d8e9..c7f8db2006c 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/MapperServiceTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/MapperServiceTests.java @@ -43,8 +43,8 @@ import org.elasticsearch.index.mapper.MapperService.MergeReason; import org.elasticsearch.index.mapper.NumberFieldMapper.NumberFieldType; import org.elasticsearch.indices.InvalidTypeNameException; import org.elasticsearch.indices.analysis.AnalysisModule.AnalysisProvider; -import org.elasticsearch.plugins.AnalysisPlugin; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.AnalysisPlugin; +import org.opensearch.plugins.Plugin; import org.opensearch.test.OpenSearchSingleNodeTestCase; import org.opensearch.test.InternalSettingsPlugin; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/MockMetadataMapperPlugin.java b/server/src/test/java/org/elasticsearch/index/mapper/MockMetadataMapperPlugin.java index 7fc1717e98a..44f159d2430 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/MockMetadataMapperPlugin.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/MockMetadataMapperPlugin.java @@ -22,8 +22,8 @@ package org.elasticsearch.index.mapper; import org.apache.lucene.document.Field; import org.apache.lucene.document.StringField; import org.opensearch.common.xcontent.XContentParser; -import org.elasticsearch.plugins.MapperPlugin; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.MapperPlugin; +import org.opensearch.plugins.Plugin; import java.io.IOException; import java.util.Collections; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/NestedObjectMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/NestedObjectMapperTests.java index 05b723bc929..3351b50dcae 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/NestedObjectMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/NestedObjectMapperTests.java @@ -31,7 +31,7 @@ import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentType; import org.elasticsearch.index.mapper.MapperService.MergeReason; import org.elasticsearch.index.mapper.ObjectMapper.Dynamic; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import org.opensearch.test.OpenSearchSingleNodeTestCase; import org.opensearch.test.InternalSettingsPlugin; import org.opensearch.test.VersionUtils; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/ObjectMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/ObjectMapperTests.java index 5d7a1576ffd..407b9d20af0 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/ObjectMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/ObjectMapperTests.java @@ -26,7 +26,7 @@ import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentType; import org.elasticsearch.index.mapper.MapperService.MergeReason; import org.elasticsearch.index.mapper.ObjectMapper.Dynamic; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import org.opensearch.test.OpenSearchSingleNodeTestCase; import org.opensearch.test.InternalSettingsPlugin; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/SourceFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/SourceFieldMapperTests.java index 67c17b633de..f2f9d1d85b3 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/SourceFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/SourceFieldMapperTests.java @@ -29,7 +29,7 @@ import org.opensearch.common.xcontent.XContentHelper; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import org.opensearch.test.OpenSearchSingleNodeTestCase; import org.opensearch.test.InternalSettingsPlugin; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/TypeFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/TypeFieldMapperTests.java index 93550af6bd0..6ba4a1a8855 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/TypeFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/TypeFieldMapperTests.java @@ -35,7 +35,7 @@ import org.elasticsearch.index.fielddata.IndexOrdinalsFieldData; import org.elasticsearch.index.fielddata.LeafOrdinalsFieldData; import org.elasticsearch.index.mapper.MapperService.MergeReason; import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import org.opensearch.test.OpenSearchSingleNodeTestCase; import org.opensearch.test.InternalSettingsPlugin; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/UpdateMappingTests.java b/server/src/test/java/org/elasticsearch/index/mapper/UpdateMappingTests.java index 97217af914c..f2bbb2d4d9d 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/UpdateMappingTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/UpdateMappingTests.java @@ -29,7 +29,7 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentFactory; import org.elasticsearch.index.IndexService; import org.elasticsearch.index.mapper.MapperService.MergeReason; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import org.opensearch.test.OpenSearchSingleNodeTestCase; import org.opensearch.test.InternalSettingsPlugin; import org.hamcrest.Matchers; diff --git a/server/src/test/java/org/elasticsearch/index/query/TermsSetQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/TermsSetQueryBuilderTests.java index 6a178c88cb2..734d076264b 100644 --- a/server/src/test/java/org/elasticsearch/index/query/TermsSetQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/TermsSetQueryBuilderTests.java @@ -43,7 +43,7 @@ import org.opensearch.common.Strings; import org.opensearch.common.compress.CompressedXContent; import org.elasticsearch.index.fielddata.ScriptDocValues; import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import org.opensearch.script.MockScriptEngine; import org.opensearch.script.MockScriptPlugin; import org.opensearch.script.Script; diff --git a/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilderTests.java index 0d7c3d75f77..4e4cb8a16ba 100644 --- a/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilderTests.java @@ -48,8 +48,8 @@ import org.elasticsearch.index.query.RandomQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.WrapperQueryBuilder; import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder; -import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.plugins.SearchPlugin; +import org.opensearch.plugins.Plugin; +import org.opensearch.plugins.SearchPlugin; import org.opensearch.script.MockScriptEngine; import org.opensearch.script.Script; import org.opensearch.script.ScriptType; diff --git a/server/src/test/java/org/elasticsearch/index/query/plugin/DummyQueryParserPlugin.java b/server/src/test/java/org/elasticsearch/index/query/plugin/DummyQueryParserPlugin.java index 3f57712a51b..391b7c09371 100644 --- a/server/src/test/java/org/elasticsearch/index/query/plugin/DummyQueryParserPlugin.java +++ b/server/src/test/java/org/elasticsearch/index/query/plugin/DummyQueryParserPlugin.java @@ -24,8 +24,8 @@ import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.Query; import org.apache.lucene.search.ScoreMode; import org.apache.lucene.search.Weight; -import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.plugins.SearchPlugin; +import org.opensearch.plugins.Plugin; +import org.opensearch.plugins.SearchPlugin; import java.io.IOException; import java.util.List; diff --git a/server/src/test/java/org/elasticsearch/index/similarity/SimilarityTests.java b/server/src/test/java/org/elasticsearch/index/similarity/SimilarityTests.java index 22d42d86975..26adb12e1fd 100644 --- a/server/src/test/java/org/elasticsearch/index/similarity/SimilarityTests.java +++ b/server/src/test/java/org/elasticsearch/index/similarity/SimilarityTests.java @@ -41,7 +41,7 @@ import org.elasticsearch.index.IndexService; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.MapperParsingException; import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import org.opensearch.test.OpenSearchSingleNodeTestCase; import org.opensearch.test.InternalSettingsPlugin; diff --git a/server/src/test/java/org/opensearch/common/network/NetworkModuleTests.java b/server/src/test/java/org/opensearch/common/network/NetworkModuleTests.java index 338023f49e0..4e9d10027fc 100644 --- a/server/src/test/java/org/opensearch/common/network/NetworkModuleTests.java +++ b/server/src/test/java/org/opensearch/common/network/NetworkModuleTests.java @@ -33,7 +33,7 @@ import org.opensearch.http.HttpServerTransport; import org.opensearch.http.HttpStats; import org.opensearch.http.NullDispatcher; import org.elasticsearch.indices.breaker.CircuitBreakerService; -import org.elasticsearch.plugins.NetworkPlugin; +import org.opensearch.plugins.NetworkPlugin; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; diff --git a/server/src/test/java/org/opensearch/indices/IndicesServiceTests.java b/server/src/test/java/org/opensearch/indices/IndicesServiceTests.java index 13165dcf208..040779a9110 100644 --- a/server/src/test/java/org/opensearch/indices/IndicesServiceTests.java +++ b/server/src/test/java/org/opensearch/indices/IndicesServiceTests.java @@ -60,9 +60,9 @@ import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.index.shard.ShardPath; import org.elasticsearch.index.similarity.NonNegativeScoresSimilarity; import org.elasticsearch.indices.IndicesService.ShardDeletionCheckResult; -import org.elasticsearch.plugins.EnginePlugin; -import org.elasticsearch.plugins.MapperPlugin; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.EnginePlugin; +import org.opensearch.plugins.MapperPlugin; +import org.opensearch.plugins.Plugin; import org.opensearch.test.OpenSearchSingleNodeTestCase; import org.opensearch.test.IndexSettingsModule; import org.opensearch.test.VersionUtils; diff --git a/server/src/test/java/org/opensearch/indices/analysis/AnalysisModuleTests.java b/server/src/test/java/org/opensearch/indices/analysis/AnalysisModuleTests.java index d43497bbca3..af315e8df76 100644 --- a/server/src/test/java/org/opensearch/indices/analysis/AnalysisModuleTests.java +++ b/server/src/test/java/org/opensearch/indices/analysis/AnalysisModuleTests.java @@ -53,7 +53,7 @@ import org.elasticsearch.index.analysis.TokenFilterFactory; import org.opensearch.index.analysis.MyFilterTokenFilterFactory; import org.elasticsearch.index.analysis.TokenizerFactory; import org.elasticsearch.indices.analysis.AnalysisModule.AnalysisProvider; -import org.elasticsearch.plugins.AnalysisPlugin; +import org.opensearch.plugins.AnalysisPlugin; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.IndexSettingsModule; import org.opensearch.test.VersionUtils; diff --git a/server/src/test/java/org/opensearch/node/NodeTests.java b/server/src/test/java/org/opensearch/node/NodeTests.java index 706046162f3..fb3385bebfa 100644 --- a/server/src/test/java/org/opensearch/node/NodeTests.java +++ b/server/src/test/java/org/opensearch/node/NodeTests.java @@ -34,8 +34,8 @@ import org.elasticsearch.index.shard.IndexShard; import org.elasticsearch.indices.IndicesService; import org.elasticsearch.indices.breaker.BreakerSettings; import org.elasticsearch.indices.breaker.CircuitBreakerService; -import org.elasticsearch.plugins.CircuitBreakerPlugin; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.CircuitBreakerPlugin; +import org.opensearch.plugins.Plugin; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.InternalTestCluster; import org.opensearch.test.MockHttpTransport; diff --git a/test/framework/src/main/java/org/opensearch/bootstrap/BootstrapForTesting.java b/test/framework/src/main/java/org/opensearch/bootstrap/BootstrapForTesting.java index fa9ed1888da..d7a91a1714f 100644 --- a/test/framework/src/main/java/org/opensearch/bootstrap/BootstrapForTesting.java +++ b/test/framework/src/main/java/org/opensearch/bootstrap/BootstrapForTesting.java @@ -30,7 +30,7 @@ import org.opensearch.common.io.FileSystemUtils; import org.opensearch.common.io.PathUtils; import org.opensearch.common.network.IfConfig; import org.opensearch.common.settings.Settings; -import org.elasticsearch.plugins.PluginInfo; +import org.opensearch.plugins.PluginInfo; import org.opensearch.secure_sm.SecureSM; import org.junit.Assert; @@ -140,10 +140,10 @@ public class BootstrapForTesting { // read test-framework permissions Map codebases = Security.getCodebaseJarMap(JarHell.parseClassPath()); // when testing server, the main opensearch code is not yet in a jar, so we need to manually add it - addClassCodebase(codebases,"opensearch", "org.elasticsearch.plugins.PluginsService"); + addClassCodebase(codebases,"opensearch", "org.opensearch.plugins.PluginsService"); if (System.getProperty("tests.gradle") == null) { // intellij and eclipse don't package our internal libs, so we need to set the codebases for them manually - addClassCodebase(codebases,"plugin-classloader", "org.elasticsearch.plugins.ExtendedPluginsClassLoader"); + addClassCodebase(codebases,"plugin-classloader", "org.opensearch.plugins.ExtendedPluginsClassLoader"); addClassCodebase(codebases,"opensearch-nio", "org.elasticsearch.nio.ChannelFactory"); addClassCodebase(codebases, "opensearch-secure-sm", "org.elasticsearch.secure_sm.SecureSM"); addClassCodebase(codebases, "opensearch-rest-client", "org.elasticsearch.client.RestClient"); diff --git a/test/framework/src/main/java/org/opensearch/index/MockEngineFactoryPlugin.java b/test/framework/src/main/java/org/opensearch/index/MockEngineFactoryPlugin.java index d5001905b7c..88b62f7fe02 100644 --- a/test/framework/src/main/java/org/opensearch/index/MockEngineFactoryPlugin.java +++ b/test/framework/src/main/java/org/opensearch/index/MockEngineFactoryPlugin.java @@ -22,8 +22,8 @@ import org.apache.lucene.index.AssertingDirectoryReader; import org.apache.lucene.index.FilterDirectoryReader; import org.opensearch.common.settings.Setting; import org.elasticsearch.index.engine.EngineFactory; -import org.elasticsearch.plugins.EnginePlugin; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.EnginePlugin; +import org.opensearch.plugins.Plugin; import org.opensearch.test.engine.MockEngineFactory; import org.opensearch.test.engine.MockEngineSupport; diff --git a/test/framework/src/main/java/org/opensearch/index/analysis/AnalysisTestsHelper.java b/test/framework/src/main/java/org/opensearch/index/analysis/AnalysisTestsHelper.java index bb00d770aa2..42faadd1300 100644 --- a/test/framework/src/main/java/org/opensearch/index/analysis/AnalysisTestsHelper.java +++ b/test/framework/src/main/java/org/opensearch/index/analysis/AnalysisTestsHelper.java @@ -25,7 +25,7 @@ import org.opensearch.common.settings.Settings; import org.elasticsearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.indices.analysis.AnalysisModule; -import org.elasticsearch.plugins.AnalysisPlugin; +import org.opensearch.plugins.AnalysisPlugin; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.IndexSettingsModule; diff --git a/test/framework/src/main/java/org/opensearch/index/mapper/MapperServiceTestCase.java b/test/framework/src/main/java/org/opensearch/index/mapper/MapperServiceTestCase.java index b01e1d7ea3c..81cacb3d0ea 100644 --- a/test/framework/src/main/java/org/opensearch/index/mapper/MapperServiceTestCase.java +++ b/test/framework/src/main/java/org/opensearch/index/mapper/MapperServiceTestCase.java @@ -44,9 +44,9 @@ import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.index.similarity.SimilarityService; import org.elasticsearch.indices.IndicesModule; import org.elasticsearch.indices.mapper.MapperRegistry; -import org.elasticsearch.plugins.MapperPlugin; -import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.plugins.ScriptPlugin; +import org.opensearch.plugins.MapperPlugin; +import org.opensearch.plugins.Plugin; +import org.opensearch.plugins.ScriptPlugin; import org.opensearch.script.ScriptModule; import org.opensearch.script.ScriptService; import org.opensearch.search.lookup.SearchLookup; diff --git a/test/framework/src/main/java/org/opensearch/index/mapper/MockFieldFilterPlugin.java b/test/framework/src/main/java/org/opensearch/index/mapper/MockFieldFilterPlugin.java index 417366007db..d809ad3a9eb 100644 --- a/test/framework/src/main/java/org/opensearch/index/mapper/MockFieldFilterPlugin.java +++ b/test/framework/src/main/java/org/opensearch/index/mapper/MockFieldFilterPlugin.java @@ -19,8 +19,8 @@ package org.opensearch.index.mapper; -import org.elasticsearch.plugins.MapperPlugin; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.MapperPlugin; +import org.opensearch.plugins.Plugin; import java.util.function.Function; import java.util.function.Predicate; diff --git a/test/framework/src/main/java/org/opensearch/indices/analysis/AnalysisFactoryTestCase.java b/test/framework/src/main/java/org/opensearch/indices/analysis/AnalysisFactoryTestCase.java index 63f857e6b33..821ba53ad41 100644 --- a/test/framework/src/main/java/org/opensearch/indices/analysis/AnalysisFactoryTestCase.java +++ b/test/framework/src/main/java/org/opensearch/indices/analysis/AnalysisFactoryTestCase.java @@ -26,7 +26,7 @@ import org.elasticsearch.index.analysis.HunspellTokenFilterFactory; import org.elasticsearch.index.analysis.ShingleTokenFilterFactory; import org.elasticsearch.index.analysis.StandardTokenizerFactory; import org.elasticsearch.index.analysis.StopTokenFilterFactory; -import org.elasticsearch.plugins.AnalysisPlugin; +import org.opensearch.plugins.AnalysisPlugin; import org.opensearch.test.OpenSearchTestCase; import java.util.HashMap; diff --git a/test/framework/src/main/java/org/opensearch/ingest/IngestTestPlugin.java b/test/framework/src/main/java/org/opensearch/ingest/IngestTestPlugin.java index 552d7380d9b..6813f63ec21 100644 --- a/test/framework/src/main/java/org/opensearch/ingest/IngestTestPlugin.java +++ b/test/framework/src/main/java/org/opensearch/ingest/IngestTestPlugin.java @@ -22,8 +22,8 @@ package org.opensearch.ingest; import java.util.Collections; import java.util.Map; -import org.elasticsearch.plugins.IngestPlugin; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.IngestPlugin; +import org.opensearch.plugins.Plugin; /** * Adds an ingest processor to be used in tests. diff --git a/test/framework/src/main/java/org/opensearch/node/MockNode.java b/test/framework/src/main/java/org/opensearch/node/MockNode.java index 1e2f0fe61e3..6b8eb34eaef 100644 --- a/test/framework/src/main/java/org/opensearch/node/MockNode.java +++ b/test/framework/src/main/java/org/opensearch/node/MockNode.java @@ -37,7 +37,7 @@ import org.opensearch.http.HttpServerTransport; import org.elasticsearch.indices.IndicesService; import org.elasticsearch.indices.breaker.CircuitBreakerService; import org.elasticsearch.indices.recovery.RecoverySettings; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import org.opensearch.script.MockScriptService; import org.opensearch.script.ScriptContext; import org.opensearch.script.ScriptEngine; diff --git a/test/framework/src/main/java/org/opensearch/node/NodeMocksPlugin.java b/test/framework/src/main/java/org/opensearch/node/NodeMocksPlugin.java index 2d150dffc32..0fc9353e2e5 100644 --- a/test/framework/src/main/java/org/opensearch/node/NodeMocksPlugin.java +++ b/test/framework/src/main/java/org/opensearch/node/NodeMocksPlugin.java @@ -18,7 +18,7 @@ */ package org.opensearch.node; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; public class NodeMocksPlugin extends Plugin { // just a marker plugin for MockNode to mock out BigArrays } diff --git a/test/framework/src/main/java/org/opensearch/node/RecoverySettingsChunkSizePlugin.java b/test/framework/src/main/java/org/opensearch/node/RecoverySettingsChunkSizePlugin.java index b7021010504..1a8be4b2618 100644 --- a/test/framework/src/main/java/org/opensearch/node/RecoverySettingsChunkSizePlugin.java +++ b/test/framework/src/main/java/org/opensearch/node/RecoverySettingsChunkSizePlugin.java @@ -23,7 +23,7 @@ import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Setting.Property; import org.opensearch.common.unit.ByteSizeValue; import org.elasticsearch.indices.recovery.RecoverySettings; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import java.util.List; diff --git a/test/framework/src/main/java/org/opensearch/search/MockSearchService.java b/test/framework/src/main/java/org/opensearch/search/MockSearchService.java index ebe62df0c48..b4a24327c15 100644 --- a/test/framework/src/main/java/org/opensearch/search/MockSearchService.java +++ b/test/framework/src/main/java/org/opensearch/search/MockSearchService.java @@ -24,7 +24,7 @@ import org.opensearch.common.util.BigArrays; import org.elasticsearch.indices.IndicesService; import org.elasticsearch.indices.breaker.CircuitBreakerService; import org.opensearch.node.MockNode; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import org.opensearch.script.ScriptService; import org.opensearch.search.fetch.FetchPhase; import org.opensearch.search.internal.ReaderContext; diff --git a/test/framework/src/main/java/org/opensearch/search/aggregations/BasePipelineAggregationTestCase.java b/test/framework/src/main/java/org/opensearch/search/aggregations/BasePipelineAggregationTestCase.java index 2b2350a3aea..9abb6f9da94 100644 --- a/test/framework/src/main/java/org/opensearch/search/aggregations/BasePipelineAggregationTestCase.java +++ b/test/framework/src/main/java/org/opensearch/search/aggregations/BasePipelineAggregationTestCase.java @@ -43,7 +43,7 @@ import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; import org.elasticsearch.env.Environment; import org.elasticsearch.indices.IndicesModule; -import org.elasticsearch.plugins.SearchPlugin; +import org.opensearch.plugins.SearchPlugin; import org.opensearch.search.SearchModule; import org.opensearch.search.aggregations.PipelineAggregationBuilder.ValidationContext; import org.opensearch.search.aggregations.pipeline.AbstractPipelineAggregationBuilder; diff --git a/test/framework/src/main/java/org/opensearch/test/AbstractMultiClustersTestCase.java b/test/framework/src/main/java/org/opensearch/test/AbstractMultiClustersTestCase.java index aa79fb2ebed..bddd44cbfee 100644 --- a/test/framework/src/main/java/org/opensearch/test/AbstractMultiClustersTestCase.java +++ b/test/framework/src/main/java/org/opensearch/test/AbstractMultiClustersTestCase.java @@ -25,7 +25,7 @@ import org.opensearch.client.Client; import org.opensearch.common.network.NetworkModule; import org.opensearch.common.settings.Settings; import org.opensearch.core.internal.io.IOUtils; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import org.opensearch.test.transport.MockTransportService; import org.opensearch.transport.RemoteClusterAware; import org.opensearch.transport.RemoteConnectionInfo; diff --git a/test/framework/src/main/java/org/opensearch/test/InternalSettingsPlugin.java b/test/framework/src/main/java/org/opensearch/test/InternalSettingsPlugin.java index d38ac3c7b8d..7f6528dc112 100644 --- a/test/framework/src/main/java/org/opensearch/test/InternalSettingsPlugin.java +++ b/test/framework/src/main/java/org/opensearch/test/InternalSettingsPlugin.java @@ -26,7 +26,7 @@ import org.elasticsearch.index.IndexModule; import org.elasticsearch.index.IndexService; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.monitor.fs.FsService; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import org.opensearch.transport.RemoteConnectionStrategy; import java.util.Arrays; diff --git a/test/framework/src/main/java/org/opensearch/test/InternalTestCluster.java b/test/framework/src/main/java/org/opensearch/test/InternalTestCluster.java index 0a31047634c..413b98ba2af 100644 --- a/test/framework/src/main/java/org/opensearch/test/InternalTestCluster.java +++ b/test/framework/src/main/java/org/opensearch/test/InternalTestCluster.java @@ -108,7 +108,7 @@ import org.opensearch.node.Node; import org.opensearch.node.NodeRoleSettings; import org.opensearch.node.NodeService; import org.opensearch.node.NodeValidationException; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import org.opensearch.script.ScriptModule; import org.opensearch.script.ScriptService; import org.opensearch.search.SearchService; diff --git a/test/framework/src/main/java/org/opensearch/test/MockHttpTransport.java b/test/framework/src/main/java/org/opensearch/test/MockHttpTransport.java index 24913c52401..db032206026 100644 --- a/test/framework/src/main/java/org/opensearch/test/MockHttpTransport.java +++ b/test/framework/src/main/java/org/opensearch/test/MockHttpTransport.java @@ -25,7 +25,7 @@ import org.opensearch.common.transport.TransportAddress; import org.opensearch.http.HttpInfo; import org.opensearch.http.HttpServerTransport; import org.opensearch.http.HttpStats; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; /** * A dummy http transport used by tests when not wanting to actually bind to a real address. diff --git a/test/framework/src/main/java/org/opensearch/test/MockIndexEventListener.java b/test/framework/src/main/java/org/opensearch/test/MockIndexEventListener.java index 7811a4b8c67..82c48e92e4c 100644 --- a/test/framework/src/main/java/org/opensearch/test/MockIndexEventListener.java +++ b/test/framework/src/main/java/org/opensearch/test/MockIndexEventListener.java @@ -33,7 +33,7 @@ import org.elasticsearch.index.shard.IndexShard; import org.elasticsearch.index.shard.IndexShardState; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.indices.cluster.IndicesClusterStateService.AllocatedIndices.IndexRemovalReason; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import java.util.Arrays; import java.util.Collection; diff --git a/test/framework/src/main/java/org/opensearch/test/MockKeywordPlugin.java b/test/framework/src/main/java/org/opensearch/test/MockKeywordPlugin.java index 1b16979a915..a08e39f2d2c 100644 --- a/test/framework/src/main/java/org/opensearch/test/MockKeywordPlugin.java +++ b/test/framework/src/main/java/org/opensearch/test/MockKeywordPlugin.java @@ -21,8 +21,8 @@ package org.opensearch.test; import org.apache.lucene.analysis.MockTokenizer; import org.elasticsearch.index.analysis.TokenizerFactory; import org.elasticsearch.indices.analysis.AnalysisModule; -import org.elasticsearch.plugins.AnalysisPlugin; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.AnalysisPlugin; +import org.opensearch.plugins.Plugin; import java.util.Map; diff --git a/test/framework/src/main/java/org/opensearch/test/NodeConfigurationSource.java b/test/framework/src/main/java/org/opensearch/test/NodeConfigurationSource.java index 9364a9ac6b2..a7942988654 100644 --- a/test/framework/src/main/java/org/opensearch/test/NodeConfigurationSource.java +++ b/test/framework/src/main/java/org/opensearch/test/NodeConfigurationSource.java @@ -19,7 +19,7 @@ package org.opensearch.test; import org.opensearch.common.settings.Settings; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import java.nio.file.Path; import java.util.Collection; diff --git a/test/framework/src/main/java/org/opensearch/test/OpenSearchSingleNodeTestCase.java b/test/framework/src/main/java/org/opensearch/test/OpenSearchSingleNodeTestCase.java index 9de2fc1066b..75d73c0a999 100644 --- a/test/framework/src/main/java/org/opensearch/test/OpenSearchSingleNodeTestCase.java +++ b/test/framework/src/main/java/org/opensearch/test/OpenSearchSingleNodeTestCase.java @@ -50,7 +50,7 @@ import org.elasticsearch.indices.breaker.HierarchyCircuitBreakerService; import org.opensearch.node.MockNode; import org.opensearch.node.Node; import org.opensearch.node.NodeValidationException; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import org.opensearch.script.MockScriptService; import org.opensearch.search.internal.SearchContext; import org.opensearch.transport.TransportSettings; diff --git a/test/framework/src/main/java/org/opensearch/test/TestGeoShapeFieldMapperPlugin.java b/test/framework/src/main/java/org/opensearch/test/TestGeoShapeFieldMapperPlugin.java index d5cd55c8bca..b20336136ba 100644 --- a/test/framework/src/main/java/org/opensearch/test/TestGeoShapeFieldMapperPlugin.java +++ b/test/framework/src/main/java/org/opensearch/test/TestGeoShapeFieldMapperPlugin.java @@ -20,8 +20,8 @@ package org.opensearch.test; import org.elasticsearch.index.mapper.GeoShapeFieldMapper; import org.elasticsearch.index.mapper.Mapper; -import org.elasticsearch.plugins.MapperPlugin; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.MapperPlugin; +import org.opensearch.plugins.Plugin; import java.util.Collections; import java.util.LinkedHashMap; diff --git a/test/framework/src/test/java/org/opensearch/test/disruption/NetworkDisruptionIT.java b/test/framework/src/test/java/org/opensearch/test/disruption/NetworkDisruptionIT.java index 056923e6069..07a13f2ecdf 100644 --- a/test/framework/src/test/java/org/opensearch/test/disruption/NetworkDisruptionIT.java +++ b/test/framework/src/test/java/org/opensearch/test/disruption/NetworkDisruptionIT.java @@ -26,7 +26,7 @@ import org.opensearch.cluster.NodeConnectionsService; import org.opensearch.common.collect.Tuple; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.settings.Settings; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import org.opensearch.test.OpenSearchIntegTestCase; import org.opensearch.test.InternalTestCluster; import org.opensearch.test.disruption.NetworkDisruption;