Skip to content

Commit 0d4e124

Browse files
gmarouligmarouli
committed
Use the _na_ constant instead of the string literal for traceability
1 parent a481eaf commit 0d4e124

File tree

31 files changed

+129
-74
lines changed

31 files changed

+129
-74
lines changed

‎modules/parent-join/src/test/java/org/elasticsearch/join/aggregations/ChildrenToParentAggregatorTests.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import org.apache.lucene.store.Directory;
2121
import org.apache.lucene.tests.index.RandomIndexWriter;
2222
import org.apache.lucene.util.BytesRef;
23+
import org.elasticsearch.cluster.metadata.IndexMetadata;
2324
import org.elasticsearch.common.lucene.index.ElasticsearchDirectoryReader;
2425
import org.elasticsearch.core.Tuple;
2526
import org.elasticsearch.index.Index;
@@ -86,7 +87,7 @@ public void testParentChild() throws IOException {
8687

8788
DirectoryReader indexReader = ElasticsearchDirectoryReader.wrap(
8889
DirectoryReader.open(directory),
89-
new ShardId(new Index("foo", "_na_"), 1)
90+
new ShardId(new Index("foo", IndexMetadata.INDEX_UUID_NA_VALUE), 1)
9091
);
9192
// verify with all documents
9293
testCase(new MatchAllDocsQuery(), indexReader, parent -> {
@@ -151,7 +152,7 @@ public void testParentChildTerms() throws IOException {
151152

152153
DirectoryReader indexReader = ElasticsearchDirectoryReader.wrap(
153154
DirectoryReader.open(directory),
154-
new ShardId(new Index("foo", "_na_"), 1)
155+
new ShardId(new Index("foo", IndexMetadata.INDEX_UUID_NA_VALUE), 1)
155156
);
156157
// verify a terms-aggregation inside the parent-aggregation
157158
testCaseTerms(new MatchAllDocsQuery(), indexReader, parent -> {
@@ -192,7 +193,7 @@ public void testTermsParentChildTerms() throws IOException {
192193

193194
DirectoryReader indexReader = ElasticsearchDirectoryReader.wrap(
194195
DirectoryReader.open(directory),
195-
new ShardId(new Index("foo", "_na_"), 1)
196+
new ShardId(new Index("foo", IndexMetadata.INDEX_UUID_NA_VALUE), 1)
196197
);
197198
// verify a terms-aggregation inside the parent-aggregation which itself is inside a
198199
// terms-aggregation on the child-documents

‎modules/parent-join/src/test/java/org/elasticsearch/join/aggregations/ParentToChildrenAggregatorTests.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import org.apache.lucene.store.Directory;
2525
import org.apache.lucene.tests.index.RandomIndexWriter;
2626
import org.apache.lucene.util.BytesRef;
27+
import org.elasticsearch.cluster.metadata.IndexMetadata;
2728
import org.elasticsearch.common.lucene.index.ElasticsearchDirectoryReader;
2829
import org.elasticsearch.core.Tuple;
2930
import org.elasticsearch.index.Index;
@@ -89,7 +90,7 @@ public void testParentChild() throws IOException {
8990

9091
DirectoryReader indexReader = ElasticsearchDirectoryReader.wrap(
9192
DirectoryReader.open(directory),
92-
new ShardId(new Index("foo", "_na_"), 1)
93+
new ShardId(new Index("foo", IndexMetadata.INDEX_UUID_NA_VALUE), 1)
9394
);
9495
testCase(new MatchAllDocsQuery(), indexReader, child -> {
9596
int expectedTotalChildren = 0;
@@ -128,7 +129,7 @@ public void testParentChildAsSubAgg() throws IOException {
128129
try (
129130
DirectoryReader indexReader = ElasticsearchDirectoryReader.wrap(
130131
DirectoryReader.open(directory),
131-
new ShardId(new Index("foo", "_na_"), 1)
132+
new ShardId(new Index("foo", IndexMetadata.INDEX_UUID_NA_VALUE), 1)
132133
)
133134
) {
134135
AggregationBuilder request = new TermsAggregationBuilder("t").field("kwd")
@@ -180,7 +181,7 @@ public void testBestDeferringCollectorWithSubAggOfChildrenAggNeedingScores() thr
180181
try (
181182
var indexReader = ElasticsearchDirectoryReader.wrap(
182183
DirectoryReader.open(directory),
183-
new ShardId(new Index("foo", "_na_"), 1)
184+
new ShardId(new Index("foo", IndexMetadata.INDEX_UUID_NA_VALUE), 1)
184185
)
185186
) {
186187
// invalid usage,

‎plugins/analysis-icu/src/test/java/org/elasticsearch/plugin/analysis/icu/IcuTokenizerFactoryTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,6 @@ private static TestAnalysis createTestAnalysis() throws IOException {
103103
.build();
104104
Settings nodeSettings = Settings.builder().put(Environment.PATH_HOME_SETTING.getKey(), home).build();
105105

106-
return createTestAnalysis(new Index("test", "_na_"), nodeSettings, settings, new AnalysisICUPlugin());
106+
return createTestAnalysis(new Index("test", IndexMetadata.INDEX_UUID_NA_VALUE), nodeSettings, settings, new AnalysisICUPlugin());
107107
}
108108
}

‎plugins/analysis-icu/src/test/java/org/elasticsearch/plugin/analysis/icu/SimpleIcuAnalysisTests.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
package org.elasticsearch.plugin.analysis.icu;
1111

12+
import org.elasticsearch.cluster.metadata.IndexMetadata;
1213
import org.elasticsearch.common.settings.Settings;
1314
import org.elasticsearch.index.Index;
1415
import org.elasticsearch.index.analysis.CharFilterFactory;
@@ -22,7 +23,11 @@
2223

2324
public class SimpleIcuAnalysisTests extends ESTestCase {
2425
public void testDefaultsIcuAnalysis() throws IOException {
25-
TestAnalysis analysis = createTestAnalysis(new Index("test", "_na_"), Settings.EMPTY, new AnalysisICUPlugin());
26+
TestAnalysis analysis = createTestAnalysis(
27+
new Index("test", IndexMetadata.INDEX_UUID_NA_VALUE),
28+
Settings.EMPTY,
29+
new AnalysisICUPlugin()
30+
);
2631

2732
TokenizerFactory tokenizerFactory = analysis.tokenizer.get("icu_tokenizer");
2833
assertThat(tokenizerFactory, instanceOf(IcuTokenizerFactory.class));

‎plugins/analysis-icu/src/test/java/org/elasticsearch/plugin/analysis/icu/SimpleIcuCollationTokenFilterTests.java‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import org.apache.lucene.analysis.Tokenizer;
1818
import org.apache.lucene.analysis.core.KeywordTokenizer;
1919
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
20+
import org.elasticsearch.cluster.metadata.IndexMetadata;
2021
import org.elasticsearch.common.settings.Settings;
2122
import org.elasticsearch.index.Index;
2223
import org.elasticsearch.index.analysis.TokenFilterFactory;
@@ -37,7 +38,7 @@ public void testDefaultUsage() throws Exception {
3738
.put("index.analysis.filter.myCollator.type", "icu_collation")
3839
.put("index.analysis.filter.myCollator.strength", "primary")
3940
.build();
40-
TestAnalysis analysis = createTestAnalysis(new Index("test", "_na_"), settings, new AnalysisICUPlugin());
41+
TestAnalysis analysis = createTestAnalysis(new Index("test", IndexMetadata.INDEX_UUID_NA_VALUE), settings, new AnalysisICUPlugin());
4142

4243
TokenFilterFactory filterFactory = analysis.tokenFilter.get("myCollator");
4344
assertCollatesToSame(filterFactory, "FOO", "foo");
@@ -55,7 +56,7 @@ public void testBasicUsage() throws Exception {
5556
.put("index.analysis.filter.myCollator.language", "tr")
5657
.put("index.analysis.filter.myCollator.strength", "primary")
5758
.build();
58-
TestAnalysis analysis = createTestAnalysis(new Index("test", "_na_"), settings, new AnalysisICUPlugin());
59+
TestAnalysis analysis = createTestAnalysis(new Index("test", IndexMetadata.INDEX_UUID_NA_VALUE), settings, new AnalysisICUPlugin());
5960

6061
TokenFilterFactory filterFactory = analysis.tokenFilter.get("myCollator");
6162
assertCollatesToSame(filterFactory, "I WİLL USE TURKİSH CASING", "ı will use turkish casıng");
@@ -71,7 +72,7 @@ public void testNormalization() throws IOException {
7172
.put("index.analysis.filter.myCollator.strength", "primary")
7273
.put("index.analysis.filter.myCollator.decomposition", "canonical")
7374
.build();
74-
TestAnalysis analysis = createTestAnalysis(new Index("test", "_na_"), settings, new AnalysisICUPlugin());
75+
TestAnalysis analysis = createTestAnalysis(new Index("test", IndexMetadata.INDEX_UUID_NA_VALUE), settings, new AnalysisICUPlugin());
7576

7677
TokenFilterFactory filterFactory = analysis.tokenFilter.get("myCollator");
7778
assertCollatesToSame(filterFactory, "I W\u0049\u0307LL USE TURKİSH CASING", "ı will use turkish casıng");
@@ -87,7 +88,7 @@ public void testSecondaryStrength() throws IOException {
8788
.put("index.analysis.filter.myCollator.strength", "secondary")
8889
.put("index.analysis.filter.myCollator.decomposition", "no")
8990
.build();
90-
TestAnalysis analysis = createTestAnalysis(new Index("test", "_na_"), settings, new AnalysisICUPlugin());
91+
TestAnalysis analysis = createTestAnalysis(new Index("test", IndexMetadata.INDEX_UUID_NA_VALUE), settings, new AnalysisICUPlugin());
9192

9293
TokenFilterFactory filterFactory = analysis.tokenFilter.get("myCollator");
9394
assertCollatesToSame(filterFactory, "TESTING", "testing");
@@ -104,7 +105,7 @@ public void testIgnorePunctuation() throws IOException {
104105
.put("index.analysis.filter.myCollator.strength", "primary")
105106
.put("index.analysis.filter.myCollator.alternate", "shifted")
106107
.build();
107-
TestAnalysis analysis = createTestAnalysis(new Index("test", "_na_"), settings, new AnalysisICUPlugin());
108+
TestAnalysis analysis = createTestAnalysis(new Index("test", IndexMetadata.INDEX_UUID_NA_VALUE), settings, new AnalysisICUPlugin());
108109

109110
TokenFilterFactory filterFactory = analysis.tokenFilter.get("myCollator");
110111
assertCollatesToSame(filterFactory, "foo-bar", "foo bar");
@@ -122,7 +123,7 @@ public void testIgnoreWhitespace() throws IOException {
122123
.put("index.analysis.filter.myCollator.alternate", "shifted")
123124
.put("index.analysis.filter.myCollator.variableTop", " ")
124125
.build();
125-
TestAnalysis analysis = createTestAnalysis(new Index("test", "_na_"), settings, new AnalysisICUPlugin());
126+
TestAnalysis analysis = createTestAnalysis(new Index("test", IndexMetadata.INDEX_UUID_NA_VALUE), settings, new AnalysisICUPlugin());
126127

127128
TokenFilterFactory filterFactory = analysis.tokenFilter.get("myCollator");
128129
assertCollatesToSame(filterFactory, "foo bar", "foobar");
@@ -140,7 +141,7 @@ public void testNumerics() throws IOException {
140141
.put("index.analysis.filter.myCollator.language", "en")
141142
.put("index.analysis.filter.myCollator.numeric", "true")
142143
.build();
143-
TestAnalysis analysis = createTestAnalysis(new Index("test", "_na_"), settings, new AnalysisICUPlugin());
144+
TestAnalysis analysis = createTestAnalysis(new Index("test", IndexMetadata.INDEX_UUID_NA_VALUE), settings, new AnalysisICUPlugin());
144145

145146
TokenFilterFactory filterFactory = analysis.tokenFilter.get("myCollator");
146147
assertCollation(filterFactory, "foobar-9", "foobar-10", -1);
@@ -157,7 +158,7 @@ public void testIgnoreAccentsButNotCase() throws IOException {
157158
.put("index.analysis.filter.myCollator.strength", "primary")
158159
.put("index.analysis.filter.myCollator.caseLevel", "true")
159160
.build();
160-
TestAnalysis analysis = createTestAnalysis(new Index("test", "_na_"), settings, new AnalysisICUPlugin());
161+
TestAnalysis analysis = createTestAnalysis(new Index("test", IndexMetadata.INDEX_UUID_NA_VALUE), settings, new AnalysisICUPlugin());
161162

162163
TokenFilterFactory filterFactory = analysis.tokenFilter.get("myCollator");
163164
assertCollatesToSame(filterFactory, "résumé", "resume");
@@ -177,7 +178,7 @@ public void testUpperCaseFirst() throws IOException {
177178
.put("index.analysis.filter.myCollator.strength", "tertiary")
178179
.put("index.analysis.filter.myCollator.caseFirst", "upper")
179180
.build();
180-
TestAnalysis analysis = createTestAnalysis(new Index("test", "_na_"), settings, new AnalysisICUPlugin());
181+
TestAnalysis analysis = createTestAnalysis(new Index("test", IndexMetadata.INDEX_UUID_NA_VALUE), settings, new AnalysisICUPlugin());
181182

182183
TokenFilterFactory filterFactory = analysis.tokenFilter.get("myCollator");
183184
assertCollation(filterFactory, "Resume", "resume", -1);
@@ -202,7 +203,7 @@ public void testCustomRules() throws Exception {
202203
.put("index.analysis.filter.myCollator.rules", tailoredRules)
203204
.put("index.analysis.filter.myCollator.strength", "primary")
204205
.build();
205-
TestAnalysis analysis = createTestAnalysis(new Index("test", "_na_"), settings, new AnalysisICUPlugin());
206+
TestAnalysis analysis = createTestAnalysis(new Index("test", IndexMetadata.INDEX_UUID_NA_VALUE), settings, new AnalysisICUPlugin());
206207

207208
TokenFilterFactory filterFactory = analysis.tokenFilter.get("myCollator");
208209
assertCollatesToSame(filterFactory, "Töne", "Toene");
@@ -218,7 +219,7 @@ public void testBasicCustomRules() throws Exception {
218219
.put("index.analysis.filter.myCollator.type", "icu_collation")
219220
.put("index.analysis.filter.myCollator.rules", "&a < g")
220221
.build();
221-
TestAnalysis analysis = createTestAnalysis(new Index("test", "_na_"), settings, new AnalysisICUPlugin());
222+
TestAnalysis analysis = createTestAnalysis(new Index("test", IndexMetadata.INDEX_UUID_NA_VALUE), settings, new AnalysisICUPlugin());
222223

223224
TokenFilterFactory filterFactory = analysis.tokenFilter.get("myCollator");
224225
assertCollation(filterFactory, "green", "bird", -1);

‎plugins/analysis-icu/src/test/java/org/elasticsearch/plugin/analysis/icu/SimpleIcuNormalizerCharFilterTests.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import com.ibm.icu.text.Normalizer2;
1313

1414
import org.apache.lucene.analysis.CharFilter;
15+
import org.elasticsearch.cluster.metadata.IndexMetadata;
1516
import org.elasticsearch.common.settings.Settings;
1617
import org.elasticsearch.index.Index;
1718
import org.elasticsearch.index.analysis.CharFilterFactory;
@@ -25,7 +26,7 @@
2526
public class SimpleIcuNormalizerCharFilterTests extends ESTestCase {
2627
public void testDefaultSetting() throws Exception {
2728
Settings settings = Settings.builder().put("index.analysis.char_filter.myNormalizerChar.type", "icu_normalizer").build();
28-
TestAnalysis analysis = createTestAnalysis(new Index("test", "_na_"), settings, new AnalysisICUPlugin());
29+
TestAnalysis analysis = createTestAnalysis(new Index("test", IndexMetadata.INDEX_UUID_NA_VALUE), settings, new AnalysisICUPlugin());
2930
CharFilterFactory charFilterFactory = analysis.charFilter.get("myNormalizerChar");
3031

3132
String input = "ʰ㌰゙5℃№㈱㌘，バッファーの正規化のテスト．㋐㋑㋒㋓㋔ｶｷｸｹｺｻﾞｼﾞｽﾞｾﾞｿﾞg̈각/각நிเกषिchkʷक्षि";
@@ -49,7 +50,7 @@ public void testNameAndModeSetting() throws Exception {
4950
.put("index.analysis.char_filter.myNormalizerChar.name", "nfkc")
5051
.put("index.analysis.char_filter.myNormalizerChar.mode", "decompose")
5152
.build();
52-
TestAnalysis analysis = createTestAnalysis(new Index("test", "_na_"), settings, new AnalysisICUPlugin());
53+
TestAnalysis analysis = createTestAnalysis(new Index("test", IndexMetadata.INDEX_UUID_NA_VALUE), settings, new AnalysisICUPlugin());
5354
CharFilterFactory charFilterFactory = analysis.charFilter.get("myNormalizerChar");
5455

5556
String input = "ʰ㌰゙5℃№㈱㌘，バッファーの正規化のテスト．㋐㋑㋒㋓㋔ｶｷｸｹｺｻﾞｼﾞｽﾞｾﾞｿﾞg̈각/각நிเกषिchkʷक्षि";

‎plugins/analysis-kuromoji/src/test/java/org/elasticsearch/plugin/analysis/kuromoji/KuromojiAnalysisTests.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,12 @@ private static TestAnalysis createTestAnalysis() throws IOException {
290290
.put(IndexMetadata.SETTING_VERSION_CREATED, IndexVersion.current())
291291
.build();
292292
Settings nodeSettings = Settings.builder().put(Environment.PATH_HOME_SETTING.getKey(), home).build();
293-
return createTestAnalysis(new Index("test", "_na_"), nodeSettings, settings, new AnalysisKuromojiPlugin());
293+
return createTestAnalysis(
294+
new Index("test", IndexMetadata.INDEX_UUID_NA_VALUE),
295+
nodeSettings,
296+
settings,
297+
new AnalysisKuromojiPlugin()
298+
);
294299
}
295300

296301
public static void assertSimpleTSOutput(TokenStream stream, String[] expected) throws IOException {

‎plugins/analysis-phonetic/src/test/java/org/elasticsearch/plugin/analysis/phonetic/SimplePhoneticAnalysisTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public void setup() throws IOException {
3838
.loadFromStream(yaml, getClass().getResourceAsStream(yaml), false)
3939
.put(IndexMetadata.SETTING_VERSION_CREATED, IndexVersion.current())
4040
.build();
41-
this.analysis = createTestAnalysis(new Index("test", "_na_"), settings, new AnalysisPhoneticPlugin());
41+
this.analysis = createTestAnalysis(new Index("test", IndexMetadata.INDEX_UUID_NA_VALUE), settings, new AnalysisPhoneticPlugin());
4242
}
4343

4444
public void testPhoneticTokenFilterFactory() throws IOException {

‎plugins/analysis-smartcn/src/test/java/org/elasticsearch/plugin/analysis/smartcn/SimpleSmartChineseAnalysisTests.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
package org.elasticsearch.plugin.analysis.smartcn;
1111

12+
import org.elasticsearch.cluster.metadata.IndexMetadata;
1213
import org.elasticsearch.common.settings.Settings;
1314
import org.elasticsearch.index.Index;
1415
import org.elasticsearch.index.analysis.TokenizerFactory;
@@ -21,7 +22,11 @@
2122

2223
public class SimpleSmartChineseAnalysisTests extends ESTestCase {
2324
public void testDefaultsIcuAnalysis() throws IOException {
24-
final TestAnalysis analysis = createTestAnalysis(new Index("test", "_na_"), Settings.EMPTY, new AnalysisSmartChinesePlugin());
25+
final TestAnalysis analysis = createTestAnalysis(
26+
new Index("test", IndexMetadata.INDEX_UUID_NA_VALUE),
27+
Settings.EMPTY,
28+
new AnalysisSmartChinesePlugin()
29+
);
2530
TokenizerFactory tokenizerFactory = analysis.tokenizer.get("smartcn_tokenizer");
2631
MatcherAssert.assertThat(tokenizerFactory, instanceOf(SmartChineseTokenizerTokenizerFactory.class));
2732
}

‎plugins/analysis-stempel/src/test/java/org/elasticsearch/index/analysis/PolishAnalysisTests.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
import org.apache.lucene.analysis.Analyzer;
1313
import org.apache.lucene.analysis.pl.PolishAnalyzer;
14+
import org.elasticsearch.cluster.metadata.IndexMetadata;
1415
import org.elasticsearch.common.settings.Settings;
1516
import org.elasticsearch.index.Index;
1617
import org.elasticsearch.index.analysis.pl.PolishStemTokenFilterFactory;
@@ -24,7 +25,11 @@
2425

2526
public class PolishAnalysisTests extends ESTestCase {
2627
public void testDefaultsPolishAnalysis() throws IOException {
27-
final TestAnalysis analysis = createTestAnalysis(new Index("test", "_na_"), Settings.EMPTY, new AnalysisStempelPlugin());
28+
final TestAnalysis analysis = createTestAnalysis(
29+
new Index("test", IndexMetadata.INDEX_UUID_NA_VALUE),
30+
Settings.EMPTY,
31+
new AnalysisStempelPlugin()
32+
);
2833
TokenFilterFactory tokenizerFactory = analysis.tokenFilter.get("polish_stem");
2934
MatcherAssert.assertThat(tokenizerFactory, instanceOf(PolishStemTokenFilterFactory.class));
3035

0 commit comments

Comments
 (0)