Skip to content

Commit e2fe084

Browse files
jaymodejaymode
committed
Use List convenience methods in rest actions
This commit replaces usages of older collection utility methods with the JDK 9 convenience method `List.of()`. Relates elastic#51950
1 parent b9e2d16 commit e2fe084

File tree

254 files changed

+412
-775
lines changed

Some content is hidden

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

254 files changed

+412
-775
lines changed

‎client/client-benchmark-noop-api-plugin/src/main/java/org/elasticsearch/plugin/noop/action/bulk/RestNoopBulkAction.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@
3939
import java.io.IOException;
4040
import java.util.List;
4141

42-
import static java.util.Arrays.asList;
43-
import static java.util.Collections.unmodifiableList;
4442
import static org.elasticsearch.rest.RestRequest.Method.POST;
4543
import static org.elasticsearch.rest.RestRequest.Method.PUT;
4644
import static org.elasticsearch.rest.RestStatus.OK;
@@ -49,11 +47,11 @@ public class RestNoopBulkAction extends BaseRestHandler {
4947

5048
@Override
5149
public List<Route> routes() {
52-
return unmodifiableList(asList(
50+
return List.of(
5351
new Route(POST, "/_noop_bulk"),
5452
new Route(PUT, "/_noop_bulk"),
5553
new Route(POST, "/{index}/_noop_bulk"),
56-
new Route(PUT, "/{index}/_noop_bulk")));
54+
new Route(PUT, "/{index}/_noop_bulk"));
5755
}
5856

5957
@Override

‎client/client-benchmark-noop-api-plugin/src/main/java/org/elasticsearch/plugin/noop/action/search/RestNoopSearchAction.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,18 @@
2626

2727
import java.util.List;
2828

29-
import static java.util.Arrays.asList;
30-
import static java.util.Collections.unmodifiableList;
3129
import static org.elasticsearch.rest.RestRequest.Method.GET;
3230
import static org.elasticsearch.rest.RestRequest.Method.POST;
3331

3432
public class RestNoopSearchAction extends BaseRestHandler {
3533

3634
@Override
3735
public List<Route> routes() {
38-
return unmodifiableList(asList(
36+
return List.of(
3937
new Route(GET, "/_noop_search"),
4038
new Route(POST, "/_noop_search"),
4139
new Route(GET, "/{index}/_noop_search"),
42-
new Route(POST, "/{index}/_noop_search")));
40+
new Route(POST, "/{index}/_noop_search"));
4341
}
4442

4543
@Override

‎modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/GrokProcessorGetAction.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
import java.util.List;
4242
import java.util.Map;
4343

44-
import static java.util.Collections.singletonList;
4544
import static org.elasticsearch.ingest.common.IngestCommonPlugin.GROK_PATTERNS;
4645
import static org.elasticsearch.rest.RestRequest.Method.GET;
4746

@@ -120,7 +119,7 @@ public static class RestAction extends BaseRestHandler {
120119

121120
@Override
122121
public List<Route> routes() {
123-
return singletonList(new Route(GET, "/_ingest/processor/grok"));
122+
return List.of(new Route(GET, "/_ingest/processor/grok"));
124123
}
125124

126125
@Override

‎modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/RestMultiSearchTemplateAction.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import java.util.Set;
3535

3636
import static java.util.Arrays.asList;
37-
import static java.util.Collections.unmodifiableList;
3837
import static org.elasticsearch.rest.RestRequest.Method.GET;
3938
import static org.elasticsearch.rest.RestRequest.Method.POST;
4039

@@ -58,11 +57,11 @@ public RestMultiSearchTemplateAction(Settings settings) {
5857

5958
@Override
6059
public List<Route> routes() {
61-
return unmodifiableList(asList(
60+
return List.of(
6261
new Route(GET, "/_msearch/template"),
6362
new Route(POST, "/_msearch/template"),
6463
new Route(GET, "/{index}/_msearch/template"),
65-
new Route(POST, "/{index}/_msearch/template")));
64+
new Route(POST, "/{index}/_msearch/template"));
6665
}
6766

6867
@Override

‎modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/RestRenderSearchTemplateAction.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,20 +29,18 @@
2929
import java.io.IOException;
3030
import java.util.List;
3131

32-
import static java.util.Arrays.asList;
33-
import static java.util.Collections.unmodifiableList;
3432
import static org.elasticsearch.rest.RestRequest.Method.GET;
3533
import static org.elasticsearch.rest.RestRequest.Method.POST;
3634

3735
public class RestRenderSearchTemplateAction extends BaseRestHandler {
3836

3937
@Override
4038
public List<Route> routes() {
41-
return unmodifiableList(asList(
39+
return List.of(
4240
new Route(GET, "/_render/template"),
4341
new Route(POST, "/_render/template"),
4442
new Route(GET, "/_render/template/{id}"),
45-
new Route(POST, "/_render/template/{id}")));
43+
new Route(POST, "/_render/template/{id}"));
4644
}
4745

4846
@Override

‎modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/RestSearchTemplateAction.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@
3434
import java.util.List;
3535
import java.util.Set;
3636

37-
import static java.util.Arrays.asList;
38-
import static java.util.Collections.unmodifiableList;
3937
import static org.elasticsearch.rest.RestRequest.Method.GET;
4038
import static org.elasticsearch.rest.RestRequest.Method.POST;
4139

@@ -50,11 +48,11 @@ public class RestSearchTemplateAction extends BaseRestHandler {
5048

5149
@Override
5250
public List<Route> routes() {
53-
return unmodifiableList(asList(
51+
return List.of(
5452
new Route(GET, "/_search/template"),
5553
new Route(POST, "/_search/template"),
5654
new Route(GET, "/{index}/_search/template"),
57-
new Route(POST, "/{index}/_search/template")));
55+
new Route(POST, "/{index}/_search/template"));
5856
}
5957

6058
@Override

‎modules/lang-painless/src/main/java/org/elasticsearch/painless/action/PainlessContextAction.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
import java.util.Objects;
5252
import java.util.stream.Collectors;
5353

54-
import static java.util.Collections.singletonList;
5554
import static org.elasticsearch.rest.RestRequest.Method.GET;
5655

5756
/**
@@ -196,7 +195,7 @@ public static class RestAction extends BaseRestHandler {
196195

197196
@Override
198197
public List<Route> routes() {
199-
return singletonList(new Route(GET, "/_scripts/painless/_context"));
198+
return List.of(new Route(GET, "/_scripts/painless/_context"));
200199
}
201200

202201
@Override

‎modules/lang-painless/src/main/java/org/elasticsearch/painless/action/PainlessExecuteAction.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,6 @@
8484
import java.util.Map;
8585
import java.util.Objects;
8686

87-
import static java.util.Arrays.asList;
88-
import static java.util.Collections.unmodifiableList;
8987
import static org.elasticsearch.action.ValidateActions.addValidationError;
9088
import static org.elasticsearch.rest.RestRequest.Method.GET;
9189
import static org.elasticsearch.rest.RestRequest.Method.POST;
@@ -568,9 +566,9 @@ public static class RestAction extends BaseRestHandler {
568566

569567
@Override
570568
public List<Route> routes() {
571-
return unmodifiableList(asList(
569+
return List.of(
572570
new Route(GET, "/_scripts/painless/_execute"),
573-
new Route(POST, "/_scripts/painless/_execute")));
571+
new Route(POST, "/_scripts/painless/_execute"));
574572
}
575573

576574
@Override

‎modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/RestRankEvalAction.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@
3131
import java.io.IOException;
3232
import java.util.List;
3333

34-
import static java.util.Arrays.asList;
35-
import static java.util.Collections.unmodifiableList;
3634
import static org.elasticsearch.rest.RestRequest.Method.GET;
3735
import static org.elasticsearch.rest.RestRequest.Method.POST;
3836

@@ -94,11 +92,11 @@ public class RestRankEvalAction extends BaseRestHandler {
9492

9593
@Override
9694
public List<Route> routes() {
97-
return unmodifiableList(asList(
95+
return List.of(
9896
new Route(GET, "/" + ENDPOINT),
9997
new Route(POST, "/" + ENDPOINT),
10098
new Route(GET, "/{index}/" + ENDPOINT),
101-
new Route(POST, "/{index}/" + ENDPOINT)));
99+
new Route(POST, "/{index}/" + ENDPOINT));
102100
}
103101

104102
@Override

‎modules/reindex/src/main/java/org/elasticsearch/index/reindex/RestDeleteByQueryAction.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import java.util.Map;
2929
import java.util.function.Consumer;
3030

31-
import static java.util.Collections.singletonList;
3231
import static org.elasticsearch.rest.RestRequest.Method.POST;
3332

3433
public class RestDeleteByQueryAction extends AbstractBulkByQueryRestHandler<DeleteByQueryRequest, DeleteByQueryAction> {
@@ -39,7 +38,7 @@ public RestDeleteByQueryAction() {
3938

4039
@Override
4140
public List<Route> routes() {
42-
return singletonList(new Route(POST, "/{index}/_delete_by_query"));
41+
return List.of(new Route(POST, "/{index}/_delete_by_query"));
4342
}
4443

4544
@Override

0 commit comments

Comments
 (0)