Remove Settings from BaseRestRequest Constructor (#45418)

* Resolving the todo, cleaning up the unused `settings` parameter
* Cleaning up some other minor dead code in affected classes

Author: original-brownbear

client/client-benchmark-noop-api-plugin/src/main/java/org/elasticsearch/plugin/noop/NoopPlugin.java

@@ -55,7 +55,7 @@ public List<RestHandler> getRestHandlers(Settings settings, RestController restC
             IndexScopedSettings indexScopedSettings, SettingsFilter settingsFilter, IndexNameExpressionResolver indexNameExpressionResolver,
             Supplier<DiscoveryNodes> nodesInCluster) {
         return Arrays.asList(
-                new RestNoopBulkAction(settings, restController),
-                new RestNoopSearchAction(settings, restController));
+                new RestNoopBulkAction(restController),
+                new RestNoopSearchAction(restController));
     }
 }

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

@@ -27,7 +27,6 @@
 import org.elasticsearch.action.update.UpdateResponse;
 import org.elasticsearch.client.Requests;
 import org.elasticsearch.client.node.NodeClient;
-import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.index.shard.ShardId;
 import org.elasticsearch.rest.BaseRestHandler;
@@ -45,9 +44,8 @@
 import static org.elasticsearch.rest.RestStatus.OK;
 
 public class RestNoopBulkAction extends BaseRestHandler {
-    public RestNoopBulkAction(Settings settings, RestController controller) {
-        super(settings);
 
+    public RestNoopBulkAction(RestController controller) {
         controller.registerHandler(POST, "/_noop_bulk", this);
         controller.registerHandler(PUT, "/_noop_bulk", this);
         controller.registerHandler(POST, "/{index}/_noop_bulk", this);

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

@@ -20,20 +20,17 @@
 
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.client.node.NodeClient;
-import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestController;
 import org.elasticsearch.rest.RestRequest;
 import org.elasticsearch.rest.action.RestStatusToXContentListener;
 
-import java.io.IOException;
-
 import static org.elasticsearch.rest.RestRequest.Method.GET;
 import static org.elasticsearch.rest.RestRequest.Method.POST;
 
 public class RestNoopSearchAction extends BaseRestHandler {
-    public RestNoopSearchAction(Settings settings, RestController controller) {
-        super(settings);
+
+    public RestNoopSearchAction(RestController controller) {
         controller.registerHandler(GET, "/_noop_search", this);
         controller.registerHandler(POST, "/_noop_search", this);
         controller.registerHandler(GET, "/{index}/_noop_search", this);
@@ -48,7 +45,7 @@ public String getName() {
     }
 
     @Override
-    public RestChannelConsumer prepareRequest(final RestRequest request, final NodeClient client) throws IOException {
+    public RestChannelConsumer prepareRequest(final RestRequest request, final NodeClient client) {
         SearchRequest searchRequest = new SearchRequest();
         return channel -> client.execute(NoopSearchAction.INSTANCE, searchRequest, new RestStatusToXContentListener<>(channel));
     }

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

@@ -29,7 +29,6 @@
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
-import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.rest.BaseRestHandler;
@@ -117,8 +116,7 @@ protected void doExecute(Task task, Request request, ActionListener<Response> li
     }
 
     public static class RestAction extends BaseRestHandler {
-        RestAction(Settings settings, RestController controller) {
-            super(settings);
+        RestAction(RestController controller) {
             controller.registerHandler(GET, "/_ingest/processor/grok", this);
         }
 

modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/IngestCommonPlugin.java

@@ -102,7 +102,7 @@ public List<RestHandler> getRestHandlers(Settings settings, RestController restC
                                              IndexScopedSettings indexScopedSettings, SettingsFilter settingsFilter,
                                              IndexNameExpressionResolver indexNameExpressionResolver,
                                              Supplier<DiscoveryNodes> nodesInCluster) {
-        return Arrays.asList(new GrokProcessorGetAction.RestAction(settings, restController));
+        return Arrays.asList(new GrokProcessorGetAction.RestAction(restController));
     }
 
     @Override

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

@@ -59,8 +59,8 @@ public List<RestHandler> getRestHandlers(Settings settings, RestController restC
             IndexScopedSettings indexScopedSettings, SettingsFilter settingsFilter, IndexNameExpressionResolver indexNameExpressionResolver,
             Supplier<DiscoveryNodes> nodesInCluster) {
         return Arrays.asList(
-                new RestSearchTemplateAction(settings, restController),
+                new RestSearchTemplateAction(restController),
                 new RestMultiSearchTemplateAction(settings, restController),
-                new RestRenderSearchTemplateAction(settings, restController));
+                new RestRenderSearchTemplateAction(restController));
     }
 }

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

@@ -52,7 +52,6 @@ public class RestMultiSearchTemplateAction extends BaseRestHandler {
     private final boolean allowExplicitIndex;
 
     public RestMultiSearchTemplateAction(Settings settings, RestController controller) {
-        super(settings);
         this.allowExplicitIndex = MULTI_ALLOW_EXPLICIT_INDEX.get(settings);
 
         controller.registerHandler(GET, "/_msearch/template", this);

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

@@ -20,7 +20,6 @@
 package org.elasticsearch.script.mustache;
 
 import org.elasticsearch.client.node.NodeClient;
-import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestController;
@@ -34,8 +33,8 @@
 import static org.elasticsearch.rest.RestRequest.Method.POST;
 
 public class RestRenderSearchTemplateAction extends BaseRestHandler {
-    public RestRenderSearchTemplateAction(Settings settings, RestController controller) {
-        super(settings);
+
+    public RestRenderSearchTemplateAction(RestController controller) {
         controller.registerHandler(GET, "/_render/template", this);
         controller.registerHandler(POST, "/_render/template", this);
         controller.registerHandler(GET, "/_render/template/{id}", this);

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

@@ -21,7 +21,6 @@
 
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.client.node.NodeClient;
-import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestController;
@@ -47,9 +46,7 @@ public class RestSearchTemplateAction extends BaseRestHandler {
         RESPONSE_PARAMS = Collections.unmodifiableSet(responseParams);
     }
 
-    public RestSearchTemplateAction(Settings settings, RestController controller) {
-        super(settings);
-
+    public RestSearchTemplateAction(RestController controller) {
         controller.registerHandler(GET, "/_search/template", this);
         controller.registerHandler(POST, "/_search/template", this);
         controller.registerHandler(GET, "/{index}/_search/template", this);

modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessPlugin.java

@@ -155,8 +155,8 @@ public List<RestHandler> getRestHandlers(Settings settings, RestController restC
                                              IndexNameExpressionResolver indexNameExpressionResolver,
                                              Supplier<DiscoveryNodes> nodesInCluster) {
         List<RestHandler> handlers = new ArrayList<>();
-        handlers.add(new PainlessExecuteAction.RestAction(settings, restController));
-        handlers.add(new PainlessContextAction.RestAction(settings, restController));
+        handlers.add(new PainlessExecuteAction.RestAction(restController));
+        handlers.add(new PainlessContextAction.RestAction(restController));
         return handlers;
     }
 }