From fcdea3ab47b9f4ace8dff21f49cb2dcc4b98e9ad Mon Sep 17 00:00:00 2001 From: Bin Wei Date: Tue, 2 Aug 2022 20:38:44 +0800 Subject: [PATCH] Rename Class ending with Plugin to Module under modules dir (#4042) * Rename Class ending with Plugin to Module under modules dir (#4034) Signed-off-by: rockybean * Rename from Module to ModulePlugin Signed-off-by: rockybean --- modules/aggs-matrix-stats/build.gradle | 2 +- ...ava => MatrixAggregationModulePlugin.java} | 2 +- .../stats/InternalMatrixStatsTests.java | 4 +-- .../stats/MatrixStatsAggregatorTests.java | 4 +-- modules/analysis-common/build.gradle | 2 +- .../common/QueryStringWithAnalyzersIT.java | 2 +- ...n.java => CommonAnalysisModulePlugin.java} | 4 +-- .../ASCIIFoldingTokenFilterFactoryTests.java | 4 +-- ...rdDelimiterTokenFilterFactoryTestCase.java | 14 +++++----- .../common/CJKFilterFactoryTests.java | 2 +- .../common/CommonAnalysisFactoryTests.java | 2 +- .../CommonGramsTokenFilterFactoryTests.java | 4 +-- .../common/CompoundAnalysisTests.java | 4 +-- ...ncatenateGraphTokenFilterFactoryTests.java | 16 ++++++------ .../common/DisableGraphQueryTests.java | 2 +- .../EdgeNGramTokenFilterFactoryTests.java | 4 +-- .../common/EdgeNGramTokenizerTests.java | 2 +- .../common/ElisionFilterFactoryTests.java | 2 +- .../common/HighlighterWithAnalyzersTests.java | 2 +- .../common/KeepFilterFactoryTests.java | 12 ++++----- .../common/KeepTypesFilterFactoryTests.java | 12 ++++++--- .../KeywordMarkerFilterFactoryTests.java | 6 ++--- .../LimitTokenCountFilterFactoryTests.java | 2 +- .../analysis/common/MassiveWordListTests.java | 2 +- .../common/MinHashFilterFactoryTests.java | 10 +++++-- .../common/MultiplexerTokenFilterTests.java | 4 +-- .../common/NGramTokenFilterFactoryTests.java | 4 +-- .../PatternCaptureTokenFilterTests.java | 2 +- .../PredicateTokenScriptFilterTests.java | 2 +- .../RemoveDuplicatesFilterFactoryTests.java | 5 +++- .../ScriptedConditionTokenFilterTests.java | 2 +- .../common/ShingleTokenFilterTests.java | 2 +- ...temmerOverrideTokenFilterFactoryTests.java | 2 +- .../StemmerTokenFilterFactoryTests.java | 2 +- .../common/SynonymsAnalysisTests.java | 22 ++++++++-------- .../analysis/common/TrimTokenFilterTests.java | 5 +++- ...DelimiterGraphTokenFilterFactoryTests.java | 15 ++++++----- .../WordDelimiterTokenFilterFactoryTests.java | 2 +- modules/geo/build.gradle | 2 +- .../{GeoPlugin.java => GeoModulePlugin.java} | 2 +- modules/ingest-common/build.gradle | 2 +- .../ingest/common/IngestRestartIT.java | 2 +- ...gin.java => IngestCommonModulePlugin.java} | 4 +-- modules/ingest-geoip/build.gradle | 2 +- .../geoip/GeoIpProcessorNonIngestNodeIT.java | 2 +- .../ingest/geoip/GeoIpProcessor.java | 2 +- ...ugin.java => IngestGeoIpModulePlugin.java} | 2 +- .../geoip/GeoIpProcessorFactoryTests.java | 18 ++++++------- .../ingest/geoip/GeoIpProcessorTests.java | 2 +- ...java => IngestGeoIpModulePluginTests.java} | 4 +-- modules/ingest-user-agent/build.gradle | 2 +- ....java => IngestUserAgentModulePlugin.java} | 4 +-- .../ingest/useragent/UserAgentProcessor.java | 8 +++++- .../UserAgentProcessorFactoryTests.java | 2 +- modules/lang-expression/build.gradle | 2 +- .../script/expression/MoreExpressionIT.java | 2 +- .../script/expression/StoredExpressionIT.java | 2 +- ...lugin.java => ExpressionModulePlugin.java} | 2 +- modules/lang-mustache/build.gradle | 2 +- .../mustache/MultiSearchTemplateIT.java | 2 +- .../script/mustache/SearchTemplateIT.java | 2 +- ...ePlugin.java => MustacheModulePlugin.java} | 2 +- modules/lang-painless/build.gradle | 2 +- ...sPlugin.java => PainlessModulePlugin.java} | 2 +- .../action/PainlessExecuteApiTests.java | 4 +-- modules/mapper-extras/build.gradle | 2 +- ...gin.java => MapperExtrasModulePlugin.java} | 2 +- .../index/mapper/BWCTemplateTests.java | 2 +- .../mapper/RankFeatureFieldMapperTests.java | 2 +- .../RankFeatureMetaFieldMapperTests.java | 2 +- .../mapper/RankFeaturesFieldMapperTests.java | 2 +- .../mapper/ScaledFloatFieldMapperTests.java | 2 +- .../SearchAsYouTypeFieldMapperTests.java | 2 +- .../mapper/TokenCountFieldMapperTests.java | 2 +- .../query/RankFeatureQueryBuilderTests.java | 4 +-- modules/opensearch-dashboards/build.gradle | 2 +- ... => OpenSearchDashboardsModulePlugin.java} | 2 +- ...penSearchDashboardsModulePluginTests.java} | 14 +++++----- modules/parent-join/build.gradle | 2 +- .../join/query/ParentChildTestCase.java | 4 +-- ...lugin.java => ParentJoinModulePlugin.java} | 4 +-- .../join/aggregations/ChildrenTests.java | 4 +-- .../ChildrenToParentAggregatorTests.java | 4 +-- .../aggregations/InternalChildrenTests.java | 4 +-- .../aggregations/InternalParentTests.java | 4 +-- .../join/aggregations/ParentTests.java | 4 +-- .../ParentToChildrenAggregatorTests.java | 4 +-- .../mapper/ParentJoinFieldMapperTests.java | 4 +-- .../join/query/HasChildQueryBuilderTests.java | 4 +-- .../query/HasParentQueryBuilderTests.java | 4 +-- .../join/query/ParentIdQueryBuilderTests.java | 4 +-- modules/percolator/build.gradle | 2 +- .../percolator/PercolatorQuerySearchIT.java | 4 +-- ...lugin.java => PercolatorModulePlugin.java} | 2 +- .../percolator/CandidateQueryTests.java | 2 +- .../PercolateQueryBuilderTests.java | 2 +- .../PercolatorFieldMapperTests.java | 9 +++++-- .../PercolatorQuerySearchTests.java | 2 +- modules/rank-eval/build.gradle | 2 +- .../index/rankeval/RankEvalRequestIT.java | 2 +- ...lPlugin.java => RankEvalModulePlugin.java} | 2 +- .../index/rankeval/EvalQueryQualityTests.java | 6 +++-- .../index/rankeval/RankEvalRequestTests.java | 8 +++--- .../index/rankeval/RankEvalSpecTests.java | 2 +- modules/reindex/build.gradle | 2 +- .../documentation/ReindexDocumentationIT.java | 4 +-- ...exPlugin.java => ReindexModulePlugin.java} | 6 ++--- .../reindex/spi/RemoteReindexExtension.java | 3 ++- .../ReindexFromRemoteWithAuthTests.java | 6 ++--- .../reindex/ReindexRenamedSettingTests.java | 2 +- .../index/reindex/ReindexSingleNodeTests.java | 2 +- .../index/reindex/ReindexTestCase.java | 2 +- .../opensearch/index/reindex/RetryTests.java | 4 +-- modules/repository-url/build.gradle | 2 +- .../url/URLSnapshotRestoreIT.java | 4 +-- ...in.java => URLRepositoryModulePlugin.java} | 2 +- modules/systemd/build.gradle | 2 +- ...mdPlugin.java => SystemdModulePlugin.java} | 8 +++--- ...sts.java => SystemdModulePluginTests.java} | 26 +++++++++++-------- modules/transport-netty4/build.gradle | 2 +- .../OpenSearchNetty4IntegTestCase.java | 8 +++--- .../Netty4TransportPublishAddressIT.java | 4 +-- ...ty4Plugin.java => Netty4ModulePlugin.java} | 2 +- .../opensearch/http/HttpSmokeTestCase.java | 18 ++++++------- 124 files changed, 278 insertions(+), 241 deletions(-) rename modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/{MatrixAggregationPlugin.java => MatrixAggregationModulePlugin.java} (95%) rename modules/analysis-common/src/main/java/org/opensearch/analysis/common/{CommonAnalysisPlugin.java => CommonAnalysisModulePlugin.java} (99%) rename modules/geo/src/main/java/org/opensearch/geo/{GeoPlugin.java => GeoModulePlugin.java} (95%) rename modules/ingest-common/src/main/java/org/opensearch/ingest/common/{IngestCommonPlugin.java => IngestCommonModulePlugin.java} (98%) rename modules/ingest-geoip/src/main/java/org/opensearch/ingest/geoip/{IngestGeoIpPlugin.java => IngestGeoIpModulePlugin.java} (99%) rename modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/{IngestGeoIpPluginTests.java => IngestGeoIpModulePluginTests.java} (95%) rename modules/ingest-user-agent/src/main/java/org/opensearch/ingest/useragent/{IngestUserAgentPlugin.java => IngestUserAgentModulePlugin.java} (96%) rename modules/lang-expression/src/main/java/org/opensearch/script/expression/{ExpressionPlugin.java => ExpressionModulePlugin.java} (95%) rename modules/lang-mustache/src/main/java/org/opensearch/script/mustache/{MustachePlugin.java => MustacheModulePlugin.java} (96%) rename modules/lang-painless/src/main/java/org/opensearch/painless/{PainlessPlugin.java => PainlessModulePlugin.java} (98%) rename modules/mapper-extras/src/main/java/org/opensearch/index/mapper/{MapperExtrasPlugin.java => MapperExtrasModulePlugin.java} (96%) rename modules/opensearch-dashboards/src/main/java/org/opensearch/dashboards/{OpenSearchDashboardsPlugin.java => OpenSearchDashboardsModulePlugin.java} (98%) rename modules/opensearch-dashboards/src/test/java/org/opensearch/dashboards/{OpenSearchDashboardsPluginTests.java => OpenSearchDashboardsModulePluginTests.java} (79%) rename modules/parent-join/src/main/java/org/opensearch/join/{ParentJoinPlugin.java => ParentJoinModulePlugin.java} (95%) rename modules/percolator/src/main/java/org/opensearch/percolator/{PercolatorPlugin.java => PercolatorModulePlugin.java} (96%) rename modules/rank-eval/src/main/java/org/opensearch/index/rankeval/{RankEvalPlugin.java => RankEvalModulePlugin.java} (98%) rename modules/reindex/src/main/java/org/opensearch/index/reindex/{ReindexPlugin.java => ReindexModulePlugin.java} (96%) rename modules/repository-url/src/main/java/org/opensearch/plugin/repository/url/{URLRepositoryPlugin.java => URLRepositoryModulePlugin.java} (96%) rename modules/systemd/src/main/java/org/opensearch/systemd/{SystemdPlugin.java => SystemdModulePlugin.java} (96%) rename modules/systemd/src/test/java/org/opensearch/systemd/{SystemdPluginTests.java => SystemdModulePluginTests.java} (87%) rename modules/transport-netty4/src/main/java/org/opensearch/transport/{Netty4Plugin.java => Netty4ModulePlugin.java} (98%) diff --git a/modules/aggs-matrix-stats/build.gradle b/modules/aggs-matrix-stats/build.gradle index dd3aee61f7664..705fa17456a79 100644 --- a/modules/aggs-matrix-stats/build.gradle +++ b/modules/aggs-matrix-stats/build.gradle @@ -31,7 +31,7 @@ apply plugin: 'opensearch.yaml-rest-test' opensearchplugin { description 'Adds aggregations whose input are a list of numeric fields and output includes a matrix.' - classname 'org.opensearch.search.aggregations.matrix.MatrixAggregationPlugin' + classname 'org.opensearch.search.aggregations.matrix.MatrixAggregationModulePlugin' hasClientJar = true } 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/MatrixAggregationModulePlugin.java similarity index 95% rename from modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/MatrixAggregationPlugin.java rename to modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/MatrixAggregationModulePlugin.java index debeacffe321e..df1926282d500 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/MatrixAggregationModulePlugin.java @@ -42,7 +42,7 @@ import static java.util.Collections.singletonList; -public class MatrixAggregationPlugin extends Plugin implements SearchPlugin { +public class MatrixAggregationModulePlugin extends Plugin implements SearchPlugin { @Override public List getAggregations() { return singletonList( 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 e523c77e0786f..cc16b9b23b5d5 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 @@ -43,7 +43,7 @@ import org.opensearch.search.aggregations.Aggregation; import org.opensearch.search.aggregations.InternalAggregation; import org.opensearch.search.aggregations.ParsedAggregation; -import org.opensearch.search.aggregations.matrix.MatrixAggregationPlugin; +import org.opensearch.search.aggregations.matrix.MatrixAggregationModulePlugin; import org.opensearch.search.aggregations.matrix.stats.InternalMatrixStats.Fields; import org.opensearch.search.aggregations.pipeline.PipelineAggregator.PipelineTree; import org.opensearch.test.InternalAggregationTestCase; @@ -64,7 +64,7 @@ public class InternalMatrixStatsTests extends InternalAggregationTestCase getSearchPlugins() { - return Collections.singletonList(new MatrixAggregationPlugin()); + return Collections.singletonList(new MatrixAggregationModulePlugin()); } } diff --git a/modules/analysis-common/build.gradle b/modules/analysis-common/build.gradle index be0acf7218c1e..58ecf79cda0d7 100644 --- a/modules/analysis-common/build.gradle +++ b/modules/analysis-common/build.gradle @@ -32,7 +32,7 @@ apply plugin: 'opensearch.internal-cluster-test' opensearchplugin { description 'Adds "built in" analyzers to OpenSearch.' - classname 'org.opensearch.analysis.common.CommonAnalysisPlugin' + classname 'org.opensearch.analysis.common.CommonAnalysisModulePlugin' extendedPlugins = ['lang-painless'] } 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 8c2f83bf83d85..785e597857825 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 @@ -48,7 +48,7 @@ public class QueryStringWithAnalyzersIT extends OpenSearchIntegTestCase { @Override protected Collection> nodePlugins() { - return Arrays.asList(CommonAnalysisPlugin.class); + return Arrays.asList(CommonAnalysisModulePlugin.class); } /** diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CommonAnalysisPlugin.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CommonAnalysisModulePlugin.java similarity index 99% rename from modules/analysis-common/src/main/java/org/opensearch/analysis/common/CommonAnalysisPlugin.java rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/CommonAnalysisModulePlugin.java index c69917ed52be8..57865e15d523a 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CommonAnalysisPlugin.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CommonAnalysisModulePlugin.java @@ -167,9 +167,9 @@ import static org.opensearch.plugins.AnalysisPlugin.requiresAnalysisSettings; -public class CommonAnalysisPlugin extends Plugin implements AnalysisPlugin, ScriptPlugin { +public class CommonAnalysisModulePlugin extends Plugin implements AnalysisPlugin, ScriptPlugin { - private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(CommonAnalysisPlugin.class); + private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(CommonAnalysisModulePlugin.class); private final SetOnce scriptService = new SetOnce<>(); diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ASCIIFoldingTokenFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ASCIIFoldingTokenFilterFactoryTests.java index 1a4651dc23fff..d107977237b9e 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ASCIIFoldingTokenFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ASCIIFoldingTokenFilterFactoryTests.java @@ -51,7 +51,7 @@ public void testDefault() throws IOException { .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .put("index.analysis.filter.my_ascii_folding.type", "asciifolding") .build(), - new CommonAnalysisPlugin() + new CommonAnalysisModulePlugin() ); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("my_ascii_folding"); String source = "Ansprüche"; @@ -68,7 +68,7 @@ public void testPreserveOriginal() throws IOException { .put("index.analysis.filter.my_ascii_folding.type", "asciifolding") .put("index.analysis.filter.my_ascii_folding.preserve_original", true) .build(), - new CommonAnalysisPlugin() + new CommonAnalysisModulePlugin() ); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("my_ascii_folding"); String source = "Ansprüche"; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/BaseWordDelimiterTokenFilterFactoryTestCase.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/BaseWordDelimiterTokenFilterFactoryTestCase.java index 9d54776755766..829ace512b5c8 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/BaseWordDelimiterTokenFilterFactoryTestCase.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/BaseWordDelimiterTokenFilterFactoryTestCase.java @@ -60,7 +60,7 @@ public void testDefault() throws IOException { .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .put("index.analysis.filter.my_word_delimiter.type", type) .build(), - new CommonAnalysisPlugin() + new CommonAnalysisModulePlugin() ); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("my_word_delimiter"); String source = "PowerShot 500-42 wi-fi wi-fi-4000 j2se O'Neil's"; @@ -78,7 +78,7 @@ public void testCatenateWords() throws IOException { .put("index.analysis.filter.my_word_delimiter.catenate_words", "true") .put("index.analysis.filter.my_word_delimiter.generate_word_parts", "false") .build(), - new CommonAnalysisPlugin() + new CommonAnalysisModulePlugin() ); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("my_word_delimiter"); String source = "PowerShot 500-42 wi-fi wi-fi-4000 j2se O'Neil's"; @@ -96,7 +96,7 @@ public void testCatenateNumbers() throws IOException { .put("index.analysis.filter.my_word_delimiter.generate_number_parts", "false") .put("index.analysis.filter.my_word_delimiter.catenate_numbers", "true") .build(), - new CommonAnalysisPlugin() + new CommonAnalysisModulePlugin() ); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("my_word_delimiter"); String source = "PowerShot 500-42 wi-fi wi-fi-4000 j2se O'Neil's"; @@ -115,7 +115,7 @@ public void testCatenateAll() throws IOException { .put("index.analysis.filter.my_word_delimiter.generate_number_parts", "false") .put("index.analysis.filter.my_word_delimiter.catenate_all", "true") .build(), - new CommonAnalysisPlugin() + new CommonAnalysisModulePlugin() ); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("my_word_delimiter"); String source = "PowerShot 500-42 wi-fi wi-fi-4000 j2se O'Neil's"; @@ -132,7 +132,7 @@ public void testSplitOnCaseChange() throws IOException { .put("index.analysis.filter.my_word_delimiter.type", type) .put("index.analysis.filter.my_word_delimiter.split_on_case_change", "false") .build(), - new CommonAnalysisPlugin() + new CommonAnalysisModulePlugin() ); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("my_word_delimiter"); String source = "PowerShot"; @@ -149,7 +149,7 @@ public void testPreserveOriginal() throws IOException { .put("index.analysis.filter.my_word_delimiter.type", type) .put("index.analysis.filter.my_word_delimiter.preserve_original", "true") .build(), - new CommonAnalysisPlugin() + new CommonAnalysisModulePlugin() ); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("my_word_delimiter"); String source = "PowerShot 500-42 wi-fi wi-fi-4000 j2se O'Neil's"; @@ -186,7 +186,7 @@ public void testStemEnglishPossessive() throws IOException { .put("index.analysis.filter.my_word_delimiter.type", type) .put("index.analysis.filter.my_word_delimiter.stem_english_possessive", "false") .build(), - new CommonAnalysisPlugin() + new CommonAnalysisModulePlugin() ); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("my_word_delimiter"); String source = "PowerShot 500-42 wi-fi wi-fi-4000 j2se O'Neil's"; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CJKFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CJKFilterFactoryTests.java index f2c0d9859cbe4..2f33194125652 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CJKFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CJKFilterFactoryTests.java @@ -52,7 +52,7 @@ public class CJKFilterFactoryTests extends OpenSearchTokenStreamTestCase { @Before public void setup() throws IOException { - analysis = AnalysisTestsHelper.createTestAnalysisFromClassPath(createTempDir(), RESOURCE, new CommonAnalysisPlugin()); + analysis = AnalysisTestsHelper.createTestAnalysisFromClassPath(createTempDir(), RESOURCE, new CommonAnalysisModulePlugin()); } public void testDefault() throws IOException { diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CommonAnalysisFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CommonAnalysisFactoryTests.java index 4cf0d1de28717..1c4db089565ff 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CommonAnalysisFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CommonAnalysisFactoryTests.java @@ -50,7 +50,7 @@ public class CommonAnalysisFactoryTests extends AnalysisFactoryTestCase { public CommonAnalysisFactoryTests() { - super(new CommonAnalysisPlugin()); + super(new CommonAnalysisModulePlugin()); } @Override diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CommonGramsTokenFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CommonGramsTokenFilterFactoryTests.java index 04570be7a6f9e..713d61f294630 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CommonGramsTokenFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CommonGramsTokenFilterFactoryTests.java @@ -58,7 +58,7 @@ public void testDefault() throws IOException { .build(); try { - AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisPlugin()); + AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisModulePlugin()); Assert.fail("[common_words] or [common_words_path] is set"); } catch (IllegalArgumentException e) {} catch (IOException e) { fail("expected IAE"); @@ -333,7 +333,7 @@ private Path createHome() throws IOException { } private static OpenSearchTestCase.TestAnalysis createTestAnalysisFromSettings(Settings settings) throws IOException { - return AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisPlugin()); + return AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisModulePlugin()); } } 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 e5ce7c818f72b..32556db3939b8 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 @@ -102,8 +102,8 @@ private List analyze(Settings settings, String analyzerName, String text } private AnalysisModule createAnalysisModule(Settings settings) throws IOException { - CommonAnalysisPlugin commonAnalysisPlugin = new CommonAnalysisPlugin(); - return new AnalysisModule(TestEnvironment.newEnvironment(settings), Arrays.asList(commonAnalysisPlugin, new AnalysisPlugin() { + CommonAnalysisModulePlugin commonAnalysisModulePlugin = new CommonAnalysisModulePlugin(); + return new AnalysisModule(TestEnvironment.newEnvironment(settings), Arrays.asList(commonAnalysisModulePlugin, new AnalysisPlugin() { @Override public Map> getTokenFilters() { return singletonMap("myfilter", MyFilterTokenFilterFactory::new); diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ConcatenateGraphTokenFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ConcatenateGraphTokenFilterFactoryTests.java index eaf571e7469d6..1a78690dffcf7 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ConcatenateGraphTokenFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ConcatenateGraphTokenFilterFactoryTests.java @@ -29,7 +29,7 @@ public class ConcatenateGraphTokenFilterFactoryTests extends OpenSearchTokenStre public void testSimpleTokenizerAndConcatenate() throws IOException { OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings( Settings.builder().put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()).build(), - new CommonAnalysisPlugin() + new CommonAnalysisModulePlugin() ); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("concatenate_graph"); @@ -47,7 +47,7 @@ public void testTokenizerCustomizedSeparator() throws IOException { .put("index.analysis.filter.my_concatenate_graph.type", "concatenate_graph") .put("index.analysis.filter.my_concatenate_graph.token_separator", "+") .build(), - new CommonAnalysisPlugin() + new CommonAnalysisModulePlugin() ); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("my_concatenate_graph"); @@ -65,7 +65,7 @@ public void testTokenizerEmptySeparator() throws IOException { .put("index.analysis.filter.my_concatenate_graph.type", "concatenate_graph") .put("index.analysis.filter.my_concatenate_graph.token_separator", "") .build(), - new CommonAnalysisPlugin() + new CommonAnalysisModulePlugin() ); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("my_concatenate_graph"); @@ -83,7 +83,7 @@ public void testPreservePositionIncrementsDefault() throws IOException { .put("index.analysis.filter.my_concatenate_graph.type", "concatenate_graph") .put("index.analysis.filter.my_concatenate_graph.token_separator", "+") .build(), - new CommonAnalysisPlugin() + new CommonAnalysisModulePlugin() ); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("my_concatenate_graph"); @@ -106,7 +106,7 @@ public void testPreservePositionIncrementsTrue() throws IOException { .put("index.analysis.filter.my_concatenate_graph.token_separator", "+") .put("index.analysis.filter.my_concatenate_graph.preserve_position_increments", "true") .build(), - new CommonAnalysisPlugin() + new CommonAnalysisModulePlugin() ); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("my_concatenate_graph"); @@ -132,7 +132,7 @@ public void testGraph() throws IOException { .put("index.analysis.analyzer.my_analyzer.tokenizer", "whitespace") .put("index.analysis.analyzer.my_analyzer.filter", "my_word_delimiter, my_concatenate_graph") .build(), - new CommonAnalysisPlugin() + new CommonAnalysisModulePlugin() ); String source = "PowerShot Is AweSome"; @@ -166,7 +166,7 @@ public void testInvalidSeparator() { .put("index.analysis.filter.my_concatenate_graph.type", "concatenate_graph") .put("index.analysis.filter.my_concatenate_graph.token_separator", "11") .build(), - new CommonAnalysisPlugin() + new CommonAnalysisModulePlugin() ) ); } @@ -187,7 +187,7 @@ public void testMaxGraphExpansion() throws IOException { .put("index.analysis.analyzer.my_analyzer.tokenizer", "whitespace") .put("index.analysis.analyzer.my_analyzer.filter", "my_word_delimiter, my_concatenate_graph") .build(), - new CommonAnalysisPlugin() + new CommonAnalysisModulePlugin() ); String source = "PowerShot Is AweSome"; 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 35915af8f263d..9bfc3a77e8c44 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 @@ -74,7 +74,7 @@ public class DisableGraphQueryTests extends OpenSearchSingleNodeTestCase { @Override protected Collection> getPlugins() { - return Collections.singleton(CommonAnalysisPlugin.class); + return Collections.singleton(CommonAnalysisModulePlugin.class); } @Before diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/EdgeNGramTokenFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/EdgeNGramTokenFilterFactoryTests.java index b3724d99f10ed..e62a9c52edc5c 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/EdgeNGramTokenFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/EdgeNGramTokenFilterFactoryTests.java @@ -52,7 +52,7 @@ public void testDefault() throws IOException { .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .put("index.analysis.filter.my_edge_ngram.type", "edge_ngram") .build(), - new CommonAnalysisPlugin() + new CommonAnalysisModulePlugin() ); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("my_edge_ngram"); String source = "foo"; @@ -69,7 +69,7 @@ public void testPreserveOriginal() throws IOException { .put("index.analysis.filter.my_edge_ngram.type", "edge_ngram") .put("index.analysis.filter.my_edge_ngram.preserve_original", true) .build(), - new CommonAnalysisPlugin() + new CommonAnalysisModulePlugin() ); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("my_edge_ngram"); String source = "foo"; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/EdgeNGramTokenizerTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/EdgeNGramTokenizerTests.java index e77f895d05661..34fdec4135bfe 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/EdgeNGramTokenizerTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/EdgeNGramTokenizerTests.java @@ -60,7 +60,7 @@ private IndexAnalyzers buildAnalyzers(Version version, String tokenizer) throws .put("index.analysis.analyzer.my_analyzer.tokenizer", tokenizer) .build(); IndexSettings idxSettings = IndexSettingsModule.newIndexSettings("index", indexSettings); - return new AnalysisModule(TestEnvironment.newEnvironment(settings), Collections.singletonList(new CommonAnalysisPlugin())) + return new AnalysisModule(TestEnvironment.newEnvironment(settings), Collections.singletonList(new CommonAnalysisModulePlugin())) .getAnalysisRegistry() .build(idxSettings); } diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ElisionFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ElisionFilterFactoryTests.java index 164068eab5e1f..fc5c9ce49bbc9 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ElisionFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ElisionFilterFactoryTests.java @@ -49,7 +49,7 @@ public void testElisionFilterWithNoArticles() throws IOException { IllegalArgumentException e = expectThrows( IllegalArgumentException.class, - () -> AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisPlugin()) + () -> AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisModulePlugin()) ); assertEquals("elision filter requires [articles] or [articles_path] setting", e.getMessage()); 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 57c959a4f0b65..74ed3cd79e753 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 @@ -65,7 +65,7 @@ public class HighlighterWithAnalyzersTests extends OpenSearchIntegTestCase { @Override protected Collection> nodePlugins() { - return Arrays.asList(CommonAnalysisPlugin.class); + return Arrays.asList(CommonAnalysisModulePlugin.class); } public void testNgramHighlightingWithBrokenPositions() throws IOException { diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeepFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeepFilterFactoryTests.java index 0b094e52df8a1..41f27cd8b9136 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeepFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeepFilterFactoryTests.java @@ -54,7 +54,7 @@ public void testLoadWithoutSettings() throws IOException { OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromClassPath( createTempDir(), RESOURCE, - new CommonAnalysisPlugin() + new CommonAnalysisModulePlugin() ); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("keep"); Assert.assertNull(tokenFilter); @@ -68,7 +68,7 @@ public void testLoadOverConfiguredSettings() { .put("index.analysis.filter.broken_keep_filter.keep_words", "[\"Hello\", \"worlD\"]") .build(); try { - AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisPlugin()); + AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisModulePlugin()); Assert.fail("path and array are configured"); } catch (IllegalArgumentException e) {} catch (IOException e) { fail("expected IAE"); @@ -83,7 +83,7 @@ public void testKeepWordsPathSettings() { .build(); try { // test our none existing setup is picked up - AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisPlugin()); + AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisModulePlugin()); fail("expected an exception due to non existent keep_words_path"); } catch (IllegalArgumentException e) {} catch (IOException e) { fail("expected IAE"); @@ -92,7 +92,7 @@ public void testKeepWordsPathSettings() { settings = Settings.builder().put(settings).putList("index.analysis.filter.non_broken_keep_filter.keep_words", "test").build(); try { // test our none existing setup is picked up - AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisPlugin()); + AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisModulePlugin()); fail("expected an exception indicating that you can't use [keep_words_path] with [keep_words] "); } catch (IllegalArgumentException e) {} catch (IOException e) { fail("expected IAE"); @@ -104,7 +104,7 @@ public void testCaseInsensitiveMapping() throws IOException { OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromClassPath( createTempDir(), RESOURCE, - new CommonAnalysisPlugin() + new CommonAnalysisModulePlugin() ); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("my_keep_filter"); assertThat(tokenFilter, instanceOf(KeepWordFilterFactory.class)); @@ -119,7 +119,7 @@ public void testCaseSensitiveMapping() throws IOException { OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromClassPath( createTempDir(), RESOURCE, - new CommonAnalysisPlugin() + new CommonAnalysisModulePlugin() ); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("my_case_sensitive_keep_filter"); assertThat(tokenFilter, instanceOf(KeepWordFilterFactory.class)); diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeepTypesFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeepTypesFilterFactoryTests.java index 1f1021b4bfe66..eaab746be26dc 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeepTypesFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeepTypesFilterFactoryTests.java @@ -63,7 +63,10 @@ public void testKeepTypesInclude() throws IOException { ); } Settings settings = settingsBuilder.build(); - OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisPlugin()); + OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings( + settings, + new CommonAnalysisModulePlugin() + ); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("keep_numbers"); assertThat(tokenFilter, instanceOf(KeepTypesFilterFactory.class)); String source = "Hello 123 world"; @@ -80,7 +83,10 @@ public void testKeepTypesExclude() throws IOException { .putList(BASE_SETTING + "." + KeepTypesFilterFactory.KEEP_TYPES_KEY, new String[] { "", "" }) .put(BASE_SETTING + "." + KeepTypesFilterFactory.KEEP_TYPES_MODE_KEY, KeepTypesFilterFactory.KeepTypesMode.EXCLUDE) .build(); - OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisPlugin()); + OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings( + settings, + new CommonAnalysisModulePlugin() + ); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("keep_numbers"); assertThat(tokenFilter, instanceOf(KeepTypesFilterFactory.class)); String source = "Hello 123 world"; @@ -99,7 +105,7 @@ public void testKeepTypesException() throws IOException { .build(); IllegalArgumentException ex = expectThrows( IllegalArgumentException.class, - () -> AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisPlugin()) + () -> AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisModulePlugin()) ); assertEquals("`keep_types` tokenfilter mode can only be [include] or [exclude] but was [bad_parameter].", ex.getMessage()); } diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeywordMarkerFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeywordMarkerFilterFactoryTests.java index 40e354785ddbe..f9c5a25444ed0 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeywordMarkerFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeywordMarkerFilterFactoryTests.java @@ -65,7 +65,7 @@ public void testKeywordSet() throws IOException { .put("index.analysis.analyzer.my_keyword.filter", "my_keyword, porter_stem") .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .build(); - TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisPlugin()); + TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisModulePlugin()); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("my_keyword"); assertThat(tokenFilter, instanceOf(KeywordMarkerTokenFilterFactory.class)); TokenStream filter = tokenFilter.create(new WhitespaceTokenizer()); @@ -87,7 +87,7 @@ public void testKeywordPattern() throws IOException { .put("index.analysis.analyzer.my_keyword.filter", "my_keyword, porter_stem") .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .build(); - TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisPlugin()); + TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisModulePlugin()); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("my_keyword"); assertThat(tokenFilter, instanceOf(KeywordMarkerTokenFilterFactory.class)); TokenStream filter = tokenFilter.create(new WhitespaceTokenizer()); @@ -112,7 +112,7 @@ public void testCannotSpecifyBothKeywordsAndPattern() throws IOException { .build(); IllegalArgumentException e = expectThrows( IllegalArgumentException.class, - () -> AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisPlugin()) + () -> AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisModulePlugin()) ); assertEquals("cannot specify both `keywords_pattern` and `keywords` or `keywords_path`", e.getMessage()); } diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/LimitTokenCountFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/LimitTokenCountFilterFactoryTests.java index 76471fd98e5fe..99708045b0be2 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/LimitTokenCountFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/LimitTokenCountFilterFactoryTests.java @@ -119,7 +119,7 @@ public void testSettings() throws IOException { } private static OpenSearchTestCase.TestAnalysis createTestAnalysisFromSettings(Settings settings) throws IOException { - return AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisPlugin()); + return AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisModulePlugin()); } } 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 390e36c4ca0a0..41f60e1264b5c 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 @@ -43,7 +43,7 @@ public class MassiveWordListTests extends OpenSearchSingleNodeTestCase { @Override protected Collection> getPlugins() { - return Collections.singleton(CommonAnalysisPlugin.class); + return Collections.singleton(CommonAnalysisModulePlugin.class); } public void testCreateIndexWithMassiveWordList() { diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/MinHashFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/MinHashFilterFactoryTests.java index 514c53f17456c..e86a939dc857b 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/MinHashFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/MinHashFilterFactoryTests.java @@ -50,7 +50,10 @@ public void testDefault() throws IOException { int default_bucket_size = 512; int default_hash_set_size = 1; Settings settings = Settings.builder().put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()).build(); - OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisPlugin()); + OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings( + settings, + new CommonAnalysisModulePlugin() + ); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("min_hash"); String source = "the quick brown fox"; Tokenizer tokenizer = new WhitespaceTokenizer(); @@ -70,7 +73,10 @@ public void testSettings() throws IOException { .put("index.analysis.filter.test_min_hash.with_rotation", false) .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .build(); - OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisPlugin()); + OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings( + settings, + new CommonAnalysisModulePlugin() + ); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("test_min_hash"); String source = "sushi"; Tokenizer tokenizer = new WhitespaceTokenizer(); diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/MultiplexerTokenFilterTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/MultiplexerTokenFilterTests.java index 167f61464da1b..e9dfa299871e5 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/MultiplexerTokenFilterTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/MultiplexerTokenFilterTests.java @@ -65,7 +65,7 @@ public void testMultiplexingFilter() throws IOException { IndexAnalyzers indexAnalyzers = new AnalysisModule( TestEnvironment.newEnvironment(settings), - Collections.singletonList(new CommonAnalysisPlugin()) + Collections.singletonList(new CommonAnalysisModulePlugin()) ).getAnalysisRegistry().build(idxSettings); try (NamedAnalyzer analyzer = indexAnalyzers.get("myAnalyzer")) { @@ -99,7 +99,7 @@ public void testMultiplexingNoOriginal() throws IOException { IndexAnalyzers indexAnalyzers = new AnalysisModule( TestEnvironment.newEnvironment(settings), - Collections.singletonList(new CommonAnalysisPlugin()) + Collections.singletonList(new CommonAnalysisModulePlugin()) ).getAnalysisRegistry().build(idxSettings); try (NamedAnalyzer analyzer = indexAnalyzers.get("myAnalyzer")) { diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/NGramTokenFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/NGramTokenFilterFactoryTests.java index 85090648096d1..e5f558b1c2fdd 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/NGramTokenFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/NGramTokenFilterFactoryTests.java @@ -52,7 +52,7 @@ public void testDefault() throws IOException { .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .put("index.analysis.filter.my_ngram.type", "ngram") .build(), - new CommonAnalysisPlugin() + new CommonAnalysisModulePlugin() ); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("my_ngram"); String source = "foo"; @@ -69,7 +69,7 @@ public void testPreserveOriginal() throws IOException { .put("index.analysis.filter.my_ngram.type", "ngram") .put("index.analysis.filter.my_ngram.preserve_original", true) .build(), - new CommonAnalysisPlugin() + new CommonAnalysisModulePlugin() ); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("my_ngram"); String source = "foo"; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/PatternCaptureTokenFilterTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/PatternCaptureTokenFilterTests.java index 5cd18a5b01f18..a3dc75fd37671 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/PatternCaptureTokenFilterTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/PatternCaptureTokenFilterTests.java @@ -55,7 +55,7 @@ public void testPatternCaptureTokenFilter() throws Exception { .build(); IndexSettings idxSettings = IndexSettingsModule.newIndexSettings("index", settings); - IndexAnalyzers indexAnalyzers = createTestAnalysis(idxSettings, settings, new CommonAnalysisPlugin()).indexAnalyzers; + IndexAnalyzers indexAnalyzers = createTestAnalysis(idxSettings, settings, new CommonAnalysisModulePlugin()).indexAnalyzers; NamedAnalyzer analyzer1 = indexAnalyzers.get("single"); assertTokenStreamContents(analyzer1.tokenStream("test", "foobarbaz"), new String[] { "foobarbaz", "foobar", "foo" }); diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/PredicateTokenScriptFilterTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/PredicateTokenScriptFilterTests.java index c16f4f37846ec..b31f4020ef627 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/PredicateTokenScriptFilterTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/PredicateTokenScriptFilterTests.java @@ -81,7 +81,7 @@ public FactoryType compile(Script script, ScriptContext FactoryType compile(Script script, ScriptContext { indexAnalyzers = createTestAnalysis(idxSettings, settings, new CommonAnalysisPlugin()).indexAnalyzers; } + () -> { indexAnalyzers = createTestAnalysis(idxSettings, settings, new CommonAnalysisModulePlugin()).indexAnalyzers; } ); } @@ -259,7 +259,7 @@ public void testTokenFiltersBypassSynonymAnalysis() throws IOException { String[] bypassingFactories = new String[] { "dictionary_decompounder" }; - CommonAnalysisPlugin plugin = new CommonAnalysisPlugin(); + CommonAnalysisModulePlugin plugin = new CommonAnalysisModulePlugin(); for (String factory : bypassingFactories) { TokenFilterFactory tff = plugin.getTokenFilters().get(factory).get(idxSettings, null, factory, settings); TokenizerFactory tok = new KeywordTokenizerFactory(idxSettings, null, "keyword", settings); @@ -294,7 +294,7 @@ public void testPreconfiguredTokenFilters() throws IOException { .build(); IndexSettings idxSettings = IndexSettingsModule.newIndexSettings("index", settings); - CommonAnalysisPlugin plugin = new CommonAnalysisPlugin(); + CommonAnalysisModulePlugin plugin = new CommonAnalysisModulePlugin(); for (PreConfiguredTokenFilter tf : plugin.getPreConfiguredTokenFilters()) { if (disallowedFilters.contains(tf.getName())) { @@ -319,7 +319,7 @@ public void testDisallowedTokenFilters() throws IOException { .put("output_unigrams", "true") .build(); IndexSettings idxSettings = IndexSettingsModule.newIndexSettings("index", settings); - CommonAnalysisPlugin plugin = new CommonAnalysisPlugin(); + CommonAnalysisModulePlugin plugin = new CommonAnalysisModulePlugin(); String[] disallowedFactories = new String[] { "multiplexer", diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/TrimTokenFilterTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/TrimTokenFilterTests.java index 3ea9c526052f2..a5419df92db07 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/TrimTokenFilterTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/TrimTokenFilterTests.java @@ -49,7 +49,10 @@ public void testNormalizer() throws IOException { .putList("index.analysis.normalizer.my_normalizer.filter", "trim") .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .build(); - OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisPlugin()); + OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings( + settings, + new CommonAnalysisModulePlugin() + ); assertNull(analysis.indexAnalyzers.get("my_normalizer")); NamedAnalyzer normalizer = analysis.indexAnalyzers.getNormalizer("my_normalizer"); assertNotNull(normalizer); diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/WordDelimiterGraphTokenFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/WordDelimiterGraphTokenFilterFactoryTests.java index 102182f381128..7a717fe7fe22e 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/WordDelimiterGraphTokenFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/WordDelimiterGraphTokenFilterFactoryTests.java @@ -64,7 +64,7 @@ public void testMultiTerms() throws IOException { .put("index.analysis.filter.my_word_delimiter.catenate_all", "true") .put("index.analysis.filter.my_word_delimiter.preserve_original", "true") .build(), - new CommonAnalysisPlugin() + new CommonAnalysisModulePlugin() ); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("my_word_delimiter"); @@ -114,7 +114,7 @@ public void testPartsAndCatenate() throws IOException { .put("index.analysis.filter.my_word_delimiter.catenate_words", "true") .put("index.analysis.filter.my_word_delimiter.generate_word_parts", "true") .build(), - new CommonAnalysisPlugin() + new CommonAnalysisModulePlugin() ); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("my_word_delimiter"); String source = "PowerShot"; @@ -146,7 +146,7 @@ public void testAdjustingOffsets() throws IOException { .put("index.analysis.filter.my_word_delimiter.generate_word_parts", "true") .put("index.analysis.filter.my_word_delimiter.adjust_offsets", "false") .build(), - new CommonAnalysisPlugin() + new CommonAnalysisModulePlugin() ); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("my_word_delimiter"); String source = "PowerShot"; @@ -181,7 +181,10 @@ public void testIgnoreKeywords() throws IOException { .put("index.analysis.analyzer.my_analyzer.filter", "my_keyword, my_word_delimiter") .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .build(); - OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisPlugin()); + OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings( + settings, + new CommonAnalysisModulePlugin() + ); String source = "PowerShot PowerHungry"; int[] expectedStartOffsets = new int[] { 0, 5, 10, 15 }; int[] expectedEndOffsets = new int[] { 5, 9, 15, 21 }; @@ -191,7 +194,7 @@ public void testIgnoreKeywords() throws IOException { // test with keywords but ignore_keywords is set as true settings = Settings.builder().put(settings).put("index.analysis.filter.my_word_delimiter.ignore_keywords", "true").build(); - analysis = AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisPlugin()); + analysis = AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisModulePlugin()); analyzer = analysis.indexAnalyzers.get("my_analyzer"); expectedStartOffsets = new int[] { 0, 5, 10 }; expectedEndOffsets = new int[] { 5, 9, 21 }; @@ -213,7 +216,7 @@ public void testPreconfiguredFilter() throws IOException { try ( IndexAnalyzers indexAnalyzers = new AnalysisModule( TestEnvironment.newEnvironment(settings), - Collections.singletonList(new CommonAnalysisPlugin()) + Collections.singletonList(new CommonAnalysisModulePlugin()) ).getAnalysisRegistry().build(idxSettings) ) { diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/WordDelimiterTokenFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/WordDelimiterTokenFilterFactoryTests.java index ea37fd5ce9546..b6e064f72630a 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/WordDelimiterTokenFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/WordDelimiterTokenFilterFactoryTests.java @@ -58,7 +58,7 @@ public void testPartsAndCatenate() throws IOException { .put("index.analysis.filter.my_word_delimiter.catenate_words", "true") .put("index.analysis.filter.my_word_delimiter.generate_word_parts", "true") .build(), - new CommonAnalysisPlugin() + new CommonAnalysisModulePlugin() ); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("my_word_delimiter"); String source = "PowerShot"; diff --git a/modules/geo/build.gradle b/modules/geo/build.gradle index d78e83ec7c4c6..1146b6924b2f8 100644 --- a/modules/geo/build.gradle +++ b/modules/geo/build.gradle @@ -31,7 +31,7 @@ apply plugin: 'opensearch.yaml-rest-test' opensearchplugin { description 'Placeholder plugin for geospatial features in OpenSearch. only registers geo_shape field mapper for now' - classname 'org.opensearch.geo.GeoPlugin' + classname 'org.opensearch.geo.GeoModulePlugin' } restResources { diff --git a/modules/geo/src/main/java/org/opensearch/geo/GeoPlugin.java b/modules/geo/src/main/java/org/opensearch/geo/GeoModulePlugin.java similarity index 95% rename from modules/geo/src/main/java/org/opensearch/geo/GeoPlugin.java rename to modules/geo/src/main/java/org/opensearch/geo/GeoModulePlugin.java index 9b898da33bb12..ed8c7c06fb3e8 100644 --- a/modules/geo/src/main/java/org/opensearch/geo/GeoPlugin.java +++ b/modules/geo/src/main/java/org/opensearch/geo/GeoModulePlugin.java @@ -40,7 +40,7 @@ import java.util.Collections; import java.util.Map; -public class GeoPlugin extends Plugin implements MapperPlugin { +public class GeoModulePlugin extends Plugin implements MapperPlugin { @Override public Map getMappers() { diff --git a/modules/ingest-common/build.gradle b/modules/ingest-common/build.gradle index 34201069d7b7b..7b567eb9110c5 100644 --- a/modules/ingest-common/build.gradle +++ b/modules/ingest-common/build.gradle @@ -32,7 +32,7 @@ apply plugin: 'opensearch.internal-cluster-test' opensearchplugin { description 'Module for ingest processors that do not require additional security permissions or have large dependencies and resources' - classname 'org.opensearch.ingest.common.IngestCommonPlugin' + classname 'org.opensearch.ingest.common.IngestCommonModulePlugin' extendedPlugins = ['lang-painless'] } 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 f27c903d8795f..784dad8cea49f 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 @@ -63,7 +63,7 @@ public class IngestRestartIT extends OpenSearchIntegTestCase { @Override protected Collection> nodePlugins() { - return Arrays.asList(IngestCommonPlugin.class, CustomScriptPlugin.class); + return Arrays.asList(IngestCommonModulePlugin.class, CustomScriptPlugin.class); } @Override diff --git a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/IngestCommonPlugin.java b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/IngestCommonModulePlugin.java similarity index 98% rename from modules/ingest-common/src/main/java/org/opensearch/ingest/common/IngestCommonPlugin.java rename to modules/ingest-common/src/main/java/org/opensearch/ingest/common/IngestCommonModulePlugin.java index 969f77aa85152..c786785a008d7 100644 --- a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/IngestCommonPlugin.java +++ b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/IngestCommonModulePlugin.java @@ -60,7 +60,7 @@ import java.util.Map; import java.util.function.Supplier; -public class IngestCommonPlugin extends Plugin implements ActionPlugin, IngestPlugin { +public class IngestCommonModulePlugin extends Plugin implements ActionPlugin, IngestPlugin { static final Setting WATCHDOG_INTERVAL = Setting.timeSetting( "ingest.grok.watchdog.interval", @@ -73,7 +73,7 @@ public class IngestCommonPlugin extends Plugin implements ActionPlugin, IngestPl Setting.Property.NodeScope ); - public IngestCommonPlugin() {} + public IngestCommonModulePlugin() {} @Override public Map getProcessors(Processor.Parameters parameters) { diff --git a/modules/ingest-geoip/build.gradle b/modules/ingest-geoip/build.gradle index f3be0fe61d4be..7dce788f3a4a4 100644 --- a/modules/ingest-geoip/build.gradle +++ b/modules/ingest-geoip/build.gradle @@ -35,7 +35,7 @@ apply plugin: 'opensearch.internal-cluster-test' opensearchplugin { description 'Ingest processor that uses looksup geo data based on ip adresses using the Maxmind geo database' - classname 'org.opensearch.ingest.geoip.IngestGeoIpPlugin' + classname 'org.opensearch.ingest.geoip.IngestGeoIpModulePlugin' } dependencies { diff --git a/modules/ingest-geoip/src/internalClusterTest/java/org/opensearch/ingest/geoip/GeoIpProcessorNonIngestNodeIT.java b/modules/ingest-geoip/src/internalClusterTest/java/org/opensearch/ingest/geoip/GeoIpProcessorNonIngestNodeIT.java index e88c77b8e33f4..65378ca79041c 100644 --- a/modules/ingest-geoip/src/internalClusterTest/java/org/opensearch/ingest/geoip/GeoIpProcessorNonIngestNodeIT.java +++ b/modules/ingest-geoip/src/internalClusterTest/java/org/opensearch/ingest/geoip/GeoIpProcessorNonIngestNodeIT.java @@ -75,7 +75,7 @@ public List> getSettings() { @Override protected Collection> nodePlugins() { - return Arrays.asList(IngestGeoIpPlugin.class, IngestGeoIpSettingsPlugin.class); + return Arrays.asList(IngestGeoIpModulePlugin.class, IngestGeoIpSettingsPlugin.class); } @Override diff --git a/modules/ingest-geoip/src/main/java/org/opensearch/ingest/geoip/GeoIpProcessor.java b/modules/ingest-geoip/src/main/java/org/opensearch/ingest/geoip/GeoIpProcessor.java index 030f75bf48e18..ebffe61f6e756 100644 --- a/modules/ingest-geoip/src/main/java/org/opensearch/ingest/geoip/GeoIpProcessor.java +++ b/modules/ingest-geoip/src/main/java/org/opensearch/ingest/geoip/GeoIpProcessor.java @@ -49,7 +49,7 @@ import org.opensearch.ingest.AbstractProcessor; import org.opensearch.ingest.IngestDocument; import org.opensearch.ingest.Processor; -import org.opensearch.ingest.geoip.IngestGeoIpPlugin.GeoIpCache; +import org.opensearch.ingest.geoip.IngestGeoIpModulePlugin.GeoIpCache; import java.io.IOException; import java.net.InetAddress; 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/IngestGeoIpModulePlugin.java similarity index 99% rename from modules/ingest-geoip/src/main/java/org/opensearch/ingest/geoip/IngestGeoIpPlugin.java rename to modules/ingest-geoip/src/main/java/org/opensearch/ingest/geoip/IngestGeoIpModulePlugin.java index 790a9bb4bf978..7869e4a7de7fc 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/IngestGeoIpModulePlugin.java @@ -64,7 +64,7 @@ import java.util.function.Function; import java.util.stream.Stream; -public class IngestGeoIpPlugin extends Plugin implements IngestPlugin, Closeable { +public class IngestGeoIpModulePlugin extends Plugin implements IngestPlugin, Closeable { public static final Setting CACHE_SIZE = Setting.longSetting("ingest.geoip.cache_size", 1000, 0, Setting.Property.NodeScope); static String[] DEFAULT_DATABASE_FILENAMES = new String[] { "GeoLite2-ASN.mmdb", "GeoLite2-City.mmdb", "GeoLite2-Country.mmdb" }; diff --git a/modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/GeoIpProcessorFactoryTests.java b/modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/GeoIpProcessorFactoryTests.java index cda2f5692b0db..d459686162cd0 100644 --- a/modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/GeoIpProcessorFactoryTests.java +++ b/modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/GeoIpProcessorFactoryTests.java @@ -37,7 +37,7 @@ import org.opensearch.common.Randomness; import org.opensearch.index.VersionType; import org.opensearch.ingest.IngestDocument; -import org.opensearch.ingest.geoip.IngestGeoIpPlugin.GeoIpCache; +import org.opensearch.ingest.geoip.IngestGeoIpModulePlugin.GeoIpCache; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.StreamsUtils; import org.junit.AfterClass; @@ -73,7 +73,7 @@ public static void loadDatabaseReaders() throws IOException { Files.createDirectories(geoIpConfigDir); copyDatabaseFiles(geoIpDir); - databaseReaders = IngestGeoIpPlugin.loadDatabaseReaders(geoIpDir, geoIpConfigDir); + databaseReaders = IngestGeoIpModulePlugin.loadDatabaseReaders(geoIpDir, geoIpConfigDir); } @AfterClass @@ -279,7 +279,7 @@ public void testLazyLoading() throws Exception { // Loading another database reader instances, because otherwise we can't test lazy loading as the // database readers used at class level are reused between tests. (we want to keep that otherwise running this // test will take roughly 4 times more time) - Map databaseReaders = IngestGeoIpPlugin.loadDatabaseReaders(geoIpDir, geoIpConfigDir); + Map databaseReaders = IngestGeoIpModulePlugin.loadDatabaseReaders(geoIpDir, geoIpConfigDir); GeoIpProcessor.Factory factory = new GeoIpProcessor.Factory(databaseReaders, new GeoIpCache(1000)); for (DatabaseReaderLazyLoader lazyLoader : databaseReaders.values()) { assertNull(lazyLoader.databaseReader.get()); @@ -336,7 +336,7 @@ public void testLoadingCustomDatabase() throws IOException { * Loading another database reader instances, because otherwise we can't test lazy loading as the database readers used at class * level are reused between tests. (we want to keep that otherwise running this test will take roughly 4 times more time). */ - final Map databaseReaders = IngestGeoIpPlugin.loadDatabaseReaders(geoIpDir, geoIpConfigDir); + final Map databaseReaders = IngestGeoIpModulePlugin.loadDatabaseReaders(geoIpDir, geoIpConfigDir); final GeoIpProcessor.Factory factory = new GeoIpProcessor.Factory(databaseReaders, new GeoIpCache(1000)); for (DatabaseReaderLazyLoader lazyLoader : databaseReaders.values()) { assertNull(lazyLoader.databaseReader.get()); @@ -365,9 +365,9 @@ public void testDatabaseNotExistsInDir() throws IOException { Files.createDirectories(geoIpConfigDir); } copyDatabaseFiles(geoIpDir); - final String databaseFilename = randomFrom(IngestGeoIpPlugin.DEFAULT_DATABASE_FILENAMES); + final String databaseFilename = randomFrom(IngestGeoIpModulePlugin.DEFAULT_DATABASE_FILENAMES); Files.delete(geoIpDir.resolve(databaseFilename)); - final IOException e = expectThrows(IOException.class, () -> IngestGeoIpPlugin.loadDatabaseReaders(geoIpDir, geoIpConfigDir)); + final IOException e = expectThrows(IOException.class, () -> IngestGeoIpModulePlugin.loadDatabaseReaders(geoIpDir, geoIpConfigDir)); assertThat(e, hasToString(containsString("expected database [" + databaseFilename + "] to exist in [" + geoIpDir + "]"))); } @@ -377,9 +377,9 @@ public void testDatabaseExistsInConfigDir() throws IOException { final Path geoIpConfigDir = configDir.resolve("ingest-geoip"); Files.createDirectories(geoIpConfigDir); copyDatabaseFiles(geoIpDir); - final String databaseFilename = randomFrom(IngestGeoIpPlugin.DEFAULT_DATABASE_FILENAMES); + final String databaseFilename = randomFrom(IngestGeoIpModulePlugin.DEFAULT_DATABASE_FILENAMES); copyDatabaseFile(geoIpConfigDir, databaseFilename); - final IOException e = expectThrows(IOException.class, () -> IngestGeoIpPlugin.loadDatabaseReaders(geoIpDir, geoIpConfigDir)); + final IOException e = expectThrows(IOException.class, () -> IngestGeoIpModulePlugin.loadDatabaseReaders(geoIpDir, geoIpConfigDir)); assertThat(e, hasToString(containsString("expected database [" + databaseFilename + "] to not exist in [" + geoIpConfigDir + "]"))); } @@ -388,7 +388,7 @@ private static void copyDatabaseFile(final Path path, final String databaseFilen } private static void copyDatabaseFiles(final Path path) throws IOException { - for (final String databaseFilename : IngestGeoIpPlugin.DEFAULT_DATABASE_FILENAMES) { + for (final String databaseFilename : IngestGeoIpModulePlugin.DEFAULT_DATABASE_FILENAMES) { copyDatabaseFile(path, databaseFilename); } } diff --git a/modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/GeoIpProcessorTests.java b/modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/GeoIpProcessorTests.java index 34c80fec520aa..8b94e8cc114ed 100644 --- a/modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/GeoIpProcessorTests.java +++ b/modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/GeoIpProcessorTests.java @@ -37,7 +37,7 @@ import org.opensearch.common.io.PathUtils; import org.opensearch.ingest.IngestDocument; import org.opensearch.ingest.RandomDocumentPicks; -import org.opensearch.ingest.geoip.IngestGeoIpPlugin.GeoIpCache; +import org.opensearch.ingest.geoip.IngestGeoIpModulePlugin.GeoIpCache; import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; diff --git a/modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/IngestGeoIpPluginTests.java b/modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/IngestGeoIpModulePluginTests.java similarity index 95% rename from modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/IngestGeoIpPluginTests.java rename to modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/IngestGeoIpModulePluginTests.java index 540d68b0982eb..e79354b3d7cd0 100644 --- a/modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/IngestGeoIpPluginTests.java +++ b/modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/IngestGeoIpModulePluginTests.java @@ -34,12 +34,12 @@ import com.maxmind.geoip2.model.AbstractResponse; import org.opensearch.common.network.InetAddresses; -import org.opensearch.ingest.geoip.IngestGeoIpPlugin.GeoIpCache; +import org.opensearch.ingest.geoip.IngestGeoIpModulePlugin.GeoIpCache; import org.opensearch.test.OpenSearchTestCase; import static org.mockito.Mockito.mock; -public class IngestGeoIpPluginTests extends OpenSearchTestCase { +public class IngestGeoIpModulePluginTests extends OpenSearchTestCase { public void testCachesAndEvictsResults() { GeoIpCache cache = new GeoIpCache(1); diff --git a/modules/ingest-user-agent/build.gradle b/modules/ingest-user-agent/build.gradle index a3752ad1c7f7e..187e72d192a3d 100644 --- a/modules/ingest-user-agent/build.gradle +++ b/modules/ingest-user-agent/build.gradle @@ -31,7 +31,7 @@ apply plugin: 'opensearch.yaml-rest-test' opensearchplugin { description 'Ingest processor that extracts information from a user agent' - classname 'org.opensearch.ingest.useragent.IngestUserAgentPlugin' + classname 'org.opensearch.ingest.useragent.IngestUserAgentModulePlugin' } restResources { 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/IngestUserAgentModulePlugin.java similarity index 96% rename from modules/ingest-user-agent/src/main/java/org/opensearch/ingest/useragent/IngestUserAgentPlugin.java rename to modules/ingest-user-agent/src/main/java/org/opensearch/ingest/useragent/IngestUserAgentModulePlugin.java index dc005ae36dff8..cd96fcf2347ef 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/IngestUserAgentModulePlugin.java @@ -49,7 +49,7 @@ import java.util.Map; import java.util.stream.Stream; -public class IngestUserAgentPlugin extends Plugin implements IngestPlugin { +public class IngestUserAgentModulePlugin extends Plugin implements IngestPlugin { private final Setting CACHE_SIZE_SETTING = Setting.longSetting( "ingest.user_agent.cache_size", @@ -85,7 +85,7 @@ static Map createUserAgentParsers(Path userAgentConfigD UserAgentParser defaultParser = new UserAgentParser( DEFAULT_PARSER_NAME, - IngestUserAgentPlugin.class.getResourceAsStream("/regexes.yml"), + IngestUserAgentModulePlugin.class.getResourceAsStream("/regexes.yml"), cache ); userAgentParsers.put(DEFAULT_PARSER_NAME, defaultParser); diff --git a/modules/ingest-user-agent/src/main/java/org/opensearch/ingest/useragent/UserAgentProcessor.java b/modules/ingest-user-agent/src/main/java/org/opensearch/ingest/useragent/UserAgentProcessor.java index 0625f1f8fd1af..df88e98e7fc4f 100644 --- a/modules/ingest-user-agent/src/main/java/org/opensearch/ingest/useragent/UserAgentProcessor.java +++ b/modules/ingest-user-agent/src/main/java/org/opensearch/ingest/useragent/UserAgentProcessor.java @@ -313,7 +313,13 @@ public UserAgentProcessor create( ) throws Exception { String field = readStringProperty(TYPE, processorTag, config, "field"); String targetField = readStringProperty(TYPE, processorTag, config, "target_field", "user_agent"); - String regexFilename = readStringProperty(TYPE, processorTag, config, "regex_file", IngestUserAgentPlugin.DEFAULT_PARSER_NAME); + String regexFilename = readStringProperty( + TYPE, + processorTag, + config, + "regex_file", + IngestUserAgentModulePlugin.DEFAULT_PARSER_NAME + ); List propertyNames = readOptionalList(TYPE, processorTag, config, "properties"); boolean ignoreMissing = readBooleanProperty(TYPE, processorTag, config, "ignore_missing", false); boolean useECS = readBooleanProperty(TYPE, processorTag, config, "ecs", true); diff --git a/modules/ingest-user-agent/src/test/java/org/opensearch/ingest/useragent/UserAgentProcessorFactoryTests.java b/modules/ingest-user-agent/src/test/java/org/opensearch/ingest/useragent/UserAgentProcessorFactoryTests.java index 72815a37f46de..576136436ef33 100644 --- a/modules/ingest-user-agent/src/test/java/org/opensearch/ingest/useragent/UserAgentProcessorFactoryTests.java +++ b/modules/ingest-user-agent/src/test/java/org/opensearch/ingest/useragent/UserAgentProcessorFactoryTests.java @@ -91,7 +91,7 @@ public static void createUserAgentParsers() throws IOException { } } - userAgentParsers = IngestUserAgentPlugin.createUserAgentParsers(userAgentConfigDir, new UserAgentCache(1000)); + userAgentParsers = IngestUserAgentModulePlugin.createUserAgentParsers(userAgentConfigDir, new UserAgentCache(1000)); } public void testBuildDefaults() throws Exception { diff --git a/modules/lang-expression/build.gradle b/modules/lang-expression/build.gradle index 203c332069c5f..114c750e34b17 100644 --- a/modules/lang-expression/build.gradle +++ b/modules/lang-expression/build.gradle @@ -32,7 +32,7 @@ apply plugin: 'opensearch.internal-cluster-test' opensearchplugin { description 'Lucene expressions integration for OpenSearch' - classname 'org.opensearch.script.expression.ExpressionPlugin' + classname 'org.opensearch.script.expression.ExpressionModulePlugin' } dependencies { diff --git a/modules/lang-expression/src/internalClusterTest/java/org/opensearch/script/expression/MoreExpressionIT.java b/modules/lang-expression/src/internalClusterTest/java/org/opensearch/script/expression/MoreExpressionIT.java index 952b00dda608c..69d5e639e4aec 100644 --- a/modules/lang-expression/src/internalClusterTest/java/org/opensearch/script/expression/MoreExpressionIT.java +++ b/modules/lang-expression/src/internalClusterTest/java/org/opensearch/script/expression/MoreExpressionIT.java @@ -78,7 +78,7 @@ public class MoreExpressionIT extends OpenSearchIntegTestCase { @Override protected Collection> nodePlugins() { - return Collections.singleton(ExpressionPlugin.class); + return Collections.singleton(ExpressionModulePlugin.class); } private SearchRequestBuilder buildRequest(String script, Object... params) { 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 5aade265439d2..cf14b47fa9f3e 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 @@ -59,7 +59,7 @@ protected Settings nodeSettings(int nodeOrdinal) { @Override protected Collection> nodePlugins() { - return Collections.singleton(ExpressionPlugin.class); + return Collections.singleton(ExpressionModulePlugin.class); } public void testAllOpsDisabledIndexedScripts() throws IOException { 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/ExpressionModulePlugin.java similarity index 95% rename from modules/lang-expression/src/main/java/org/opensearch/script/expression/ExpressionPlugin.java rename to modules/lang-expression/src/main/java/org/opensearch/script/expression/ExpressionModulePlugin.java index 440a03c63bd98..7640fcf7a3bc5 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/ExpressionModulePlugin.java @@ -40,7 +40,7 @@ import org.opensearch.script.ScriptContext; import org.opensearch.script.ScriptEngine; -public class ExpressionPlugin extends Plugin implements ScriptPlugin { +public class ExpressionModulePlugin extends Plugin implements ScriptPlugin { @Override public ScriptEngine getScriptEngine(Settings settings, Collection> contexts) { diff --git a/modules/lang-mustache/build.gradle b/modules/lang-mustache/build.gradle index 511a6b144c21a..14eafd8d43e13 100644 --- a/modules/lang-mustache/build.gradle +++ b/modules/lang-mustache/build.gradle @@ -33,7 +33,7 @@ apply plugin: 'opensearch.internal-cluster-test' opensearchplugin { description 'Mustache scripting integration for OpenSearch' - classname 'org.opensearch.script.mustache.MustachePlugin' + classname 'org.opensearch.script.mustache.MustacheModulePlugin' hasClientJar = true // For the template apis and query } diff --git a/modules/lang-mustache/src/internalClusterTest/java/org/opensearch/script/mustache/MultiSearchTemplateIT.java b/modules/lang-mustache/src/internalClusterTest/java/org/opensearch/script/mustache/MultiSearchTemplateIT.java index 617f1f4f738a0..fbb8ebdec384c 100644 --- a/modules/lang-mustache/src/internalClusterTest/java/org/opensearch/script/mustache/MultiSearchTemplateIT.java +++ b/modules/lang-mustache/src/internalClusterTest/java/org/opensearch/script/mustache/MultiSearchTemplateIT.java @@ -58,7 +58,7 @@ public class MultiSearchTemplateIT extends OpenSearchIntegTestCase { @Override protected Collection> nodePlugins() { - return Collections.singleton(MustachePlugin.class); + return Collections.singleton(MustacheModulePlugin.class); } public void testBasic() throws Exception { 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 61f047a32f1c1..87ef8b810f5e0 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 @@ -62,7 +62,7 @@ public class SearchTemplateIT extends OpenSearchSingleNodeTestCase { @Override protected Collection> getPlugins() { - return Collections.singleton(MustachePlugin.class); + return Collections.singleton(MustacheModulePlugin.class); } @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/MustacheModulePlugin.java similarity index 96% rename from modules/lang-mustache/src/main/java/org/opensearch/script/mustache/MustachePlugin.java rename to modules/lang-mustache/src/main/java/org/opensearch/script/mustache/MustacheModulePlugin.java index 498dc2ac57cc7..03be9d7efb2db 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/MustacheModulePlugin.java @@ -54,7 +54,7 @@ import java.util.List; import java.util.function.Supplier; -public class MustachePlugin extends Plugin implements ScriptPlugin, ActionPlugin, SearchPlugin { +public class MustacheModulePlugin extends Plugin implements ScriptPlugin, ActionPlugin, SearchPlugin { @Override public ScriptEngine getScriptEngine(Settings settings, Collection> contexts) { diff --git a/modules/lang-painless/build.gradle b/modules/lang-painless/build.gradle index c997068ccb6c9..f29c48aecf5df 100644 --- a/modules/lang-painless/build.gradle +++ b/modules/lang-painless/build.gradle @@ -37,7 +37,7 @@ apply plugin: 'com.github.johnrengelman.shadow' opensearchplugin { description 'An easy, safe and fast scripting language for OpenSearch' - classname 'org.opensearch.painless.PainlessPlugin' + classname 'org.opensearch.painless.PainlessModulePlugin' } testClusters.all { diff --git a/modules/lang-painless/src/main/java/org/opensearch/painless/PainlessPlugin.java b/modules/lang-painless/src/main/java/org/opensearch/painless/PainlessModulePlugin.java similarity index 98% rename from modules/lang-painless/src/main/java/org/opensearch/painless/PainlessPlugin.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/PainlessModulePlugin.java index 9a235df0fb184..4a432b8f17b25 100644 --- a/modules/lang-painless/src/main/java/org/opensearch/painless/PainlessPlugin.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/PainlessModulePlugin.java @@ -81,7 +81,7 @@ /** * Registers Painless as a plugin. */ -public final class PainlessPlugin extends Plugin implements ScriptPlugin, ExtensiblePlugin, ActionPlugin { +public final class PainlessModulePlugin extends Plugin implements ScriptPlugin, ExtensiblePlugin, ActionPlugin { private static final Map, List> allowlists; 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 424d88cbc9e00..6e318eda91985 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 @@ -36,7 +36,7 @@ import org.opensearch.common.xcontent.XContentType; import org.opensearch.index.IndexService; import org.opensearch.index.query.MatchQueryBuilder; -import org.opensearch.painless.PainlessPlugin; +import org.opensearch.painless.PainlessModulePlugin; import org.opensearch.painless.action.PainlessExecuteAction.Request; import org.opensearch.painless.action.PainlessExecuteAction.Response; import org.opensearch.plugins.Plugin; @@ -60,7 +60,7 @@ public class PainlessExecuteApiTests extends OpenSearchSingleNodeTestCase { @Override protected Collection> getPlugins() { - return Collections.singleton(PainlessPlugin.class); + return Collections.singleton(PainlessModulePlugin.class); } public void testDefaults() throws IOException { diff --git a/modules/mapper-extras/build.gradle b/modules/mapper-extras/build.gradle index 08758c7ab2bda..b16176ca5aa72 100644 --- a/modules/mapper-extras/build.gradle +++ b/modules/mapper-extras/build.gradle @@ -32,7 +32,7 @@ apply plugin: 'opensearch.java-rest-test' opensearchplugin { description 'Adds advanced field mappers' - classname 'org.opensearch.index.mapper.MapperExtrasPlugin' + classname 'org.opensearch.index.mapper.MapperExtrasModulePlugin' hasClientJar = true } diff --git a/modules/mapper-extras/src/main/java/org/opensearch/index/mapper/MapperExtrasPlugin.java b/modules/mapper-extras/src/main/java/org/opensearch/index/mapper/MapperExtrasModulePlugin.java similarity index 96% rename from modules/mapper-extras/src/main/java/org/opensearch/index/mapper/MapperExtrasPlugin.java rename to modules/mapper-extras/src/main/java/org/opensearch/index/mapper/MapperExtrasModulePlugin.java index ebb86bc055825..081a3414c3675 100644 --- a/modules/mapper-extras/src/main/java/org/opensearch/index/mapper/MapperExtrasPlugin.java +++ b/modules/mapper-extras/src/main/java/org/opensearch/index/mapper/MapperExtrasModulePlugin.java @@ -43,7 +43,7 @@ import java.util.List; import java.util.Map; -public class MapperExtrasPlugin extends Plugin implements MapperPlugin, SearchPlugin { +public class MapperExtrasModulePlugin extends Plugin implements MapperPlugin, SearchPlugin { @Override public Map getMappers() { 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 d9e40fac1ad0f..d498116efc108 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 @@ -47,7 +47,7 @@ public class BWCTemplateTests extends OpenSearchSingleNodeTestCase { @Override protected Collection> getPlugins() { - return pluginList(MapperExtrasPlugin.class); + return pluginList(MapperExtrasModulePlugin.class); } public void testBeatsTemplatesBWC() throws Exception { 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 908e5db6196c3..1e001eb2f55a5 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 @@ -72,7 +72,7 @@ protected void assertExistsQuery(MappedFieldType fieldType, Query query, ParseCo @Override protected Collection getPlugins() { - return List.of(new MapperExtrasPlugin()); + return List.of(new MapperExtrasModulePlugin()); } static int getFrequency(TokenStream tk) throws IOException { diff --git a/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/RankFeatureMetaFieldMapperTests.java b/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/RankFeatureMetaFieldMapperTests.java index 3161e7462d2a0..63487fd7baa89 100644 --- a/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/RankFeatureMetaFieldMapperTests.java +++ b/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/RankFeatureMetaFieldMapperTests.java @@ -57,7 +57,7 @@ public void setup() { @Override protected Collection> getPlugins() { - return pluginList(MapperExtrasPlugin.class); + return pluginList(MapperExtrasModulePlugin.class); } public void testBasics() throws Exception { diff --git a/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/RankFeaturesFieldMapperTests.java b/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/RankFeaturesFieldMapperTests.java index 55d825d1b53bb..33e780c622a82 100644 --- a/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/RankFeaturesFieldMapperTests.java +++ b/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/RankFeaturesFieldMapperTests.java @@ -58,7 +58,7 @@ protected void assertExistsQuery(MapperService mapperService) { @Override protected Collection getPlugins() { - return org.opensearch.common.collect.List.of(new MapperExtrasPlugin()); + return org.opensearch.common.collect.List.of(new MapperExtrasModulePlugin()); } @Override diff --git a/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/ScaledFloatFieldMapperTests.java b/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/ScaledFloatFieldMapperTests.java index e19f9dd7988e1..74c79b0db469b 100644 --- a/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/ScaledFloatFieldMapperTests.java +++ b/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/ScaledFloatFieldMapperTests.java @@ -53,7 +53,7 @@ public class ScaledFloatFieldMapperTests extends MapperTestCase { @Override protected Collection getPlugins() { - return singletonList(new MapperExtrasPlugin()); + return singletonList(new MapperExtrasModulePlugin()); } @Override diff --git a/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/SearchAsYouTypeFieldMapperTests.java b/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/SearchAsYouTypeFieldMapperTests.java index 7c4b8956d9e3c..6ab2293620893 100644 --- a/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/SearchAsYouTypeFieldMapperTests.java +++ b/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/SearchAsYouTypeFieldMapperTests.java @@ -133,7 +133,7 @@ protected void writeFieldValue(XContentBuilder builder) throws IOException { @Override protected Collection getPlugins() { - return org.opensearch.common.collect.List.of(new MapperExtrasPlugin()); + return org.opensearch.common.collect.List.of(new MapperExtrasModulePlugin()); } @Override diff --git a/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/TokenCountFieldMapperTests.java b/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/TokenCountFieldMapperTests.java index e9d3767373b95..1ebec6b963b53 100644 --- a/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/TokenCountFieldMapperTests.java +++ b/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/TokenCountFieldMapperTests.java @@ -62,7 +62,7 @@ public class TokenCountFieldMapperTests extends MapperTestCase { @Override protected Collection getPlugins() { - return Collections.singletonList(new MapperExtrasPlugin()); + return Collections.singletonList(new MapperExtrasModulePlugin()); } @Override diff --git a/modules/mapper-extras/src/test/java/org/opensearch/index/query/RankFeatureQueryBuilderTests.java b/modules/mapper-extras/src/test/java/org/opensearch/index/query/RankFeatureQueryBuilderTests.java index e183ba6f6735c..f57aac8a244b7 100644 --- a/modules/mapper-extras/src/test/java/org/opensearch/index/query/RankFeatureQueryBuilderTests.java +++ b/modules/mapper-extras/src/test/java/org/opensearch/index/query/RankFeatureQueryBuilderTests.java @@ -38,7 +38,7 @@ import org.opensearch.action.admin.indices.mapping.put.PutMappingRequest; import org.opensearch.common.Strings; import org.opensearch.common.compress.CompressedXContent; -import org.opensearch.index.mapper.MapperExtrasPlugin; +import org.opensearch.index.mapper.MapperExtrasModulePlugin; import org.opensearch.index.mapper.MapperService; import org.opensearch.index.query.RankFeatureQueryBuilder.ScoreFunction; import org.opensearch.plugins.Plugin; @@ -78,7 +78,7 @@ protected void initializeAdditionalMappings(MapperService mapperService) throws @Override protected Collection> getPlugins() { - return Arrays.asList(MapperExtrasPlugin.class, TestGeoShapeFieldMapperPlugin.class); + return Arrays.asList(MapperExtrasModulePlugin.class, TestGeoShapeFieldMapperPlugin.class); } @Override diff --git a/modules/opensearch-dashboards/build.gradle b/modules/opensearch-dashboards/build.gradle index f76ca739faf81..07453e1f70f1c 100644 --- a/modules/opensearch-dashboards/build.gradle +++ b/modules/opensearch-dashboards/build.gradle @@ -31,7 +31,7 @@ apply plugin: 'opensearch.java-rest-test' opensearchplugin { description 'Plugin exposing APIs for OpenSearch Dashboards system indices' - classname 'org.opensearch.dashboards.OpenSearchDashboardsPlugin' + classname 'org.opensearch.dashboards.OpenSearchDashboardsModulePlugin' } dependencies { diff --git a/modules/opensearch-dashboards/src/main/java/org/opensearch/dashboards/OpenSearchDashboardsPlugin.java b/modules/opensearch-dashboards/src/main/java/org/opensearch/dashboards/OpenSearchDashboardsModulePlugin.java similarity index 98% rename from modules/opensearch-dashboards/src/main/java/org/opensearch/dashboards/OpenSearchDashboardsPlugin.java rename to modules/opensearch-dashboards/src/main/java/org/opensearch/dashboards/OpenSearchDashboardsModulePlugin.java index 534218ef438e7..09fd52ff65c66 100644 --- a/modules/opensearch-dashboards/src/main/java/org/opensearch/dashboards/OpenSearchDashboardsPlugin.java +++ b/modules/opensearch-dashboards/src/main/java/org/opensearch/dashboards/OpenSearchDashboardsModulePlugin.java @@ -75,7 +75,7 @@ import static java.util.Collections.unmodifiableList; -public class OpenSearchDashboardsPlugin extends Plugin implements SystemIndexPlugin { +public class OpenSearchDashboardsModulePlugin extends Plugin implements SystemIndexPlugin { public static final Setting> OPENSEARCH_DASHBOARDS_INDEX_NAMES_SETTING = Setting.listSetting( "opensearch_dashboards.system_indices", diff --git a/modules/opensearch-dashboards/src/test/java/org/opensearch/dashboards/OpenSearchDashboardsPluginTests.java b/modules/opensearch-dashboards/src/test/java/org/opensearch/dashboards/OpenSearchDashboardsModulePluginTests.java similarity index 79% rename from modules/opensearch-dashboards/src/test/java/org/opensearch/dashboards/OpenSearchDashboardsPluginTests.java rename to modules/opensearch-dashboards/src/test/java/org/opensearch/dashboards/OpenSearchDashboardsModulePluginTests.java index a74af8cd257b5..1573113d58ecd 100644 --- a/modules/opensearch-dashboards/src/test/java/org/opensearch/dashboards/OpenSearchDashboardsPluginTests.java +++ b/modules/opensearch-dashboards/src/test/java/org/opensearch/dashboards/OpenSearchDashboardsModulePluginTests.java @@ -44,28 +44,28 @@ import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.is; -public class OpenSearchDashboardsPluginTests extends OpenSearchTestCase { +public class OpenSearchDashboardsModulePluginTests extends OpenSearchTestCase { public void testOpenSearchDashboardsIndexNames() { assertThat( - new OpenSearchDashboardsPlugin().getSettings(), - contains(OpenSearchDashboardsPlugin.OPENSEARCH_DASHBOARDS_INDEX_NAMES_SETTING) + new OpenSearchDashboardsModulePlugin().getSettings(), + contains(OpenSearchDashboardsModulePlugin.OPENSEARCH_DASHBOARDS_INDEX_NAMES_SETTING) ); assertThat( - new OpenSearchDashboardsPlugin().getSystemIndexDescriptors(Settings.EMPTY) + new OpenSearchDashboardsModulePlugin().getSystemIndexDescriptors(Settings.EMPTY) .stream() .map(SystemIndexDescriptor::getIndexPattern) .collect(Collectors.toList()), contains(".opensearch_dashboards", ".opensearch_dashboards_*", ".reporting-*", ".apm-agent-configuration", ".apm-custom-link") ); final List names = Collections.unmodifiableList(Arrays.asList("." + randomAlphaOfLength(4), "." + randomAlphaOfLength(5))); - final List namesFromDescriptors = new OpenSearchDashboardsPlugin().getSystemIndexDescriptors( - Settings.builder().putList(OpenSearchDashboardsPlugin.OPENSEARCH_DASHBOARDS_INDEX_NAMES_SETTING.getKey(), names).build() + final List namesFromDescriptors = new OpenSearchDashboardsModulePlugin().getSystemIndexDescriptors( + Settings.builder().putList(OpenSearchDashboardsModulePlugin.OPENSEARCH_DASHBOARDS_INDEX_NAMES_SETTING.getKey(), names).build() ).stream().map(SystemIndexDescriptor::getIndexPattern).collect(Collectors.toList()); assertThat(namesFromDescriptors, is(names)); assertThat( - new OpenSearchDashboardsPlugin().getSystemIndexDescriptors(Settings.EMPTY) + new OpenSearchDashboardsModulePlugin().getSystemIndexDescriptors(Settings.EMPTY) .stream() .anyMatch(systemIndexDescriptor -> systemIndexDescriptor.matchesIndexPattern(".opensearch_dashboards-event-log-7-1")), is(false) diff --git a/modules/parent-join/build.gradle b/modules/parent-join/build.gradle index 3c71a731e6a6a..d509e65106e7b 100644 --- a/modules/parent-join/build.gradle +++ b/modules/parent-join/build.gradle @@ -32,7 +32,7 @@ apply plugin: 'opensearch.internal-cluster-test' opensearchplugin { description 'This module adds the support parent-child queries and aggregations' - classname 'org.opensearch.join.ParentJoinPlugin' + classname 'org.opensearch.join.ParentJoinModulePlugin' hasClientJar = true } diff --git a/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/query/ParentChildTestCase.java b/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/query/ParentChildTestCase.java index 5d6d4fb333d49..71d7c0928e643 100644 --- a/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/query/ParentChildTestCase.java +++ b/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/query/ParentChildTestCase.java @@ -38,7 +38,7 @@ import org.opensearch.common.xcontent.XContentHelper; import org.opensearch.common.xcontent.json.JsonXContent; import org.opensearch.index.IndexModule; -import org.opensearch.join.ParentJoinPlugin; +import org.opensearch.join.ParentJoinModulePlugin; import org.opensearch.plugins.Plugin; import org.opensearch.test.OpenSearchIntegTestCase; import org.opensearch.test.InternalSettingsPlugin; @@ -60,7 +60,7 @@ protected boolean ignoreExternalCluster() { @Override protected Collection> nodePlugins() { - return Arrays.asList(InternalSettingsPlugin.class, ParentJoinPlugin.class); + return Arrays.asList(InternalSettingsPlugin.class, ParentJoinModulePlugin.class); } @Override diff --git a/modules/parent-join/src/main/java/org/opensearch/join/ParentJoinPlugin.java b/modules/parent-join/src/main/java/org/opensearch/join/ParentJoinModulePlugin.java similarity index 95% rename from modules/parent-join/src/main/java/org/opensearch/join/ParentJoinPlugin.java rename to modules/parent-join/src/main/java/org/opensearch/join/ParentJoinModulePlugin.java index 6889e38c04ff3..31e5be7f9979c 100644 --- a/modules/parent-join/src/main/java/org/opensearch/join/ParentJoinPlugin.java +++ b/modules/parent-join/src/main/java/org/opensearch/join/ParentJoinModulePlugin.java @@ -50,9 +50,9 @@ import java.util.List; import java.util.Map; -public class ParentJoinPlugin extends Plugin implements SearchPlugin, MapperPlugin { +public class ParentJoinModulePlugin extends Plugin implements SearchPlugin, MapperPlugin { - public ParentJoinPlugin() {} + public ParentJoinModulePlugin() {} @Override public List> getQueries() { 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 71088e1d5391d..086176bfbde6c 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 @@ -32,7 +32,7 @@ package org.opensearch.join.aggregations; -import org.opensearch.join.ParentJoinPlugin; +import org.opensearch.join.ParentJoinModulePlugin; import org.opensearch.plugins.Plugin; import org.opensearch.search.aggregations.BaseAggregationTestCase; import org.opensearch.test.TestGeoShapeFieldMapperPlugin; @@ -44,7 +44,7 @@ public class ChildrenTests extends BaseAggregationTestCase> getPlugins() { - return Arrays.asList(ParentJoinPlugin.class, TestGeoShapeFieldMapperPlugin.class); + return Arrays.asList(ParentJoinModulePlugin.class, TestGeoShapeFieldMapperPlugin.class); } @Override 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 0d134592fa678..d1b4f3c3ebc27 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 @@ -61,7 +61,7 @@ import org.opensearch.index.mapper.NumberFieldMapper; import org.opensearch.index.mapper.Uid; import org.opensearch.index.shard.ShardId; -import org.opensearch.join.ParentJoinPlugin; +import org.opensearch.join.ParentJoinModulePlugin; import org.opensearch.join.mapper.MetaJoinFieldMapper; import org.opensearch.join.mapper.ParentJoinFieldMapper; import org.opensearch.plugins.SearchPlugin; @@ -350,6 +350,6 @@ private void testCaseTermsParentTerms(Query query, IndexSearcher indexSearcher, @Override protected List getSearchPlugins() { - return Collections.singletonList(new ParentJoinPlugin()); + return Collections.singletonList(new ParentJoinModulePlugin()); } } 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 8eaedc4aa15b0..3884c856d9a0e 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 @@ -35,7 +35,7 @@ import org.opensearch.common.ParseField; import org.opensearch.common.xcontent.NamedXContentRegistry; import org.opensearch.common.xcontent.NamedXContentRegistry.Entry; -import org.opensearch.join.ParentJoinPlugin; +import org.opensearch.join.ParentJoinModulePlugin; import org.opensearch.plugins.SearchPlugin; import org.opensearch.search.aggregations.Aggregation; import org.opensearch.search.aggregations.InternalAggregations; @@ -50,7 +50,7 @@ public class InternalChildrenTests extends InternalSingleBucketAggregationTestCa @Override protected SearchPlugin registerPlugin() { - return new ParentJoinPlugin(); + return new ParentJoinModulePlugin(); } @Override 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 cd5236ab49a39..72bfc55888147 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 @@ -34,7 +34,7 @@ import org.opensearch.common.ParseField; import org.opensearch.common.xcontent.NamedXContentRegistry.Entry; -import org.opensearch.join.ParentJoinPlugin; +import org.opensearch.join.ParentJoinModulePlugin; import org.opensearch.plugins.SearchPlugin; import org.opensearch.search.aggregations.Aggregation; import org.opensearch.search.aggregations.InternalAggregations; @@ -49,7 +49,7 @@ public class InternalParentTests extends InternalSingleBucketAggregationTestCase @Override protected SearchPlugin registerPlugin() { - return new ParentJoinPlugin(); + return new ParentJoinModulePlugin(); } @Override 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 abb258f37198b..4f08e004ea208 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 @@ -35,7 +35,7 @@ import java.util.Arrays; import java.util.Collection; -import org.opensearch.join.ParentJoinPlugin; +import org.opensearch.join.ParentJoinModulePlugin; import org.opensearch.plugins.Plugin; import org.opensearch.search.aggregations.BaseAggregationTestCase; import org.opensearch.test.TestGeoShapeFieldMapperPlugin; @@ -44,7 +44,7 @@ public class ParentTests extends BaseAggregationTestCase> getPlugins() { - return Arrays.asList(ParentJoinPlugin.class, TestGeoShapeFieldMapperPlugin.class); + return Arrays.asList(ParentJoinModulePlugin.class, TestGeoShapeFieldMapperPlugin.class); } @Override 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 2ed06ee0c0ea9..61a1b761f17ab 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 @@ -62,7 +62,7 @@ import org.opensearch.index.mapper.NumberFieldMapper; import org.opensearch.index.mapper.Uid; import org.opensearch.index.shard.ShardId; -import org.opensearch.join.ParentJoinPlugin; +import org.opensearch.join.ParentJoinModulePlugin; import org.opensearch.join.mapper.MetaJoinFieldMapper; import org.opensearch.join.mapper.ParentJoinFieldMapper; import org.opensearch.plugins.SearchPlugin; @@ -287,6 +287,6 @@ private void testCase(Query query, IndexSearcher indexSearcher, Consumer getSearchPlugins() { - return Collections.singletonList(new ParentJoinPlugin()); + return Collections.singletonList(new ParentJoinModulePlugin()); } } 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 a9ac151dd3806..53e9495b707fe 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 @@ -44,7 +44,7 @@ import org.opensearch.index.mapper.MapperService; import org.opensearch.index.mapper.ParsedDocument; import org.opensearch.index.mapper.SourceToParse; -import org.opensearch.join.ParentJoinPlugin; +import org.opensearch.join.ParentJoinModulePlugin; import org.opensearch.plugins.Plugin; import org.opensearch.test.OpenSearchSingleNodeTestCase; @@ -56,7 +56,7 @@ public class ParentJoinFieldMapperTests extends OpenSearchSingleNodeTestCase { @Override protected Collection> getPlugins() { - return Collections.singletonList(ParentJoinPlugin.class); + return Collections.singletonList(ParentJoinModulePlugin.class); } public void testSingleLevel() throws Exception { 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 5595c98a439bf..5a7b51b64210c 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 @@ -63,7 +63,7 @@ import org.opensearch.index.query.TermQueryBuilder; import org.opensearch.index.query.WrapperQueryBuilder; import org.opensearch.index.similarity.SimilarityService; -import org.opensearch.join.ParentJoinPlugin; +import org.opensearch.join.ParentJoinModulePlugin; import org.opensearch.plugins.Plugin; import org.opensearch.search.sort.FieldSortBuilder; import org.opensearch.search.sort.SortOrder; @@ -99,7 +99,7 @@ public class HasChildQueryBuilderTests extends AbstractQueryTestCase> getPlugins() { - return Arrays.asList(ParentJoinPlugin.class, TestGeoShapeFieldMapperPlugin.class); + return Arrays.asList(ParentJoinModulePlugin.class, TestGeoShapeFieldMapperPlugin.class); } @Override 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 0f983799a6d25..32c9e490be165 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 @@ -50,7 +50,7 @@ import org.opensearch.index.query.QueryShardException; import org.opensearch.index.query.TermQueryBuilder; import org.opensearch.index.query.WrapperQueryBuilder; -import org.opensearch.join.ParentJoinPlugin; +import org.opensearch.join.ParentJoinModulePlugin; import org.opensearch.plugins.Plugin; import org.opensearch.search.sort.FieldSortBuilder; import org.opensearch.search.sort.SortOrder; @@ -83,7 +83,7 @@ public class HasParentQueryBuilderTests extends AbstractQueryTestCase> getPlugins() { - return Arrays.asList(ParentJoinPlugin.class, TestGeoShapeFieldMapperPlugin.class); + return Arrays.asList(ParentJoinModulePlugin.class, TestGeoShapeFieldMapperPlugin.class); } @Override 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 41bc717db1fc8..995206120d075 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 @@ -45,7 +45,7 @@ import org.opensearch.index.mapper.MapperService; import org.opensearch.index.query.QueryShardContext; import org.opensearch.index.query.QueryShardException; -import org.opensearch.join.ParentJoinPlugin; +import org.opensearch.join.ParentJoinModulePlugin; import org.opensearch.plugins.Plugin; import org.opensearch.test.AbstractQueryTestCase; import org.opensearch.test.TestGeoShapeFieldMapperPlugin; @@ -72,7 +72,7 @@ public class ParentIdQueryBuilderTests extends AbstractQueryTestCase> getPlugins() { - return Arrays.asList(ParentJoinPlugin.class, TestGeoShapeFieldMapperPlugin.class); + return Arrays.asList(ParentJoinModulePlugin.class, TestGeoShapeFieldMapperPlugin.class); } @Override diff --git a/modules/percolator/build.gradle b/modules/percolator/build.gradle index 1738de5a55748..2312f7bda80b2 100644 --- a/modules/percolator/build.gradle +++ b/modules/percolator/build.gradle @@ -32,7 +32,7 @@ apply plugin: 'opensearch.internal-cluster-test' opensearchplugin { description 'Percolator module adds capability to index queries and query these queries by specifying documents' - classname 'org.opensearch.percolator.PercolatorPlugin' + classname 'org.opensearch.percolator.PercolatorModulePlugin' hasClientJar = true } 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 8d3c37bc9b039..8c0bfb378bccd 100644 --- a/modules/percolator/src/internalClusterTest/java/org/opensearch/percolator/PercolatorQuerySearchIT.java +++ b/modules/percolator/src/internalClusterTest/java/org/opensearch/percolator/PercolatorQuerySearchIT.java @@ -44,7 +44,7 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentType; -import org.opensearch.geo.GeoPlugin; +import org.opensearch.geo.GeoModulePlugin; import org.opensearch.index.mapper.MapperParsingException; import org.opensearch.index.query.MatchPhraseQueryBuilder; import org.opensearch.index.query.MultiMatchQueryBuilder; @@ -93,7 +93,7 @@ protected boolean addMockGeoShapeFieldMapper() { @Override protected Collection> nodePlugins() { - return Arrays.asList(PercolatorPlugin.class, GeoPlugin.class); + return Arrays.asList(PercolatorModulePlugin.class, GeoModulePlugin.class); } public void testPercolatorQuery() throws Exception { diff --git a/modules/percolator/src/main/java/org/opensearch/percolator/PercolatorPlugin.java b/modules/percolator/src/main/java/org/opensearch/percolator/PercolatorModulePlugin.java similarity index 96% rename from modules/percolator/src/main/java/org/opensearch/percolator/PercolatorPlugin.java rename to modules/percolator/src/main/java/org/opensearch/percolator/PercolatorModulePlugin.java index f841860d3930a..c0416f0336a10 100644 --- a/modules/percolator/src/main/java/org/opensearch/percolator/PercolatorPlugin.java +++ b/modules/percolator/src/main/java/org/opensearch/percolator/PercolatorModulePlugin.java @@ -46,7 +46,7 @@ import static java.util.Collections.singletonList; import static java.util.Collections.singletonMap; -public class PercolatorPlugin extends Plugin implements MapperPlugin, SearchPlugin { +public class PercolatorModulePlugin extends Plugin implements MapperPlugin, SearchPlugin { @Override public List> getQueries() { return singletonList(new QuerySpec<>(PercolateQueryBuilder.NAME, PercolateQueryBuilder::new, PercolateQueryBuilder::fromXContent)); 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 e59aa227e3dc7..1e884f591cbf8 100644 --- a/modules/percolator/src/test/java/org/opensearch/percolator/CandidateQueryTests.java +++ b/modules/percolator/src/test/java/org/opensearch/percolator/CandidateQueryTests.java @@ -149,7 +149,7 @@ public class CandidateQueryTests extends OpenSearchSingleNodeTestCase { @Override protected Collection> getPlugins() { - return Collections.singleton(PercolatorPlugin.class); + return Collections.singleton(PercolatorModulePlugin.class); } @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 87aa28a3346bc..8a744a038442f 100644 --- a/modules/percolator/src/test/java/org/opensearch/percolator/PercolateQueryBuilderTests.java +++ b/modules/percolator/src/test/java/org/opensearch/percolator/PercolateQueryBuilderTests.java @@ -97,7 +97,7 @@ public class PercolateQueryBuilderTests extends AbstractQueryTestCase> getPlugins() { - return Arrays.asList(PercolatorPlugin.class, TestGeoShapeFieldMapperPlugin.class); + return Arrays.asList(PercolatorModulePlugin.class, TestGeoShapeFieldMapperPlugin.class); } @Override 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 fe9c486b68166..fc18a7af937f9 100644 --- a/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorFieldMapperTests.java +++ b/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorFieldMapperTests.java @@ -95,7 +95,7 @@ import org.opensearch.index.query.functionscore.RandomScoreFunctionBuilder; import org.opensearch.index.query.functionscore.ScriptScoreFunctionBuilder; import org.opensearch.indices.TermsLookup; -import org.opensearch.join.ParentJoinPlugin; +import org.opensearch.join.ParentJoinModulePlugin; import org.opensearch.join.query.HasChildQueryBuilder; import org.opensearch.join.query.HasParentQueryBuilder; import org.opensearch.plugins.Plugin; @@ -145,7 +145,12 @@ public class PercolatorFieldMapperTests extends OpenSearchSingleNodeTestCase { @Override protected Collection> getPlugins() { - return pluginList(InternalSettingsPlugin.class, PercolatorPlugin.class, FoolMeScriptPlugin.class, ParentJoinPlugin.class); + return pluginList( + InternalSettingsPlugin.class, + PercolatorModulePlugin.class, + FoolMeScriptPlugin.class, + ParentJoinModulePlugin.class + ); } @Override 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 1d77c9d472864..3d44a94297790 100644 --- a/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorQuerySearchTests.java +++ b/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorQuerySearchTests.java @@ -78,7 +78,7 @@ public class PercolatorQuerySearchTests extends OpenSearchSingleNodeTestCase { @Override protected Collection> getPlugins() { - return Arrays.asList(PercolatorPlugin.class, CustomScriptPlugin.class); + return Arrays.asList(PercolatorModulePlugin.class, CustomScriptPlugin.class); } public static class CustomScriptPlugin extends MockScriptPlugin { diff --git a/modules/rank-eval/build.gradle b/modules/rank-eval/build.gradle index 2b1d1e9abc4b4..4232d583dc984 100644 --- a/modules/rank-eval/build.gradle +++ b/modules/rank-eval/build.gradle @@ -32,7 +32,7 @@ apply plugin: 'opensearch.internal-cluster-test' opensearchplugin { description 'The Rank Eval module adds APIs to evaluate ranking quality.' - classname 'org.opensearch.index.rankeval.RankEvalPlugin' + classname 'org.opensearch.index.rankeval.RankEvalModulePlugin' hasClientJar = true } 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 ea80b59711b8a..6eb974c77a5f3 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 @@ -65,7 +65,7 @@ public class RankEvalRequestIT extends OpenSearchIntegTestCase { @Override protected Collection> nodePlugins() { - return Arrays.asList(RankEvalPlugin.class); + return Arrays.asList(RankEvalModulePlugin.class); } @Before 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/RankEvalModulePlugin.java similarity index 98% rename from modules/rank-eval/src/main/java/org/opensearch/index/rankeval/RankEvalPlugin.java rename to modules/rank-eval/src/main/java/org/opensearch/index/rankeval/RankEvalModulePlugin.java index a1eaa0f62f0f1..af960207e5175 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/RankEvalModulePlugin.java @@ -53,7 +53,7 @@ import java.util.List; import java.util.function.Supplier; -public class RankEvalPlugin extends Plugin implements ActionPlugin { +public class RankEvalModulePlugin extends Plugin implements ActionPlugin { @Override public List> getActions() { diff --git a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/EvalQueryQualityTests.java b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/EvalQueryQualityTests.java index 56d23d8ca3184..ab34435c5f346 100644 --- a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/EvalQueryQualityTests.java +++ b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/EvalQueryQualityTests.java @@ -56,12 +56,14 @@ public class EvalQueryQualityTests extends OpenSearchTestCase { - private static NamedWriteableRegistry namedWritableRegistry = new NamedWriteableRegistry(new RankEvalPlugin().getNamedWriteables()); + private static NamedWriteableRegistry namedWritableRegistry = new NamedWriteableRegistry( + new RankEvalModulePlugin().getNamedWriteables() + ); @SuppressWarnings("resource") @Override protected NamedXContentRegistry xContentRegistry() { - return new NamedXContentRegistry(new RankEvalPlugin().getNamedXContent()); + return new NamedXContentRegistry(new RankEvalModulePlugin().getNamedXContent()); } public static EvalQueryQuality randomEvalQueryQuality() { diff --git a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RankEvalRequestTests.java b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RankEvalRequestTests.java index 401bb1b2a7bb7..c2a041ea59aee 100644 --- a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RankEvalRequestTests.java +++ b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RankEvalRequestTests.java @@ -47,21 +47,21 @@ public class RankEvalRequestTests extends AbstractWireSerializingTestCase { - private static RankEvalPlugin rankEvalPlugin = new RankEvalPlugin(); + private static RankEvalModulePlugin rankEvalModulePlugin = new RankEvalModulePlugin(); @AfterClass public static void releasePluginResources() throws IOException { - rankEvalPlugin.close(); + rankEvalModulePlugin.close(); } @Override protected NamedXContentRegistry xContentRegistry() { - return new NamedXContentRegistry(rankEvalPlugin.getNamedXContent()); + return new NamedXContentRegistry(rankEvalModulePlugin.getNamedXContent()); } @Override protected NamedWriteableRegistry getNamedWriteableRegistry() { - return new NamedWriteableRegistry(rankEvalPlugin.getNamedWriteables()); + return new NamedWriteableRegistry(rankEvalModulePlugin.getNamedWriteables()); } @Override diff --git a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RankEvalSpecTests.java b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RankEvalSpecTests.java index b79b26eb0af2e..31db13889be4b 100644 --- a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RankEvalSpecTests.java +++ b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RankEvalSpecTests.java @@ -71,7 +71,7 @@ public class RankEvalSpecTests extends OpenSearchTestCase { @SuppressWarnings("resource") @Override protected NamedXContentRegistry xContentRegistry() { - return new NamedXContentRegistry(new RankEvalPlugin().getNamedXContent()); + return new NamedXContentRegistry(new RankEvalModulePlugin().getNamedXContent()); } private static List randomList(Supplier randomSupplier) { diff --git a/modules/reindex/build.gradle b/modules/reindex/build.gradle index 37526a924da73..cad7d67f3ef84 100644 --- a/modules/reindex/build.gradle +++ b/modules/reindex/build.gradle @@ -41,7 +41,7 @@ apply plugin: 'opensearch.internal-cluster-test' opensearchplugin { description 'The Reindex module adds APIs to reindex from one index to another or update documents in place.' - classname 'org.opensearch.index.reindex.ReindexPlugin' + classname 'org.opensearch.index.reindex.ReindexModulePlugin' hasClientJar = true } 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 6d313e06263b3..05cb87b3f9165 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 @@ -46,7 +46,7 @@ import org.opensearch.index.reindex.DeleteByQueryAction; import org.opensearch.index.reindex.DeleteByQueryRequestBuilder; import org.opensearch.index.reindex.ReindexAction; -import org.opensearch.index.reindex.ReindexPlugin; +import org.opensearch.index.reindex.ReindexModulePlugin; import org.opensearch.index.reindex.ReindexRequestBuilder; import org.opensearch.index.reindex.RethrottleAction; import org.opensearch.index.reindex.RethrottleRequestBuilder; @@ -88,7 +88,7 @@ protected boolean ignoreExternalCluster() { @Override protected Collection> nodePlugins() { - return Arrays.asList(ReindexPlugin.class, ReindexCancellationPlugin.class); + return Arrays.asList(ReindexModulePlugin.class, ReindexCancellationPlugin.class); } @Before diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexPlugin.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexModulePlugin.java similarity index 96% rename from modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexPlugin.java rename to modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexModulePlugin.java index 865ae26f6f54d..28c6b4038ecfd 100644 --- a/modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexPlugin.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexModulePlugin.java @@ -37,7 +37,6 @@ import org.apache.logging.log4j.Logger; import org.opensearch.index.reindex.spi.RemoteReindexExtension; import org.opensearch.plugins.ExtensiblePlugin; -import org.opensearch.plugins.ExtensiblePlugin.ExtensionLoader; import org.opensearch.watcher.ResourceWatcherService; import org.opensearch.action.ActionRequest; import org.opensearch.action.ActionResponse; @@ -62,7 +61,6 @@ import org.opensearch.script.ScriptService; import org.opensearch.tasks.Task; import org.opensearch.threadpool.ThreadPool; -import org.opensearch.watcher.ResourceWatcherService; import java.util.ArrayList; import java.util.Arrays; @@ -73,9 +71,9 @@ import static java.util.Collections.singletonList; -public class ReindexPlugin extends Plugin implements ActionPlugin, ExtensiblePlugin { +public class ReindexModulePlugin extends Plugin implements ActionPlugin, ExtensiblePlugin { public static final String NAME = "reindex"; - private static final Logger logger = LogManager.getLogger(ReindexPlugin.class); + private static final Logger logger = LogManager.getLogger(ReindexModulePlugin.class); @Override public List> getActions() { diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/spi/RemoteReindexExtension.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/spi/RemoteReindexExtension.java index ce252de292d63..22d560b19c699 100644 --- a/modules/reindex/src/main/java/org/opensearch/index/reindex/spi/RemoteReindexExtension.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/spi/RemoteReindexExtension.java @@ -7,10 +7,11 @@ import org.opensearch.action.ActionListener; import org.opensearch.index.reindex.BulkByScrollResponse; +import org.opensearch.index.reindex.ReindexModulePlugin; import org.opensearch.index.reindex.ReindexRequest; /** - * This interface provides an extension point for {@link org.opensearch.index.reindex.ReindexPlugin}. + * This interface provides an extension point for {@link ReindexModulePlugin}. * This interface can be implemented to provide a custom Rest interceptor and {@link ActionListener} * The Rest interceptor can be used to pre-process any reindex request and perform any action * on the response. The ActionListener listens to the success and failure events on every reindex request diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteWithAuthTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteWithAuthTests.java index 8ce850a936557..dd7eb977bbe48 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteWithAuthTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteWithAuthTests.java @@ -65,7 +65,7 @@ import org.opensearch.tasks.Task; import org.opensearch.test.OpenSearchSingleNodeTestCase; import org.opensearch.threadpool.ThreadPool; -import org.opensearch.transport.Netty4Plugin; +import org.opensearch.transport.Netty4ModulePlugin; import org.opensearch.watcher.ResourceWatcherService; import org.junit.Before; @@ -87,7 +87,7 @@ public class ReindexFromRemoteWithAuthTests extends OpenSearchSingleNodeTestCase @Override protected Collection> getPlugins() { - return Arrays.asList(Netty4Plugin.class, ReindexFromRemoteWithAuthTests.TestPlugin.class, ReindexPlugin.class); + return Arrays.asList(Netty4ModulePlugin.class, ReindexFromRemoteWithAuthTests.TestPlugin.class, ReindexModulePlugin.class); } @Override @@ -100,7 +100,7 @@ protected Settings nodeSettings() { Settings.Builder settings = Settings.builder().put(super.nodeSettings()); // Allowlist reindexing from the http host we're going to use settings.put(TransportReindexAction.REMOTE_CLUSTER_ALLOWLIST.getKey(), "127.0.0.1:*"); - settings.put(NetworkModule.HTTP_TYPE_KEY, Netty4Plugin.NETTY_HTTP_TRANSPORT_NAME); + settings.put(NetworkModule.HTTP_TYPE_KEY, Netty4ModulePlugin.NETTY_HTTP_TRANSPORT_NAME); return settings.build(); } diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexRenamedSettingTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexRenamedSettingTests.java index 00747d85221c6..be4bacce9b57c 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexRenamedSettingTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexRenamedSettingTests.java @@ -24,7 +24,7 @@ * The test can be removed along with removing support of the deprecated setting. */ public class ReindexRenamedSettingTests extends OpenSearchTestCase { - private final ReindexPlugin plugin = new ReindexPlugin(); + private final ReindexModulePlugin plugin = new ReindexModulePlugin(); /** * Validate the both settings are known and supported. 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 8ce9cf74bb8be..8c113973f4415 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 @@ -46,7 +46,7 @@ public class ReindexSingleNodeTests extends OpenSearchSingleNodeTestCase { @Override protected Collection> getPlugins() { - return Arrays.asList(ReindexPlugin.class); + return Arrays.asList(ReindexModulePlugin.class); } public void testDeprecatedSort() { 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 0ce3a9f3461c3..0941516194f6e 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 @@ -51,7 +51,7 @@ public abstract class ReindexTestCase extends OpenSearchIntegTestCase { @Override protected Collection> nodePlugins() { - return Arrays.asList(ReindexPlugin.class); + return Arrays.asList(ReindexModulePlugin.class); } protected ReindexRequestBuilder reindex() { 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 0b052f8fd57a3..0a01843405d9f 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 @@ -49,7 +49,7 @@ import org.opensearch.plugins.Plugin; import org.opensearch.test.OpenSearchIntegTestCase; import org.opensearch.threadpool.ThreadPool; -import org.opensearch.transport.Netty4Plugin; +import org.opensearch.transport.Netty4ModulePlugin; import org.junit.After; import java.util.ArrayList; @@ -84,7 +84,7 @@ public void forceUnblockAllExecutors() { @Override protected Collection> nodePlugins() { - return Arrays.asList(ReindexPlugin.class, Netty4Plugin.class); + return Arrays.asList(ReindexModulePlugin.class, Netty4ModulePlugin.class); } /** diff --git a/modules/repository-url/build.gradle b/modules/repository-url/build.gradle index 702f0e9bb0f8b..7a697623eb8d9 100644 --- a/modules/repository-url/build.gradle +++ b/modules/repository-url/build.gradle @@ -38,7 +38,7 @@ apply plugin: 'opensearch.internal-cluster-test' opensearchplugin { description 'Module for URL repository' - classname 'org.opensearch.plugin.repository.url.URLRepositoryPlugin' + classname 'org.opensearch.plugin.repository.url.URLRepositoryModulePlugin' } restResources { diff --git a/modules/repository-url/src/internalClusterTest/java/org/opensearch/repositories/url/URLSnapshotRestoreIT.java b/modules/repository-url/src/internalClusterTest/java/org/opensearch/repositories/url/URLSnapshotRestoreIT.java index aa274549f3a9b..1bf461d67862b 100644 --- a/modules/repository-url/src/internalClusterTest/java/org/opensearch/repositories/url/URLSnapshotRestoreIT.java +++ b/modules/repository-url/src/internalClusterTest/java/org/opensearch/repositories/url/URLSnapshotRestoreIT.java @@ -39,7 +39,7 @@ import org.opensearch.client.Client; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.ByteSizeUnit; -import org.opensearch.plugin.repository.url.URLRepositoryPlugin; +import org.opensearch.plugin.repository.url.URLRepositoryModulePlugin; import org.opensearch.plugins.Plugin; import org.opensearch.repositories.fs.FsRepository; import org.opensearch.snapshots.SnapshotState; @@ -59,7 +59,7 @@ public class URLSnapshotRestoreIT extends OpenSearchIntegTestCase { @Override protected Collection> nodePlugins() { - return Collections.singletonList(URLRepositoryPlugin.class); + return Collections.singletonList(URLRepositoryModulePlugin.class); } public void testUrlRepository() throws Exception { 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/URLRepositoryModulePlugin.java similarity index 96% rename from modules/repository-url/src/main/java/org/opensearch/plugin/repository/url/URLRepositoryPlugin.java rename to modules/repository-url/src/main/java/org/opensearch/plugin/repository/url/URLRepositoryModulePlugin.java index d1b08d443805f..00d697e9fb0f6 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/URLRepositoryModulePlugin.java @@ -47,7 +47,7 @@ import java.util.List; import java.util.Map; -public class URLRepositoryPlugin extends Plugin implements RepositoryPlugin { +public class URLRepositoryModulePlugin extends Plugin implements RepositoryPlugin { @Override public List> getSettings() { diff --git a/modules/systemd/build.gradle b/modules/systemd/build.gradle index 26e094a9eeae1..726092ffe4273 100644 --- a/modules/systemd/build.gradle +++ b/modules/systemd/build.gradle @@ -30,5 +30,5 @@ opensearchplugin { description 'Integrates OpenSearch with systemd' - classname 'org.opensearch.systemd.SystemdPlugin' + classname 'org.opensearch.systemd.SystemdModulePlugin' } diff --git a/modules/systemd/src/main/java/org/opensearch/systemd/SystemdPlugin.java b/modules/systemd/src/main/java/org/opensearch/systemd/SystemdModulePlugin.java similarity index 96% rename from modules/systemd/src/main/java/org/opensearch/systemd/SystemdPlugin.java rename to modules/systemd/src/main/java/org/opensearch/systemd/SystemdModulePlugin.java index 8abdbbb74ae7f..a22b3f862e017 100644 --- a/modules/systemd/src/main/java/org/opensearch/systemd/SystemdPlugin.java +++ b/modules/systemd/src/main/java/org/opensearch/systemd/SystemdModulePlugin.java @@ -55,9 +55,9 @@ import java.util.Collections; import java.util.function.Supplier; -public class SystemdPlugin extends Plugin implements ClusterPlugin { +public class SystemdModulePlugin extends Plugin implements ClusterPlugin { - private static final Logger logger = LogManager.getLogger(SystemdPlugin.class); + private static final Logger logger = LogManager.getLogger(SystemdModulePlugin.class); private final boolean enabled; @@ -66,11 +66,11 @@ final boolean isEnabled() { } @SuppressWarnings("unused") - public SystemdPlugin() { + public SystemdModulePlugin() { this(System.getenv("OPENSEARCH_SD_NOTIFY")); } - SystemdPlugin(final String esSDNotify) { + SystemdModulePlugin(final String esSDNotify) { logger.trace("OPENSEARCH_SD_NOTIFY is set to [{}]", esSDNotify); if (esSDNotify == null) { enabled = false; diff --git a/modules/systemd/src/test/java/org/opensearch/systemd/SystemdPluginTests.java b/modules/systemd/src/test/java/org/opensearch/systemd/SystemdModulePluginTests.java similarity index 87% rename from modules/systemd/src/test/java/org/opensearch/systemd/SystemdPluginTests.java rename to modules/systemd/src/test/java/org/opensearch/systemd/SystemdModulePluginTests.java index 63d97a7486f58..532d47cd009e0 100644 --- a/modules/systemd/src/test/java/org/opensearch/systemd/SystemdPluginTests.java +++ b/modules/systemd/src/test/java/org/opensearch/systemd/SystemdModulePluginTests.java @@ -56,7 +56,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -public class SystemdPluginTests extends OpenSearchTestCase { +public class SystemdModulePluginTests extends OpenSearchTestCase { final Scheduler.Cancellable extender = mock(Scheduler.Cancellable.class); final ThreadPool threadPool = mock(ThreadPool.class); @@ -67,14 +67,14 @@ public class SystemdPluginTests extends OpenSearchTestCase { } public void testIsImplicitlyNotEnabled() { - final SystemdPlugin plugin = new SystemdPlugin(null); + final SystemdModulePlugin plugin = new SystemdModulePlugin(null); plugin.createComponents(null, null, threadPool, null, null, null, null, null, null, null, null); assertFalse(plugin.isEnabled()); assertNull(plugin.extender()); } public void testIsExplicitlyNotEnabled() { - final SystemdPlugin plugin = new SystemdPlugin(Boolean.FALSE.toString()); + final SystemdModulePlugin plugin = new SystemdModulePlugin(Boolean.FALSE.toString()); plugin.createComponents(null, null, threadPool, null, null, null, null, null, null, null, null); assertFalse(plugin.isEnabled()); assertNull(plugin.extender()); @@ -85,7 +85,7 @@ public void testInvalid() { s -> Boolean.TRUE.toString().equals(s) || Boolean.FALSE.toString().equals(s), () -> randomAlphaOfLength(4) ); - final RuntimeException e = expectThrows(RuntimeException.class, () -> new SystemdPlugin(esSDNotify)); + final RuntimeException e = expectThrows(RuntimeException.class, () -> new SystemdModulePlugin(esSDNotify)); assertThat(e, hasToString(containsString("OPENSEARCH_SD_NOTIFY set to unexpected value [" + esSDNotify + "]"))); } @@ -113,9 +113,9 @@ public void testOnNodeStartedNotEnabled() { private void runTestOnNodeStarted( final String esSDNotify, final int rc, - final BiConsumer, SystemdPlugin> assertions + final BiConsumer, SystemdModulePlugin> assertions ) { - runTest(esSDNotify, rc, assertions, SystemdPlugin::onNodeStarted, "READY=1"); + runTest(esSDNotify, rc, assertions, SystemdModulePlugin::onNodeStarted, "READY=1"); } public void testCloseSuccess() { @@ -138,21 +138,25 @@ public void testCloseNotEnabled() { runTestClose(Boolean.FALSE.toString(), randomInt(), (maybe, plugin) -> assertThat(maybe, OptionalMatchers.isEmpty())); } - private void runTestClose(final String esSDNotify, final int rc, final BiConsumer, SystemdPlugin> assertions) { - runTest(esSDNotify, rc, assertions, SystemdPlugin::close, "STOPPING=1"); + private void runTestClose( + final String esSDNotify, + final int rc, + final BiConsumer, SystemdModulePlugin> assertions + ) { + runTest(esSDNotify, rc, assertions, SystemdModulePlugin::close, "STOPPING=1"); } private void runTest( final String esSDNotify, final int rc, - final BiConsumer, SystemdPlugin> assertions, - final CheckedConsumer invocation, + final BiConsumer, SystemdModulePlugin> assertions, + final CheckedConsumer invocation, final String expectedState ) { final AtomicBoolean invoked = new AtomicBoolean(); final AtomicInteger invokedUnsetEnvironment = new AtomicInteger(); final AtomicReference invokedState = new AtomicReference<>(); - final SystemdPlugin plugin = new SystemdPlugin(esSDNotify) { + final SystemdModulePlugin plugin = new SystemdModulePlugin(esSDNotify) { @Override int sd_notify(final int unset_environment, final String state) { diff --git a/modules/transport-netty4/build.gradle b/modules/transport-netty4/build.gradle index 450eaed14fa46..b72cb6d868d79 100644 --- a/modules/transport-netty4/build.gradle +++ b/modules/transport-netty4/build.gradle @@ -49,7 +49,7 @@ apply plugin: 'opensearch.publish' */ opensearchplugin { description 'Netty 4 based transport implementation' - classname 'org.opensearch.transport.Netty4Plugin' + classname 'org.opensearch.transport.Netty4ModulePlugin' hasClientJar = true } 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 9915b9fe51be2..9b086e0b8baa9 100644 --- a/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/OpenSearchNetty4IntegTestCase.java +++ b/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/OpenSearchNetty4IntegTestCase.java @@ -35,7 +35,7 @@ import org.opensearch.common.settings.Settings; import org.opensearch.plugins.Plugin; import org.opensearch.test.OpenSearchIntegTestCase; -import org.opensearch.transport.Netty4Plugin; +import org.opensearch.transport.Netty4ModulePlugin; import org.opensearch.transport.netty4.Netty4Transport; import java.util.Collection; @@ -60,13 +60,13 @@ protected Settings nodeSettings(int nodeOrdinal) { if (randomBoolean()) { builder.put(Netty4Transport.WORKER_COUNT.getKey(), random().nextInt(3) + 1); } - builder.put(NetworkModule.TRANSPORT_TYPE_KEY, Netty4Plugin.NETTY_TRANSPORT_NAME); - builder.put(NetworkModule.HTTP_TYPE_KEY, Netty4Plugin.NETTY_HTTP_TRANSPORT_NAME); + builder.put(NetworkModule.TRANSPORT_TYPE_KEY, Netty4ModulePlugin.NETTY_TRANSPORT_NAME); + builder.put(NetworkModule.HTTP_TYPE_KEY, Netty4ModulePlugin.NETTY_HTTP_TRANSPORT_NAME); return builder.build(); } @Override protected Collection> nodePlugins() { - return Collections.singletonList(Netty4Plugin.class); + return Collections.singletonList(Netty4ModulePlugin.class); } } diff --git a/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/transport/netty4/Netty4TransportPublishAddressIT.java b/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/transport/netty4/Netty4TransportPublishAddressIT.java index a572a181a46fd..e6604abf126da 100644 --- a/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/transport/netty4/Netty4TransportPublishAddressIT.java +++ b/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/transport/netty4/Netty4TransportPublishAddressIT.java @@ -41,7 +41,7 @@ import org.opensearch.common.transport.BoundTransportAddress; import org.opensearch.common.transport.TransportAddress; import org.opensearch.test.OpenSearchIntegTestCase; -import org.opensearch.transport.Netty4Plugin; +import org.opensearch.transport.Netty4ModulePlugin; import org.opensearch.transport.TransportInfo; import java.net.Inet4Address; @@ -60,7 +60,7 @@ public class Netty4TransportPublishAddressIT extends OpenSearchNetty4IntegTestCa protected Settings nodeSettings(int nodeOrdinal) { return Settings.builder() .put(super.nodeSettings(nodeOrdinal)) - .put(NetworkModule.TRANSPORT_TYPE_KEY, Netty4Plugin.NETTY_TRANSPORT_NAME) + .put(NetworkModule.TRANSPORT_TYPE_KEY, Netty4ModulePlugin.NETTY_TRANSPORT_NAME) .build(); } diff --git a/modules/transport-netty4/src/main/java/org/opensearch/transport/Netty4Plugin.java b/modules/transport-netty4/src/main/java/org/opensearch/transport/Netty4ModulePlugin.java similarity index 98% rename from modules/transport-netty4/src/main/java/org/opensearch/transport/Netty4Plugin.java rename to modules/transport-netty4/src/main/java/org/opensearch/transport/Netty4ModulePlugin.java index 73cfe4e46fbda..8a18210fd963e 100644 --- a/modules/transport-netty4/src/main/java/org/opensearch/transport/Netty4Plugin.java +++ b/modules/transport-netty4/src/main/java/org/opensearch/transport/Netty4ModulePlugin.java @@ -57,7 +57,7 @@ import java.util.Map; import java.util.function.Supplier; -public class Netty4Plugin extends Plugin implements NetworkPlugin { +public class Netty4ModulePlugin extends Plugin implements NetworkPlugin { public static final String NETTY_TRANSPORT_NAME = "netty4"; public static final String NETTY_HTTP_TRANSPORT_NAME = "netty4"; diff --git a/qa/smoke-test-http/src/test/java/org/opensearch/http/HttpSmokeTestCase.java b/qa/smoke-test-http/src/test/java/org/opensearch/http/HttpSmokeTestCase.java index 951c2df53ba59..08974b902c418 100644 --- a/qa/smoke-test-http/src/test/java/org/opensearch/http/HttpSmokeTestCase.java +++ b/qa/smoke-test-http/src/test/java/org/opensearch/http/HttpSmokeTestCase.java @@ -35,7 +35,7 @@ import org.opensearch.common.settings.Settings; import org.opensearch.plugins.Plugin; import org.opensearch.test.OpenSearchIntegTestCase; -import org.opensearch.transport.Netty4Plugin; +import org.opensearch.transport.Netty4ModulePlugin; import org.opensearch.transport.nio.MockNioTransportPlugin; import org.opensearch.transport.nio.NioTransportPlugin; import org.junit.BeforeClass; @@ -52,9 +52,9 @@ public abstract class HttpSmokeTestCase extends OpenSearchIntegTestCase { @SuppressWarnings("unchecked") @BeforeClass public static void setUpTransport() { - nodeTransportTypeKey = getTypeKey(randomFrom(getTestTransportPlugin(), Netty4Plugin.class, NioTransportPlugin.class)); - nodeHttpTypeKey = getHttpTypeKey(randomFrom(Netty4Plugin.class, NioTransportPlugin.class)); - clientTypeKey = getTypeKey(randomFrom(getTestTransportPlugin(), Netty4Plugin.class, NioTransportPlugin.class)); + nodeTransportTypeKey = getTypeKey(randomFrom(getTestTransportPlugin(), Netty4ModulePlugin.class, NioTransportPlugin.class)); + nodeHttpTypeKey = getHttpTypeKey(randomFrom(Netty4ModulePlugin.class, NioTransportPlugin.class)); + clientTypeKey = getTypeKey(randomFrom(getTestTransportPlugin(), Netty4ModulePlugin.class, NioTransportPlugin.class)); } private static String getTypeKey(Class clazz) { @@ -63,8 +63,8 @@ private static String getTypeKey(Class clazz) { } else if (clazz.equals(NioTransportPlugin.class)) { return NioTransportPlugin.NIO_TRANSPORT_NAME; } else { - assert clazz.equals(Netty4Plugin.class); - return Netty4Plugin.NETTY_TRANSPORT_NAME; + assert clazz.equals(Netty4ModulePlugin.class); + return Netty4ModulePlugin.NETTY_TRANSPORT_NAME; } } @@ -72,8 +72,8 @@ private static String getHttpTypeKey(Class clazz) { if (clazz.equals(NioTransportPlugin.class)) { return NioTransportPlugin.NIO_HTTP_TRANSPORT_NAME; } else { - assert clazz.equals(Netty4Plugin.class); - return Netty4Plugin.NETTY_HTTP_TRANSPORT_NAME; + assert clazz.equals(Netty4ModulePlugin.class); + return Netty4ModulePlugin.NETTY_HTTP_TRANSPORT_NAME; } } @@ -92,7 +92,7 @@ protected Settings nodeSettings(int nodeOrdinal) { @Override protected Collection> nodePlugins() { - return Arrays.asList(getTestTransportPlugin(), Netty4Plugin.class, NioTransportPlugin.class); + return Arrays.asList(getTestTransportPlugin(), Netty4ModulePlugin.class, NioTransportPlugin.class); } @Override