Skip to content

Commit 3f8ee82

Browse files
original-brownbearoriginal-brownbear
authored
Use indices admin client shortcut in most integration tests (#96946)
Replacing the remaining usages that I could automatically replace and a couple that I did by hand in this PR. Also, added the same shortcut to the single node tests to save some duplication there.
1 parent c8e676a commit 3f8ee82

File tree

328 files changed

+1677
-2466
lines changed

Some content is hidden

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

328 files changed

+1677
-2466
lines changed

‎modules/aggregations/src/internalClusterTest/java/org/elasticsearch/aggregations/bucket/TimeSeriesAggregationsIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ public void testGetHitsFailure() throws Exception {
524524
response = client().prepareSearch("test").setQuery(queryBuilder).setSize(10).addAggregation(timeSeries("by_ts")).get();
525525
assertSearchResponse(response);
526526

527-
assertAcked(client().admin().indices().delete(new DeleteIndexRequest("test")).actionGet());
527+
assertAcked(indicesAdmin().delete(new DeleteIndexRequest("test")).actionGet());
528528
}
529529

530530
public static TimeSeriesAggregationBuilder timeSeries(String name) {

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@ protected Collection<Class<? extends Plugin>> nodePlugins() {
3232
*/
3333
public void testCustomWordDelimiterQueryString() {
3434
assertAcked(
35-
client().admin()
36-
.indices()
37-
.prepareCreate("test")
35+
indicesAdmin().prepareCreate("test")
3836
.setSettings(
3937
Settings.builder()
4038
.put("analysis.analyzer.my_analyzer.type", "custom")

‎modules/analysis-common/src/internalClusterTest/java/org/elasticsearch/analysis/common/ReloadAnalyzerTests.java

Lines changed: 13 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,7 @@ public void testSynonymsUpdateable() throws IOException {
5353
final String synonymAnalyzerName = "synonym_analyzer";
5454
final String synonymGraphAnalyzerName = "synonym_graph_analyzer";
5555
assertAcked(
56-
client().admin()
57-
.indices()
58-
.prepareCreate(indexName)
56+
indicesAdmin().prepareCreate(indexName)
5957
.setSettings(
6058
indexSettings(5, 0).put("analysis.analyzer." + synonymAnalyzerName + ".tokenizer", "standard")
6159
.putList("analysis.analyzer." + synonymAnalyzerName + ".filter", "lowercase", "synonym_filter")
@@ -72,7 +70,7 @@ public void testSynonymsUpdateable() throws IOException {
7270
);
7371

7472
client().prepareIndex(indexName).setId("1").setSource("field", "Foo").get();
75-
assertNoFailures(client().admin().indices().prepareRefresh(indexName).execute().actionGet());
73+
assertNoFailures(indicesAdmin().prepareRefresh(indexName).execute().actionGet());
7674

7775
SearchResponse response = client().prepareSearch(indexName).setQuery(QueryBuilders.matchQuery("field", "baz")).get();
7876
assertHitCount(response, 1L);
@@ -81,7 +79,7 @@ public void testSynonymsUpdateable() throws IOException {
8179

8280
{
8381
for (String analyzerName : new String[] { synonymAnalyzerName, synonymGraphAnalyzerName }) {
84-
Response analyzeResponse = client().admin().indices().prepareAnalyze(indexName, "foo").setAnalyzer(analyzerName).get();
82+
Response analyzeResponse = indicesAdmin().prepareAnalyze(indexName, "foo").setAnalyzer(analyzerName).get();
8583
assertEquals(2, analyzeResponse.getTokens().size());
8684
Set<String> tokens = new HashSet<>();
8785
analyzeResponse.getTokens().stream().map(AnalyzeToken::getTerm).forEach(t -> tokens.add(t));
@@ -108,7 +106,7 @@ public void testSynonymsUpdateable() throws IOException {
108106

109107
{
110108
for (String analyzerName : new String[] { synonymAnalyzerName, synonymGraphAnalyzerName }) {
111-
Response analyzeResponse = client().admin().indices().prepareAnalyze(indexName, "foo").setAnalyzer(analyzerName).get();
109+
Response analyzeResponse = indicesAdmin().prepareAnalyze(indexName, "foo").setAnalyzer(analyzerName).get();
112110
assertEquals(3, analyzeResponse.getTokens().size());
113111
Set<String> tokens = new HashSet<>();
114112
analyzeResponse.getTokens().stream().map(AnalyzeToken::getTerm).forEach(t -> tokens.add(t));
@@ -131,9 +129,7 @@ public void testSynonymsInMultiplexerUpdateable() throws FileNotFoundException,
131129
final String indexName = "test";
132130
final String synonymAnalyzerName = "synonym_in_multiplexer_analyzer";
133131
assertAcked(
134-
client().admin()
135-
.indices()
136-
.prepareCreate(indexName)
132+
indicesAdmin().prepareCreate(indexName)
137133
.setSettings(
138134
indexSettings(5, 0).put("analysis.analyzer." + synonymAnalyzerName + ".tokenizer", "whitespace")
139135
.putList("analysis.analyzer." + synonymAnalyzerName + ".filter", "my_multiplexer")
@@ -147,14 +143,14 @@ public void testSynonymsInMultiplexerUpdateable() throws FileNotFoundException,
147143
);
148144

149145
client().prepareIndex(indexName).setId("1").setSource("field", "foo").get();
150-
assertNoFailures(client().admin().indices().prepareRefresh(indexName).execute().actionGet());
146+
assertNoFailures(indicesAdmin().prepareRefresh(indexName).execute().actionGet());
151147

152148
SearchResponse response = client().prepareSearch(indexName).setQuery(QueryBuilders.matchQuery("field", "baz")).get();
153149
assertHitCount(response, 1L);
154150
response = client().prepareSearch(indexName).setQuery(QueryBuilders.matchQuery("field", "buzz")).get();
155151
assertHitCount(response, 0L);
156152

157-
Response analyzeResponse = client().admin().indices().prepareAnalyze(indexName, "foo").setAnalyzer(synonymAnalyzerName).get();
153+
Response analyzeResponse = indicesAdmin().prepareAnalyze(indexName, "foo").setAnalyzer(synonymAnalyzerName).get();
158154
assertEquals(2, analyzeResponse.getTokens().size());
159155
final Set<String> tokens = new HashSet<>();
160156
analyzeResponse.getTokens().stream().map(AnalyzeToken::getTerm).forEach(t -> tokens.add(t));
@@ -176,7 +172,7 @@ public void testSynonymsInMultiplexerUpdateable() throws FileNotFoundException,
176172
assertEquals(1, reloadedAnalyzers.size());
177173
assertTrue(reloadedAnalyzers.contains(synonymAnalyzerName));
178174

179-
analyzeResponse = client().admin().indices().prepareAnalyze(indexName, "foo").setAnalyzer(synonymAnalyzerName).get();
175+
analyzeResponse = indicesAdmin().prepareAnalyze(indexName, "foo").setAnalyzer(synonymAnalyzerName).get();
180176
assertEquals(3, analyzeResponse.getTokens().size());
181177
tokens.clear();
182178
analyzeResponse.getTokens().stream().map(AnalyzeToken::getTerm).forEach(t -> tokens.add(t));
@@ -214,9 +210,7 @@ public void testUpdateableSynonymsRejectedAtIndexTime() throws FileNotFoundExcep
214210

215211
MapperException ex = expectThrows(
216212
MapperException.class,
217-
() -> client().admin()
218-
.indices()
219-
.prepareCreate(indexName)
213+
() -> indicesAdmin().prepareCreate(indexName)
220214
.setSettings(
221215
indexSettings(5, 0).put("analysis.analyzer." + analyzerName + ".tokenizer", "standard")
222216
.putList("analysis.analyzer." + analyzerName + ".filter", "lowercase", "synonym_filter")
@@ -237,9 +231,7 @@ public void testUpdateableSynonymsRejectedAtIndexTime() throws FileNotFoundExcep
237231
// same for synonym filters in multiplexer chain
238232
ex = expectThrows(
239233
MapperException.class,
240-
() -> client().admin()
241-
.indices()
242-
.prepareCreate(indexName)
234+
() -> indicesAdmin().prepareCreate(indexName)
243235
.setSettings(
244236
indexSettings(5, 0).put("analysis.analyzer." + analyzerName + ".tokenizer", "whitespace")
245237
.putList("analysis.analyzer." + analyzerName + ".filter", "my_multiplexer")
@@ -267,9 +259,7 @@ public void testKeywordMarkerUpdateable() throws IOException {
267259
final String indexName = "test";
268260
final String analyzerName = "keyword_maker_analyzer";
269261
assertAcked(
270-
client().admin()
271-
.indices()
272-
.prepareCreate(indexName)
262+
indicesAdmin().prepareCreate(indexName)
273263
.setSettings(
274264
indexSettings(5, 0).put("analysis.analyzer." + analyzerName + ".tokenizer", "whitespace")
275265
.putList("analysis.analyzer." + analyzerName + ".filter", "keyword_marker_filter", "stemmer")
@@ -280,11 +270,7 @@ public void testKeywordMarkerUpdateable() throws IOException {
280270
.setMapping("field", "type=text,analyzer=standard,search_analyzer=" + analyzerName)
281271
);
282272

283-
AnalyzeAction.Response analysisResponse = client().admin()
284-
.indices()
285-
.prepareAnalyze("test", "running jumping")
286-
.setAnalyzer(analyzerName)
287-
.get();
273+
AnalyzeAction.Response analysisResponse = indicesAdmin().prepareAnalyze("test", "running jumping").setAnalyzer(analyzerName).get();
288274
List<AnalyzeToken> tokens = analysisResponse.getTokens();
289275
assertEquals("running", tokens.get(0).getTerm());
290276
assertEquals("jump", tokens.get(1).getTerm());
@@ -306,7 +292,7 @@ public void testKeywordMarkerUpdateable() throws IOException {
306292
assertEquals(1, reloadedAnalyzers.size());
307293
assertTrue(reloadedAnalyzers.contains(analyzerName));
308294

309-
analysisResponse = client().admin().indices().prepareAnalyze("test", "running jumping").setAnalyzer(analyzerName).get();
295+
analysisResponse = indicesAdmin().prepareAnalyze("test", "running jumping").setAnalyzer(analyzerName).get();
310296
tokens = analysisResponse.getTokens();
311297
assertEquals("running", tokens.get(0).getTerm());
312298
assertEquals("jumping", tokens.get(1).getTerm());

‎modules/analysis-common/src/internalClusterTest/java/org/elasticsearch/analysis/common/ReloadSynonymAnalyzerIT.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,7 @@ public void testSynonymsUpdateable() throws FileNotFoundException, IOException,
6262
out.println("foo, baz");
6363
}
6464
assertAcked(
65-
client().admin()
66-
.indices()
67-
.prepareCreate("test")
65+
indicesAdmin().prepareCreate("test")
6866
.setSettings(
6967
indexSettings(cluster().numDataNodes() * 2, 1).put("analysis.analyzer.my_synonym_analyzer.tokenizer", "standard")
7068
.put("analysis.analyzer.my_synonym_analyzer.filter", "my_synonym_filter")
@@ -76,13 +74,13 @@ public void testSynonymsUpdateable() throws FileNotFoundException, IOException,
7674
);
7775

7876
client().prepareIndex("test").setId("1").setSource("field", "foo").get();
79-
assertNoFailures(client().admin().indices().prepareRefresh("test").execute().actionGet());
77+
assertNoFailures(indicesAdmin().prepareRefresh("test").execute().actionGet());
8078

8179
SearchResponse response = client().prepareSearch("test").setQuery(QueryBuilders.matchQuery("field", "baz")).get();
8280
assertHitCount(response, 1L);
8381
response = client().prepareSearch("test").setQuery(QueryBuilders.matchQuery("field", "buzz")).get();
8482
assertHitCount(response, 0L);
85-
Response analyzeResponse = client().admin().indices().prepareAnalyze("test", "foo").setAnalyzer("my_synonym_analyzer").get();
83+
Response analyzeResponse = indicesAdmin().prepareAnalyze("test", "foo").setAnalyzer("my_synonym_analyzer").get();
8684
assertEquals(2, analyzeResponse.getTokens().size());
8785
assertEquals("foo", analyzeResponse.getTokens().get(0).getTerm());
8886
assertEquals("baz", analyzeResponse.getTokens().get(1).getTerm());
@@ -108,7 +106,7 @@ public void testSynonymsUpdateable() throws FileNotFoundException, IOException,
108106
reloadResponse.getReloadDetails().get("test").getReloadedAnalyzers()
109107
);
110108

111-
analyzeResponse = client().admin().indices().prepareAnalyze("test", "foo").setAnalyzer("my_synonym_analyzer").get();
109+
analyzeResponse = indicesAdmin().prepareAnalyze("test", "foo").setAnalyzer("my_synonym_analyzer").get();
112110
assertEquals(3, analyzeResponse.getTokens().size());
113111
Set<String> tokens = new HashSet<>();
114112
analyzeResponse.getTokens().stream().map(AnalyzeToken::getTerm).forEach(t -> tokens.add(t));

‎modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/MassiveWordListTests.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@ public void testCreateIndexWithMassiveWordList() {
2727
for (int i = 0; i < wordList.length; i++) {
2828
wordList[i] = "hello world";
2929
}
30-
client().admin()
31-
.indices()
32-
.prepareCreate("test")
30+
indicesAdmin().prepareCreate("test")
3331
.setSettings(
3432
Settings.builder()
3533
.put("index.number_of_shards", 1)

0 commit comments

Comments
 (0)