Skip to content

Commit f46f7eb

Browse files
author
Ajay Kumar Movva
committed
Merge branch 'main' of https://github.com/opensearch-project/OpenSearch into feature/pit_stats
2 parents f93ddc5 + fcdea3a commit f46f7eb

File tree

397 files changed

+4149
-1185
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

397 files changed

+4149
-1185
lines changed

‎DEVELOPER_GUIDE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ Work to make sure that OpenSearch can scale in a distributed manner.
460460

461461
Includes:
462462

463-
- Nodes (Master, Data, Compute, Ingest, Discovery, etc.)
463+
- Nodes (Cluster Manager, Data, Compute, Ingest, Discovery, etc.)
464464
- Replication & Merge Policies (Document, Segment level)
465465
- Snapshot/Restore (repositories; S3, Azure, GCP, NFS)
466466
- Translog (e.g., OpenSearch, Kafka, Kinesis)

‎TESTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ The branch needs to be available on the remote that the BWC makes of the reposit
395395

396396
Example:
397397

398-
Say you need to make a change to `master` and have a BWC layer in `5.x`. You will need to: . Create a branch called `index_req_change` off your remote `${remote}`. This will contain your change. . Create a branch called `index_req_bwc_5.x` off `5.x`. This will contain your bwc layer. . Push both branches to your remote repository. . Run the tests with `./gradlew check -Dbwc.remote=${remote} -Dbwc.refspec.5.x=index_req_bwc_5.x`.
398+
Say you need to make a change to `main` and have a BWC layer in `5.x`. You will need to: . Create a branch called `index_req_change` off your remote `${remote}`. This will contain your change. . Create a branch called `index_req_bwc_5.x` off `5.x`. This will contain your bwc layer. . Push both branches to your remote repository. . Run the tests with `./gradlew check -Dbwc.remote=${remote} -Dbwc.refspec.5.x=index_req_bwc_5.x`.
399399

400400
### Skip fetching latest
401401

‎build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ plugins {
5555
id 'lifecycle-base'
5656
id 'opensearch.docker-support'
5757
id 'opensearch.global-build-info'
58-
id "com.diffplug.spotless" version "6.8.0" apply false
58+
id "com.diffplug.spotless" version "6.9.0" apply false
5959
id "org.gradle.test-retry" version "1.4.0" apply false
6060
id "test-report-aggregation"
6161
id 'jacoco-report-aggregation'

‎buildSrc/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,8 @@ dependencies {
112112
api 'commons-io:commons-io:2.7'
113113
api "net.java.dev.jna:jna:5.11.0"
114114
api 'gradle.plugin.com.github.johnrengelman:shadow:7.1.2'
115+
api 'org.jdom:jdom2:2.0.6.1'
116+
api 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10'
115117
api 'de.thetaphi:forbiddenapis:3.3'
116118
api 'com.avast.gradle:gradle-docker-compose-plugin:0.15.2'
117119
api 'org.apache.maven:maven-model:3.6.2'

‎buildSrc/version.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
opensearch = 3.0.0
2-
lucene = 9.3.0-snapshot-b7231bb
2+
lucene = 9.3.0
33

44
bundled_jdk_vendor = adoptium
55
bundled_jdk = 17.0.3+7
@@ -32,7 +32,7 @@ commonslogging = 1.2
3232
commonscodec = 1.13
3333

3434
# plugin dependencies
35-
aws = 1.12.247
35+
aws = 1.12.270
3636

3737
# when updating this version, you need to ensure compatibility with:
3838
# - plugins/ingest-attachment (transitive dependency, check the upstream POM)

‎modules/aggs-matrix-stats/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ apply plugin: 'opensearch.yaml-rest-test'
3131

3232
opensearchplugin {
3333
description 'Adds aggregations whose input are a list of numeric fields and output includes a matrix.'
34-
classname 'org.opensearch.search.aggregations.matrix.MatrixAggregationPlugin'
34+
classname 'org.opensearch.search.aggregations.matrix.MatrixAggregationModulePlugin'
3535
hasClientJar = true
3636
}
3737

‎modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/MatrixAggregationPlugin.java renamed to ‎modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/MatrixAggregationModulePlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242

4343
import static java.util.Collections.singletonList;
4444

45-
public class MatrixAggregationPlugin extends Plugin implements SearchPlugin {
45+
public class MatrixAggregationModulePlugin extends Plugin implements SearchPlugin {
4646
@Override
4747
public List<AggregationSpec> getAggregations() {
4848
return singletonList(

‎modules/aggs-matrix-stats/src/test/java/org/opensearch/search/aggregations/matrix/stats/InternalMatrixStatsTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
import org.opensearch.search.aggregations.Aggregation;
4444
import org.opensearch.search.aggregations.InternalAggregation;
4545
import org.opensearch.search.aggregations.ParsedAggregation;
46-
import org.opensearch.search.aggregations.matrix.MatrixAggregationPlugin;
46+
import org.opensearch.search.aggregations.matrix.MatrixAggregationModulePlugin;
4747
import org.opensearch.search.aggregations.matrix.stats.InternalMatrixStats.Fields;
4848
import org.opensearch.search.aggregations.pipeline.PipelineAggregator.PipelineTree;
4949
import org.opensearch.test.InternalAggregationTestCase;
@@ -64,7 +64,7 @@ public class InternalMatrixStatsTests extends InternalAggregationTestCase<Intern
6464

6565
@Override
6666
protected SearchPlugin registerPlugin() {
67-
return new MatrixAggregationPlugin();
67+
return new MatrixAggregationModulePlugin();
6868
}
6969

7070
@Override

‎modules/aggs-matrix-stats/src/test/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsAggregatorTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
import org.opensearch.index.mapper.NumberFieldMapper;
4646
import org.opensearch.plugins.SearchPlugin;
4747
import org.opensearch.search.aggregations.AggregatorTestCase;
48-
import org.opensearch.search.aggregations.matrix.MatrixAggregationPlugin;
48+
import org.opensearch.search.aggregations.matrix.MatrixAggregationModulePlugin;
4949

5050
import java.util.Arrays;
5151
import java.util.Collections;
@@ -128,6 +128,6 @@ public void testTwoFields() throws Exception {
128128

129129
@Override
130130
protected List<SearchPlugin> getSearchPlugins() {
131-
return Collections.singletonList(new MatrixAggregationPlugin());
131+
return Collections.singletonList(new MatrixAggregationModulePlugin());
132132
}
133133
}

‎modules/analysis-common/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ apply plugin: 'opensearch.internal-cluster-test'
3232

3333
opensearchplugin {
3434
description 'Adds "built in" analyzers to OpenSearch.'
35-
classname 'org.opensearch.analysis.common.CommonAnalysisPlugin'
35+
classname 'org.opensearch.analysis.common.CommonAnalysisModulePlugin'
3636
extendedPlugins = ['lang-painless']
3737
}
3838

‎modules/analysis-common/src/internalClusterTest/java/org/opensearch/analysis/common/QueryStringWithAnalyzersIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
public class QueryStringWithAnalyzersIT extends OpenSearchIntegTestCase {
4949
@Override
5050
protected Collection<Class<? extends Plugin>> nodePlugins() {
51-
return Arrays.asList(CommonAnalysisPlugin.class);
51+
return Arrays.asList(CommonAnalysisModulePlugin.class);
5252
}
5353

5454
/**

‎modules/analysis-common/src/main/java/org/opensearch/analysis/common/CommonAnalysisPlugin.java renamed to ‎modules/analysis-common/src/main/java/org/opensearch/analysis/common/CommonAnalysisModulePlugin.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,9 @@
167167

168168
import static org.opensearch.plugins.AnalysisPlugin.requiresAnalysisSettings;
169169

170-
public class CommonAnalysisPlugin extends Plugin implements AnalysisPlugin, ScriptPlugin {
170+
public class CommonAnalysisModulePlugin extends Plugin implements AnalysisPlugin, ScriptPlugin {
171171

172-
private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(CommonAnalysisPlugin.class);
172+
private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(CommonAnalysisModulePlugin.class);
173173

174174
private final SetOnce<ScriptService> scriptService = new SetOnce<>();
175175

‎modules/analysis-common/src/test/java/org/opensearch/analysis/common/ASCIIFoldingTokenFilterFactoryTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public void testDefault() throws IOException {
5151
.put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString())
5252
.put("index.analysis.filter.my_ascii_folding.type", "asciifolding")
5353
.build(),
54-
new CommonAnalysisPlugin()
54+
new CommonAnalysisModulePlugin()
5555
);
5656
TokenFilterFactory tokenFilter = analysis.tokenFilter.get("my_ascii_folding");
5757
String source = "Ansprüche";
@@ -68,7 +68,7 @@ public void testPreserveOriginal() throws IOException {
6868
.put("index.analysis.filter.my_ascii_folding.type", "asciifolding")
6969
.put("index.analysis.filter.my_ascii_folding.preserve_original", true)
7070
.build(),
71-
new CommonAnalysisPlugin()
71+
new CommonAnalysisModulePlugin()
7272
);
7373
TokenFilterFactory tokenFilter = analysis.tokenFilter.get("my_ascii_folding");
7474
String source = "Ansprüche";

‎modules/analysis-common/src/test/java/org/opensearch/analysis/common/BaseWordDelimiterTokenFilterFactoryTestCase.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public void testDefault() throws IOException {
6060
.put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString())
6161
.put("index.analysis.filter.my_word_delimiter.type", type)
6262
.build(),
63-
new CommonAnalysisPlugin()
63+
new CommonAnalysisModulePlugin()
6464
);
6565
TokenFilterFactory tokenFilter = analysis.tokenFilter.get("my_word_delimiter");
6666
String source = "PowerShot 500-42 wi-fi wi-fi-4000 j2se O'Neil's";
@@ -78,7 +78,7 @@ public void testCatenateWords() throws IOException {
7878
.put("index.analysis.filter.my_word_delimiter.catenate_words", "true")
7979
.put("index.analysis.filter.my_word_delimiter.generate_word_parts", "false")
8080
.build(),
81-
new CommonAnalysisPlugin()
81+
new CommonAnalysisModulePlugin()
8282
);
8383
TokenFilterFactory tokenFilter = analysis.tokenFilter.get("my_word_delimiter");
8484
String source = "PowerShot 500-42 wi-fi wi-fi-4000 j2se O'Neil's";
@@ -96,7 +96,7 @@ public void testCatenateNumbers() throws IOException {
9696
.put("index.analysis.filter.my_word_delimiter.generate_number_parts", "false")
9797
.put("index.analysis.filter.my_word_delimiter.catenate_numbers", "true")
9898
.build(),
99-
new CommonAnalysisPlugin()
99+
new CommonAnalysisModulePlugin()
100100
);
101101
TokenFilterFactory tokenFilter = analysis.tokenFilter.get("my_word_delimiter");
102102
String source = "PowerShot 500-42 wi-fi wi-fi-4000 j2se O'Neil's";
@@ -115,7 +115,7 @@ public void testCatenateAll() throws IOException {
115115
.put("index.analysis.filter.my_word_delimiter.generate_number_parts", "false")
116116
.put("index.analysis.filter.my_word_delimiter.catenate_all", "true")
117117
.build(),
118-
new CommonAnalysisPlugin()
118+
new CommonAnalysisModulePlugin()
119119
);
120120
TokenFilterFactory tokenFilter = analysis.tokenFilter.get("my_word_delimiter");
121121
String source = "PowerShot 500-42 wi-fi wi-fi-4000 j2se O'Neil's";
@@ -132,7 +132,7 @@ public void testSplitOnCaseChange() throws IOException {
132132
.put("index.analysis.filter.my_word_delimiter.type", type)
133133
.put("index.analysis.filter.my_word_delimiter.split_on_case_change", "false")
134134
.build(),
135-
new CommonAnalysisPlugin()
135+
new CommonAnalysisModulePlugin()
136136
);
137137
TokenFilterFactory tokenFilter = analysis.tokenFilter.get("my_word_delimiter");
138138
String source = "PowerShot";
@@ -149,7 +149,7 @@ public void testPreserveOriginal() throws IOException {
149149
.put("index.analysis.filter.my_word_delimiter.type", type)
150150
.put("index.analysis.filter.my_word_delimiter.preserve_original", "true")
151151
.build(),
152-
new CommonAnalysisPlugin()
152+
new CommonAnalysisModulePlugin()
153153
);
154154
TokenFilterFactory tokenFilter = analysis.tokenFilter.get("my_word_delimiter");
155155
String source = "PowerShot 500-42 wi-fi wi-fi-4000 j2se O'Neil's";
@@ -186,7 +186,7 @@ public void testStemEnglishPossessive() throws IOException {
186186
.put("index.analysis.filter.my_word_delimiter.type", type)
187187
.put("index.analysis.filter.my_word_delimiter.stem_english_possessive", "false")
188188
.build(),
189-
new CommonAnalysisPlugin()
189+
new CommonAnalysisModulePlugin()
190190
);
191191
TokenFilterFactory tokenFilter = analysis.tokenFilter.get("my_word_delimiter");
192192
String source = "PowerShot 500-42 wi-fi wi-fi-4000 j2se O'Neil's";

‎modules/analysis-common/src/test/java/org/opensearch/analysis/common/CJKFilterFactoryTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public class CJKFilterFactoryTests extends OpenSearchTokenStreamTestCase {
5252

5353
@Before
5454
public void setup() throws IOException {
55-
analysis = AnalysisTestsHelper.createTestAnalysisFromClassPath(createTempDir(), RESOURCE, new CommonAnalysisPlugin());
55+
analysis = AnalysisTestsHelper.createTestAnalysisFromClassPath(createTempDir(), RESOURCE, new CommonAnalysisModulePlugin());
5656
}
5757

5858
public void testDefault() throws IOException {

‎modules/analysis-common/src/test/java/org/opensearch/analysis/common/CommonAnalysisFactoryTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050

5151
public class CommonAnalysisFactoryTests extends AnalysisFactoryTestCase {
5252
public CommonAnalysisFactoryTests() {
53-
super(new CommonAnalysisPlugin());
53+
super(new CommonAnalysisModulePlugin());
5454
}
5555

5656
@Override

‎modules/analysis-common/src/test/java/org/opensearch/analysis/common/CommonGramsTokenFilterFactoryTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public void testDefault() throws IOException {
5858
.build();
5959

6060
try {
61-
AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisPlugin());
61+
AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisModulePlugin());
6262
Assert.fail("[common_words] or [common_words_path] is set");
6363
} catch (IllegalArgumentException e) {} catch (IOException e) {
6464
fail("expected IAE");
@@ -333,7 +333,7 @@ private Path createHome() throws IOException {
333333
}
334334

335335
private static OpenSearchTestCase.TestAnalysis createTestAnalysisFromSettings(Settings settings) throws IOException {
336-
return AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisPlugin());
336+
return AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisModulePlugin());
337337
}
338338

339339
}

‎modules/analysis-common/src/test/java/org/opensearch/analysis/common/CompoundAnalysisTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ private List<String> analyze(Settings settings, String analyzerName, String text
102102
}
103103

104104
private AnalysisModule createAnalysisModule(Settings settings) throws IOException {
105-
CommonAnalysisPlugin commonAnalysisPlugin = new CommonAnalysisPlugin();
106-
return new AnalysisModule(TestEnvironment.newEnvironment(settings), Arrays.asList(commonAnalysisPlugin, new AnalysisPlugin() {
105+
CommonAnalysisModulePlugin commonAnalysisModulePlugin = new CommonAnalysisModulePlugin();
106+
return new AnalysisModule(TestEnvironment.newEnvironment(settings), Arrays.asList(commonAnalysisModulePlugin, new AnalysisPlugin() {
107107
@Override
108108
public Map<String, AnalysisProvider<TokenFilterFactory>> getTokenFilters() {
109109
return singletonMap("myfilter", MyFilterTokenFilterFactory::new);

‎modules/analysis-common/src/test/java/org/opensearch/analysis/common/ConcatenateGraphTokenFilterFactoryTests.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class ConcatenateGraphTokenFilterFactoryTests extends OpenSearchTokenStre
2929
public void testSimpleTokenizerAndConcatenate() throws IOException {
3030
OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings(
3131
Settings.builder().put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()).build(),
32-
new CommonAnalysisPlugin()
32+
new CommonAnalysisModulePlugin()
3333
);
3434

3535
TokenFilterFactory tokenFilter = analysis.tokenFilter.get("concatenate_graph");
@@ -47,7 +47,7 @@ public void testTokenizerCustomizedSeparator() throws IOException {
4747
.put("index.analysis.filter.my_concatenate_graph.type", "concatenate_graph")
4848
.put("index.analysis.filter.my_concatenate_graph.token_separator", "+")
4949
.build(),
50-
new CommonAnalysisPlugin()
50+
new CommonAnalysisModulePlugin()
5151
);
5252

5353
TokenFilterFactory tokenFilter = analysis.tokenFilter.get("my_concatenate_graph");
@@ -65,7 +65,7 @@ public void testTokenizerEmptySeparator() throws IOException {
6565
.put("index.analysis.filter.my_concatenate_graph.type", "concatenate_graph")
6666
.put("index.analysis.filter.my_concatenate_graph.token_separator", "")
6767
.build(),
68-
new CommonAnalysisPlugin()
68+
new CommonAnalysisModulePlugin()
6969
);
7070

7171
TokenFilterFactory tokenFilter = analysis.tokenFilter.get("my_concatenate_graph");
@@ -83,7 +83,7 @@ public void testPreservePositionIncrementsDefault() throws IOException {
8383
.put("index.analysis.filter.my_concatenate_graph.type", "concatenate_graph")
8484
.put("index.analysis.filter.my_concatenate_graph.token_separator", "+")
8585
.build(),
86-
new CommonAnalysisPlugin()
86+
new CommonAnalysisModulePlugin()
8787
);
8888

8989
TokenFilterFactory tokenFilter = analysis.tokenFilter.get("my_concatenate_graph");
@@ -106,7 +106,7 @@ public void testPreservePositionIncrementsTrue() throws IOException {
106106
.put("index.analysis.filter.my_concatenate_graph.token_separator", "+")
107107
.put("index.analysis.filter.my_concatenate_graph.preserve_position_increments", "true")
108108
.build(),
109-
new CommonAnalysisPlugin()
109+
new CommonAnalysisModulePlugin()
110110
);
111111

112112
TokenFilterFactory tokenFilter = analysis.tokenFilter.get("my_concatenate_graph");
@@ -132,7 +132,7 @@ public void testGraph() throws IOException {
132132
.put("index.analysis.analyzer.my_analyzer.tokenizer", "whitespace")
133133
.put("index.analysis.analyzer.my_analyzer.filter", "my_word_delimiter, my_concatenate_graph")
134134
.build(),
135-
new CommonAnalysisPlugin()
135+
new CommonAnalysisModulePlugin()
136136
);
137137

138138
String source = "PowerShot Is AweSome";
@@ -166,7 +166,7 @@ public void testInvalidSeparator() {
166166
.put("index.analysis.filter.my_concatenate_graph.type", "concatenate_graph")
167167
.put("index.analysis.filter.my_concatenate_graph.token_separator", "11")
168168
.build(),
169-
new CommonAnalysisPlugin()
169+
new CommonAnalysisModulePlugin()
170170
)
171171
);
172172
}
@@ -187,7 +187,7 @@ public void testMaxGraphExpansion() throws IOException {
187187
.put("index.analysis.analyzer.my_analyzer.tokenizer", "whitespace")
188188
.put("index.analysis.analyzer.my_analyzer.filter", "my_word_delimiter, my_concatenate_graph")
189189
.build(),
190-
new CommonAnalysisPlugin()
190+
new CommonAnalysisModulePlugin()
191191
);
192192

193193
String source = "PowerShot Is AweSome";

‎modules/analysis-common/src/test/java/org/opensearch/analysis/common/DisableGraphQueryTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public class DisableGraphQueryTests extends OpenSearchSingleNodeTestCase {
7474

7575
@Override
7676
protected Collection<Class<? extends Plugin>> getPlugins() {
77-
return Collections.singleton(CommonAnalysisPlugin.class);
77+
return Collections.singleton(CommonAnalysisModulePlugin.class);
7878
}
7979

8080
@Before

‎modules/analysis-common/src/test/java/org/opensearch/analysis/common/EdgeNGramTokenFilterFactoryTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public void testDefault() throws IOException {
5252
.put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString())
5353
.put("index.analysis.filter.my_edge_ngram.type", "edge_ngram")
5454
.build(),
55-
new CommonAnalysisPlugin()
55+
new CommonAnalysisModulePlugin()
5656
);
5757
TokenFilterFactory tokenFilter = analysis.tokenFilter.get("my_edge_ngram");
5858
String source = "foo";
@@ -69,7 +69,7 @@ public void testPreserveOriginal() throws IOException {
6969
.put("index.analysis.filter.my_edge_ngram.type", "edge_ngram")
7070
.put("index.analysis.filter.my_edge_ngram.preserve_original", true)
7171
.build(),
72-
new CommonAnalysisPlugin()
72+
new CommonAnalysisModulePlugin()
7373
);
7474
TokenFilterFactory tokenFilter = analysis.tokenFilter.get("my_edge_ngram");
7575
String source = "foo";

‎modules/analysis-common/src/test/java/org/opensearch/analysis/common/EdgeNGramTokenizerTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ private IndexAnalyzers buildAnalyzers(Version version, String tokenizer) throws
6060
.put("index.analysis.analyzer.my_analyzer.tokenizer", tokenizer)
6161
.build();
6262
IndexSettings idxSettings = IndexSettingsModule.newIndexSettings("index", indexSettings);
63-
return new AnalysisModule(TestEnvironment.newEnvironment(settings), Collections.singletonList(new CommonAnalysisPlugin()))
63+
return new AnalysisModule(TestEnvironment.newEnvironment(settings), Collections.singletonList(new CommonAnalysisModulePlugin()))
6464
.getAnalysisRegistry()
6565
.build(idxSettings);
6666
}

‎modules/analysis-common/src/test/java/org/opensearch/analysis/common/ElisionFilterFactoryTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public void testElisionFilterWithNoArticles() throws IOException {
4949

5050
IllegalArgumentException e = expectThrows(
5151
IllegalArgumentException.class,
52-
() -> AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisPlugin())
52+
() -> AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisModulePlugin())
5353
);
5454

5555
assertEquals("elision filter requires [articles] or [articles_path] setting", e.getMessage());

‎modules/analysis-common/src/test/java/org/opensearch/analysis/common/HighlighterWithAnalyzersTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
public class HighlighterWithAnalyzersTests extends OpenSearchIntegTestCase {
6666
@Override
6767
protected Collection<Class<? extends Plugin>> nodePlugins() {
68-
return Arrays.asList(CommonAnalysisPlugin.class);
68+
return Arrays.asList(CommonAnalysisModulePlugin.class);
6969
}
7070

7171
public void testNgramHighlightingWithBrokenPositions() throws IOException {

0 commit comments

Comments
 (0)