Remove StreamOutput #writeOptionalStreamable and #writeStreamableList (#44602)

remove usages of writeOptionalStreamable and writeStreambaleList

relates #34389.

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

@@ -127,7 +127,7 @@ public class MultiSearchTemplateRequest extends ActionRequest implements Composi
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
         out.writeVInt(maxConcurrentSearchRequests);
-        out.writeStreamableList(requests);
+        out.writeList(requests);
     }
 
     @Override

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

@@ -232,7 +232,7 @@ public class SearchTemplateRequest extends ActionRequest implements CompositeInd
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
-        out.writeOptionalStreamable(request);
+        out.writeOptionalWriteable(request);
         out.writeBoolean(simulate);
         out.writeBoolean(explain);
         out.writeBoolean(profile);

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

@@ -82,7 +82,7 @@ public class SearchTemplateResponse extends ActionResponse implements StatusToXC
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         out.writeOptionalBytesReference(source);
-        out.writeOptionalStreamable(response);
+        out.writeOptionalWriteable(response);
     }
 
     public static SearchTemplateResponse fromXContent(XContentParser parser) throws IOException {

server/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsResponse.java

@@ -45,7 +45,7 @@ public class NodesHotThreadsResponse extends BaseNodesResponse<NodeHotThreads> {
 
     @Override
     protected void writeNodesTo(StreamOutput out, List<NodeHotThreads> nodes) throws IOException {
-        out.writeStreamableList(nodes);
+        out.writeList(nodes);
     }
 
 }

server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoResponse.java

@@ -52,7 +52,7 @@ public class NodesInfoResponse extends BaseNodesResponse<NodeInfo> implements To
 
     @Override
     protected void writeNodesTo(StreamOutput out, List<NodeInfo> nodes) throws IOException {
-        out.writeStreamableList(nodes);
+        out.writeList(nodes);
     }
 
     @Override

server/src/main/java/org/elasticsearch/action/admin/cluster/node/reload/NodesReloadSecureSettingsResponse.java

@@ -55,7 +55,7 @@ public class NodesReloadSecureSettingsResponse extends BaseNodesResponse<NodesRe
 
     @Override
     protected void writeNodesTo(StreamOutput out, List<NodesReloadSecureSettingsResponse.NodeResponse> nodes) throws IOException {
-        out.writeStreamableList(nodes);
+        out.writeList(nodes);
     }
 
     @Override

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

@@ -49,7 +49,7 @@ public class NodesStatsResponse extends BaseNodesResponse<NodeStats> implements
 
     @Override
     protected void writeNodesTo(StreamOutput out, List<NodeStats> nodes) throws IOException {
-        out.writeStreamableList(nodes);
+        out.writeList(nodes);
     }
 
     @Override

server/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodesUsageResponse.java

@@ -53,7 +53,7 @@ public class NodesUsageResponse extends BaseNodesResponse<NodeUsage> implements
 
     @Override
     protected void writeNodesTo(StreamOutput out, List<NodeUsage> nodes) throws IOException {
-        out.writeStreamableList(nodes);
+        out.writeList(nodes);
     }
 
     @Override

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

@@ -162,7 +162,7 @@ public class TransportNodesSnapshotsStatus extends TransportNodesAction<Transpor
 
         @Override
         protected void writeNodesTo(StreamOutput out, List<NodeSnapshotStatus> nodes) throws IOException {
-            out.writeStreamableList(nodes);
+            out.writeList(nodes);
         }
     }
 

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

@@ -109,7 +109,7 @@ public class ClusterStatsResponse extends BaseNodesResponse<ClusterStatsNodeResp
     @Override
     protected void writeNodesTo(StreamOutput out, List<ClusterStatsNodeResponse> nodes) throws IOException {
         // nodeStats and indicesStats are rebuilt from nodes
-        out.writeStreamableList(nodes);
+        out.writeList(nodes);
     }
 
     @Override

server/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentResponse.java

@@ -52,7 +52,7 @@ public class IndicesSegmentResponse extends BroadcastResponse {
         super(in);
         shards = new ShardSegments[in.readVInt()];
         for (int i = 0; i < shards.length; i++) {
-            shards[i] = ShardSegments.readShardSegments(in);
+            shards[i] = new ShardSegments(in);
         }
     }
 

server/src/main/java/org/elasticsearch/action/admin/indices/segments/ShardSegments.java

@@ -22,7 +22,7 @@ package org.elasticsearch.action.admin.indices.segments;
 import org.elasticsearch.cluster.routing.ShardRouting;
 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.index.engine.Segment;
 
 import java.io.IOException;
@@ -31,20 +31,30 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
-public class ShardSegments implements Streamable, Iterable<Segment> {
+public class ShardSegments implements Writeable, Iterable<Segment> {
 
     private ShardRouting shardRouting;
 
     private List<Segment> segments;
 
-    ShardSegments() {
-    }
-
     ShardSegments(ShardRouting shardRouting, List<Segment> segments) {
         this.shardRouting = shardRouting;
         this.segments = segments;
     }
 
+    ShardSegments(StreamInput in) throws IOException {
+        shardRouting = new ShardRouting(in);
+        int size = in.readVInt();
+        if (size == 0) {
+            segments = Collections.emptyList();
+        } else {
+            segments = new ArrayList<>(size);
+            for (int i = 0; i < size; i++) {
+                segments.add(Segment.readSegment(in));
+            }
+        }
+    }
+
     @Override
     public Iterator<Segment> iterator() {
         return segments.iterator();
@@ -78,26 +88,6 @@ public class ShardSegments implements Streamable, Iterable<Segment> {
         return count;
     }
 
-    public static ShardSegments readShardSegments(StreamInput in) throws IOException {
-        ShardSegments shard = new ShardSegments();
-        shard.readFrom(in);
-        return shard;
-    }
-
-    @Override
-    public void readFrom(StreamInput in) throws IOException {
-        shardRouting = new ShardRouting(in);
-        int size = in.readVInt();
-        if (size == 0) {
-            segments = Collections.emptyList();
-        } else {
-            segments = new ArrayList<>(size);
-            for (int i = 0; i < size; i++) {
-                segments.add(Segment.readSegment(in));
-            }
-        }
-    }
-
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         shardRouting.writeTo(out);

server/src/main/java/org/elasticsearch/action/admin/indices/segments/TransportIndicesSegmentsAction.java

@@ -74,7 +74,7 @@ public class TransportIndicesSegmentsAction
 
     @Override
     protected ShardSegments readShardResult(StreamInput in) throws IOException {
-        return ShardSegments.readShardSegments(in);
+        return new ShardSegments(in);
     }
 
     @Override

server/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStats.java

@@ -248,22 +248,22 @@ public class CommonStats implements Writeable, ToXContentFragment {
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
-        out.writeOptionalStreamable(docs);
-        out.writeOptionalStreamable(store);
-        out.writeOptionalStreamable(indexing);
-        out.writeOptionalStreamable(get);
+        out.writeOptionalWriteable(docs);
+        out.writeOptionalWriteable(store);
+        out.writeOptionalWriteable(indexing);
+        out.writeOptionalWriteable(get);
         out.writeOptionalWriteable(search);
-        out.writeOptionalStreamable(merge);
-        out.writeOptionalStreamable(refresh);
-        out.writeOptionalStreamable(flush);
-        out.writeOptionalStreamable(warmer);
-        out.writeOptionalStreamable(queryCache);
-        out.writeOptionalStreamable(fieldData);
+        out.writeOptionalWriteable(merge);
+        out.writeOptionalWriteable(refresh);
+        out.writeOptionalWriteable(flush);
+        out.writeOptionalWriteable(warmer);
+        out.writeOptionalWriteable(queryCache);
+        out.writeOptionalWriteable(fieldData);
         out.writeOptionalWriteable(completion);
-        out.writeOptionalStreamable(segments);
-        out.writeOptionalStreamable(translog);
-        out.writeOptionalStreamable(requestCache);
-        out.writeOptionalStreamable(recoveryStats);
+        out.writeOptionalWriteable(segments);
+        out.writeOptionalWriteable(translog);
+        out.writeOptionalWriteable(requestCache);
+        out.writeOptionalWriteable(recoveryStats);
     }
 
     public void add(CommonStats stats) {

server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/ShardUpgradeResult.java

@@ -22,13 +22,13 @@ package org.elasticsearch.action.admin.indices.upgrade.post;
 import org.elasticsearch.Version;
 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.index.shard.ShardId;
 
 import java.io.IOException;
 import java.text.ParseException;
 
-class ShardUpgradeResult implements Streamable {
+class ShardUpgradeResult implements Writeable {
 
     private ShardId shardId;
 
@@ -38,10 +38,6 @@ class ShardUpgradeResult implements Streamable {
 
     private boolean primary;
 
-
-    ShardUpgradeResult() {
-    }
-
     ShardUpgradeResult(ShardId shardId, boolean primary, Version upgradeVersion, org.apache.lucene.util.Version oldestLuceneSegment) {
         this.shardId = shardId;
         this.primary = primary;
@@ -49,6 +45,17 @@ class ShardUpgradeResult implements Streamable {
         this.oldestLuceneSegment = oldestLuceneSegment;
     }
 
+    ShardUpgradeResult(StreamInput in) throws IOException {
+        shardId = new ShardId(in);
+        primary = in.readBoolean();
+        upgradeVersion = Version.readVersion(in);
+        try {
+            oldestLuceneSegment = org.apache.lucene.util.Version.parse(in.readString());
+        } catch (ParseException ex) {
+            throw new IOException("failed to parse lucene version [" + oldestLuceneSegment + "]", ex);
+        }
+    }
+
     public ShardId getShardId() {
         return shardId;
     }
@@ -65,20 +72,6 @@ class ShardUpgradeResult implements Streamable {
         return primary;
     }
 
-
-    @Override
-    public void readFrom(StreamInput in) throws IOException {
-        shardId = new ShardId(in);
-        primary = in.readBoolean();
-        upgradeVersion = Version.readVersion(in);
-        try {
-            oldestLuceneSegment = org.apache.lucene.util.Version.parse(in.readString());
-        } catch (ParseException ex) {
-            throw new IOException("failed to parse lucene version [" + oldestLuceneSegment + "]", ex);
-        }
-
-    }
-
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         shardId.writeTo(out);

server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/TransportUpgradeAction.java

@@ -130,9 +130,7 @@ public class TransportUpgradeAction extends TransportBroadcastByNodeAction<Upgra
 
     @Override
     protected ShardUpgradeResult readShardResult(StreamInput in) throws IOException {
-        ShardUpgradeResult result = new ShardUpgradeResult();
-        result.readFrom(in);
-        return result;
+        return new ShardUpgradeResult(in);
     }
 
     @Override

server/src/main/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeAction.java

@@ -42,7 +42,6 @@ import org.elasticsearch.cluster.routing.ShardsIterator;
 import org.elasticsearch.cluster.service.ClusterService;
 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.tasks.Task;
 import org.elasticsearch.threadpool.ThreadPool;
@@ -76,7 +75,7 @@ import java.util.concurrent.atomic.AtomicReferenceArray;
  */
 public abstract class TransportBroadcastByNodeAction<Request extends BroadcastRequest<Request>,
         Response extends BroadcastResponse,
-        ShardOperationResult extends Streamable> extends HandledTransportAction<Request, Response> {
+        ShardOperationResult extends Writeable> extends HandledTransportAction<Request, Response> {
 
     private final ClusterService clusterService;
     private final TransportService transportService;
@@ -547,7 +546,7 @@ public abstract class TransportBroadcastByNodeAction<Request extends BroadcastRe
             out.writeVInt(totalShards);
             out.writeVInt(results.size());
             for (ShardOperationResult result : results) {
-                out.writeOptionalStreamable(result);
+                out.writeOptionalWriteable(result);
             }
             out.writeBoolean(exceptions != null);
             if (exceptions != null) {
@@ -560,19 +559,15 @@ public abstract class TransportBroadcastByNodeAction<Request extends BroadcastRe
      * Can be used for implementations of {@link #shardOperation(BroadcastRequest, ShardRouting) shardOperation} for
      * which there is no shard-level return value.
      */
-    public static final class EmptyResult implements Streamable {
+    public static final class EmptyResult implements Writeable {
         public static EmptyResult INSTANCE = new EmptyResult();
 
-        private EmptyResult() {
-        }
+        private EmptyResult() {}
 
-        @Override
-        public void readFrom(StreamInput in) throws IOException {
-        }
+        private EmptyResult(StreamInput in) {}
 
         @Override
-        public void writeTo(StreamOutput out) throws IOException {
-        }
+        public void writeTo(StreamOutput out) { }
 
         public static EmptyResult readEmptyResultFrom(StreamInput in) {
             return INSTANCE;

server/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java

@@ -977,8 +977,7 @@ public abstract class StreamInput extends InputStream {
     }
 
     /**
-     * Reads a list of objects. The list is expected to have been written using {@link StreamOutput#writeList(List)} or
-     * {@link StreamOutput#writeStreamableList(List)}.
+     * Reads a list of objects. The list is expected to have been written using {@link StreamOutput#writeList(List)}.
      *
      * @return the list of objects
      * @throws IOException if an I/O exception occurs reading the list

server/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java

@@ -916,18 +916,6 @@ public abstract class StreamOutput extends OutputStream {
         writeOptionalArray((out, value) -> value.writeTo(out), array);
     }
 
-    /**
-     * Serializes a potential null value.
-     */
-    public void writeOptionalStreamable(@Nullable Streamable streamable) throws IOException {
-        if (streamable != null) {
-            writeBoolean(true);
-            streamable.writeTo(this);
-        } else {
-            writeBoolean(false);
-        }
-    }
-
     public void writeOptionalWriteable(@Nullable Writeable writeable) throws IOException {
         if (writeable != null) {
             writeBoolean(true);
@@ -1120,16 +1108,6 @@ public abstract class StreamOutput extends OutputStream {
         }
     }
 
-    /**
-     * Writes a list of {@link Streamable} objects
-     */
-    public void writeStreamableList(List<? extends Streamable> list) throws IOException {
-        writeVInt(list.size());
-        for (Streamable obj: list) {
-            obj.writeTo(this);
-        }
-    }
-
     /**
      * Writes a collection to this stream. The corresponding collection can be read from a stream input using
      * {@link StreamInput#readList(Writeable.Reader)}.

server/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayMetaState.java

@@ -107,7 +107,7 @@ public class TransportNodesListGatewayMetaState extends TransportNodesAction<Tra
 
         @Override
         protected void writeNodesTo(StreamOutput out, List<NodeGatewayMetaState> nodes) throws IOException {
-            out.writeStreamableList(nodes);
+            out.writeList(nodes);
         }
     }
 

server/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayStartedShards.java

@@ -204,7 +204,7 @@ public class TransportNodesListGatewayStartedShards extends
 
         @Override
         protected void writeNodesTo(StreamOutput out, List<NodeGatewayStartedShards> nodes) throws IOException {
-            out.writeStreamableList(nodes);
+            out.writeList(nodes);
         }
     }
 

server/src/main/java/org/elasticsearch/indices/store/TransportNodesListShardStoreMetaData.java

@@ -272,7 +272,7 @@ public class TransportNodesListShardStoreMetaData extends TransportNodesAction<T
 
         @Override
         protected void writeNodesTo(StreamOutput out, List<NodeStoreFilesMetaData> nodes) throws IOException {
-            out.writeStreamableList(nodes);
+            out.writeList(nodes);
         }
     }
 

server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TaskManagerTestCase.java

@@ -124,7 +124,7 @@ public abstract class TaskManagerTestCase extends ESTestCase {
 
         @Override
         protected void writeNodesTo(StreamOutput out, List<NodeResponse> nodes) throws IOException {
-            out.writeStreamableList(nodes);
+            out.writeList(nodes);
         }
 
         public int failureCount() {

server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TestTaskPlugin.java

@@ -153,7 +153,7 @@ public class TestTaskPlugin extends Plugin implements ActionPlugin, NetworkPlugi
 
         @Override
         protected void writeNodesTo(StreamOutput out, List<NodeResponse> nodes) throws IOException {
-            out.writeStreamableList(nodes);
+            out.writeList(nodes);
         }
 
         public int getFailureCount() {

server/src/test/java/org/elasticsearch/action/support/nodes/TransportNodesActionTests.java

@@ -317,7 +317,7 @@ public class TransportNodesActionTests extends ESTestCase {
 
         @Override
         protected void writeNodesTo(StreamOutput out, List<TestNodeResponse> nodes) throws IOException {
-            out.writeStreamableList(nodes);
+            out.writeList(nodes);
         }
     }
 

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/TransportReloadAnalyzersAction.java

@@ -24,7 +24,7 @@ import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.inject.Inject;
 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.index.IndexService;
 import org.elasticsearch.indices.IndicesService;
 import org.elasticsearch.threadpool.ThreadPool;
@@ -93,7 +93,7 @@ public class TransportReloadAnalyzersAction
         return new ReloadResult(shardRouting.index().getName(), shardRouting.currentNodeId(), reloadedSearchAnalyzers);
     }
 
-    static final class ReloadResult implements Streamable {
+    static final class ReloadResult implements Writeable {
         String index;
         String nodeId;
         List<String> reloadedSearchAnalyzers;

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/deprecation/NodesDeprecationCheckResponse.java

@@ -35,7 +35,7 @@ public class NodesDeprecationCheckResponse extends BaseNodesResponse<NodesDeprec
 
     @Override
     protected void writeNodesTo(StreamOutput out, List<NodesDeprecationCheckAction.NodeResponse> nodes) throws IOException {
-        out.writeStreamableList(nodes);
+        out.writeList(nodes);
     }
 
     @Override

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/realm/ClearRealmCacheResponse.java

@@ -37,7 +37,7 @@ public class ClearRealmCacheResponse extends BaseNodesResponse<ClearRealmCacheRe
 
     @Override
     protected void writeNodesTo(StreamOutput out, List<ClearRealmCacheResponse.Node> nodes) throws IOException {
-        out.writeStreamableList(nodes);
+        out.writeList(nodes);
     }
 
     @Override

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/role/ClearRolesCacheResponse.java

@@ -40,7 +40,7 @@ public class ClearRolesCacheResponse extends BaseNodesResponse<ClearRolesCacheRe
 
     @Override
     protected void writeNodesTo(StreamOutput out, List<ClearRolesCacheResponse.Node> nodes) throws IOException {
-        out.writeStreamableList(nodes);
+        out.writeList(nodes);
     }
 
     @Override

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transport/actions/stats/WatcherStatsResponse.java

@@ -54,7 +54,7 @@ public class WatcherStatsResponse extends BaseNodesResponse<WatcherStatsResponse
 
     @Override
     protected void writeNodesTo(StreamOutput out, List<Node> nodes) throws IOException {
-        out.writeStreamableList(nodes);
+        out.writeList(nodes);
     }
 
     @Override

x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/plugin/SqlStatsResponse.java

@@ -37,7 +37,7 @@ public class SqlStatsResponse extends BaseNodesResponse<SqlStatsResponse.NodeSta
 
     @Override
     protected void writeNodesTo(StreamOutput out, List<NodeStatsResponse> nodes) throws IOException {
-        out.writeStreamableList(nodes);
+        out.writeList(nodes);
     }
 
     @Override