Convert direct implementations of Streamable to Writeable (#44605)

This commit converts Streamable to Writeable for direct implementations.

relates #34389

Author: rjernst

client/rest-high-level/src/test/java/org/elasticsearch/client/AbstractHlrcStreamableXContentTestCase.java

@@ -24,7 +24,7 @@
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.io.stream.BytesStreamOutput;
 import org.elasticsearch.common.io.stream.StreamInput;
-import org.elasticsearch.common.io.stream.Streamable;
+import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.lucene.uid.Versions;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.script.Script;
@@ -175,11 +175,11 @@ public void testRethrottleRequest() throws IOException {
         assertEquals(request.getTaskId(), tripped.getTaskId());
     }
 
-    private StreamInput toInputByteStream(Streamable example) throws IOException {
+    private StreamInput toInputByteStream(Writeable example) throws IOException {
         return toInputByteStream(Version.CURRENT, example);
     }
 
-    private StreamInput toInputByteStream(Version version, Streamable example) throws IOException {
+    private StreamInput toInputByteStream(Version version, Writeable example) throws IOException {
         BytesStreamOutput out = new BytesStreamOutput();
         out.setVersion(version);
         example.writeTo(out);

modules/reindex/src/test/java/org/elasticsearch/index/reindex/RoundTripTests.java

@@ -147,7 +147,7 @@ public void writeTo(StreamOutput out) throws IOException {
     public void readFrom(StreamInput in) throws IOException {
         super.readFrom(in);
         stage = SnapshotIndexShardStage.fromValue(in.readByte());
-        stats = SnapshotStats.readSnapshotStats(in);
+        stats = new SnapshotStats(in);
         nodeId = in.readOptionalString();
         failure = in.readOptionalString();
     }

server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStatus.java

@@ -21,7 +21,7 @@
 
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
-import org.elasticsearch.common.io.stream.Streamable;
+import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.unit.ByteSizeValue;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.xcontent.ToXContent;
@@ -32,7 +32,7 @@
 
 import java.io.IOException;
 
-public class SnapshotStats implements Streamable, ToXContentObject {
+public class SnapshotStats implements Writeable, ToXContentObject {
 
     private long startTime;
     private long time;
@@ -43,7 +43,20 @@ public class SnapshotStats implements Streamable, ToXContentObject {
     private long totalSize;
     private long processedSize;
 
-    SnapshotStats() {
+    SnapshotStats() {}
+
+    SnapshotStats(StreamInput in) throws IOException {
+        startTime = in.readVLong();
+        time = in.readVLong();
+
+        incrementalFileCount = in.readVInt();
+        processedFileCount = in.readVInt();
+
+        incrementalSize = in.readVLong();
+        processedSize = in.readVLong();
+
+        totalFileCount = in.readVInt();
+        totalSize = in.readVLong();
     }
 
     SnapshotStats(long startTime, long time,
@@ -115,13 +128,6 @@ public long getProcessedSize() {
         return processedSize;
     }
 
-
-    public static SnapshotStats readSnapshotStats(StreamInput in) throws IOException {
-        SnapshotStats stats = new SnapshotStats();
-        stats.readFrom(in);
-        return stats;
-    }
-
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         out.writeVLong(startTime);
@@ -137,21 +143,6 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeVLong(totalSize);
     }
 
-    @Override
-    public void readFrom(StreamInput in) throws IOException {
-        startTime = in.readVLong();
-        time = in.readVLong();
-
-        incrementalFileCount = in.readVInt();
-        processedFileCount = in.readVInt();
-
-        incrementalSize = in.readVLong();
-        processedSize = in.readVLong();
-
-        totalFileCount = in.readVInt();
-        totalSize = in.readVLong();
-    }
-
     static final class Fields {
         static final String STATS = "stats";
 

server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStats.java

@@ -27,7 +27,7 @@
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
-import org.elasticsearch.common.io.stream.Streamable;
+import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.xcontent.ConstructingObjectParser;
 import org.elasticsearch.common.xcontent.ObjectParser;
 import org.elasticsearch.common.xcontent.ToXContentObject;
@@ -55,7 +55,7 @@
 /**
  * Status of a snapshot
  */
-public class SnapshotStatus implements ToXContentObject, Streamable {
+public class SnapshotStatus implements ToXContentObject, Writeable {
 
     private Snapshot snapshot;
 
@@ -72,6 +72,28 @@ public class SnapshotStatus implements ToXContentObject, Streamable {
     @Nullable
     private Boolean includeGlobalState;
 
+    SnapshotStatus(StreamInput in) throws IOException {
+        snapshot = new Snapshot(in);
+        state = State.fromValue(in.readByte());
+        int size = in.readVInt();
+        List<SnapshotIndexShardStatus> builder = new ArrayList<>();
+        for (int i = 0; i < size; i++) {
+            builder.add(SnapshotIndexShardStatus.readShardSnapshotStatus(in));
+        }
+        shards = Collections.unmodifiableList(builder);
+        includeGlobalState = in.readOptionalBoolean();
+        final long startTime;
+        final long time;
+        if (in.getVersion().onOrAfter(Version.V_7_4_0)) {
+            startTime = in.readLong();
+            time = in.readLong();
+        } else {
+            startTime = 0L;
+            time = 0L;
+        }
+        updateShardStats(startTime, time);
+    }
+
     SnapshotStatus(Snapshot snapshot, State state, List<SnapshotIndexShardStatus> shards, Boolean includeGlobalState,
                    long startTime, long time) {
         this.snapshot = Objects.requireNonNull(snapshot);
@@ -94,9 +116,6 @@ private SnapshotStatus(Snapshot snapshot, State state, List<SnapshotIndexShardSt
         this.includeGlobalState = includeGlobalState;
     }
 
-    SnapshotStatus() {
-    }
-
     /**
      * Returns snapshot
      */
@@ -159,29 +178,6 @@ public Map<String, SnapshotIndexStatus> getIndices() {
 
     }
 
-    @Override
-    public void readFrom(StreamInput in) throws IOException {
-        snapshot = new Snapshot(in);
-        state = State.fromValue(in.readByte());
-        int size = in.readVInt();
-        List<SnapshotIndexShardStatus> builder = new ArrayList<>();
-        for (int i = 0; i < size; i++) {
-            builder.add(SnapshotIndexShardStatus.readShardSnapshotStatus(in));
-        }
-        shards = Collections.unmodifiableList(builder);
-        includeGlobalState = in.readOptionalBoolean();
-        final long startTime;
-        final long time;
-        if (in.getVersion().onOrAfter(Version.V_7_4_0)) {
-            startTime = in.readLong();
-            time = in.readLong();
-        } else {
-            startTime = 0L;
-            time = 0L;
-        }
-        updateShardStats(startTime, time);
-    }
-
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         snapshot.writeTo(out);
@@ -197,18 +193,6 @@ public void writeTo(StreamOutput out) throws IOException {
         }
     }
 
-    /**
-     * Reads snapshot status from stream input
-     *
-     * @param in stream input
-     * @return deserialized snapshot status
-     */
-    public static SnapshotStatus readSnapshotStatus(StreamInput in) throws IOException {
-        SnapshotStatus snapshotInfo = new SnapshotStatus();
-        snapshotInfo.readFrom(in);
-        return snapshotInfo;
-    }
-
     @Override
     public String toString() {
         return Strings.toString(this, true, false);

server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStatus.java

@@ -47,7 +47,7 @@ public SnapshotsStatusResponse(StreamInput in) throws IOException {
         int size = in.readVInt();
         List<SnapshotStatus> builder = new ArrayList<>();
         for (int i = 0; i < size; i++) {
-            builder.add(SnapshotStatus.readSnapshotStatus(in));
+            builder.add(new SnapshotStatus(in));
         }
         snapshots = Collections.unmodifiableList(builder);
     }

server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusResponse.java

@@ -49,7 +49,7 @@ public ClusterStatsNodeResponse(StreamInput in) throws IOException {
         int size = in.readVInt();
         shardsStats = new ShardStats[size];
         for (int i = 0; i < size; i++) {
-            shardsStats[i] = ShardStats.readShardStats(in);
+            shardsStats[i] = new ShardStats(in);
         }
     }
 

server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodeResponse.java

@@ -26,7 +26,7 @@
 import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
-import org.elasticsearch.common.io.stream.Streamable;
+import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.xcontent.ToXContent;
 import org.elasticsearch.common.xcontent.ToXContentFragment;
 import org.elasticsearch.common.xcontent.XContentBuilder;
@@ -42,7 +42,7 @@
 /**
  * Represents an alias, to be associated with an index
  */
-public class Alias implements Streamable, ToXContentFragment {
+public class Alias implements Writeable, ToXContentFragment {
 
     private static final ParseField FILTER = new ParseField("filter");
     private static final ParseField ROUTING = new ParseField("routing");
@@ -64,8 +64,12 @@ public class Alias implements Streamable, ToXContentFragment {
     @Nullable
     private Boolean writeIndex;
 
-    private Alias() {
-
+    public Alias(StreamInput in) throws IOException {
+        name = in.readString();
+        filter = in.readOptionalString();
+        indexRouting = in.readOptionalString();
+        searchRouting = in.readOptionalString();
+        writeIndex = in.readOptionalBoolean();
     }
 
     public Alias(String name) {
@@ -185,24 +189,6 @@ public Alias writeIndex(@Nullable Boolean writeIndex) {
         return this;
     }
 
-    /**
-     * Allows to read an alias from the provided input stream
-     */
-    public static Alias read(StreamInput in) throws IOException {
-        Alias alias = new Alias();
-        alias.readFrom(in);
-        return alias;
-    }
-
-    @Override
-    public void readFrom(StreamInput in) throws IOException {
-        name = in.readString();
-        filter = in.readOptionalString();
-        indexRouting = in.readOptionalString();
-        searchRouting = in.readOptionalString();
-        writeIndex = in.readOptionalBoolean();
-    }
-
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         out.writeString(name);

server/src/main/java/org/elasticsearch/action/admin/indices/alias/Alias.java

@@ -100,7 +100,7 @@ public CreateIndexRequest(StreamInput in) throws IOException {
         }
         int aliasesSize = in.readVInt();
         for (int i = 0; i < aliasesSize; i++) {
-            aliases.add(Alias.read(in));
+            aliases.add(new Alias(in));
         }
         waitForActiveShards = ActiveShardCount.readFrom(in);
     }