Removing TransportSingleCustomOperationAction in favour of TransportSingleShardAction to clean up code.

The TransportSingleCustomOperationAction `prefer_local` option has been removed as it isn't worth the effort.
The TransportSingleShardAction will execute the operation on the receiving node if a concrete list doesn't provide a list of candite shards routings to perform the operation on.

Author: martijnvg

core/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequest.java

@@ -19,7 +19,7 @@
 package org.elasticsearch.action.admin.indices.analyze;
 
 import org.elasticsearch.action.ActionRequestValidationException;
-import org.elasticsearch.action.support.single.custom.SingleCustomOperationRequest;
+import org.elasticsearch.action.support.single.shard.SingleShardRequest;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -32,7 +32,7 @@
  * A request to analyze a text associated with a specific index. Allow to provide
  * the actual analyzer name to perform the analysis with.
  */
-public class AnalyzeRequest extends SingleCustomOperationRequest<AnalyzeRequest> {
+public class AnalyzeRequest extends SingleShardRequest<AnalyzeRequest> {
 
     private String[] text;
 
@@ -114,7 +114,7 @@ public String field() {
 
     @Override
     public ActionRequestValidationException validate() {
-        ActionRequestValidationException validationException = super.validate();
+        ActionRequestValidationException validationException = null;
         if (text == null || text.length == 0) {
             validationException = addValidationError("text is missing", validationException);
         }

core/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequestBuilder.java

@@ -18,13 +18,13 @@
  */
 package org.elasticsearch.action.admin.indices.analyze;
 
-import org.elasticsearch.action.support.single.custom.SingleCustomOperationRequestBuilder;
+import org.elasticsearch.action.support.single.shard.SingleShardOperationRequestBuilder;
 import org.elasticsearch.client.ElasticsearchClient;
 
 /**
  *
  */
-public class AnalyzeRequestBuilder extends SingleCustomOperationRequestBuilder<AnalyzeRequest, AnalyzeResponse, AnalyzeRequestBuilder> {
+public class AnalyzeRequestBuilder extends SingleShardOperationRequestBuilder<AnalyzeRequest, AnalyzeResponse, AnalyzeRequestBuilder> {
 
     public AnalyzeRequestBuilder(ElasticsearchClient client, AnalyzeAction action) {
         super(client, action, new AnalyzeRequest());
@@ -34,15 +34,6 @@ public AnalyzeRequestBuilder(ElasticsearchClient client, AnalyzeAction action, S
         super(client, action, new AnalyzeRequest(index).text(text));
     }
 
-    /**
-     * Sets the index to use to analyzer the text (for example, if it holds specific analyzers
-     * registered).
-     */
-    public AnalyzeRequestBuilder setIndex(String index) {
-        request.index(index);
-        return this;
-    }
-
     /**
      * Sets the analyzer name to use in order to analyze the text.
      *

core/src/main/java/org/elasticsearch/action/admin/indices/analyze/TransportAnalyzeAction.java

@@ -29,7 +29,7 @@
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.Version;
 import org.elasticsearch.action.support.ActionFilters;
-import org.elasticsearch.action.support.single.custom.TransportSingleCustomOperationAction;
+import org.elasticsearch.action.support.single.shard.TransportSingleShardAction;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.block.ClusterBlockException;
@@ -54,7 +54,7 @@
 /**
  * Transport action used to execute analyze requests
  */
-public class TransportAnalyzeAction extends TransportSingleCustomOperationAction<AnalyzeRequest, AnalyzeResponse> {
+public class TransportAnalyzeAction extends TransportSingleShardAction<AnalyzeRequest, AnalyzeResponse> {
 
     private final IndicesService indicesService;
     private final IndicesAnalysisService indicesAnalysisService;

core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsIndexRequest.java

@@ -19,16 +19,17 @@
 
 package org.elasticsearch.action.admin.indices.mapping.get;
 
+import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.OriginalIndices;
 import org.elasticsearch.action.support.IndicesOptions;
-import org.elasticsearch.action.support.single.custom.SingleCustomOperationRequest;
+import org.elasticsearch.action.support.single.shard.SingleShardRequest;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 
 import java.io.IOException;
 
-class GetFieldMappingsIndexRequest extends SingleCustomOperationRequest<GetFieldMappingsIndexRequest> {
+class GetFieldMappingsIndexRequest extends SingleShardRequest<GetFieldMappingsIndexRequest> {
 
     private boolean probablySingleFieldRequest;
     private boolean includeDefaults;
@@ -42,7 +43,6 @@ class GetFieldMappingsIndexRequest extends SingleCustomOperationRequest<GetField
 
     GetFieldMappingsIndexRequest(GetFieldMappingsRequest other, String index, boolean probablySingleFieldRequest) {
         super(other);
-        this.preferLocal(other.local);
         this.probablySingleFieldRequest = probablySingleFieldRequest;
         this.includeDefaults = other.includeDefaults();
         this.types = other.types();
@@ -52,6 +52,11 @@ class GetFieldMappingsIndexRequest extends SingleCustomOperationRequest<GetField
         this.originalIndices = new OriginalIndices(other);
     }
 
+    @Override
+    public ActionRequestValidationException validate() {
+        return null;
+    }
+
     public String[] types() {
         return types;
     }
@@ -88,11 +93,6 @@ public void writeTo(StreamOutput out) throws IOException {
         OriginalIndices.writeOriginalIndices(originalIndices, out);
     }
 
-    @Override
-    protected void writeIndex(StreamOutput out) throws IOException {
-        out.writeString(index());
-    }
-
     @Override
     public void readFrom(StreamInput in) throws IOException {
         super.readFrom(in);
@@ -103,8 +103,4 @@ public void readFrom(StreamInput in) throws IOException {
         originalIndices = OriginalIndices.readOriginalIndices(in);
     }
 
-    @Override
-    protected void readIndex(StreamInput in) throws IOException {
-        index(in.readString());
-    }
 }

core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetFieldMappingsIndexAction.java

@@ -26,7 +26,7 @@
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.action.admin.indices.mapping.get.GetFieldMappingsResponse.FieldMappingMetaData;
 import org.elasticsearch.action.support.ActionFilters;
-import org.elasticsearch.action.support.single.custom.TransportSingleCustomOperationAction;
+import org.elasticsearch.action.support.single.shard.TransportSingleShardAction;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.block.ClusterBlockException;
@@ -58,7 +58,7 @@
 /**
  * Transport action used to retrieve the mappings related to fields that belong to a specific index
  */
-public class TransportGetFieldMappingsIndexAction extends TransportSingleCustomOperationAction<GetFieldMappingsIndexRequest, GetFieldMappingsResponse> {
+public class TransportGetFieldMappingsIndexAction extends TransportSingleShardAction<GetFieldMappingsIndexRequest, GetFieldMappingsResponse> {
 
     private static final String ACTION_NAME = GetFieldMappingsAction.NAME + "[index]";
 

core/src/main/java/org/elasticsearch/action/explain/ExplainRequest.java

@@ -152,7 +152,7 @@ public ExplainRequest filteringAlias(String[] filteringAlias) {
 
     @Override
     public ActionRequestValidationException validate() {
-        ActionRequestValidationException validationException = super.validate();
+        ActionRequestValidationException validationException = super.validateNonNullIndex();
         if (type == null) {
             validationException = ValidateActions.addValidationError("type is missing", validationException);
         }

core/src/main/java/org/elasticsearch/action/explain/TransportExplainAction.java

@@ -88,7 +88,7 @@ protected void doExecute(ExplainRequest request, ActionListener<ExplainResponse>
     }
 
     @Override
-    protected boolean resolveIndex() {
+    protected boolean resolveIndex(ExplainRequest request) {
         return true;
     }
 

core/src/main/java/org/elasticsearch/action/get/GetRequest.java

@@ -118,7 +118,7 @@ public GetRequest(String index, String type, String id) {
 
     @Override
     public ActionRequestValidationException validate() {
-        ActionRequestValidationException validationException = super.validate();
+        ActionRequestValidationException validationException = super.validateNonNullIndex();
         if (type == null) {
             validationException = ValidateActions.addValidationError("type is missing", validationException);
         }

core/src/main/java/org/elasticsearch/action/get/MultiGetShardRequest.java

@@ -20,6 +20,7 @@
 package org.elasticsearch.action.get;
 
 import com.carrotsearch.hppc.IntArrayList;
+import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.support.single.shard.SingleShardRequest;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -54,6 +55,11 @@ public class MultiGetShardRequest extends SingleShardRequest<MultiGetShardReques
         ignoreErrorsOnGeneratedFields = multiGetRequest.ignoreErrorsOnGeneratedFields;
     }
 
+    @Override
+    public ActionRequestValidationException validate() {
+        return super.validateNonNullIndex();
+    }
+
     public int shardId() {
         return this.shardId;
     }

core/src/main/java/org/elasticsearch/action/get/TransportGetAction.java

@@ -58,7 +58,7 @@ public TransportGetAction(Settings settings, ClusterService clusterService, Tran
     }
 
     @Override
-    protected boolean resolveIndex() {
+    protected boolean resolveIndex(GetRequest request) {
         return true;
     }
 

core/src/main/java/org/elasticsearch/action/get/TransportShardMultiGetAction.java

@@ -20,7 +20,6 @@
 package org.elasticsearch.action.get;
 
 import org.elasticsearch.ElasticsearchException;
-import org.elasticsearch.ExceptionsHelper;
 import org.elasticsearch.action.support.ActionFilters;
 import org.elasticsearch.action.support.TransportActions;
 import org.elasticsearch.action.support.single.shard.TransportSingleShardAction;
@@ -68,7 +67,7 @@ protected MultiGetShardResponse newResponse() {
     }
 
     @Override
-    protected boolean resolveIndex() {
+    protected boolean resolveIndex(MultiGetShardRequest request) {
         return true;
     }
 

core/src/main/java/org/elasticsearch/action/percolate/TransportShardMultiPercolateAction.java

@@ -21,6 +21,7 @@
 
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.ExceptionsHelper;
+import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.ActionResponse;
 import org.elasticsearch.action.IndicesRequest;
 import org.elasticsearch.action.OriginalIndices;
@@ -76,7 +77,7 @@ protected Response newResponse() {
     }
 
     @Override
-    protected boolean resolveIndex() {
+    protected boolean resolveIndex(Request request) {
         return false;
     }
 
@@ -127,6 +128,11 @@ public static class Request extends SingleShardRequest implements IndicesRequest
             this.items = new ArrayList<>();
         }
 
+        @Override
+        public ActionRequestValidationException validate() {
+            return super.validateNonNullIndex();
+        }
+
         @Override
         public String[] indices() {
             List<String> indices = new ArrayList<>();