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
jaymode · Feb 12, 2020 · e2fe084 · e2fe084
1 parent b9e2d16
commit e2fe084
Show file tree

Hide file tree

Showing 254 changed files with 412 additions and 775 deletions.
diff --git a/...pi-plugin/src/main/java/org/elasticsearch/plugin/noop/action/bulk/RestNoopBulkAction.java b/...pi-plugin/src/main/java/org/elasticsearch/plugin/noop/action/bulk/RestNoopBulkAction.java
@@ -39,8 +39,6 @@
 import java.io.IOException;
 import java.util.List;
 
-import static java.util.Arrays.asList;
-import static java.util.Collections.unmodifiableList;
 import static org.elasticsearch.rest.RestRequest.Method.POST;
 import static org.elasticsearch.rest.RestRequest.Method.PUT;
 import static org.elasticsearch.rest.RestStatus.OK;
@@ -49,11 +47,11 @@ public class RestNoopBulkAction extends BaseRestHandler {
 
     @Override
     public List<Route> routes() {
-        return unmodifiableList(asList(
+        return List.of(
             new Route(POST, "/_noop_bulk"),
             new Route(PUT, "/_noop_bulk"),
             new Route(POST, "/{index}/_noop_bulk"),
-            new Route(PUT, "/{index}/_noop_bulk")));
+            new Route(PUT, "/{index}/_noop_bulk"));
     }
 
     @Override

diff --git a/...lugin/src/main/java/org/elasticsearch/plugin/noop/action/search/RestNoopSearchAction.java b/...lugin/src/main/java/org/elasticsearch/plugin/noop/action/search/RestNoopSearchAction.java
@@ -26,20 +26,18 @@
 
 import java.util.List;
 
-import static java.util.Arrays.asList;
-import static java.util.Collections.unmodifiableList;
 import static org.elasticsearch.rest.RestRequest.Method.GET;
 import static org.elasticsearch.rest.RestRequest.Method.POST;
 
 public class RestNoopSearchAction extends BaseRestHandler {
 
     @Override
     public List<Route> routes() {
-        return unmodifiableList(asList(
+        return List.of(
             new Route(GET, "/_noop_search"),
             new Route(POST, "/_noop_search"),
             new Route(GET, "/{index}/_noop_search"),
-            new Route(POST, "/{index}/_noop_search")));
+            new Route(POST, "/{index}/_noop_search"));
     }
 
     @Override

diff --git a/...s/ingest-common/src/main/java/org/elasticsearch/ingest/common/GrokProcessorGetAction.java b/...s/ingest-common/src/main/java/org/elasticsearch/ingest/common/GrokProcessorGetAction.java
@@ -41,7 +41,6 @@
 import java.util.List;
 import java.util.Map;
 
-import static java.util.Collections.singletonList;
 import static org.elasticsearch.ingest.common.IngestCommonPlugin.GROK_PATTERNS;
 import static org.elasticsearch.rest.RestRequest.Method.GET;
 
@@ -120,7 +119,7 @@ public static class RestAction extends BaseRestHandler {
 
         @Override
         public List<Route> routes() {
-            return singletonList(new Route(GET, "/_ingest/processor/grok"));
+            return List.of(new Route(GET, "/_ingest/processor/grok"));
         }
 
         @Override

diff --git a/...stache/src/main/java/org/elasticsearch/script/mustache/RestMultiSearchTemplateAction.java b/...stache/src/main/java/org/elasticsearch/script/mustache/RestMultiSearchTemplateAction.java
@@ -34,7 +34,6 @@
 import java.util.Set;
 
 import static java.util.Arrays.asList;
-import static java.util.Collections.unmodifiableList;
 import static org.elasticsearch.rest.RestRequest.Method.GET;
 import static org.elasticsearch.rest.RestRequest.Method.POST;
 
@@ -58,11 +57,11 @@ public RestMultiSearchTemplateAction(Settings settings) {
 
     @Override
     public List<Route> routes() {
-        return unmodifiableList(asList(
+        return List.of(
             new Route(GET, "/_msearch/template"),
             new Route(POST, "/_msearch/template"),
             new Route(GET, "/{index}/_msearch/template"),
-            new Route(POST, "/{index}/_msearch/template")));
+            new Route(POST, "/{index}/_msearch/template"));
     }
 
     @Override

diff --git a/...tache/src/main/java/org/elasticsearch/script/mustache/RestRenderSearchTemplateAction.java b/...tache/src/main/java/org/elasticsearch/script/mustache/RestRenderSearchTemplateAction.java
@@ -29,20 +29,18 @@
 import java.io.IOException;
 import java.util.List;
 
-import static java.util.Arrays.asList;
-import static java.util.Collections.unmodifiableList;
 import static org.elasticsearch.rest.RestRequest.Method.GET;
 import static org.elasticsearch.rest.RestRequest.Method.POST;
 
 public class RestRenderSearchTemplateAction extends BaseRestHandler {
 
     @Override
     public List<Route> routes() {
-        return unmodifiableList(asList(
+        return List.of(
             new Route(GET, "/_render/template"),
             new Route(POST, "/_render/template"),
             new Route(GET, "/_render/template/{id}"),
-            new Route(POST, "/_render/template/{id}")));
+            new Route(POST, "/_render/template/{id}"));
     }
 
     @Override

diff --git a/...ng-mustache/src/main/java/org/elasticsearch/script/mustache/RestSearchTemplateAction.java b/...ng-mustache/src/main/java/org/elasticsearch/script/mustache/RestSearchTemplateAction.java
@@ -34,8 +34,6 @@
 import java.util.List;
 import java.util.Set;
 
-import static java.util.Arrays.asList;
-import static java.util.Collections.unmodifiableList;
 import static org.elasticsearch.rest.RestRequest.Method.GET;
 import static org.elasticsearch.rest.RestRequest.Method.POST;
 
@@ -50,11 +48,11 @@ public class RestSearchTemplateAction extends BaseRestHandler {
 
     @Override
     public List<Route> routes() {
-        return unmodifiableList(asList(
+        return List.of(
             new Route(GET, "/_search/template"),
             new Route(POST, "/_search/template"),
             new Route(GET, "/{index}/_search/template"),
-            new Route(POST, "/{index}/_search/template")));
+            new Route(POST, "/{index}/_search/template"));
     }
 
     @Override

diff --git a/.../lang-painless/src/main/java/org/elasticsearch/painless/action/PainlessContextAction.java b/.../lang-painless/src/main/java/org/elasticsearch/painless/action/PainlessContextAction.java
@@ -51,7 +51,6 @@
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-import static java.util.Collections.singletonList;
 import static org.elasticsearch.rest.RestRequest.Method.GET;
 
 /**
@@ -196,7 +195,7 @@ public static class RestAction extends BaseRestHandler {
 
         @Override
         public List<Route> routes() {
-            return singletonList(new Route(GET, "/_scripts/painless/_context"));
+            return List.of(new Route(GET, "/_scripts/painless/_context"));
         }
 
         @Override

diff --git a/.../lang-painless/src/main/java/org/elasticsearch/painless/action/PainlessExecuteAction.java b/.../lang-painless/src/main/java/org/elasticsearch/painless/action/PainlessExecuteAction.java
@@ -84,8 +84,6 @@
 import java.util.Map;
 import java.util.Objects;
 
-import static java.util.Arrays.asList;
-import static java.util.Collections.unmodifiableList;
 import static org.elasticsearch.action.ValidateActions.addValidationError;
 import static org.elasticsearch.rest.RestRequest.Method.GET;
 import static org.elasticsearch.rest.RestRequest.Method.POST;
@@ -568,9 +566,9 @@ public static class RestAction extends BaseRestHandler {
 
         @Override
         public List<Route> routes() {
-            return unmodifiableList(asList(
+            return List.of(
                 new Route(GET, "/_scripts/painless/_execute"),
-                new Route(POST, "/_scripts/painless/_execute")));
+                new Route(POST, "/_scripts/painless/_execute"));
         }
 
         @Override

diff --git a/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/RestRankEvalAction.java b/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/RestRankEvalAction.java
@@ -31,8 +31,6 @@
 import java.io.IOException;
 import java.util.List;
 
-import static java.util.Arrays.asList;
-import static java.util.Collections.unmodifiableList;
 import static org.elasticsearch.rest.RestRequest.Method.GET;
 import static org.elasticsearch.rest.RestRequest.Method.POST;
 
@@ -94,11 +92,11 @@ public class RestRankEvalAction extends BaseRestHandler {
 
     @Override
     public List<Route> routes() {
-        return unmodifiableList(asList(
+        return List.of(
             new Route(GET, "/" + ENDPOINT),
             new Route(POST, "/" + ENDPOINT),
             new Route(GET, "/{index}/" + ENDPOINT),
-            new Route(POST, "/{index}/" + ENDPOINT)));
+            new Route(POST, "/{index}/" + ENDPOINT));
     }
 
     @Override

diff --git a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/RestDeleteByQueryAction.java b/modules/reindex/src/main/java/org/elasticsearch/index/reindex/RestDeleteByQueryAction.java
@@ -28,7 +28,6 @@
 import java.util.Map;
 import java.util.function.Consumer;
 
-import static java.util.Collections.singletonList;
 import static org.elasticsearch.rest.RestRequest.Method.POST;
 
 public class RestDeleteByQueryAction extends AbstractBulkByQueryRestHandler<DeleteByQueryRequest, DeleteByQueryAction> {
@@ -39,7 +38,7 @@ public RestDeleteByQueryAction() {
 
     @Override
     public List<Route> routes() {
-        return singletonList(new Route(POST, "/{index}/_delete_by_query"));
+        return List.of(new Route(POST, "/{index}/_delete_by_query"));
     }
 
     @Override

diff --git a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/RestReindexAction.java b/modules/reindex/src/main/java/org/elasticsearch/index/reindex/RestReindexAction.java
@@ -26,7 +26,6 @@
 import java.io.IOException;
 import java.util.List;
 
-import static java.util.Collections.singletonList;
 import static org.elasticsearch.common.unit.TimeValue.parseTimeValue;
 import static org.elasticsearch.rest.RestRequest.Method.POST;
 
@@ -41,7 +40,7 @@ public RestReindexAction() {
 
     @Override
     public List<Route> routes() {
-        return singletonList(new Route(POST, "/_reindex"));
+        return List.of(new Route(POST, "/_reindex"));
     }
 
     @Override

diff --git a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/RestRethrottleAction.java b/modules/reindex/src/main/java/org/elasticsearch/index/reindex/RestRethrottleAction.java
@@ -28,8 +28,6 @@
 import java.util.List;
 import java.util.function.Supplier;
 
-import static java.util.Arrays.asList;
-import static java.util.Collections.unmodifiableList;
 import static org.elasticsearch.rest.RestRequest.Method.POST;
 import static org.elasticsearch.rest.action.admin.cluster.RestListTasksAction.listTasksResponseListener;
 
@@ -42,10 +40,10 @@ public RestRethrottleAction(Supplier<DiscoveryNodes> nodesInCluster) {
 
     @Override
     public List<Route> routes() {
-        return unmodifiableList(asList(
+        return List.of(
             new Route(POST, "/_update_by_query/{taskId}/_rethrottle"),
             new Route(POST, "/_delete_by_query/{taskId}/_rethrottle"),
-            new Route(POST, "/_reindex/{taskId}/_rethrottle")));
+            new Route(POST, "/_reindex/{taskId}/_rethrottle"));
     }
 
     @Override

diff --git a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/RestUpdateByQueryAction.java b/modules/reindex/src/main/java/org/elasticsearch/index/reindex/RestUpdateByQueryAction.java
@@ -34,7 +34,6 @@
 import java.util.Map;
 import java.util.function.Consumer;
 
-import static java.util.Collections.singletonList;
 import static org.elasticsearch.rest.RestRequest.Method.POST;
 import static org.elasticsearch.script.Script.DEFAULT_SCRIPT_LANG;
 
@@ -46,7 +45,7 @@ public RestUpdateByQueryAction() {
 
     @Override
     public List<Route> routes() {
-        return singletonList(new Route(POST, "/{index}/_update_by_query"));
+        return List.of(new Route(POST, "/{index}/_update_by_query"));
     }
 
     @Override

diff --git a/...es/rest-handler/src/main/java/org/elasticsearch/example/resthandler/ExampleCatAction.java b/...es/rest-handler/src/main/java/org/elasticsearch/example/resthandler/ExampleCatAction.java
@@ -27,8 +27,6 @@
 
 import java.util.List;
 
-import static java.util.Arrays.asList;
-import static java.util.Collections.unmodifiableList;
 import static org.elasticsearch.rest.RestRequest.Method.GET;
 import static org.elasticsearch.rest.RestRequest.Method.POST;
 
@@ -39,9 +37,9 @@ public class ExampleCatAction extends AbstractCatAction {
 
     @Override
     public List<Route> routes() {
-        return unmodifiableList(asList(
+        return List.of(
             new Route(GET, "/_cat/example"),
-            new Route(POST, "/_cat/example")));
+            new Route(POST, "/_cat/example"));
     }
 
     @Override

diff --git a/qa/die-with-dignity/src/main/java/org/elasticsearch/RestDieWithDignityAction.java b/qa/die-with-dignity/src/main/java/org/elasticsearch/RestDieWithDignityAction.java
@@ -25,7 +25,6 @@
 
 import java.util.List;
 
-import static java.util.Collections.singletonList;
 import static org.elasticsearch.rest.RestRequest.Method.GET;
 
 public class RestDieWithDignityAction extends BaseRestHandler {
@@ -34,7 +33,7 @@ public class RestDieWithDignityAction extends BaseRestHandler {
 
     @Override
     public List<Route> routes() {
-        return singletonList(new Route(GET, "/_die_with_dignity"));
+        return List.of(new Route(GET, "/_die_with_dignity"));
     }
 
     @Override

diff --git a/qa/smoke-test-http/src/test/java/org/elasticsearch/http/TestResponseHeaderRestAction.java b/qa/smoke-test-http/src/test/java/org/elasticsearch/http/TestResponseHeaderRestAction.java
@@ -27,14 +27,13 @@
 
 import java.util.List;
 
-import static java.util.Collections.singletonList;
 import static org.elasticsearch.rest.RestRequest.Method.GET;
 
 public class TestResponseHeaderRestAction extends BaseRestHandler {
 
     @Override
     public List<Route> routes() {
-        return singletonList(new Route(GET, "/_protected"));
+        return List.of(new Route(GET, "/_protected"));
     }
 
     @Override

diff --git a/server/src/main/java/org/elasticsearch/rest/action/RestFieldCapabilitiesAction.java b/server/src/main/java/org/elasticsearch/rest/action/RestFieldCapabilitiesAction.java
@@ -29,20 +29,18 @@
 import java.io.IOException;
 import java.util.List;
 
-import static java.util.Arrays.asList;
-import static java.util.Collections.unmodifiableList;
 import static org.elasticsearch.rest.RestRequest.Method.GET;
 import static org.elasticsearch.rest.RestRequest.Method.POST;
 
 public class RestFieldCapabilitiesAction extends BaseRestHandler {
 
     @Override
     public List<Route> routes() {
-        return unmodifiableList(asList(
+        return List.of(
             new Route(GET, "/_field_caps"),
             new Route(POST, "/_field_caps"),
             new Route(GET, "/{index}/_field_caps"),
-            new Route(POST, "/{index}/_field_caps")));
+            new Route(POST, "/{index}/_field_caps"));
     }
 
     @Override

diff --git a/server/src/main/java/org/elasticsearch/rest/action/RestMainAction.java b/server/src/main/java/org/elasticsearch/rest/action/RestMainAction.java
@@ -33,18 +33,16 @@
 import java.io.IOException;
 import java.util.List;
 
-import static java.util.Arrays.asList;
-import static java.util.Collections.unmodifiableList;
 import static org.elasticsearch.rest.RestRequest.Method.GET;
 import static org.elasticsearch.rest.RestRequest.Method.HEAD;
 
 public class RestMainAction extends BaseRestHandler {
 
     @Override
     public List<Route> routes() {
-        return unmodifiableList(asList(
+        return List.of(
             new Route(GET, "/"),
-            new Route(HEAD, "/")));
+            new Route(HEAD, "/"));
     }
 
     @Override

diff --git a/.../java/org/elasticsearch/rest/action/admin/cluster/RestAddVotingConfigExclusionAction.java b/.../java/org/elasticsearch/rest/action/admin/cluster/RestAddVotingConfigExclusionAction.java
@@ -31,7 +31,6 @@
 import java.io.IOException;
 import java.util.List;
 
-import static java.util.Collections.singletonList;
 import static org.elasticsearch.rest.RestRequest.Method.POST;
 
 public class RestAddVotingConfigExclusionAction extends BaseRestHandler {
@@ -45,7 +44,7 @@ public String getName() {
 
     @Override
     public List<Route> routes() {
-        return singletonList(new Route(POST, "/_cluster/voting_config_exclusions/{node_name}"));
+        return List.of(new Route(POST, "/_cluster/voting_config_exclusions/{node_name}"));
     }
 
     @Override

diff --git a/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestCancelTasksAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestCancelTasksAction.java
@@ -31,8 +31,6 @@
 import java.util.List;
 import java.util.function.Supplier;
 
-import static java.util.Arrays.asList;
-import static java.util.Collections.unmodifiableList;
 import static org.elasticsearch.rest.RestRequest.Method.POST;
 import static org.elasticsearch.rest.action.admin.cluster.RestListTasksAction.listTasksResponseListener;
 
@@ -51,8 +49,8 @@ public String getName() {
 
     @Override
     public List<Route> routes() {
-        return unmodifiableList(asList(new Route(POST, "/_tasks/_cancel"),
-            new Route(POST, "/_tasks/{task_id}/_cancel")));
+        return List.of(new Route(POST, "/_tasks/_cancel"),
+            new Route(POST, "/_tasks/{task_id}/_cancel"));
     }
 
     @Override