Skip to content

Commit 347cbaf

Browse files
dliappisdliappis
authored
Fix line length for aliases and remove suppression (#37455)
Relates #34884
1 parent 6d99e79 commit 347cbaf

File tree

2 files changed

+40
-23
lines changed

2 files changed

+40
-23
lines changed

‎buildSrc/src/main/resources/checkstyle_suppressions.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@
4646
<suppress files="client[/\\]rest-high-level[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]client[/\\]documentation[/\\]WatcherDocumentationIT.java" id="SnippetLength" />
4747
<suppress files="modules[/\\]reindex[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]client[/\\]documentation[/\\]ReindexDocumentationIT.java" id="SnippetLength" />
4848

49-
<!-- Hopefully temporary suppression of LineLength on files that don't pass it. We should remove these when we the
50-
files start to pass. -->
51-
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]aliases[/\\]IndexAliasesIT.java" checks="LineLength" />
52-
5349
<!-- Gradle requires inputs to be seriablizable -->
5450
<suppress files="buildSrc[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]gradle[/\\]precommit[/\\]TestingConventionRule.java" checks="RegexpSinglelineJava" />
5551
</suppressions>

‎server/src/test/java/org/elasticsearch/aliases/IndexAliasesIT.java‎

Lines changed: 40 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,8 @@ public void testFilteringAliases() throws Exception {
187187
logger.info("--> making sure that filter was stored with alias [alias1] and filter [user:kimchy]");
188188
ClusterState clusterState = admin().cluster().prepareState().get().getState();
189189
IndexMetaData indexMd = clusterState.metaData().index("test");
190-
assertThat(indexMd.getAliases().get("alias1").filter().string(), equalTo("{\"term\":{\"user\":{\"value\":\"kimchy\",\"boost\":1.0}}}"));
190+
assertThat(indexMd.getAliases().get("alias1").filter().string(),
191+
equalTo("{\"term\":{\"user\":{\"value\":\"kimchy\",\"boost\":1.0}}}"));
191192

192193
}
193194

@@ -321,32 +322,38 @@ public void testSearchingFilteringAliasesTwoIndices() throws Exception {
321322
logger.info("--> checking filtering alias for two indices");
322323
SearchResponse searchResponse = client().prepareSearch("foos").setQuery(QueryBuilders.matchAllQuery()).get();
323324
assertHits(searchResponse.getHits(), "1", "5");
324-
assertThat(client().prepareSearch("foos").setSize(0).setQuery(QueryBuilders.matchAllQuery()).get().getHits().getTotalHits().value, equalTo(2L));
325+
assertThat(client().prepareSearch("foos")
326+
.setSize(0).setQuery(QueryBuilders.matchAllQuery()).get().getHits().getTotalHits().value, equalTo(2L));
325327

326328
logger.info("--> checking filtering alias for one index");
327329
searchResponse = client().prepareSearch("bars").setQuery(QueryBuilders.matchAllQuery()).get();
328330
assertHits(searchResponse.getHits(), "2");
329-
assertThat(client().prepareSearch("bars").setSize(0).setQuery(QueryBuilders.matchAllQuery()).get().getHits().getTotalHits().value, equalTo(1L));
331+
assertThat(client().prepareSearch("bars")
332+
.setSize(0).setQuery(QueryBuilders.matchAllQuery()).get().getHits().getTotalHits().value, equalTo(1L));
330333

331334
logger.info("--> checking filtering alias for two indices and one complete index");
332335
searchResponse = client().prepareSearch("foos", "test1").setQuery(QueryBuilders.matchAllQuery()).get();
333336
assertHits(searchResponse.getHits(), "1", "2", "3", "4", "5");
334-
assertThat(client().prepareSearch("foos", "test1").setSize(0).setQuery(QueryBuilders.matchAllQuery()).get().getHits().getTotalHits().value, equalTo(5L));
337+
assertThat(client().prepareSearch("foos", "test1")
338+
.setSize(0).setQuery(QueryBuilders.matchAllQuery()).get().getHits().getTotalHits().value, equalTo(5L));
335339

336340
logger.info("--> checking filtering alias for two indices and non-filtering alias for one index");
337341
searchResponse = client().prepareSearch("foos", "aliasToTest1").setQuery(QueryBuilders.matchAllQuery()).get();
338342
assertHits(searchResponse.getHits(), "1", "2", "3", "4", "5");
339-
assertThat(client().prepareSearch("foos", "aliasToTest1").setSize(0).setQuery(QueryBuilders.matchAllQuery()).get().getHits().getTotalHits().value, equalTo(5L));
343+
assertThat(client().prepareSearch("foos", "aliasToTest1")
344+
.setSize(0).setQuery(QueryBuilders.matchAllQuery()).get().getHits().getTotalHits().value, equalTo(5L));
340345

341346
logger.info("--> checking filtering alias for two indices and non-filtering alias for both indices");
342347
searchResponse = client().prepareSearch("foos", "aliasToTests").setQuery(QueryBuilders.matchAllQuery()).get();
343348
assertThat(searchResponse.getHits().getTotalHits().value, equalTo(8L));
344-
assertThat(client().prepareSearch("foos", "aliasToTests").setSize(0).setQuery(QueryBuilders.matchAllQuery()).get().getHits().getTotalHits().value, equalTo(8L));
349+
assertThat(client().prepareSearch("foos", "aliasToTests")
350+
.setSize(0).setQuery(QueryBuilders.matchAllQuery()).get().getHits().getTotalHits().value, equalTo(8L));
345351

346352
logger.info("--> checking filtering alias for two indices and non-filtering alias for both indices");
347353
searchResponse = client().prepareSearch("foos", "aliasToTests").setQuery(QueryBuilders.termQuery("name", "something")).get();
348354
assertHits(searchResponse.getHits(), "4", "8");
349-
assertThat(client().prepareSearch("foos", "aliasToTests").setSize(0).setQuery(QueryBuilders.termQuery("name", "something")).get().getHits().getTotalHits().value, equalTo(2L));
355+
assertThat(client().prepareSearch("foos", "aliasToTests")
356+
.setSize(0).setQuery(QueryBuilders.termQuery("name", "something")).get().getHits().getTotalHits().value, equalTo(2L));
350357
}
351358

352359
public void testSearchingFilteringAliasesMultipleIndices() throws Exception {
@@ -390,27 +397,33 @@ public void testSearchingFilteringAliasesMultipleIndices() throws Exception {
390397
logger.info("--> checking filtering alias for multiple indices");
391398
SearchResponse searchResponse = client().prepareSearch("filter23", "filter13").setQuery(QueryBuilders.matchAllQuery()).get();
392399
assertHits(searchResponse.getHits(), "21", "31", "13", "33");
393-
assertThat(client().prepareSearch("filter23", "filter13").setSize(0).setQuery(QueryBuilders.matchAllQuery()).get().getHits().getTotalHits().value, equalTo(4L));
400+
assertThat(client().prepareSearch("filter23", "filter13")
401+
.setSize(0).setQuery(QueryBuilders.matchAllQuery()).get().getHits().getTotalHits().value, equalTo(4L));
394402

395403
searchResponse = client().prepareSearch("filter23", "filter1").setQuery(QueryBuilders.matchAllQuery()).get();
396404
assertHits(searchResponse.getHits(), "21", "31", "11", "12", "13");
397-
assertThat(client().prepareSearch("filter23", "filter1").setSize(0).setQuery(QueryBuilders.matchAllQuery()).get().getHits().getTotalHits().value, equalTo(5L));
405+
assertThat(client().prepareSearch("filter23", "filter1")
406+
.setSize(0).setQuery(QueryBuilders.matchAllQuery()).get().getHits().getTotalHits().value, equalTo(5L));
398407

399408
searchResponse = client().prepareSearch("filter13", "filter1").setQuery(QueryBuilders.matchAllQuery()).get();
400409
assertHits(searchResponse.getHits(), "11", "12", "13", "33");
401-
assertThat(client().prepareSearch("filter13", "filter1").setSize(0).setQuery(QueryBuilders.matchAllQuery()).get().getHits().getTotalHits().value, equalTo(4L));
410+
assertThat(client().prepareSearch("filter13", "filter1")
411+
.setSize(0).setQuery(QueryBuilders.matchAllQuery()).get().getHits().getTotalHits().value, equalTo(4L));
402412

403413
searchResponse = client().prepareSearch("filter13", "filter1", "filter23").setQuery(QueryBuilders.matchAllQuery()).get();
404414
assertHits(searchResponse.getHits(), "11", "12", "13", "21", "31", "33");
405-
assertThat(client().prepareSearch("filter13", "filter1", "filter23").setSize(0).setQuery(QueryBuilders.matchAllQuery()).get().getHits().getTotalHits().value, equalTo(6L));
415+
assertThat(client().prepareSearch("filter13", "filter1", "filter23")
416+
.setSize(0).setQuery(QueryBuilders.matchAllQuery()).get().getHits().getTotalHits().value, equalTo(6L));
406417

407418
searchResponse = client().prepareSearch("filter23", "filter13", "test2").setQuery(QueryBuilders.matchAllQuery()).get();
408419
assertHits(searchResponse.getHits(), "21", "22", "23", "31", "13", "33");
409-
assertThat(client().prepareSearch("filter23", "filter13", "test2").setSize(0).setQuery(QueryBuilders.matchAllQuery()).get().getHits().getTotalHits().value, equalTo(6L));
420+
assertThat(client().prepareSearch("filter23", "filter13", "test2")
421+
.setSize(0).setQuery(QueryBuilders.matchAllQuery()).get().getHits().getTotalHits().value, equalTo(6L));
410422

411423
searchResponse = client().prepareSearch("filter23", "filter13", "test1", "test2").setQuery(QueryBuilders.matchAllQuery()).get();
412424
assertHits(searchResponse.getHits(), "11", "12", "13", "21", "22", "23", "31", "33");
413-
assertThat(client().prepareSearch("filter23", "filter13", "test1", "test2").setSize(0).setQuery(QueryBuilders.matchAllQuery()).get().getHits().getTotalHits().value, equalTo(8L));
425+
assertThat(client().prepareSearch("filter23", "filter13", "test1", "test2")
426+
.setSize(0).setQuery(QueryBuilders.matchAllQuery()).get().getHits().getTotalHits().value, equalTo(8L));
414427
}
415428

416429
public void testDeletingByQueryFilteringAliases() throws Exception {
@@ -447,7 +460,8 @@ public void testDeletingByQueryFilteringAliases() throws Exception {
447460
refresh();
448461

449462
logger.info("--> checking counts before delete");
450-
assertThat(client().prepareSearch("bars").setSize(0).setQuery(QueryBuilders.matchAllQuery()).get().getHits().getTotalHits().value, equalTo(1L));
463+
assertThat(client().prepareSearch("bars")
464+
.setSize(0).setQuery(QueryBuilders.matchAllQuery()).get().getHits().getTotalHits().value, equalTo(1L));
451465
}
452466

453467
public void testDeleteAliases() throws Exception {
@@ -511,13 +525,17 @@ public void testWaitForAliasCreationMultipleShards() throws Exception {
511525

512526
public void testWaitForAliasCreationSingleShard() throws Exception {
513527
logger.info("--> creating index [test]");
514-
assertAcked(admin().indices().create(createIndexRequest("test").settings(Settings.builder().put("index.number_of_replicas", 0).put("index.number_of_shards", 1))).get());
528+
assertAcked(admin().indices().create(createIndexRequest("test").settings(Settings.builder()
529+
.put("index.number_of_replicas", 0)
530+
.put("index.number_of_shards", 1)))
531+
.get());
515532

516533
ensureGreen();
517534

518535
for (int i = 0; i < 10; i++) {
519536
assertAcked(admin().indices().prepareAliases().addAlias("test", "alias" + i));
520-
client().index(indexRequest("alias" + i).type("type1").id("1").source(source("1", "test"), XContentType.JSON)).get();
537+
client().index(indexRequest("alias" + i).type("type1").id("1").source(source("1", "test"),
538+
XContentType.JSON)).get();
521539
}
522540
}
523541

@@ -579,7 +597,8 @@ public void testSameAlias() throws Exception {
579597
assertThat(stopWatch.stop().lastTaskTime().millis(), lessThan(timeout.millis()));
580598

581599
logger.info("--> verify that filter was updated");
582-
AliasMetaData aliasMetaData = ((AliasOrIndex.Alias) internalCluster().clusterService().state().metaData().getAliasAndIndexLookup().get("alias1")).getFirstAliasMetaData();
600+
AliasMetaData aliasMetaData = ((AliasOrIndex.Alias) internalCluster()
601+
.clusterService().state().metaData().getAliasAndIndexLookup().get("alias1")).getFirstAliasMetaData();
583602
assertThat(aliasMetaData.getFilter().toString(), equalTo("{\"term\":{\"name\":{\"value\":\"bar\",\"boost\":1.0}}}"));
584603

585604
logger.info("--> deleting alias1");
@@ -905,8 +924,10 @@ public void testAddAliasWithFilterNoMapping() throws Exception {
905924

906925
public void testAliasFilterWithNowInRangeFilterAndQuery() throws Exception {
907926
assertAcked(prepareCreate("my-index").addMapping("my-type", "timestamp", "type=date"));
908-
assertAcked(admin().indices().prepareAliases().addAlias("my-index", "filter1", rangeQuery("timestamp").from("2016-12-01").to("2016-12-31")));
909-
assertAcked(admin().indices().prepareAliases().addAlias("my-index", "filter2", rangeQuery("timestamp").from("2016-01-01").to("2016-12-31")));
927+
assertAcked(admin().indices().prepareAliases()
928+
.addAlias("my-index", "filter1", rangeQuery("timestamp").from("2016-12-01").to("2016-12-31")));
929+
assertAcked(admin().indices().prepareAliases()
930+
.addAlias("my-index", "filter2", rangeQuery("timestamp").from("2016-01-01").to("2016-12-31")));
910931

911932
final int numDocs = scaledRandomIntBetween(5, 52);
912933
for (int i = 1; i <= numDocs; i++) {

0 commit comments

Comments
 (0)