From 8ee7296feab0781af2cce49d60f38f8175ff6aa0 Mon Sep 17 00:00:00 2001 From: Harold Wang <74381974+harold-wang@users.noreply.github.com> Date: Tue, 16 Mar 2021 23:26:23 -0700 Subject: [PATCH] [Rename] org.elasticsearch.plugins (#348) * Rename org.elasticsearch.gateway to org.opensearch.gateway Signed-off-by: Harold Wang * Rename org.elasticsearch.http to org.opensearch.http Signed-off-by: Harold Wang * Renames org.elasticsearch.plugins to org.opensearch.plugins Signed-off-by: Harold Wang --- .../opensearch/plugin/noop/NoopPlugin.java | 4 +-- .../client/PreBuiltTransportClient.java | 2 +- .../client/PreBuiltTransportClientTests.java | 2 +- .../matrix/MatrixAggregationPlugin.java | 4 +-- .../spi/MatrixStatsNamedXContentProvider.java | 4 +-- .../stats/InternalMatrixStatsTests.java | 2 +- .../stats/MatrixStatsAggregatorTests.java | 4 +-- .../common/QueryStringWithAnalyzersIT.java | 2 +- .../common/CompoundAnalysisTests.java | 2 +- .../common/DisableGraphQueryTests.java | 2 +- .../common/HighlighterWithAnalyzersTests.java | 2 +- .../analysis/common/MassiveWordListTests.java | 2 +- .../ingest/common/IngestRestartIT.java | 2 +- .../ingest/geoip/IngestGeoIpPlugin.java | 2 +- .../useragent/IngestUserAgentPlugin.java | 4 +-- .../elasticsearch/kibana/KibanaPlugin.java | 4 +-- .../script/expression/StoredExpressionIT.java | 2 +- .../script/expression/ExpressionPlugin.java | 4 +-- .../script/mustache/SearchTemplateIT.java | 2 +- .../script/mustache/MustachePlugin.java | 8 ++--- .../action/PainlessExecuteApiTests.java | 2 +- .../index/mapper/BWCTemplateTests.java | 2 +- .../mapper/RankFeatureFieldMapperTests.java | 2 +- .../org/opensearch/join/ParentJoinPlugin.java | 6 ++-- .../spi/ParentJoinNamedXContentProvider.java | 4 +-- .../join/aggregations/ChildrenTests.java | 4 +-- .../ChildrenToParentAggregatorTests.java | 8 ++--- .../aggregations/InternalChildrenTests.java | 8 ++--- .../aggregations/InternalParentTests.java | 8 ++--- .../join/aggregations/ParentTests.java | 4 +-- .../ParentToChildrenAggregatorTests.java | 6 ++-- .../mapper/ParentJoinFieldMapperTests.java | 2 +- .../join/query/HasChildQueryBuilderTests.java | 2 +- .../query/HasParentQueryBuilderTests.java | 2 +- .../join/query/ParentIdQueryBuilderTests.java | 2 +- .../percolator/PercolatorQuerySearchIT.java | 2 +- .../percolator/CandidateQueryTests.java | 2 +- .../PercolateQueryBuilderTests.java | 2 +- .../PercolatorFieldMapperTests.java | 2 +- .../PercolatorQuerySearchTests.java | 2 +- .../index/rankeval/RankEvalRequestIT.java | 2 +- .../RankEvalNamedXContentProvider.java | 2 +- .../index/rankeval/RankEvalPlugin.java | 4 +-- .../documentation/ReindexDocumentationIT.java | 2 +- .../opensearch/index/reindex/CancelTests.java | 2 +- .../reindex/DeleteByQueryBasicTests.java | 2 +- .../index/reindex/ReindexSingleNodeTests.java | 2 +- .../index/reindex/ReindexTestCase.java | 2 +- .../opensearch/index/reindex/RetryTests.java | 2 +- .../repository/url/URLRepositoryPlugin.java | 4 +-- .../OpenSearchNetty4IntegTestCase.java | 2 +- .../cluster/node/info/PluginsAndModules.java | 2 +- .../cluster/stats/ClusterStatsNodes.java | 2 +- .../org/opensearch/rest/BaseRestHandler.java | 2 +- .../org/opensearch/script/ScriptModule.java | 2 +- .../opensearch/search/SearchExtBuilder.java | 4 +-- .../org/opensearch/search/SearchModule.java | 31 ++++++++++--------- .../subphase/highlight/package-info.java | 2 +- .../index/mapper/DocumentParserTests.java | 2 +- .../index/mapper/IdFieldMapperTests.java | 2 +- .../indices/IndicesModuleTests.java | 2 +- .../repositories/RepositoriesModuleTests.java | 2 +- .../search/AbstractSearchTestCase.java | 4 +-- .../opensearch/search/SearchModuleTests.java | 14 ++++----- .../highlight/CustomHighlighterPlugin.java | 4 +-- ...ins.PluginsServiceTests$TestExtensionPoint | 4 +-- ...icsearch.plugins.spi.NamedXContentProvider | 2 +- .../opensearch/script/MockScriptPlugin.java | 4 +-- .../opensearch/script/MockScriptService.java | 2 +- .../snapshots/mockstore/MockRepository.java | 4 +-- .../transport/MockTransportClient.java | 2 +- .../transport/nio/MockNioTransportPlugin.java | 4 +-- 72 files changed, 128 insertions(+), 127 deletions(-) diff --git a/client/client-benchmark-noop-api-plugin/src/main/java/org/opensearch/plugin/noop/NoopPlugin.java b/client/client-benchmark-noop-api-plugin/src/main/java/org/opensearch/plugin/noop/NoopPlugin.java index ad03a0cdb79..f71c2e598fd 100644 --- a/client/client-benchmark-noop-api-plugin/src/main/java/org/opensearch/plugin/noop/NoopPlugin.java +++ b/client/client-benchmark-noop-api-plugin/src/main/java/org/opensearch/plugin/noop/NoopPlugin.java @@ -32,8 +32,8 @@ import org.elasticsearch.common.settings.SettingsFilter; import org.opensearch.plugin.noop.action.search.NoopSearchAction; import org.opensearch.plugin.noop.action.search.RestNoopSearchAction; import org.opensearch.plugin.noop.action.search.TransportNoopSearchAction; -import org.elasticsearch.plugins.ActionPlugin; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.ActionPlugin; +import org.opensearch.plugins.Plugin; import org.opensearch.rest.RestController; import org.opensearch.rest.RestHandler; diff --git a/client/transport/src/main/java/org/opensearch/transport/client/PreBuiltTransportClient.java b/client/transport/src/main/java/org/opensearch/transport/client/PreBuiltTransportClient.java index 978fae4a004..4fc1945bed0 100644 --- a/client/transport/src/main/java/org/opensearch/transport/client/PreBuiltTransportClient.java +++ b/client/transport/src/main/java/org/opensearch/transport/client/PreBuiltTransportClient.java @@ -29,7 +29,7 @@ import org.elasticsearch.common.settings.Settings; import org.opensearch.index.reindex.ReindexPlugin; import org.opensearch.join.ParentJoinPlugin; import org.opensearch.percolator.PercolatorPlugin; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import org.opensearch.script.mustache.MustachePlugin; import org.opensearch.transport.Netty4Plugin; diff --git a/client/transport/src/test/java/org/opensearch/transport/client/PreBuiltTransportClientTests.java b/client/transport/src/test/java/org/opensearch/transport/client/PreBuiltTransportClientTests.java index ceee466e353..81d2050c4af 100644 --- a/client/transport/src/test/java/org/opensearch/transport/client/PreBuiltTransportClientTests.java +++ b/client/transport/src/test/java/org/opensearch/transport/client/PreBuiltTransportClientTests.java @@ -26,7 +26,7 @@ import org.elasticsearch.common.settings.Settings; import org.opensearch.index.reindex.ReindexPlugin; import org.opensearch.join.ParentJoinPlugin; import org.opensearch.percolator.PercolatorPlugin; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import org.opensearch.script.mustache.MustachePlugin; import org.opensearch.transport.Netty4Plugin; import org.junit.Test; diff --git a/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/MatrixAggregationPlugin.java b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/MatrixAggregationPlugin.java index 5e9ce683088..544b9460858 100644 --- a/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/MatrixAggregationPlugin.java +++ b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/MatrixAggregationPlugin.java @@ -19,8 +19,8 @@ package org.opensearch.search.aggregations.matrix; -import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.plugins.SearchPlugin; +import org.opensearch.plugins.Plugin; +import org.opensearch.plugins.SearchPlugin; import org.opensearch.search.aggregations.matrix.stats.InternalMatrixStats; import org.opensearch.search.aggregations.matrix.stats.MatrixStatsAggregationBuilder; import org.opensearch.search.aggregations.matrix.stats.MatrixStatsParser; diff --git a/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/spi/MatrixStatsNamedXContentProvider.java b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/spi/MatrixStatsNamedXContentProvider.java index 09748a7cac1..c5058c36b1c 100644 --- a/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/spi/MatrixStatsNamedXContentProvider.java +++ b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/spi/MatrixStatsNamedXContentProvider.java @@ -22,8 +22,8 @@ package org.opensearch.search.aggregations.matrix.spi; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.ContextParser; import org.elasticsearch.common.xcontent.NamedXContentRegistry; -import org.elasticsearch.plugins.spi.NamedXContentProvider; -import org.opensearch.search.aggregations.Aggregation; +import org.opensearch.plugins.spi.NamedXContentProvider; +import org.elasticsearch.search.aggregations.Aggregation; import org.opensearch.search.aggregations.matrix.stats.MatrixStatsAggregationBuilder; import org.opensearch.search.aggregations.matrix.stats.ParsedMatrixStats; diff --git a/modules/aggs-matrix-stats/src/test/java/org/opensearch/search/aggregations/matrix/stats/InternalMatrixStatsTests.java b/modules/aggs-matrix-stats/src/test/java/org/opensearch/search/aggregations/matrix/stats/InternalMatrixStatsTests.java index 337863bf474..5c493fec316 100644 --- a/modules/aggs-matrix-stats/src/test/java/org/opensearch/search/aggregations/matrix/stats/InternalMatrixStatsTests.java +++ b/modules/aggs-matrix-stats/src/test/java/org/opensearch/search/aggregations/matrix/stats/InternalMatrixStatsTests.java @@ -25,7 +25,7 @@ import org.elasticsearch.common.util.MockPageCacheRecycler; import org.elasticsearch.common.xcontent.ContextParser; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; -import org.elasticsearch.plugins.SearchPlugin; +import org.opensearch.plugins.SearchPlugin; import org.opensearch.script.ScriptService; import org.opensearch.search.aggregations.Aggregation; import org.opensearch.search.aggregations.InternalAggregation; diff --git a/modules/aggs-matrix-stats/src/test/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsAggregatorTests.java b/modules/aggs-matrix-stats/src/test/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsAggregatorTests.java index 98fad012a12..d9bda26e0cd 100644 --- a/modules/aggs-matrix-stats/src/test/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsAggregatorTests.java +++ b/modules/aggs-matrix-stats/src/test/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsAggregatorTests.java @@ -30,8 +30,8 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.util.NumericUtils; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; -import org.elasticsearch.plugins.SearchPlugin; -import org.opensearch.search.aggregations.AggregatorTestCase; +import org.opensearch.plugins.SearchPlugin; +import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.opensearch.search.aggregations.matrix.MatrixAggregationPlugin; import java.util.Arrays; diff --git a/modules/analysis-common/src/internalClusterTest/java/org/opensearch/analysis/common/QueryStringWithAnalyzersIT.java b/modules/analysis-common/src/internalClusterTest/java/org/opensearch/analysis/common/QueryStringWithAnalyzersIT.java index 61a74f49e25..9d984d8628c 100644 --- a/modules/analysis-common/src/internalClusterTest/java/org/opensearch/analysis/common/QueryStringWithAnalyzersIT.java +++ b/modules/analysis-common/src/internalClusterTest/java/org/opensearch/analysis/common/QueryStringWithAnalyzersIT.java @@ -22,7 +22,7 @@ package org.opensearch.analysis.common; import org.opensearch.action.search.SearchResponse; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.query.Operator; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import org.elasticsearch.test.ESIntegTestCase; import java.util.Arrays; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CompoundAnalysisTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CompoundAnalysisTests.java index 5b2fd9d6fa3..4367a7827c4 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CompoundAnalysisTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CompoundAnalysisTests.java @@ -33,7 +33,7 @@ import org.elasticsearch.index.analysis.MyFilterTokenFilterFactory; import org.elasticsearch.index.analysis.TokenFilterFactory; import org.elasticsearch.indices.analysis.AnalysisModule; import org.elasticsearch.indices.analysis.AnalysisModule.AnalysisProvider; -import org.elasticsearch.plugins.AnalysisPlugin; +import org.opensearch.plugins.AnalysisPlugin; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.IndexSettingsModule; import org.hamcrest.MatcherAssert; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/DisableGraphQueryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/DisableGraphQueryTests.java index 41b9888fc70..2a80c604b5d 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/DisableGraphQueryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/DisableGraphQueryTests.java @@ -37,7 +37,7 @@ import org.elasticsearch.index.query.QueryStringQueryBuilder; import org.elasticsearch.index.query.SimpleQueryStringBuilder; import org.elasticsearch.index.query.SimpleQueryStringFlag; import org.elasticsearch.index.search.MatchQuery; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.After; import org.junit.Before; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/HighlighterWithAnalyzersTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/HighlighterWithAnalyzersTests.java index ba4313c2d4e..7ce1a40877c 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/HighlighterWithAnalyzersTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/HighlighterWithAnalyzersTests.java @@ -25,7 +25,7 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.query.Operator; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import org.opensearch.search.builder.SearchSourceBuilder; import org.opensearch.search.fetch.subphase.highlight.HighlightBuilder; import org.elasticsearch.test.ESIntegTestCase; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/MassiveWordListTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/MassiveWordListTests.java index 80e1af45726..fbe36d793c9 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/MassiveWordListTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/MassiveWordListTests.java @@ -20,7 +20,7 @@ package org.opensearch.analysis.common; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import org.elasticsearch.test.ESSingleNodeTestCase; import java.util.Collection; diff --git a/modules/ingest-common/src/internalClusterTest/java/org/opensearch/ingest/common/IngestRestartIT.java b/modules/ingest-common/src/internalClusterTest/java/org/opensearch/ingest/common/IngestRestartIT.java index 35b62025c2b..43610d6d71b 100644 --- a/modules/ingest-common/src/internalClusterTest/java/org/opensearch/ingest/common/IngestRestartIT.java +++ b/modules/ingest-common/src/internalClusterTest/java/org/opensearch/ingest/common/IngestRestartIT.java @@ -25,7 +25,7 @@ import org.opensearch.common.bytes.BytesReference; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.ingest.IngestStats; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import org.opensearch.script.MockScriptEngine; import org.opensearch.script.MockScriptPlugin; import org.elasticsearch.test.ESIntegTestCase; diff --git a/modules/ingest-geoip/src/main/java/org/opensearch/ingest/geoip/IngestGeoIpPlugin.java b/modules/ingest-geoip/src/main/java/org/opensearch/ingest/geoip/IngestGeoIpPlugin.java index 0b598051a41..6e3483192f3 100644 --- a/modules/ingest-geoip/src/main/java/org/opensearch/ingest/geoip/IngestGeoIpPlugin.java +++ b/modules/ingest-geoip/src/main/java/org/opensearch/ingest/geoip/IngestGeoIpPlugin.java @@ -32,7 +32,7 @@ import org.elasticsearch.common.io.PathUtils; import org.elasticsearch.common.settings.Setting; import org.elasticsearch.core.internal.io.IOUtils; import org.elasticsearch.ingest.Processor; -import org.elasticsearch.plugins.IngestPlugin; +import org.opensearch.plugins.IngestPlugin; import org.elasticsearch.plugins.Plugin; import java.io.Closeable; diff --git a/modules/ingest-user-agent/src/main/java/org/opensearch/ingest/useragent/IngestUserAgentPlugin.java b/modules/ingest-user-agent/src/main/java/org/opensearch/ingest/useragent/IngestUserAgentPlugin.java index d70e4f5058f..fd2dde8a64f 100644 --- a/modules/ingest-user-agent/src/main/java/org/opensearch/ingest/useragent/IngestUserAgentPlugin.java +++ b/modules/ingest-user-agent/src/main/java/org/opensearch/ingest/useragent/IngestUserAgentPlugin.java @@ -21,8 +21,8 @@ package org.opensearch.ingest.useragent; import org.elasticsearch.common.settings.Setting; import org.elasticsearch.ingest.Processor; -import org.elasticsearch.plugins.IngestPlugin; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.IngestPlugin; +import org.opensearch.plugins.Plugin; import java.io.IOException; import java.io.InputStream; diff --git a/modules/kibana/src/main/java/org/elasticsearch/kibana/KibanaPlugin.java b/modules/kibana/src/main/java/org/elasticsearch/kibana/KibanaPlugin.java index 0abcdad29f2..7f04063e7f3 100644 --- a/modules/kibana/src/main/java/org/elasticsearch/kibana/KibanaPlugin.java +++ b/modules/kibana/src/main/java/org/elasticsearch/kibana/KibanaPlugin.java @@ -29,8 +29,8 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.SettingsFilter; import org.opensearch.index.reindex.RestDeleteByQueryAction; import org.elasticsearch.indices.SystemIndexDescriptor; -import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.plugins.SystemIndexPlugin; +import org.opensearch.plugins.Plugin; +import org.opensearch.plugins.SystemIndexPlugin; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestController; import org.opensearch.rest.RestHandler; diff --git a/modules/lang-expression/src/internalClusterTest/java/org/opensearch/script/expression/StoredExpressionIT.java b/modules/lang-expression/src/internalClusterTest/java/org/opensearch/script/expression/StoredExpressionIT.java index 0a51cfa79ce..209d09a7577 100644 --- a/modules/lang-expression/src/internalClusterTest/java/org/opensearch/script/expression/StoredExpressionIT.java +++ b/modules/lang-expression/src/internalClusterTest/java/org/opensearch/script/expression/StoredExpressionIT.java @@ -22,7 +22,7 @@ package org.opensearch.script.expression; import org.opensearch.common.bytes.BytesArray; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import org.opensearch.script.Script; import org.opensearch.script.ScriptType; import org.opensearch.search.aggregations.AggregationBuilders; diff --git a/modules/lang-expression/src/main/java/org/opensearch/script/expression/ExpressionPlugin.java b/modules/lang-expression/src/main/java/org/opensearch/script/expression/ExpressionPlugin.java index f198fe32c89..6f36487d83d 100644 --- a/modules/lang-expression/src/main/java/org/opensearch/script/expression/ExpressionPlugin.java +++ b/modules/lang-expression/src/main/java/org/opensearch/script/expression/ExpressionPlugin.java @@ -22,8 +22,8 @@ package org.opensearch.script.expression; import java.util.Collection; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.plugins.ScriptPlugin; +import org.opensearch.plugins.Plugin; +import org.opensearch.plugins.ScriptPlugin; import org.opensearch.script.ScriptContext; import org.opensearch.script.ScriptEngine; diff --git a/modules/lang-mustache/src/internalClusterTest/java/org/opensearch/script/mustache/SearchTemplateIT.java b/modules/lang-mustache/src/internalClusterTest/java/org/opensearch/script/mustache/SearchTemplateIT.java index 604fd41370a..5beb00c675a 100644 --- a/modules/lang-mustache/src/internalClusterTest/java/org/opensearch/script/mustache/SearchTemplateIT.java +++ b/modules/lang-mustache/src/internalClusterTest/java/org/opensearch/script/mustache/SearchTemplateIT.java @@ -25,7 +25,7 @@ import org.opensearch.action.search.SearchRequest; import org.opensearch.common.bytes.BytesArray; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import org.opensearch.script.ScriptType; import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.Before; diff --git a/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/MustachePlugin.java b/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/MustachePlugin.java index 95814ed757c..7a063df278f 100644 --- a/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/MustachePlugin.java +++ b/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/MustachePlugin.java @@ -27,10 +27,10 @@ import org.elasticsearch.common.settings.ClusterSettings; import org.elasticsearch.common.settings.IndexScopedSettings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.SettingsFilter; -import org.elasticsearch.plugins.ActionPlugin; -import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.plugins.ScriptPlugin; -import org.elasticsearch.plugins.SearchPlugin; +import org.opensearch.plugins.ActionPlugin; +import org.opensearch.plugins.Plugin; +import org.opensearch.plugins.ScriptPlugin; +import org.opensearch.plugins.SearchPlugin; import org.opensearch.rest.RestController; import org.opensearch.rest.RestHandler; import org.opensearch.script.ScriptContext; diff --git a/modules/lang-painless/src/test/java/org/opensearch/painless/action/PainlessExecuteApiTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/action/PainlessExecuteApiTests.java index 9423bac47a6..1d44fc31288 100644 --- a/modules/lang-painless/src/test/java/org/opensearch/painless/action/PainlessExecuteApiTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/action/PainlessExecuteApiTests.java @@ -26,7 +26,7 @@ import org.elasticsearch.index.query.MatchQueryBuilder; import org.opensearch.painless.PainlessPlugin; import org.opensearch.painless.action.PainlessExecuteAction.Request; import org.opensearch.painless.action.PainlessExecuteAction.Response; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import org.opensearch.script.Script; import org.opensearch.script.ScriptException; import org.opensearch.script.ScriptService; diff --git a/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/BWCTemplateTests.java b/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/BWCTemplateTests.java index 7da7109b39f..acc46b9e83c 100644 --- a/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/BWCTemplateTests.java +++ b/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/BWCTemplateTests.java @@ -21,7 +21,7 @@ package org.opensearch.index.mapper; import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.index.mapper.MapperExtrasPlugin; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import org.elasticsearch.test.ESSingleNodeTestCase; import java.util.Collection; diff --git a/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/RankFeatureFieldMapperTests.java b/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/RankFeatureFieldMapperTests.java index fb72ad6e261..63f4e6816fb 100644 --- a/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/RankFeatureFieldMapperTests.java +++ b/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/RankFeatureFieldMapperTests.java @@ -28,7 +28,7 @@ import org.apache.lucene.search.TermQuery; import org.opensearch.common.Strings; import org.elasticsearch.common.collect.List; import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import java.io.IOException; import java.util.Arrays; diff --git a/modules/parent-join/src/main/java/org/opensearch/join/ParentJoinPlugin.java b/modules/parent-join/src/main/java/org/opensearch/join/ParentJoinPlugin.java index de82bce2c13..756c8fea856 100644 --- a/modules/parent-join/src/main/java/org/opensearch/join/ParentJoinPlugin.java +++ b/modules/parent-join/src/main/java/org/opensearch/join/ParentJoinPlugin.java @@ -28,9 +28,9 @@ import org.opensearch.join.mapper.ParentJoinFieldMapper; import org.opensearch.join.query.HasChildQueryBuilder; import org.opensearch.join.query.HasParentQueryBuilder; import org.opensearch.join.query.ParentIdQueryBuilder; -import org.elasticsearch.plugins.MapperPlugin; -import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.plugins.SearchPlugin; +import org.opensearch.plugins.MapperPlugin; +import org.opensearch.plugins.Plugin; +import org.opensearch.plugins.SearchPlugin; import java.util.Arrays; import java.util.Collections; diff --git a/modules/parent-join/src/main/java/org/opensearch/join/spi/ParentJoinNamedXContentProvider.java b/modules/parent-join/src/main/java/org/opensearch/join/spi/ParentJoinNamedXContentProvider.java index 8c863b8f17f..029810fe29f 100644 --- a/modules/parent-join/src/main/java/org/opensearch/join/spi/ParentJoinNamedXContentProvider.java +++ b/modules/parent-join/src/main/java/org/opensearch/join/spi/ParentJoinNamedXContentProvider.java @@ -26,8 +26,8 @@ import org.opensearch.join.aggregations.ChildrenAggregationBuilder; import org.opensearch.join.aggregations.ParentAggregationBuilder; import org.opensearch.join.aggregations.ParsedChildren; import org.opensearch.join.aggregations.ParsedParent; -import org.elasticsearch.plugins.spi.NamedXContentProvider; -import org.opensearch.search.aggregations.Aggregation; +import org.opensearch.plugins.spi.NamedXContentProvider; +import org.elasticsearch.search.aggregations.Aggregation; import java.util.Arrays; import java.util.List; diff --git a/modules/parent-join/src/test/java/org/opensearch/join/aggregations/ChildrenTests.java b/modules/parent-join/src/test/java/org/opensearch/join/aggregations/ChildrenTests.java index e079ce1cba9..fae550ff421 100644 --- a/modules/parent-join/src/test/java/org/opensearch/join/aggregations/ChildrenTests.java +++ b/modules/parent-join/src/test/java/org/opensearch/join/aggregations/ChildrenTests.java @@ -20,8 +20,8 @@ package org.opensearch.join.aggregations; import org.opensearch.join.ParentJoinPlugin; -import org.elasticsearch.plugins.Plugin; -import org.opensearch.search.aggregations.BaseAggregationTestCase; +import org.opensearch.plugins.Plugin; +import org.elasticsearch.search.aggregations.BaseAggregationTestCase; import org.elasticsearch.test.TestGeoShapeFieldMapperPlugin; import java.util.Arrays; diff --git a/modules/parent-join/src/test/java/org/opensearch/join/aggregations/ChildrenToParentAggregatorTests.java b/modules/parent-join/src/test/java/org/opensearch/join/aggregations/ChildrenToParentAggregatorTests.java index 897a07f2a0d..7c99063a325 100644 --- a/modules/parent-join/src/test/java/org/opensearch/join/aggregations/ChildrenToParentAggregatorTests.java +++ b/modules/parent-join/src/test/java/org/opensearch/join/aggregations/ChildrenToParentAggregatorTests.java @@ -51,10 +51,10 @@ import org.elasticsearch.index.shard.ShardId; import org.opensearch.join.ParentJoinPlugin; import org.opensearch.join.mapper.MetaJoinFieldMapper; import org.opensearch.join.mapper.ParentJoinFieldMapper; -import org.elasticsearch.plugins.SearchPlugin; -import org.opensearch.search.aggregations.Aggregation; -import org.opensearch.search.aggregations.AggregationBuilder; -import org.opensearch.search.aggregations.AggregatorTestCase; +import org.opensearch.plugins.SearchPlugin; +import org.elasticsearch.search.aggregations.Aggregation; +import org.elasticsearch.search.aggregations.AggregationBuilder; +import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.opensearch.search.aggregations.bucket.terms.LongTerms; import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder; import org.opensearch.search.aggregations.metrics.InternalMin; diff --git a/modules/parent-join/src/test/java/org/opensearch/join/aggregations/InternalChildrenTests.java b/modules/parent-join/src/test/java/org/opensearch/join/aggregations/InternalChildrenTests.java index e15b7d96892..d629a675881 100644 --- a/modules/parent-join/src/test/java/org/opensearch/join/aggregations/InternalChildrenTests.java +++ b/modules/parent-join/src/test/java/org/opensearch/join/aggregations/InternalChildrenTests.java @@ -23,10 +23,10 @@ import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.common.xcontent.NamedXContentRegistry.Entry; import org.opensearch.join.ParentJoinPlugin; -import org.elasticsearch.plugins.SearchPlugin; -import org.opensearch.search.aggregations.Aggregation; -import org.opensearch.search.aggregations.InternalAggregations; -import org.opensearch.search.aggregations.InternalSingleBucketAggregationTestCase; +import org.opensearch.plugins.SearchPlugin; +import org.elasticsearch.search.aggregations.Aggregation; +import org.elasticsearch.search.aggregations.InternalAggregations; +import org.elasticsearch.search.aggregations.InternalSingleBucketAggregationTestCase; import org.opensearch.search.aggregations.bucket.ParsedSingleBucketAggregation; import java.util.ArrayList; diff --git a/modules/parent-join/src/test/java/org/opensearch/join/aggregations/InternalParentTests.java b/modules/parent-join/src/test/java/org/opensearch/join/aggregations/InternalParentTests.java index cc2c1e179bd..9835836eb45 100644 --- a/modules/parent-join/src/test/java/org/opensearch/join/aggregations/InternalParentTests.java +++ b/modules/parent-join/src/test/java/org/opensearch/join/aggregations/InternalParentTests.java @@ -22,10 +22,10 @@ package org.opensearch.join.aggregations; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.NamedXContentRegistry.Entry; import org.opensearch.join.ParentJoinPlugin; -import org.elasticsearch.plugins.SearchPlugin; -import org.opensearch.search.aggregations.Aggregation; -import org.opensearch.search.aggregations.InternalAggregations; -import org.opensearch.search.aggregations.InternalSingleBucketAggregationTestCase; +import org.opensearch.plugins.SearchPlugin; +import org.elasticsearch.search.aggregations.Aggregation; +import org.elasticsearch.search.aggregations.InternalAggregations; +import org.elasticsearch.search.aggregations.InternalSingleBucketAggregationTestCase; import org.opensearch.search.aggregations.bucket.ParsedSingleBucketAggregation; import java.util.ArrayList; diff --git a/modules/parent-join/src/test/java/org/opensearch/join/aggregations/ParentTests.java b/modules/parent-join/src/test/java/org/opensearch/join/aggregations/ParentTests.java index 635dca0191f..dd7a3d6149e 100644 --- a/modules/parent-join/src/test/java/org/opensearch/join/aggregations/ParentTests.java +++ b/modules/parent-join/src/test/java/org/opensearch/join/aggregations/ParentTests.java @@ -23,8 +23,8 @@ import java.util.Arrays; import java.util.Collection; import org.opensearch.join.ParentJoinPlugin; -import org.elasticsearch.plugins.Plugin; -import org.opensearch.search.aggregations.BaseAggregationTestCase; +import org.opensearch.plugins.Plugin; +import org.elasticsearch.search.aggregations.BaseAggregationTestCase; import org.elasticsearch.test.TestGeoShapeFieldMapperPlugin; public class ParentTests extends BaseAggregationTestCase { diff --git a/modules/parent-join/src/test/java/org/opensearch/join/aggregations/ParentToChildrenAggregatorTests.java b/modules/parent-join/src/test/java/org/opensearch/join/aggregations/ParentToChildrenAggregatorTests.java index 0b41b0e8ba9..5027d63750d 100644 --- a/modules/parent-join/src/test/java/org/opensearch/join/aggregations/ParentToChildrenAggregatorTests.java +++ b/modules/parent-join/src/test/java/org/opensearch/join/aggregations/ParentToChildrenAggregatorTests.java @@ -52,9 +52,9 @@ import org.elasticsearch.index.shard.ShardId; import org.opensearch.join.ParentJoinPlugin; import org.opensearch.join.mapper.MetaJoinFieldMapper; import org.opensearch.join.mapper.ParentJoinFieldMapper; -import org.elasticsearch.plugins.SearchPlugin; -import org.opensearch.search.aggregations.AggregationBuilder; -import org.opensearch.search.aggregations.AggregatorTestCase; +import org.opensearch.plugins.SearchPlugin; +import org.elasticsearch.search.aggregations.AggregationBuilder; +import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.opensearch.search.aggregations.bucket.terms.StringTerms; import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder; import org.opensearch.search.aggregations.metrics.InternalMin; diff --git a/modules/parent-join/src/test/java/org/opensearch/join/mapper/ParentJoinFieldMapperTests.java b/modules/parent-join/src/test/java/org/opensearch/join/mapper/ParentJoinFieldMapperTests.java index be0477ea757..61ed3663a6c 100644 --- a/modules/parent-join/src/test/java/org/opensearch/join/mapper/ParentJoinFieldMapperTests.java +++ b/modules/parent-join/src/test/java/org/opensearch/join/mapper/ParentJoinFieldMapperTests.java @@ -32,7 +32,7 @@ import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.mapper.ParsedDocument; import org.elasticsearch.index.mapper.SourceToParse; import org.opensearch.join.ParentJoinPlugin; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import org.elasticsearch.test.ESSingleNodeTestCase; import java.util.Collection; diff --git a/modules/parent-join/src/test/java/org/opensearch/join/query/HasChildQueryBuilderTests.java b/modules/parent-join/src/test/java/org/opensearch/join/query/HasChildQueryBuilderTests.java index 50590bec028..04ec56de0ed 100644 --- a/modules/parent-join/src/test/java/org/opensearch/join/query/HasChildQueryBuilderTests.java +++ b/modules/parent-join/src/test/java/org/opensearch/join/query/HasChildQueryBuilderTests.java @@ -51,7 +51,7 @@ import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.WrapperQueryBuilder; import org.elasticsearch.index.similarity.SimilarityService; import org.opensearch.join.ParentJoinPlugin; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import org.opensearch.search.sort.FieldSortBuilder; import org.opensearch.search.sort.SortOrder; import org.elasticsearch.test.AbstractQueryTestCase; diff --git a/modules/parent-join/src/test/java/org/opensearch/join/query/HasParentQueryBuilderTests.java b/modules/parent-join/src/test/java/org/opensearch/join/query/HasParentQueryBuilderTests.java index c2c415ebdc7..437d2b56b12 100644 --- a/modules/parent-join/src/test/java/org/opensearch/join/query/HasParentQueryBuilderTests.java +++ b/modules/parent-join/src/test/java/org/opensearch/join/query/HasParentQueryBuilderTests.java @@ -38,7 +38,7 @@ import org.elasticsearch.index.query.QueryShardException; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.WrapperQueryBuilder; import org.opensearch.join.ParentJoinPlugin; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import org.opensearch.search.sort.FieldSortBuilder; import org.opensearch.search.sort.SortOrder; import org.elasticsearch.test.AbstractQueryTestCase; diff --git a/modules/parent-join/src/test/java/org/opensearch/join/query/ParentIdQueryBuilderTests.java b/modules/parent-join/src/test/java/org/opensearch/join/query/ParentIdQueryBuilderTests.java index 14e89f6e007..eea89d90c82 100644 --- a/modules/parent-join/src/test/java/org/opensearch/join/query/ParentIdQueryBuilderTests.java +++ b/modules/parent-join/src/test/java/org/opensearch/join/query/ParentIdQueryBuilderTests.java @@ -33,7 +33,7 @@ import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.index.query.QueryShardException; import org.opensearch.join.ParentJoinPlugin; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import org.elasticsearch.test.AbstractQueryTestCase; import org.elasticsearch.test.TestGeoShapeFieldMapperPlugin; import org.hamcrest.Matchers; diff --git a/modules/percolator/src/internalClusterTest/java/org/opensearch/percolator/PercolatorQuerySearchIT.java b/modules/percolator/src/internalClusterTest/java/org/opensearch/percolator/PercolatorQuerySearchIT.java index 96d9e6faf89..3911018bf5b 100644 --- a/modules/percolator/src/internalClusterTest/java/org/opensearch/percolator/PercolatorQuerySearchIT.java +++ b/modules/percolator/src/internalClusterTest/java/org/opensearch/percolator/PercolatorQuerySearchIT.java @@ -37,7 +37,7 @@ import org.elasticsearch.index.query.MatchPhraseQueryBuilder; import org.elasticsearch.index.query.MultiMatchQueryBuilder; import org.elasticsearch.index.query.Operator; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import org.opensearch.search.fetch.subphase.highlight.HighlightBuilder; import org.opensearch.search.sort.SortOrder; import org.elasticsearch.test.ESIntegTestCase; diff --git a/modules/percolator/src/test/java/org/opensearch/percolator/CandidateQueryTests.java b/modules/percolator/src/test/java/org/opensearch/percolator/CandidateQueryTests.java index 8c68907a089..ad319a2dc75 100644 --- a/modules/percolator/src/test/java/org/opensearch/percolator/CandidateQueryTests.java +++ b/modules/percolator/src/test/java/org/opensearch/percolator/CandidateQueryTests.java @@ -96,7 +96,7 @@ import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.mapper.NumberFieldMapper; import org.elasticsearch.index.mapper.ParseContext; import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.After; import org.junit.Before; diff --git a/modules/percolator/src/test/java/org/opensearch/percolator/PercolateQueryBuilderTests.java b/modules/percolator/src/test/java/org/opensearch/percolator/PercolateQueryBuilderTests.java index 7581d60a0e9..991f60f15b4 100644 --- a/modules/percolator/src/test/java/org/opensearch/percolator/PercolateQueryBuilderTests.java +++ b/modules/percolator/src/test/java/org/opensearch/percolator/PercolateQueryBuilderTests.java @@ -40,7 +40,7 @@ import org.elasticsearch.index.query.QueryBuilder; import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.index.query.Rewriteable; import org.elasticsearch.ingest.RandomDocumentPicks; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import org.elasticsearch.test.AbstractQueryTestCase; import org.elasticsearch.test.TestGeoShapeFieldMapperPlugin; import org.hamcrest.Matchers; diff --git a/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorFieldMapperTests.java b/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorFieldMapperTests.java index fffd6d13989..a3203078099 100644 --- a/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorFieldMapperTests.java +++ b/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorFieldMapperTests.java @@ -85,7 +85,7 @@ import org.elasticsearch.indices.TermsLookup; import org.opensearch.join.ParentJoinPlugin; import org.opensearch.join.query.HasChildQueryBuilder; import org.opensearch.join.query.HasParentQueryBuilder; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import org.opensearch.script.MockScriptPlugin; import org.opensearch.script.Script; import org.elasticsearch.test.ESSingleNodeTestCase; diff --git a/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorQuerySearchTests.java b/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorQuerySearchTests.java index bf34ee3bbeb..bf34ffcd6f0 100644 --- a/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorQuerySearchTests.java +++ b/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorQuerySearchTests.java @@ -35,7 +35,7 @@ import org.elasticsearch.index.query.Operator; import org.elasticsearch.index.query.QueryBuilder; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import org.opensearch.script.MockScriptPlugin; import org.opensearch.script.Script; import org.opensearch.script.ScriptType; diff --git a/modules/rank-eval/src/internalClusterTest/java/org/opensearch/index/rankeval/RankEvalRequestIT.java b/modules/rank-eval/src/internalClusterTest/java/org/opensearch/index/rankeval/RankEvalRequestIT.java index de9b841bddd..9f2bd53a817 100644 --- a/modules/rank-eval/src/internalClusterTest/java/org/opensearch/index/rankeval/RankEvalRequestIT.java +++ b/modules/rank-eval/src/internalClusterTest/java/org/opensearch/index/rankeval/RankEvalRequestIT.java @@ -29,7 +29,7 @@ import org.elasticsearch.index.query.MatchAllQueryBuilder; import org.elasticsearch.index.query.QueryBuilders; import org.opensearch.index.rankeval.PrecisionAtK.Detail; import org.elasticsearch.indices.IndexClosedException; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import org.opensearch.search.builder.SearchSourceBuilder; import org.elasticsearch.test.ESIntegTestCase; import org.junit.Before; diff --git a/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/RankEvalNamedXContentProvider.java b/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/RankEvalNamedXContentProvider.java index d087736e457..397b570a965 100644 --- a/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/RankEvalNamedXContentProvider.java +++ b/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/RankEvalNamedXContentProvider.java @@ -21,7 +21,7 @@ package org.opensearch.index.rankeval; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.NamedXContentRegistry; -import org.elasticsearch.plugins.spi.NamedXContentProvider; +import org.opensearch.plugins.spi.NamedXContentProvider; import java.util.ArrayList; import java.util.List; diff --git a/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/RankEvalPlugin.java b/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/RankEvalPlugin.java index b82c761237d..bfc33759086 100644 --- a/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/RankEvalPlugin.java +++ b/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/RankEvalPlugin.java @@ -29,8 +29,8 @@ import org.elasticsearch.common.settings.IndexScopedSettings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.SettingsFilter; import org.elasticsearch.common.xcontent.NamedXContentRegistry.Entry; -import org.elasticsearch.plugins.ActionPlugin; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.ActionPlugin; +import org.opensearch.plugins.Plugin; import org.opensearch.rest.RestController; import org.opensearch.rest.RestHandler; diff --git a/modules/reindex/src/internalClusterTest/java/org/opensearch/client/documentation/ReindexDocumentationIT.java b/modules/reindex/src/internalClusterTest/java/org/opensearch/client/documentation/ReindexDocumentationIT.java index d8cb43b3553..9c1d6b6a12b 100644 --- a/modules/reindex/src/internalClusterTest/java/org/opensearch/client/documentation/ReindexDocumentationIT.java +++ b/modules/reindex/src/internalClusterTest/java/org/opensearch/client/documentation/ReindexDocumentationIT.java @@ -41,7 +41,7 @@ import org.elasticsearch.index.reindex.UpdateByQueryAction; import org.elasticsearch.index.reindex.UpdateByQueryRequestBuilder; import org.elasticsearch.index.shard.IndexingOperationListener; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import org.opensearch.script.Script; import org.opensearch.script.ScriptType; import org.opensearch.search.sort.SortOrder; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/CancelTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/CancelTests.java index 840f00eb053..54a79d4b7a8 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/CancelTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/CancelTests.java @@ -42,7 +42,7 @@ import org.elasticsearch.index.reindex.UpdateByQueryAction; import org.elasticsearch.index.shard.IndexingOperationListener; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.ingest.IngestTestPlugin; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import org.opensearch.tasks.TaskCancelledException; import org.opensearch.tasks.TaskInfo; import org.hamcrest.Matcher; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/DeleteByQueryBasicTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/DeleteByQueryBasicTests.java index 26c6c2dba3a..e6ea9bbe405 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/DeleteByQueryBasicTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/DeleteByQueryBasicTests.java @@ -31,7 +31,7 @@ import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.index.reindex.AbstractBulkByScrollRequest; import org.elasticsearch.index.reindex.BulkByScrollResponse; import org.elasticsearch.index.reindex.DeleteByQueryRequestBuilder; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import org.opensearch.search.sort.SortOrder; import org.elasticsearch.test.InternalSettingsPlugin; import org.elasticsearch.test.InternalTestCluster; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexSingleNodeTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexSingleNodeTests.java index b5a7ebfef2a..29069308554 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexSingleNodeTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexSingleNodeTests.java @@ -22,7 +22,7 @@ package org.opensearch.index.reindex; import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.reindex.ReindexAction; import org.elasticsearch.index.reindex.ReindexRequestBuilder; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import org.opensearch.search.sort.SortOrder; import org.elasticsearch.test.ESSingleNodeTestCase; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexTestCase.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexTestCase.java index 29a70e90d54..87be5d6e729 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexTestCase.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexTestCase.java @@ -26,7 +26,7 @@ import org.elasticsearch.index.reindex.ReindexAction; import org.elasticsearch.index.reindex.ReindexRequestBuilder; import org.elasticsearch.index.reindex.UpdateByQueryAction; import org.elasticsearch.index.reindex.UpdateByQueryRequestBuilder; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.ESIntegTestCase.ClusterScope; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/RetryTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/RetryTests.java index 4d863b17547..aa82f607fea 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/RetryTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/RetryTests.java @@ -43,7 +43,7 @@ import org.elasticsearch.index.reindex.ReindexRequestBuilder; import org.elasticsearch.index.reindex.RemoteInfo; import org.elasticsearch.index.reindex.UpdateByQueryAction; import org.elasticsearch.index.reindex.UpdateByQueryRequestBuilder; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import org.elasticsearch.test.ESIntegTestCase; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.Netty4Plugin; diff --git a/modules/repository-url/src/main/java/org/opensearch/plugin/repository/url/URLRepositoryPlugin.java b/modules/repository-url/src/main/java/org/opensearch/plugin/repository/url/URLRepositoryPlugin.java index d01bd8af5a4..ab577e8a040 100644 --- a/modules/repository-url/src/main/java/org/opensearch/plugin/repository/url/URLRepositoryPlugin.java +++ b/modules/repository-url/src/main/java/org/opensearch/plugin/repository/url/URLRepositoryPlugin.java @@ -24,8 +24,8 @@ import org.elasticsearch.common.settings.Setting; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.opensearch.env.Environment; import org.elasticsearch.indices.recovery.RecoverySettings; -import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.plugins.RepositoryPlugin; +import org.opensearch.plugins.Plugin; +import org.opensearch.plugins.RepositoryPlugin; import org.opensearch.repositories.Repository; import org.opensearch.repositories.url.URLRepository; diff --git a/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/OpenSearchNetty4IntegTestCase.java b/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/OpenSearchNetty4IntegTestCase.java index 9050f96a2f6..4630501c4f4 100644 --- a/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/OpenSearchNetty4IntegTestCase.java +++ b/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/OpenSearchNetty4IntegTestCase.java @@ -20,7 +20,7 @@ package org.opensearch; import org.opensearch.common.network.NetworkModule; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import org.elasticsearch.test.ESIntegTestCase; import org.opensearch.transport.Netty4Plugin; import org.opensearch.transport.netty4.Netty4Transport; diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/node/info/PluginsAndModules.java b/server/src/main/java/org/opensearch/action/admin/cluster/node/info/PluginsAndModules.java index 5d4fec4ca2b..1d34c39fad2 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/node/info/PluginsAndModules.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/node/info/PluginsAndModules.java @@ -23,7 +23,7 @@ import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.node.ReportingService; -import org.elasticsearch.plugins.PluginInfo; +import org.opensearch.plugins.PluginInfo; import java.io.IOException; import java.util.ArrayList; diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/stats/ClusterStatsNodes.java b/server/src/main/java/org/opensearch/action/admin/cluster/stats/ClusterStatsNodes.java index 8e9dcfaf806..9b7a8d6a92a 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/stats/ClusterStatsNodes.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/stats/ClusterStatsNodes.java @@ -39,7 +39,7 @@ import org.opensearch.discovery.DiscoveryModule; import org.elasticsearch.monitor.fs.FsInfo; import org.elasticsearch.monitor.jvm.JvmInfo; import org.elasticsearch.monitor.os.OsInfo; -import org.elasticsearch.plugins.PluginInfo; +import org.opensearch.plugins.PluginInfo; import org.opensearch.transport.TransportInfo; import java.io.IOException; diff --git a/server/src/main/java/org/opensearch/rest/BaseRestHandler.java b/server/src/main/java/org/opensearch/rest/BaseRestHandler.java index 45ed67208d3..a76c77b0171 100644 --- a/server/src/main/java/org/opensearch/rest/BaseRestHandler.java +++ b/server/src/main/java/org/opensearch/rest/BaseRestHandler.java @@ -28,7 +28,7 @@ import org.elasticsearch.common.CheckedConsumer; import org.elasticsearch.common.collect.Tuple; import org.elasticsearch.common.settings.Setting; import org.elasticsearch.common.settings.Setting.Property; -import org.elasticsearch.plugins.ActionPlugin; +import org.opensearch.plugins.ActionPlugin; import org.opensearch.rest.action.admin.cluster.RestNodesUsageAction; import java.io.IOException; diff --git a/server/src/main/java/org/opensearch/script/ScriptModule.java b/server/src/main/java/org/opensearch/script/ScriptModule.java index bfbf27f485f..981b9e01a03 100644 --- a/server/src/main/java/org/opensearch/script/ScriptModule.java +++ b/server/src/main/java/org/opensearch/script/ScriptModule.java @@ -22,7 +22,7 @@ package org.opensearch.script; import org.elasticsearch.common.settings.ClusterSettings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.query.IntervalFilterScript; -import org.elasticsearch.plugins.ScriptPlugin; +import org.opensearch.plugins.ScriptPlugin; import org.opensearch.search.aggregations.pipeline.MovingFunctionScript; import java.util.Collections; diff --git a/server/src/main/java/org/opensearch/search/SearchExtBuilder.java b/server/src/main/java/org/opensearch/search/SearchExtBuilder.java index 54914ec203f..83b0e4c4b1e 100644 --- a/server/src/main/java/org/opensearch/search/SearchExtBuilder.java +++ b/server/src/main/java/org/opensearch/search/SearchExtBuilder.java @@ -25,8 +25,8 @@ import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.io.stream.Writeable; import org.elasticsearch.common.xcontent.ToXContentFragment; -import org.elasticsearch.plugins.SearchPlugin; -import org.elasticsearch.plugins.SearchPlugin.SearchExtSpec; +import org.opensearch.plugins.SearchPlugin; +import org.opensearch.plugins.SearchPlugin.SearchExtSpec; /** * Intermediate serializable representation of a search ext section. To be subclassed by plugins that support diff --git a/server/src/main/java/org/opensearch/search/SearchModule.java b/server/src/main/java/org/opensearch/search/SearchModule.java index 9bb9aa5670f..735252e2e10 100644 --- a/server/src/main/java/org/opensearch/search/SearchModule.java +++ b/server/src/main/java/org/opensearch/search/SearchModule.java @@ -89,21 +89,22 @@ import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilder; import org.elasticsearch.index.query.functionscore.ScriptScoreFunctionBuilder; import org.elasticsearch.index.query.functionscore.ScriptScoreQueryBuilder; import org.elasticsearch.index.query.functionscore.WeightBuilder; -import org.elasticsearch.plugins.SearchPlugin; -import org.elasticsearch.plugins.SearchPlugin.AggregationSpec; -import org.elasticsearch.plugins.SearchPlugin.FetchPhaseConstructionContext; -import org.elasticsearch.plugins.SearchPlugin.PipelineAggregationSpec; -import org.elasticsearch.plugins.SearchPlugin.QuerySpec; -import org.elasticsearch.plugins.SearchPlugin.RescorerSpec; -import org.elasticsearch.plugins.SearchPlugin.ScoreFunctionSpec; -import org.elasticsearch.plugins.SearchPlugin.SearchExtSpec; -import org.elasticsearch.plugins.SearchPlugin.SearchExtensionSpec; -import org.elasticsearch.plugins.SearchPlugin.SignificanceHeuristicSpec; -import org.elasticsearch.plugins.SearchPlugin.SuggesterSpec; -import org.opensearch.search.aggregations.AggregationBuilder; -import org.opensearch.search.aggregations.BaseAggregationBuilder; -import org.opensearch.search.aggregations.InternalAggregation; -import org.opensearch.search.aggregations.PipelineAggregationBuilder; +<<<<<<< HEAD +import org.opensearch.plugins.SearchPlugin; +import org.opensearch.plugins.SearchPlugin.AggregationSpec; +import org.opensearch.plugins.SearchPlugin.FetchPhaseConstructionContext; +import org.opensearch.plugins.SearchPlugin.PipelineAggregationSpec; +import org.opensearch.plugins.SearchPlugin.QuerySpec; +import org.opensearch.plugins.SearchPlugin.RescorerSpec; +import org.opensearch.plugins.SearchPlugin.ScoreFunctionSpec; +import org.opensearch.plugins.SearchPlugin.SearchExtSpec; +import org.opensearch.plugins.SearchPlugin.SearchExtensionSpec; +import org.opensearch.plugins.SearchPlugin.SignificanceHeuristicSpec; +import org.opensearch.plugins.SearchPlugin.SuggesterSpec; +import org.elasticsearch.search.aggregations.AggregationBuilder; +import org.elasticsearch.search.aggregations.BaseAggregationBuilder; +import org.elasticsearch.search.aggregations.InternalAggregation; +import org.elasticsearch.search.aggregations.PipelineAggregationBuilder; import org.opensearch.search.aggregations.bucket.adjacency.AdjacencyMatrixAggregationBuilder; import org.opensearch.search.aggregations.bucket.adjacency.InternalAdjacencyMatrix; import org.opensearch.search.aggregations.bucket.composite.CompositeAggregationBuilder; diff --git a/server/src/main/java/org/opensearch/search/fetch/subphase/highlight/package-info.java b/server/src/main/java/org/opensearch/search/fetch/subphase/highlight/package-info.java index 390b6c8f6e8..7eb77ccfb4d 100644 --- a/server/src/main/java/org/opensearch/search/fetch/subphase/highlight/package-info.java +++ b/server/src/main/java/org/opensearch/search/fetch/subphase/highlight/package-info.java @@ -20,6 +20,6 @@ /** * Fetch sub phase that extracts significant portions of string fields, marking the matches. Pluggable by implementing * {@link org.opensearch.search.fetch.subphase.highlight.Highlighter} and - * {@link org.elasticsearch.plugins.SearchPlugin#getHighlighters()}. + * {@link org.opensearch.plugins.SearchPlugin#getHighlighters()}. */ package org.opensearch.search.fetch.subphase.highlight; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/DocumentParserTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DocumentParserTests.java index bb77d638959..8330b63172d 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/DocumentParserTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/DocumentParserTests.java @@ -31,7 +31,7 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.mapper.ParseContext.Document; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import java.io.IOException; import java.math.BigDecimal; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/IdFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/IdFieldMapperTests.java index 2909b897f16..78b1789cb37 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/IdFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/IdFieldMapperTests.java @@ -31,7 +31,7 @@ import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.index.IndexService; import org.elasticsearch.index.mapper.MapperService.MergeReason; import org.elasticsearch.indices.IndicesService; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import org.elasticsearch.test.ESSingleNodeTestCase; import org.elasticsearch.test.InternalSettingsPlugin; diff --git a/server/src/test/java/org/elasticsearch/indices/IndicesModuleTests.java b/server/src/test/java/org/elasticsearch/indices/IndicesModuleTests.java index 5ed93240d74..dadb6990163 100644 --- a/server/src/test/java/org/elasticsearch/indices/IndicesModuleTests.java +++ b/server/src/test/java/org/elasticsearch/indices/IndicesModuleTests.java @@ -35,7 +35,7 @@ import org.elasticsearch.index.mapper.TextFieldMapper; import org.elasticsearch.index.mapper.TypeFieldMapper; import org.elasticsearch.index.mapper.VersionFieldMapper; import org.elasticsearch.indices.mapper.MapperRegistry; -import org.elasticsearch.plugins.MapperPlugin; +import org.opensearch.plugins.MapperPlugin; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.VersionUtils; diff --git a/server/src/test/java/org/opensearch/repositories/RepositoriesModuleTests.java b/server/src/test/java/org/opensearch/repositories/RepositoriesModuleTests.java index 8092c79c29e..69e1f891f78 100644 --- a/server/src/test/java/org/opensearch/repositories/RepositoriesModuleTests.java +++ b/server/src/test/java/org/opensearch/repositories/RepositoriesModuleTests.java @@ -24,7 +24,7 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.env.Environment; import org.elasticsearch.indices.recovery.RecoverySettings; -import org.elasticsearch.plugins.RepositoryPlugin; +import org.opensearch.plugins.RepositoryPlugin; import org.elasticsearch.test.ESTestCase; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.TransportService; diff --git a/server/src/test/java/org/opensearch/search/AbstractSearchTestCase.java b/server/src/test/java/org/opensearch/search/AbstractSearchTestCase.java index 6048611341e..878d3cf830a 100644 --- a/server/src/test/java/org/opensearch/search/AbstractSearchTestCase.java +++ b/server/src/test/java/org/opensearch/search/AbstractSearchTestCase.java @@ -31,8 +31,8 @@ import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.indices.IndicesModule; -import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.plugins.SearchPlugin; +import org.opensearch.plugins.Plugin; +import org.opensearch.plugins.SearchPlugin; import org.opensearch.search.builder.SearchSourceBuilder; import org.opensearch.search.collapse.CollapseBuilderTests; import org.opensearch.search.fetch.subphase.highlight.HighlightBuilderTests; diff --git a/server/src/test/java/org/opensearch/search/SearchModuleTests.java b/server/src/test/java/org/opensearch/search/SearchModuleTests.java index 7d18f9633dc..5c8c1e568cb 100644 --- a/server/src/test/java/org/opensearch/search/SearchModuleTests.java +++ b/server/src/test/java/org/opensearch/search/SearchModuleTests.java @@ -32,13 +32,13 @@ import org.elasticsearch.index.query.QueryRewriteContext; import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.functionscore.GaussDecayFunctionBuilder; -import org.elasticsearch.plugins.SearchPlugin; -import org.opensearch.search.aggregations.AggregationBuilder; -import org.opensearch.search.aggregations.AggregatorFactories.Builder; -import org.opensearch.search.aggregations.AggregatorFactory; -import org.opensearch.search.aggregations.BaseAggregationBuilder; -import org.opensearch.search.aggregations.InternalAggregation; -import org.opensearch.search.aggregations.InternalAggregation.ReduceContext; +import org.opensearch.plugins.SearchPlugin; +import org.elasticsearch.search.aggregations.AggregationBuilder; +import org.elasticsearch.search.aggregations.AggregatorFactories.Builder; +import org.elasticsearch.search.aggregations.AggregatorFactory; +import org.elasticsearch.search.aggregations.BaseAggregationBuilder; +import org.elasticsearch.search.aggregations.InternalAggregation; +import org.elasticsearch.search.aggregations.InternalAggregation.ReduceContext; import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder; import org.opensearch.search.aggregations.bucket.terms.heuristic.ChiSquare; import org.opensearch.search.aggregations.pipeline.AbstractPipelineAggregationBuilder; diff --git a/server/src/test/java/org/opensearch/search/fetch/subphase/highlight/CustomHighlighterPlugin.java b/server/src/test/java/org/opensearch/search/fetch/subphase/highlight/CustomHighlighterPlugin.java index e4ce8580554..560f3334386 100644 --- a/server/src/test/java/org/opensearch/search/fetch/subphase/highlight/CustomHighlighterPlugin.java +++ b/server/src/test/java/org/opensearch/search/fetch/subphase/highlight/CustomHighlighterPlugin.java @@ -19,8 +19,8 @@ package org.opensearch.search.fetch.subphase.highlight; -import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.plugins.SearchPlugin; +import org.opensearch.plugins.Plugin; +import org.opensearch.plugins.SearchPlugin; import org.opensearch.search.fetch.subphase.highlight.Highlighter; import java.util.Map; diff --git a/server/src/test/resources/META-INF/services/org.elasticsearch.plugins.PluginsServiceTests$TestExtensionPoint b/server/src/test/resources/META-INF/services/org.elasticsearch.plugins.PluginsServiceTests$TestExtensionPoint index e00a55ba1bb..1a00fe1f09e 100644 --- a/server/src/test/resources/META-INF/services/org.elasticsearch.plugins.PluginsServiceTests$TestExtensionPoint +++ b/server/src/test/resources/META-INF/services/org.elasticsearch.plugins.PluginsServiceTests$TestExtensionPoint @@ -17,5 +17,5 @@ # under the License. # -org.elasticsearch.plugins.PluginsServiceTests$TestExtension1 -org.elasticsearch.plugins.PluginsServiceTests$TestExtension2 +org.opensearch.plugins.PluginsServiceTests$TestExtension1 +org.opensearch.plugins.PluginsServiceTests$TestExtension2 diff --git a/server/src/test/resources/META-INF/services/org.elasticsearch.plugins.spi.NamedXContentProvider b/server/src/test/resources/META-INF/services/org.elasticsearch.plugins.spi.NamedXContentProvider index 8ec7461c667..6687defb2d7 100644 --- a/server/src/test/resources/META-INF/services/org.elasticsearch.plugins.spi.NamedXContentProvider +++ b/server/src/test/resources/META-INF/services/org.elasticsearch.plugins.spi.NamedXContentProvider @@ -1 +1 @@ -org.elasticsearch.plugins.spi.NamedXContentProviderTests$TestNamedXContentProvider \ No newline at end of file +org.opensearch.plugins.spi.NamedXContentProviderTests$TestNamedXContentProvider diff --git a/test/framework/src/main/java/org/opensearch/script/MockScriptPlugin.java b/test/framework/src/main/java/org/opensearch/script/MockScriptPlugin.java index 7ffc30bdbf8..8b6b00de52f 100644 --- a/test/framework/src/main/java/org/opensearch/script/MockScriptPlugin.java +++ b/test/framework/src/main/java/org/opensearch/script/MockScriptPlugin.java @@ -20,8 +20,8 @@ package org.opensearch.script; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.plugins.ScriptPlugin; +import org.opensearch.plugins.Plugin; +import org.opensearch.plugins.ScriptPlugin; import java.util.Collection; import java.util.Collections; diff --git a/test/framework/src/main/java/org/opensearch/script/MockScriptService.java b/test/framework/src/main/java/org/opensearch/script/MockScriptService.java index 58410db755f..48999fecb84 100644 --- a/test/framework/src/main/java/org/opensearch/script/MockScriptService.java +++ b/test/framework/src/main/java/org/opensearch/script/MockScriptService.java @@ -21,7 +21,7 @@ package org.opensearch.script; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.node.MockNode; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import java.util.Map; import java.util.Set; diff --git a/test/framework/src/main/java/org/opensearch/snapshots/mockstore/MockRepository.java b/test/framework/src/main/java/org/opensearch/snapshots/mockstore/MockRepository.java index 09e23bf1e3b..9f5cf037e95 100644 --- a/test/framework/src/main/java/org/opensearch/snapshots/mockstore/MockRepository.java +++ b/test/framework/src/main/java/org/opensearch/snapshots/mockstore/MockRepository.java @@ -40,7 +40,7 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.opensearch.env.Environment; import org.elasticsearch.indices.recovery.RecoverySettings; -import org.elasticsearch.plugins.RepositoryPlugin; +import org.opensearch.plugins.RepositoryPlugin; import org.opensearch.repositories.Repository; import org.opensearch.repositories.blobstore.BlobStoreRepository; import org.opensearch.repositories.fs.FsRepository; @@ -65,7 +65,7 @@ import java.util.stream.Collectors; public class MockRepository extends FsRepository { private static final Logger logger = LogManager.getLogger(MockRepository.class); - public static class Plugin extends org.elasticsearch.plugins.Plugin implements RepositoryPlugin { + public static class Plugin extends org.opensearch.plugins.Plugin implements RepositoryPlugin { public static final Setting USERNAME_SETTING = Setting.simpleString("secret.mock.username", Property.NodeScope); public static final Setting PASSWORD_SETTING = diff --git a/test/framework/src/main/java/org/opensearch/transport/MockTransportClient.java b/test/framework/src/main/java/org/opensearch/transport/MockTransportClient.java index bb96d9118f6..b85e63ecb97 100644 --- a/test/framework/src/main/java/org/opensearch/transport/MockTransportClient.java +++ b/test/framework/src/main/java/org/opensearch/transport/MockTransportClient.java @@ -22,7 +22,7 @@ import org.opensearch.client.transport.TransportClient; import org.opensearch.common.io.stream.NamedWriteableRegistry; import org.opensearch.common.network.NetworkModule; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import org.opensearch.transport.nio.MockNioTransportPlugin; import java.util.ArrayList; diff --git a/test/framework/src/main/java/org/opensearch/transport/nio/MockNioTransportPlugin.java b/test/framework/src/main/java/org/opensearch/transport/nio/MockNioTransportPlugin.java index 5727c54a410..36ba3d430a4 100644 --- a/test/framework/src/main/java/org/opensearch/transport/nio/MockNioTransportPlugin.java +++ b/test/framework/src/main/java/org/opensearch/transport/nio/MockNioTransportPlugin.java @@ -24,8 +24,8 @@ import org.opensearch.common.network.NetworkService; import org.elasticsearch.common.settings.Settings; import org.opensearch.common.util.PageCacheRecycler; import org.elasticsearch.indices.breaker.CircuitBreakerService; -import org.elasticsearch.plugins.NetworkPlugin; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.NetworkPlugin; +import org.opensearch.plugins.Plugin; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.Transport;