Remove serialization code

Author: nielsbauman

server/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequest.java

@@ -9,14 +9,12 @@
 
 package org.elasticsearch.action.admin.cluster.state;
 
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.IndicesRequest;
 import org.elasticsearch.action.support.IndicesOptions;
 import org.elasticsearch.action.support.local.LocalClusterStateRequest;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.StreamInput;
-import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.tasks.CancellableTask;
 import org.elasticsearch.tasks.Task;
@@ -47,7 +45,7 @@ public ClusterStateRequest(TimeValue masterNodeTimeout) {
     /**
      * Even though this request is only executed on the local node, we still need to be able to serialize it for cross-cluster requests.
      */
-    public ClusterStateRequest(StreamInput in) throws IOException {
+    ClusterStateRequest(StreamInput in) throws IOException {
         super(in);
         routingTable = in.readBoolean();
         nodes = in.readBoolean();
@@ -60,25 +58,6 @@ public ClusterStateRequest(StreamInput in) throws IOException {
         waitForMetadataVersion = in.readOptionalLong();
     }
 
-    @Override
-    public void writeTo(StreamOutput out) throws IOException {
-        getParentTask().writeTo(out);
-        out.writeTimeValue(masterTimeout());
-        if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) {
-            out.writeVLong(0L); // Master term
-        } // else no protection against routing loops in older versions
-        out.writeBoolean(true); // Local
-        out.writeBoolean(routingTable);
-        out.writeBoolean(nodes);
-        out.writeBoolean(metadata);
-        out.writeBoolean(blocks);
-        out.writeBoolean(customs);
-        out.writeStringArray(indices);
-        indicesOptions.writeIndicesOptions(out);
-        out.writeTimeValue(waitForTimeout);
-        out.writeOptionalLong(waitForMetadataVersion);
-    }
-
     @Override
     public ActionRequestValidationException validate() {
         return null;

server/src/main/java/org/elasticsearch/action/support/local/LocalClusterStateRequest.java

@@ -64,7 +64,7 @@ protected LocalClusterStateRequest(StreamInput in, boolean readLocal) throws IOE
     }
 
     @Override
-    public void writeTo(StreamOutput out) throws IOException {
+    public final void writeTo(StreamOutput out) throws IOException {
         TransportAction.localOnly();
     }
 

server/src/test/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequestTests.java

@@ -51,11 +51,11 @@ public void testSerialization() throws Exception {
 
             BytesStreamOutput output = new BytesStreamOutput();
             output.setTransportVersion(testVersion);
-            clusterStateRequest.writeTo(output);
+            new RemoteClusterStateRequest(clusterStateRequest).writeTo(output);
 
             StreamInput streamInput = output.bytes().streamInput();
             streamInput.setTransportVersion(testVersion);
-            ClusterStateRequest deserializedCSRequest = new ClusterStateRequest(streamInput);
+            ClusterStateRequest deserializedCSRequest = new RemoteClusterStateRequest(streamInput).clusterStateRequest();
 
             assertThat(deserializedCSRequest.routingTable(), equalTo(clusterStateRequest.routingTable()));
             assertThat(deserializedCSRequest.metadata(), equalTo(clusterStateRequest.metadata()));