refactor to routes

jaymode · Feb 6, 2020 · 171e368 · 171e368
1 parent 263e2d2
commit 171e368
Show file tree

Hide file tree

Showing 317 changed files with 1,365 additions and 2,233 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
@@ -27,21 +27,17 @@
 import org.elasticsearch.action.update.UpdateResponse;
 import org.elasticsearch.client.Requests;
 import org.elasticsearch.client.node.NodeClient;
-import org.elasticsearch.common.collect.MapBuilder;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.index.shard.ShardId;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.BytesRestResponse;
 import org.elasticsearch.rest.RestChannel;
 import org.elasticsearch.rest.RestRequest;
-import org.elasticsearch.rest.RestRequest.Method;
 import org.elasticsearch.rest.RestResponse;
 import org.elasticsearch.rest.action.RestBuilderListener;
 
 import java.io.IOException;
-import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 
 import static java.util.Arrays.asList;
 import static java.util.Collections.unmodifiableList;
@@ -52,11 +48,12 @@
 public class RestNoopBulkAction extends BaseRestHandler {
 
     @Override
-    public Map<String, List<Method>> handledMethodsAndPaths() {
-        return Collections.unmodifiableMap(MapBuilder.<String, List<Method>>newMapBuilder()
-            .put("/_noop_bulk", unmodifiableList(asList(POST, PUT)))
-            .put("/{index}/_noop_bulk", unmodifiableList(asList(POST, PUT)))
-            .map());
+    public List<Route> handledRoutes() {
+        return unmodifiableList(asList(
+            new Route("/_noop_bulk", POST),
+            new Route("/_noop_bulk", PUT),
+            new Route("/{index}/_noop_bulk", POST),
+            new Route("/{index}/_noop_bulk", PUT)));
     }
 
     @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
@@ -20,15 +20,11 @@
 
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.client.node.NodeClient;
-import org.elasticsearch.common.collect.MapBuilder;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestRequest;
-import org.elasticsearch.rest.RestRequest.Method;
 import org.elasticsearch.rest.action.RestStatusToXContentListener;
 
-import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 
 import static java.util.Arrays.asList;
 import static java.util.Collections.unmodifiableList;
@@ -38,11 +34,12 @@
 public class RestNoopSearchAction extends BaseRestHandler {
 
     @Override
-    public Map<String, List<Method>> handledMethodsAndPaths() {
-        return Collections.unmodifiableMap(MapBuilder.<String, List<Method>>newMapBuilder()
-            .put("/_noop_search", unmodifiableList(asList(GET, POST)))
-            .put("/{index}/_noop_search", unmodifiableList(asList(GET, POST)))
-            .map());
+    public List<Route> handledRoutes() {
+        return unmodifiableList(asList(
+            new Route("/_noop_search", GET),
+            new Route("/_noop_search", POST),
+            new Route("/{index}/_noop_search", GET),
+            new Route("/{index}/_noop_search", POST)));
     }
 
     @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
@@ -33,7 +33,6 @@
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestRequest;
-import org.elasticsearch.rest.RestRequest.Method;
 import org.elasticsearch.rest.action.RestToXContentListener;
 import org.elasticsearch.tasks.Task;
 import org.elasticsearch.transport.TransportService;
@@ -43,7 +42,6 @@
 import java.util.Map;
 
 import static java.util.Collections.singletonList;
-import static java.util.Collections.singletonMap;
 import static org.elasticsearch.ingest.common.IngestCommonPlugin.GROK_PATTERNS;
 import static org.elasticsearch.rest.RestRequest.Method.GET;
 
@@ -121,8 +119,8 @@ protected void doExecute(Task task, Request request, ActionListener<Response> li
     public static class RestAction extends BaseRestHandler {
 
         @Override
-        public Map<String, List<Method>> handledMethodsAndPaths() {
-            return singletonMap("/_ingest/processor/grok", singletonList(GET));
+        public List<Route> handledRoutes() {
+            return singletonList(new Route("/_ingest/processor/grok", GET));
         }
 
         @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
@@ -20,11 +20,9 @@
 package org.elasticsearch.script.mustache;
 
 import org.elasticsearch.client.node.NodeClient;
-import org.elasticsearch.common.collect.MapBuilder;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestRequest;
-import org.elasticsearch.rest.RestRequest.Method;
 import org.elasticsearch.rest.action.RestToXContentListener;
 import org.elasticsearch.rest.action.search.RestMultiSearchAction;
 import org.elasticsearch.rest.action.search.RestSearchAction;
@@ -33,7 +31,6 @@
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 import static java.util.Arrays.asList;
@@ -60,11 +57,12 @@ public RestMultiSearchTemplateAction(Settings settings) {
     }
 
     @Override
-    public Map<String, List<Method>> handledMethodsAndPaths() {
-        return Collections.unmodifiableMap(MapBuilder.<String, List<Method>>newMapBuilder()
-            .put("/_msearch/template", unmodifiableList(asList(GET, POST)))
-            .put("/{index}/_msearch/template", unmodifiableList(asList(GET, POST)))
-            .map());
+    public List<Route> handledRoutes() {
+        return unmodifiableList(asList(
+            new Route("/_msearch/template", GET),
+            new Route("/_msearch/template", POST),
+            new Route("/{index}/_msearch/template", GET),
+            new Route("/{index}/_msearch/template", POST)));
     }
 
     @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
@@ -20,18 +20,14 @@
 package org.elasticsearch.script.mustache;
 
 import org.elasticsearch.client.node.NodeClient;
-import org.elasticsearch.common.collect.MapBuilder;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestRequest;
-import org.elasticsearch.rest.RestRequest.Method;
 import org.elasticsearch.rest.action.RestToXContentListener;
 import org.elasticsearch.script.ScriptType;
 
 import java.io.IOException;
-import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 
 import static java.util.Arrays.asList;
 import static java.util.Collections.unmodifiableList;
@@ -41,11 +37,12 @@
 public class RestRenderSearchTemplateAction extends BaseRestHandler {
 
     @Override
-    public Map<String, List<Method>> handledMethodsAndPaths() {
-        return Collections.unmodifiableMap(MapBuilder.<String, List<Method>>newMapBuilder()
-            .put("/_render/template", unmodifiableList(asList(GET, POST)))
-            .put("/_render/template/{id}", unmodifiableList(asList(GET, POST)))
-            .map());
+    public List<Route> handledRoutes() {
+        return unmodifiableList(asList(
+            new Route("/_render/template", GET),
+            new Route("/_render/template", POST),
+            new Route("/_render/template/{id}", GET),
+            new Route("/_render/template/{id}", POST)));
     }
 
     @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
@@ -21,11 +21,9 @@
 
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.client.node.NodeClient;
-import org.elasticsearch.common.collect.MapBuilder;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestRequest;
-import org.elasticsearch.rest.RestRequest.Method;
 import org.elasticsearch.rest.action.RestStatusToXContentListener;
 import org.elasticsearch.rest.action.search.RestSearchAction;
 
@@ -34,7 +32,6 @@
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 import static java.util.Arrays.asList;
@@ -52,11 +49,12 @@ public class RestSearchTemplateAction extends BaseRestHandler {
     }
 
     @Override
-    public Map<String, List<Method>> handledMethodsAndPaths() {
-        return Collections.unmodifiableMap(MapBuilder.<String, List<Method>>newMapBuilder()
-            .put("/_search/template", unmodifiableList(asList(GET, POST)))
-            .put("/{index}/_search/template", unmodifiableList(asList(GET, POST)))
-            .map());
+    public List<Route> handledRoutes() {
+        return unmodifiableList(asList(
+            new Route("/_search/template", GET),
+            new Route("/_search/template", POST),
+            new Route("/{index}/_search/template", GET),
+            new Route("/{index}/_search/template", POST)));
     }
 
     @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
@@ -38,7 +38,6 @@
 import org.elasticsearch.painless.lookup.PainlessLookup;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestRequest;
-import org.elasticsearch.rest.RestRequest.Method;
 import org.elasticsearch.rest.action.RestToXContentListener;
 import org.elasticsearch.script.ScriptContext;
 import org.elasticsearch.tasks.Task;
@@ -53,7 +52,6 @@
 import java.util.stream.Collectors;
 
 import static java.util.Collections.singletonList;
-import static java.util.Collections.singletonMap;
 import static org.elasticsearch.rest.RestRequest.Method.GET;
 
 /**
@@ -197,8 +195,8 @@ protected void doExecute(Task task, Request request, ActionListener<Response> li
     public static class RestAction extends BaseRestHandler {
 
         @Override
-        public Map<String, List<Method>> handledMethodsAndPaths() {
-            return singletonMap("/_scripts/painless/_context", singletonList(GET));
+        public List<Route> handledRoutes() {
+            return singletonList(new Route("/_scripts/painless/_context", GET));
         }
 
         @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
@@ -69,7 +69,6 @@
 import org.elasticsearch.indices.IndicesService;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestRequest;
-import org.elasticsearch.rest.RestRequest.Method;
 import org.elasticsearch.rest.action.RestToXContentListener;
 import org.elasticsearch.script.FilterScript;
 import org.elasticsearch.script.ScoreScript;
@@ -86,7 +85,6 @@
 import java.util.Objects;
 
 import static java.util.Arrays.asList;
-import static java.util.Collections.singletonMap;
 import static java.util.Collections.unmodifiableList;
 import static org.elasticsearch.action.ValidateActions.addValidationError;
 import static org.elasticsearch.rest.RestRequest.Method.GET;
@@ -569,8 +567,10 @@ private static Response prepareRamIndex(Request request,
     public static class RestAction extends BaseRestHandler {
 
         @Override
-        public Map<String, List<Method>> handledMethodsAndPaths() {
-            return singletonMap("/_scripts/painless/_execute", unmodifiableList(asList(GET, POST)));
+        public List<Route> handledRoutes() {
+            return unmodifiableList(asList(
+                new Route("/_scripts/painless/_execute", GET),
+                new Route("/_scripts/painless/_execute", POST)));
         }
 
         @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
@@ -23,17 +23,13 @@
 import org.elasticsearch.action.support.IndicesOptions;
 import org.elasticsearch.client.node.NodeClient;
 import org.elasticsearch.common.Strings;
-import org.elasticsearch.common.collect.MapBuilder;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestRequest;
-import org.elasticsearch.rest.RestRequest.Method;
 import org.elasticsearch.rest.action.RestToXContentListener;
 
 import java.io.IOException;
-import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 
 import static java.util.Arrays.asList;
 import static java.util.Collections.unmodifiableList;
@@ -97,11 +93,12 @@ public class RestRankEvalAction extends BaseRestHandler {
     public static String ENDPOINT = "_rank_eval";
 
     @Override
-    public Map<String, List<Method>> handledMethodsAndPaths() {
-        return Collections.unmodifiableMap(MapBuilder.<String, List<Method>>newMapBuilder()
-            .put("/" + ENDPOINT, unmodifiableList(asList(GET, POST)))
-            .put("/{index}/" + ENDPOINT, unmodifiableList(asList(GET, POST)))
-            .map());
+    public List<Route> handledRoutes() {
+        return unmodifiableList(asList(
+            new Route("/" + ENDPOINT, GET),
+            new Route("/" + ENDPOINT, POST),
+            new Route("/{index}/" + ENDPOINT, GET),
+            new Route("/{index}/" + ENDPOINT, POST)));
     }
 
     @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
@@ -21,7 +21,6 @@
 
 import org.elasticsearch.client.node.NodeClient;
 import org.elasticsearch.rest.RestRequest;
-import org.elasticsearch.rest.RestRequest.Method;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -30,7 +29,6 @@
 import java.util.function.Consumer;
 
 import static java.util.Collections.singletonList;
-import static java.util.Collections.singletonMap;
 import static org.elasticsearch.rest.RestRequest.Method.POST;
 
 public class RestDeleteByQueryAction extends AbstractBulkByQueryRestHandler<DeleteByQueryRequest, DeleteByQueryAction> {
@@ -40,8 +38,8 @@ public RestDeleteByQueryAction() {
     }
 
     @Override
-    public Map<String, List<Method>> handledMethodsAndPaths() {
-        return singletonMap("/{index}/_delete_by_query", singletonList(POST));
+    public List<Route> handledRoutes() {
+        return singletonList(new Route("/{index}/_delete_by_query", POST));
     }
 
     @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
@@ -22,14 +22,11 @@
 import org.elasticsearch.client.node.NodeClient;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.rest.RestRequest;
-import org.elasticsearch.rest.RestRequest.Method;
 
 import java.io.IOException;
 import java.util.List;
-import java.util.Map;
 
 import static java.util.Collections.singletonList;
-import static java.util.Collections.singletonMap;
 import static org.elasticsearch.common.unit.TimeValue.parseTimeValue;
 import static org.elasticsearch.rest.RestRequest.Method.POST;
 
@@ -43,8 +40,8 @@ public RestReindexAction() {
     }
 
     @Override
-    public Map<String, List<Method>> handledMethodsAndPaths() {
-        return singletonMap("/_reindex", singletonList(POST));
+    public List<Route> handledRoutes() {
+        return singletonList(new Route("/_reindex", POST));
     }
 
     @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
@@ -21,18 +21,15 @@
 
 import org.elasticsearch.client.node.NodeClient;
 import org.elasticsearch.cluster.node.DiscoveryNodes;
-import org.elasticsearch.common.collect.MapBuilder;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestRequest;
-import org.elasticsearch.rest.RestRequest.Method;
 import org.elasticsearch.tasks.TaskId;
 
-import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 import java.util.function.Supplier;
 
-import static java.util.Collections.singletonList;
+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;
 
@@ -44,12 +41,11 @@ public RestRethrottleAction(Supplier<DiscoveryNodes> nodesInCluster) {
     }
 
     @Override
-    public Map<String, List<Method>> handledMethodsAndPaths() {
-        return Collections.unmodifiableMap(MapBuilder.<String, List<Method>>newMapBuilder()
-            .put("/_update_by_query/{taskId}/_rethrottle", singletonList(POST))
-            .put("/_delete_by_query/{taskId}/_rethrottle", singletonList(POST))
-            .put("/_reindex/{taskId}/_rethrottle", singletonList(POST))
-            .map());
+    public List<Route> handledRoutes() {
+        return unmodifiableList(asList(
+            new Route("/_update_by_query/{taskId}/_rethrottle", POST),
+            new Route("/_delete_by_query/{taskId}/_rethrottle", POST),
+            new Route("/_reindex/{taskId}/_rethrottle", POST)));
     }
 
     @Override