From 17c4b2b839ef40dc269a015818b82ed76c44f7be Mon Sep 17 00:00:00 2001
From: Ryan Ernst <ryan@elastic.co>
Date: Wed, 17 Jul 2019 18:01:29 -0700
Subject: [PATCH] Convert MasterNodeRequest to implement Writeable.Reader
 (#44452) (#44513)

This commit converts all MasterNodeRequest subclasses to fullfill
Writeable.Reader constructors.

relates #34389
---
 .../ClusterAllocationExplainRequest.java      |  5 --
 .../AddVotingConfigExclusionsRequest.java     |  5 --
 .../ClearVotingConfigExclusionsRequest.java   |  5 --
 .../cluster/health/ClusterHealthRequest.java  |  5 --
 .../get/GetRepositoriesRequest.java           |  5 --
 .../shards/ClusterSearchShardsRequest.java    |  5 --
 .../create/CreateSnapshotRequest.java         |  5 --
 .../delete/DeleteSnapshotRequest.java         |  5 --
 .../snapshots/get/GetSnapshotsRequest.java    |  5 --
 .../restore/RestoreSnapshotRequest.java       |  5 --
 .../status/SnapshotsStatusRequest.java        |  5 --
 .../cluster/state/ClusterStateRequest.java    |  5 --
 .../storedscripts/GetStoredScriptRequest.java |  5 --
 .../indices/alias/get/GetAliasesRequest.java  |  5 --
 .../exists/indices/IndicesExistsRequest.java  |  5 --
 .../exists/types/TypesExistsRequest.java      |  5 --
 .../admin/indices/get/GetIndexRequest.java    |  5 --
 .../settings/get/GetSettingsRequest.java      |  5 --
 .../shards/IndicesShardStoresRequest.java     |  5 --
 .../delete/DeleteIndexTemplateRequest.java    | 11 ++-
 .../TransportDeleteIndexTemplateAction.java   |  2 +-
 .../get/GetIndexTemplatesRequest.java         |  5 --
 .../template/put/PutIndexTemplateRequest.java | 69 +++++++++----------
 .../put/TransportPutIndexTemplateAction.java  |  2 +-
 .../action/ingest/GetPipelineRequest.java     |  5 --
 .../support/master/AcknowledgedRequest.java   |  5 --
 .../support/master/MasterNodeReadRequest.java |  5 --
 .../support/master/MasterNodeRequest.java     |  7 +-
 .../master/info/ClusterInfoRequest.java       | 10 ---
 .../CompletionPersistentTaskAction.java       | 17 ++---
 .../RemovePersistentTaskAction.java           | 13 ++--
 .../persistent/StartPersistentTaskAction.java | 23 +++----
 .../UpdatePersistentTaskStatusAction.java     | 18 +++--
 .../snapshots/SnapshotShardsService.java      | 17 ++---
 .../InternalOrPrivateSettingsPlugin.java      | 19 +++--
 .../CancelPersistentTaskRequestTests.java     |  9 +--
 .../RestartPersistentTaskRequestTests.java    |  9 +--
 .../StartPersistentActionRequestTests.java    |  9 +--
 .../UpdatePersistentTaskRequestTests.java     |  9 +--
 .../license/PostStartTrialRequest.java        | 25 +++----
 .../TransportPostStartTrialAction.java        |  2 +-
 .../protocol/xpack/XPackUsageRequest.java     |  9 +++
 .../migration/IndexUpgradeInfoRequest.java    |  5 --
 .../action/TransportXPackUsageAction.java     |  4 +-
 .../deprecation/DeprecationInfoAction.java    |  5 --
 .../ml/action/FinalizeJobExecutionAction.java |  5 --
 .../core/ml/action/GetDatafeedsAction.java    |  5 --
 .../ml/action/GetDatafeedsStatsAction.java    |  5 --
 .../xpack/core/ml/action/GetJobsAction.java   |  5 --
 .../xpack/core/ml/action/OpenJobAction.java   |  9 +--
 .../core/ml/action/StartDatafeedAction.java   |  9 +--
 .../upgrade/actions/IndexUpgradeAction.java   |  5 --
 .../service/WatcherServiceRequest.java        | 11 ++-
 .../ml/action/OpenJobActionRequestTests.java  | 15 ++--
 .../StartDatafeedActionRequestTests.java      | 13 ++--
 .../TransportWatcherServiceAction.java        |  2 +-
 56 files changed, 158 insertions(+), 335 deletions(-)

diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainRequest.java
index b6959afba5d..0b0bb8c57a9 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainRequest.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainRequest.java
@@ -243,9 +243,4 @@ public class ClusterAllocationExplainRequest extends MasterNodeRequest<ClusterAl
     public static ClusterAllocationExplainRequest parse(XContentParser parser) throws IOException {
         return PARSER.parse(parser, new ClusterAllocationExplainRequest(), null);
     }
-
-    @Override
-    public void readFrom(StreamInput in) throws IOException {
-        throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable");
-    }
 }
diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/configuration/AddVotingConfigExclusionsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/configuration/AddVotingConfigExclusionsRequest.java
index f19a3b05b5b..df11435aba1 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/cluster/configuration/AddVotingConfigExclusionsRequest.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/configuration/AddVotingConfigExclusionsRequest.java
@@ -118,11 +118,6 @@ public class AddVotingConfigExclusionsRequest extends MasterNodeRequest<AddVotin
         return null;
     }
 
-    @Override
-    public void readFrom(StreamInput in) throws IOException {
-        throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable");
-    }
-
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/configuration/ClearVotingConfigExclusionsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/configuration/ClearVotingConfigExclusionsRequest.java
index ec92eeab4ab..83490e64b29 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/cluster/configuration/ClearVotingConfigExclusionsRequest.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/configuration/ClearVotingConfigExclusionsRequest.java
@@ -83,11 +83,6 @@ public class ClearVotingConfigExclusionsRequest extends MasterNodeRequest<ClearV
         return null;
     }
 
-    @Override
-    public void readFrom(StreamInput in) throws IOException {
-        throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable");
-    }
-
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequest.java
index 3f00243a306..c879ca07d4d 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequest.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequest.java
@@ -283,11 +283,6 @@ public class ClusterHealthRequest extends MasterNodeReadRequest<ClusterHealthReq
         return null;
     }
 
-    @Override
-    public void readFrom(StreamInput in) throws IOException {
-        throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable");
-    }
-
     public enum Level {
         CLUSTER, INDICES, SHARDS
     }
diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesRequest.java
index 9c2e2b80a6d..539ba074c19 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesRequest.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesRequest.java
@@ -93,9 +93,4 @@ public class GetRepositoriesRequest extends MasterNodeReadRequest<GetRepositorie
         this.repositories = repositories;
         return this;
     }
-
-    @Override
-    public void readFrom(StreamInput in) throws IOException {
-        throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable");
-    }
 }
diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequest.java
index 4798aeb67c1..e1ba4b76e41 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequest.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequest.java
@@ -148,9 +148,4 @@ public class ClusterSearchShardsRequest extends MasterNodeReadRequest<ClusterSea
     public String preference() {
         return this.preference;
     }
-
-    @Override
-    public void readFrom(StreamInput in) throws IOException {
-        throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable");
-    }
 }
diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java
index a64e15d5453..8d357be35fc 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java
@@ -482,11 +482,6 @@ public class CreateSnapshotRequest extends MasterNodeRequest<CreateSnapshotReque
         return builder;
     }
 
-    @Override
-    public void readFrom(StreamInput in) throws IOException {
-        throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable");
-    }
-
     @Override
     public String getDescription() {
         return "snapshot [" + repository + ":" + snapshot + "]";
diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotRequest.java
index 09a93f62c52..93581c937c5 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotRequest.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotRequest.java
@@ -125,9 +125,4 @@ public class DeleteSnapshotRequest extends MasterNodeRequest<DeleteSnapshotReque
         this.snapshot = snapshot;
         return this;
     }
-
-    @Override
-    public void readFrom(StreamInput in) throws IOException {
-        throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable");
-    }
 }
diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsRequest.java
index 41ae57031d3..39b72d204b3 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsRequest.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsRequest.java
@@ -171,9 +171,4 @@ public class GetSnapshotsRequest extends MasterNodeRequest<GetSnapshotsRequest>
     public boolean verbose() {
         return verbose;
     }
-
-    @Override
-    public void readFrom(StreamInput in) throws IOException {
-        throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable");
-    }
 }
diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java
index 53aa522772a..0d2cac9b401 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java
@@ -609,11 +609,6 @@ public class RestoreSnapshotRequest extends MasterNodeRequest<RestoreSnapshotReq
         return builder;
     }
 
-    @Override
-    public void readFrom(StreamInput in) throws IOException {
-        throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable");
-    }
-
     @Override
     public String getDescription() {
         return "snapshot [" + repository + ":" + snapshot + "]";
diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusRequest.java
index 89a96648871..ae750b93b5d 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusRequest.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusRequest.java
@@ -149,9 +149,4 @@ public class SnapshotsStatusRequest extends MasterNodeRequest<SnapshotsStatusReq
     public boolean ignoreUnavailable() {
         return ignoreUnavailable;
     }
-
-    @Override
-    public void readFrom(StreamInput in) throws IOException {
-        throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable");
-    }
 }
diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequest.java
index 2cca13c0b24..b89107d5560 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequest.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequest.java
@@ -191,9 +191,4 @@ public class ClusterStateRequest extends MasterNodeReadRequest<ClusterStateReque
         this.waitForMetaDataVersion = waitForMetaDataVersion;
         return this;
     }
-
-    @Override
-    public void readFrom(StreamInput in) throws IOException {
-        throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable");
-    }
 }
diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptRequest.java
index 57f30699cc0..b52ea7ae669 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptRequest.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptRequest.java
@@ -86,11 +86,6 @@ public class GetStoredScriptRequest extends MasterNodeReadRequest<GetStoredScrip
         return this;
     }
 
-    @Override
-    public void readFrom(StreamInput in) throws IOException {
-        throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable");
-    }
-
     @Override
     public String toString() {
         return "get script [" + id + "]";
diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesRequest.java
index a40a3037aca..96b1d0ff901 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesRequest.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesRequest.java
@@ -118,9 +118,4 @@ public class GetAliasesRequest extends MasterNodeReadRequest<GetAliasesRequest>
     public ActionRequestValidationException validate() {
         return null;
     }
-
-    @Override
-    public void readFrom(StreamInput in) throws IOException {
-        throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable");
-    }
 }
diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsRequest.java
index 0c99175387d..8e6946e85eb 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsRequest.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsRequest.java
@@ -94,9 +94,4 @@ public class IndicesExistsRequest extends MasterNodeReadRequest<IndicesExistsReq
         }
         return validationException;
     }
-
-    @Override
-    public void readFrom(StreamInput in) throws IOException {
-        throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable");
-    }
 }
diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsRequest.java
index 851f175f4a4..de3a0edc515 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsRequest.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsRequest.java
@@ -100,9 +100,4 @@ public class TypesExistsRequest extends MasterNodeReadRequest<TypesExistsRequest
 
         return validationException;
     }
-
-    @Override
-    public void readFrom(StreamInput in) throws IOException {
-        throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable");
-    }
 }
diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequest.java
index fb8bd6b5684..2b6d0faeffc 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequest.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequest.java
@@ -142,11 +142,6 @@ public class GetIndexRequest extends ClusterInfoRequest<GetIndexRequest> {
         return includeDefaults;
     }
 
-    @Override
-    public void readFrom(StreamInput in) throws IOException {
-        throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable");
-    }
-
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsRequest.java
index 1f4214dbdd7..e3fd95779cb 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsRequest.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsRequest.java
@@ -129,11 +129,6 @@ public class GetSettingsRequest extends MasterNodeReadRequest<GetSettingsRequest
         return validationException;
     }
 
-    @Override
-    public void readFrom(StreamInput in) throws IOException {
-        throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable");
-    }
-
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoresRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoresRequest.java
index 18e4083095d..45a9c7283d0 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoresRequest.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoresRequest.java
@@ -128,9 +128,4 @@ public class IndicesShardStoresRequest extends MasterNodeReadRequest<IndicesShar
     public ActionRequestValidationException validate() {
         return null;
     }
-
-    @Override
-    public void readFrom(StreamInput in) throws IOException {
-        throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable");
-    }
 }
diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequest.java
index f33d35b66a5..9ee4fdd6f43 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequest.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequest.java
@@ -34,6 +34,11 @@ public class DeleteIndexTemplateRequest extends MasterNodeRequest<DeleteIndexTem
 
     private String name;
 
+    public DeleteIndexTemplateRequest(StreamInput in) throws IOException {
+        super(in);
+        name = in.readString();
+    }
+
     public DeleteIndexTemplateRequest() {
     }
 
@@ -68,12 +73,6 @@ public class DeleteIndexTemplateRequest extends MasterNodeRequest<DeleteIndexTem
         return name;
     }
 
-    @Override
-    public void readFrom(StreamInput in) throws IOException {
-        super.readFrom(in);
-        name = in.readString();
-    }
-
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/template/delete/TransportDeleteIndexTemplateAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/template/delete/TransportDeleteIndexTemplateAction.java
index 5179570c896..37e0f1bd2b1 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/indices/template/delete/TransportDeleteIndexTemplateAction.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/indices/template/delete/TransportDeleteIndexTemplateAction.java
@@ -49,7 +49,7 @@ public class TransportDeleteIndexTemplateAction
                                               ThreadPool threadPool, MetaDataIndexTemplateService indexTemplateService,
                                               ActionFilters actionFilters, IndexNameExpressionResolver indexNameExpressionResolver) {
         super(DeleteIndexTemplateAction.NAME, transportService, clusterService, threadPool, actionFilters,
-            indexNameExpressionResolver, DeleteIndexTemplateRequest::new);
+            DeleteIndexTemplateRequest::new, indexNameExpressionResolver);
         this.indexTemplateService = indexTemplateService;
     }
 
diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesRequest.java
index cfaa9408da1..3a61ae6b91d 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesRequest.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesRequest.java
@@ -82,9 +82,4 @@ public class GetIndexTemplatesRequest extends MasterNodeReadRequest<GetIndexTemp
     public String[] names() {
         return this.names;
     }
-
-    @Override
-    public void readFrom(StreamInput in) throws IOException {
-        throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable");
-    }
 }
diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequest.java
index 5278561feb3..9c3c0b0b2ac 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequest.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequest.java
@@ -89,6 +89,40 @@ public class PutIndexTemplateRequest extends MasterNodeRequest<PutIndexTemplateR
 
     private Integer version;
 
+    public PutIndexTemplateRequest(StreamInput in) throws IOException {
+        super(in);
+        cause = in.readString();
+        name = in.readString();
+
+        if (in.getVersion().onOrAfter(Version.V_6_0_0_alpha1)) {
+            indexPatterns = in.readStringList();
+        } else {
+            indexPatterns = Collections.singletonList(in.readString());
+        }
+        order = in.readInt();
+        create = in.readBoolean();
+        settings = readSettingsFromStream(in);
+        int size = in.readVInt();
+        for (int i = 0; i < size; i++) {
+            final String type = in.readString();
+            String mappingSource = in.readString();
+            mappings.put(type, mappingSource);
+        }
+        if (in.getVersion().before(Version.V_6_5_0)) {
+            // Used to be used for custom index metadata
+            int customSize = in.readVInt();
+            assert customSize == 0 : "expected not to have any custom metadata";
+            if (customSize > 0) {
+                throw new IllegalStateException("unexpected custom metadata when none is supported");
+            }
+        }
+        int aliasesSize = in.readVInt();
+        for (int i = 0; i < aliasesSize; i++) {
+            aliases.add(Alias.read(in));
+        }
+        version = in.readOptionalVInt();
+    }
+
     public PutIndexTemplateRequest() {
     }
 
@@ -454,41 +488,6 @@ public class PutIndexTemplateRequest extends MasterNodeRequest<PutIndexTemplateR
         return IndicesOptions.strictExpand();
     }
 
-    @Override
-    public void readFrom(StreamInput in) throws IOException {
-        super.readFrom(in);
-        cause = in.readString();
-        name = in.readString();
-
-        if (in.getVersion().onOrAfter(Version.V_6_0_0_alpha1)) {
-            indexPatterns = in.readStringList();
-        } else {
-            indexPatterns = Collections.singletonList(in.readString());
-        }
-        order = in.readInt();
-        create = in.readBoolean();
-        settings = readSettingsFromStream(in);
-        int size = in.readVInt();
-        for (int i = 0; i < size; i++) {
-            final String type = in.readString();
-            String mappingSource = in.readString();
-            mappings.put(type, mappingSource);
-        }
-        if (in.getVersion().before(Version.V_6_5_0)) {
-            // Used to be used for custom index metadata
-            int customSize = in.readVInt();
-            assert customSize == 0 : "expected not to have any custom metadata";
-            if (customSize > 0) {
-                throw new IllegalStateException("unexpected custom metadata when none is supported");
-            }
-        }
-        int aliasesSize = in.readVInt();
-        for (int i = 0; i < aliasesSize; i++) {
-            aliases.add(Alias.read(in));
-        }
-        version = in.readOptionalVInt();
-    }
-
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutIndexTemplateAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutIndexTemplateAction.java
index 4a49820e60e..3584bd93d11 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutIndexTemplateAction.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutIndexTemplateAction.java
@@ -53,7 +53,7 @@ public class TransportPutIndexTemplateAction extends TransportMasterNodeAction<P
                                            ActionFilters actionFilters, IndexNameExpressionResolver indexNameExpressionResolver,
                                            IndexScopedSettings indexScopedSettings) {
         super(PutIndexTemplateAction.NAME, transportService, clusterService, threadPool, actionFilters,
-            indexNameExpressionResolver, PutIndexTemplateRequest::new);
+            PutIndexTemplateRequest::new, indexNameExpressionResolver);
         this.indexTemplateService = indexTemplateService;
         this.indexScopedSettings = indexScopedSettings;
     }
diff --git a/server/src/main/java/org/elasticsearch/action/ingest/GetPipelineRequest.java b/server/src/main/java/org/elasticsearch/action/ingest/GetPipelineRequest.java
index f34f157063c..0a0cc3f2244 100644
--- a/server/src/main/java/org/elasticsearch/action/ingest/GetPipelineRequest.java
+++ b/server/src/main/java/org/elasticsearch/action/ingest/GetPipelineRequest.java
@@ -61,9 +61,4 @@ public class GetPipelineRequest extends MasterNodeReadRequest<GetPipelineRequest
     public ActionRequestValidationException validate() {
         return null;
     }
-
-    @Override
-    public void readFrom(StreamInput in) throws IOException {
-        throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable");
-    }
 }
diff --git a/server/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequest.java b/server/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequest.java
index da36e754a35..c4c5cd7101d 100644
--- a/server/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequest.java
+++ b/server/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequest.java
@@ -81,11 +81,6 @@ public abstract class AcknowledgedRequest<Request extends MasterNodeRequest<Requ
         return timeout;
     }
 
-    @Override
-    public final void readFrom(StreamInput in) throws IOException {
-        throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable");
-    }
-
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
diff --git a/server/src/main/java/org/elasticsearch/action/support/master/MasterNodeReadRequest.java b/server/src/main/java/org/elasticsearch/action/support/master/MasterNodeReadRequest.java
index 3045bef46b8..2f08b9dbcc1 100644
--- a/server/src/main/java/org/elasticsearch/action/support/master/MasterNodeReadRequest.java
+++ b/server/src/main/java/org/elasticsearch/action/support/master/MasterNodeReadRequest.java
@@ -59,9 +59,4 @@ public abstract class MasterNodeReadRequest<Request extends MasterNodeReadReques
     public final boolean local() {
         return local;
     }
-
-    @Override
-    public void readFrom(StreamInput in) throws IOException {
-        throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable");
-    }
 }
diff --git a/server/src/main/java/org/elasticsearch/action/support/master/MasterNodeRequest.java b/server/src/main/java/org/elasticsearch/action/support/master/MasterNodeRequest.java
index 2bf342603a2..5d54ff2f71a 100644
--- a/server/src/main/java/org/elasticsearch/action/support/master/MasterNodeRequest.java
+++ b/server/src/main/java/org/elasticsearch/action/support/master/MasterNodeRequest.java
@@ -70,11 +70,8 @@ public abstract class MasterNodeRequest<Request extends MasterNodeRequest<Reques
     }
 
     @Override
-    public void readFrom(StreamInput in) throws IOException {
-        // TODO(talevy): throw exception once all MasterNodeRequest
-        //               subclasses have been migrated to Writeable Readers
-        super.readFrom(in);
-        masterNodeTimeout = in.readTimeValue();
+    public final void readFrom(StreamInput in) throws IOException {
+        throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable");
     }
 
 }
diff --git a/server/src/main/java/org/elasticsearch/action/support/master/info/ClusterInfoRequest.java b/server/src/main/java/org/elasticsearch/action/support/master/info/ClusterInfoRequest.java
index 9c730d243e3..d41d9dcec92 100644
--- a/server/src/main/java/org/elasticsearch/action/support/master/info/ClusterInfoRequest.java
+++ b/server/src/main/java/org/elasticsearch/action/support/master/info/ClusterInfoRequest.java
@@ -86,14 +86,4 @@ public abstract class ClusterInfoRequest<Request extends ClusterInfoRequest<Requ
     public IndicesOptions indicesOptions() {
         return indicesOptions;
     }
-
-    @Override
-    public void readFrom(StreamInput in) throws IOException {
-        // TODO(talevy): once all ClusterInfoRequest objects are converted, remove this
-        super.readFrom(in);
-        indices = in.readStringArray();
-        types = in.readStringArray();
-        indicesOptions = IndicesOptions.readIndicesOptions(in);
-        // throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable");
-    }
 }
diff --git a/server/src/main/java/org/elasticsearch/persistent/CompletionPersistentTaskAction.java b/server/src/main/java/org/elasticsearch/persistent/CompletionPersistentTaskAction.java
index ef0759d1c93..ec268fe77f8 100644
--- a/server/src/main/java/org/elasticsearch/persistent/CompletionPersistentTaskAction.java
+++ b/server/src/main/java/org/elasticsearch/persistent/CompletionPersistentTaskAction.java
@@ -68,8 +68,13 @@ public class CompletionPersistentTaskAction extends StreamableResponseActionType
 
         private long allocationId = -1;
 
-        public Request() {
+        public Request() {}
 
+        public Request(StreamInput in) throws IOException {
+            super(in);
+            taskId = in.readString();
+            allocationId = in.readLong();
+            exception = in.readException();
         }
 
         public Request(String taskId, long allocationId, Exception exception) {
@@ -78,14 +83,6 @@ public class CompletionPersistentTaskAction extends StreamableResponseActionType
             this.allocationId = allocationId;
         }
 
-        @Override
-        public void readFrom(StreamInput in) throws IOException {
-            super.readFrom(in);
-            taskId = in.readString();
-            allocationId = in.readLong();
-            exception = in.readException();
-        }
-
         @Override
         public void writeTo(StreamOutput out) throws IOException {
             super.writeTo(out);
@@ -140,7 +137,7 @@ public class CompletionPersistentTaskAction extends StreamableResponseActionType
                                PersistentTasksClusterService persistentTasksClusterService,
                                IndexNameExpressionResolver indexNameExpressionResolver) {
             super(CompletionPersistentTaskAction.NAME, transportService, clusterService, threadPool, actionFilters,
-                    indexNameExpressionResolver, Request::new);
+                Request::new, indexNameExpressionResolver);
             this.persistentTasksClusterService = persistentTasksClusterService;
         }
 
diff --git a/server/src/main/java/org/elasticsearch/persistent/RemovePersistentTaskAction.java b/server/src/main/java/org/elasticsearch/persistent/RemovePersistentTaskAction.java
index 96a594fa5e4..9b87a9263dc 100644
--- a/server/src/main/java/org/elasticsearch/persistent/RemovePersistentTaskAction.java
+++ b/server/src/main/java/org/elasticsearch/persistent/RemovePersistentTaskAction.java
@@ -58,8 +58,11 @@ public class RemovePersistentTaskAction extends StreamableResponseActionType<Per
 
         private String taskId;
 
-        public Request() {
+        public Request() {}
 
+        public Request(StreamInput in) throws IOException {
+            super(in);
+            taskId = in.readString();
         }
 
         public Request(String taskId) {
@@ -70,12 +73,6 @@ public class RemovePersistentTaskAction extends StreamableResponseActionType<Per
             this.taskId = taskId;
         }
 
-        @Override
-        public void readFrom(StreamInput in) throws IOException {
-            super.readFrom(in);
-            taskId = in.readString();
-        }
-
         @Override
         public void writeTo(StreamOutput out) throws IOException {
             super.writeTo(out);
@@ -125,7 +122,7 @@ public class RemovePersistentTaskAction extends StreamableResponseActionType<Per
                                PersistentTasksClusterService persistentTasksClusterService,
                                IndexNameExpressionResolver indexNameExpressionResolver) {
             super(RemovePersistentTaskAction.NAME, transportService, clusterService, threadPool, actionFilters,
-                    indexNameExpressionResolver, Request::new);
+                Request::new, indexNameExpressionResolver);
             this.persistentTasksClusterService = persistentTasksClusterService;
         }
 
diff --git a/server/src/main/java/org/elasticsearch/persistent/StartPersistentTaskAction.java b/server/src/main/java/org/elasticsearch/persistent/StartPersistentTaskAction.java
index 8d7772b755a..5c291284afd 100644
--- a/server/src/main/java/org/elasticsearch/persistent/StartPersistentTaskAction.java
+++ b/server/src/main/java/org/elasticsearch/persistent/StartPersistentTaskAction.java
@@ -69,19 +69,10 @@ public class StartPersistentTaskAction extends StreamableResponseActionType<Pers
 
         private PersistentTaskParams params;
 
-        public Request() {
+        public Request() {}
 
-        }
-
-        public Request(String taskId, String taskName, PersistentTaskParams params) {
-            this.taskId = taskId;
-            this.taskName = taskName;
-            this.params = params;
-        }
-
-        @Override
-        public void readFrom(StreamInput in) throws IOException {
-            super.readFrom(in);
+        public Request(StreamInput in) throws IOException {
+            super(in);
             taskId = in.readString();
             taskName = in.readString();
             if (in.getVersion().onOrAfter(Version.V_6_3_0)) {
@@ -91,6 +82,12 @@ public class StartPersistentTaskAction extends StreamableResponseActionType<Pers
             }
         }
 
+        public Request(String taskId, String taskName, PersistentTaskParams params) {
+            this.taskId = taskId;
+            this.taskName = taskName;
+            this.params = params;
+        }
+
         @Override
         public void writeTo(StreamOutput out) throws IOException {
             super.writeTo(out);
@@ -198,7 +195,7 @@ public class StartPersistentTaskAction extends StreamableResponseActionType<Pers
                                PersistentTasksService persistentTasksService,
                                IndexNameExpressionResolver indexNameExpressionResolver) {
             super(StartPersistentTaskAction.NAME, transportService, clusterService, threadPool, actionFilters,
-                    indexNameExpressionResolver, Request::new);
+                Request::new, indexNameExpressionResolver);
             this.persistentTasksClusterService = persistentTasksClusterService;
             NodePersistentTasksExecutor executor = new NodePersistentTasksExecutor(threadPool);
             clusterService.addListener(new PersistentTasksNodeService(persistentTasksService, persistentTasksExecutorRegistry,
diff --git a/server/src/main/java/org/elasticsearch/persistent/UpdatePersistentTaskStatusAction.java b/server/src/main/java/org/elasticsearch/persistent/UpdatePersistentTaskStatusAction.java
index e61e4960c3c..4906901c6e4 100644
--- a/server/src/main/java/org/elasticsearch/persistent/UpdatePersistentTaskStatusAction.java
+++ b/server/src/main/java/org/elasticsearch/persistent/UpdatePersistentTaskStatusAction.java
@@ -62,7 +62,13 @@ public class UpdatePersistentTaskStatusAction extends StreamableResponseActionTy
         private long allocationId = -1L;
         private PersistentTaskState state;
 
-        public Request() {
+        public Request() {}
+
+        public Request(StreamInput in) throws IOException {
+            super(in);
+            taskId = in.readString();
+            allocationId = in.readLong();
+            state = in.readOptionalNamedWriteable(PersistentTaskState.class);
         }
 
         public Request(String taskId, long allocationId, PersistentTaskState state) {
@@ -83,14 +89,6 @@ public class UpdatePersistentTaskStatusAction extends StreamableResponseActionTy
             this.state = state;
         }
 
-        @Override
-        public void readFrom(StreamInput in) throws IOException {
-            super.readFrom(in);
-            taskId = in.readString();
-            allocationId = in.readLong();
-            state = in.readOptionalNamedWriteable(PersistentTaskState.class);
-        }
-
         @Override
         public void writeTo(StreamOutput out) throws IOException {
             super.writeTo(out);
@@ -155,7 +153,7 @@ public class UpdatePersistentTaskStatusAction extends StreamableResponseActionTy
                                PersistentTasksClusterService persistentTasksClusterService,
                                IndexNameExpressionResolver indexNameExpressionResolver) {
             super(UpdatePersistentTaskStatusAction.NAME, transportService, clusterService, threadPool, actionFilters,
-                    indexNameExpressionResolver, Request::new);
+                Request::new, indexNameExpressionResolver);
             this.persistentTasksClusterService = persistentTasksClusterService;
         }
 
diff --git a/server/src/main/java/org/elasticsearch/snapshots/SnapshotShardsService.java b/server/src/main/java/org/elasticsearch/snapshots/SnapshotShardsService.java
index 6eaa38eedfc..2caeaff519d 100644
--- a/server/src/main/java/org/elasticsearch/snapshots/SnapshotShardsService.java
+++ b/server/src/main/java/org/elasticsearch/snapshots/SnapshotShardsService.java
@@ -426,8 +426,13 @@ public class SnapshotShardsService extends AbstractLifecycleComponent implements
         private ShardId shardId;
         private ShardSnapshotStatus status;
 
-        public UpdateIndexShardSnapshotStatusRequest() {
+        public UpdateIndexShardSnapshotStatusRequest() {}
 
+        public UpdateIndexShardSnapshotStatusRequest(StreamInput in) throws IOException {
+            super(in);
+            snapshot = new Snapshot(in);
+            shardId = new ShardId(in);
+            status = new ShardSnapshotStatus(in);
         }
 
         public UpdateIndexShardSnapshotStatusRequest(Snapshot snapshot, ShardId shardId, ShardSnapshotStatus status) {
@@ -443,14 +448,6 @@ public class SnapshotShardsService extends AbstractLifecycleComponent implements
             return null;
         }
 
-        @Override
-        public void readFrom(StreamInput in) throws IOException {
-            super.readFrom(in);
-            snapshot = new Snapshot(in);
-            shardId = new ShardId(in);
-            status = new ShardSnapshotStatus(in);
-        }
-
         @Override
         public void writeTo(StreamOutput out) throws IOException {
             super.writeTo(out);
@@ -619,7 +616,7 @@ public class SnapshotShardsService extends AbstractLifecycleComponent implements
                 ThreadPool threadPool, ActionFilters actionFilters, IndexNameExpressionResolver indexNameExpressionResolver) {
                     super(
                         SnapshotShardsService.UPDATE_SNAPSHOT_STATUS_ACTION_NAME, transportService, clusterService, threadPool,
-                        actionFilters, indexNameExpressionResolver, UpdateIndexShardSnapshotStatusRequest::new
+                        actionFilters, UpdateIndexShardSnapshotStatusRequest::new, indexNameExpressionResolver
                     );
         }
 
diff --git a/server/src/test/java/org/elasticsearch/indices/settings/InternalOrPrivateSettingsPlugin.java b/server/src/test/java/org/elasticsearch/indices/settings/InternalOrPrivateSettingsPlugin.java
index e422471a011..86391febd14 100644
--- a/server/src/test/java/org/elasticsearch/indices/settings/InternalOrPrivateSettingsPlugin.java
+++ b/server/src/test/java/org/elasticsearch/indices/settings/InternalOrPrivateSettingsPlugin.java
@@ -77,8 +77,13 @@ public class InternalOrPrivateSettingsPlugin extends Plugin implements ActionPlu
             private String key;
             private String value;
 
-            Request() {
+            Request() {}
 
+            Request(StreamInput in) throws IOException {
+                super(in);
+                index = in.readString();
+                key = in.readString();
+                value = in.readString();
             }
 
             public Request(final String index, final String key, final String value) {
@@ -92,14 +97,6 @@ public class InternalOrPrivateSettingsPlugin extends Plugin implements ActionPlu
                 return null;
             }
 
-            @Override
-            public void readFrom(final StreamInput in) throws IOException {
-                super.readFrom(in);
-                index = in.readString();
-                key = in.readString();
-                value = in.readString();
-            }
-
             @Override
             public void writeTo(final StreamOutput out) throws IOException {
                 super.writeTo(out);
@@ -138,8 +135,8 @@ public class InternalOrPrivateSettingsPlugin extends Plugin implements ActionPlu
                     clusterService,
                     threadPool,
                     actionFilters,
-                    indexNameExpressionResolver,
-                    UpdateInternalOrPrivateAction.Request::new);
+                    UpdateInternalOrPrivateAction.Request::new,
+                    indexNameExpressionResolver);
         }
 
         @Override
diff --git a/server/src/test/java/org/elasticsearch/persistent/CancelPersistentTaskRequestTests.java b/server/src/test/java/org/elasticsearch/persistent/CancelPersistentTaskRequestTests.java
index 2ce82c1e799..90ead35a606 100644
--- a/server/src/test/java/org/elasticsearch/persistent/CancelPersistentTaskRequestTests.java
+++ b/server/src/test/java/org/elasticsearch/persistent/CancelPersistentTaskRequestTests.java
@@ -18,12 +18,13 @@
  */
 package org.elasticsearch.persistent;
 
-import org.elasticsearch.test.AbstractStreamableTestCase;
+import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.persistent.RemovePersistentTaskAction.Request;
+import org.elasticsearch.test.AbstractWireSerializingTestCase;
 
 import static com.carrotsearch.randomizedtesting.RandomizedTest.randomAsciiOfLength;
 
-public class CancelPersistentTaskRequestTests extends AbstractStreamableTestCase<Request> {
+public class CancelPersistentTaskRequestTests extends AbstractWireSerializingTestCase<Request> {
 
     @Override
     protected Request createTestInstance() {
@@ -31,7 +32,7 @@ public class CancelPersistentTaskRequestTests extends AbstractStreamableTestCase
     }
 
     @Override
-    protected Request createBlankInstance() {
-        return new Request();
+    protected Writeable.Reader<Request> instanceReader() {
+        return Request::new;
     }
 }
diff --git a/server/src/test/java/org/elasticsearch/persistent/RestartPersistentTaskRequestTests.java b/server/src/test/java/org/elasticsearch/persistent/RestartPersistentTaskRequestTests.java
index 3ce29d543d4..d0bbd4521f4 100644
--- a/server/src/test/java/org/elasticsearch/persistent/RestartPersistentTaskRequestTests.java
+++ b/server/src/test/java/org/elasticsearch/persistent/RestartPersistentTaskRequestTests.java
@@ -18,10 +18,11 @@
  */
 package org.elasticsearch.persistent;
 
-import org.elasticsearch.test.AbstractStreamableTestCase;
+import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.persistent.CompletionPersistentTaskAction.Request;
+import org.elasticsearch.test.AbstractWireSerializingTestCase;
 
-public class RestartPersistentTaskRequestTests extends AbstractStreamableTestCase<Request> {
+public class RestartPersistentTaskRequestTests extends AbstractWireSerializingTestCase<Request> {
 
     @Override
     protected Request createTestInstance() {
@@ -29,7 +30,7 @@ public class RestartPersistentTaskRequestTests extends AbstractStreamableTestCas
     }
 
     @Override
-    protected Request createBlankInstance() {
-        return new Request();
+    protected Writeable.Reader<Request> instanceReader() {
+        return Request::new;
     }
 }
diff --git a/server/src/test/java/org/elasticsearch/persistent/StartPersistentActionRequestTests.java b/server/src/test/java/org/elasticsearch/persistent/StartPersistentActionRequestTests.java
index e4c5a26de9c..80155256d4f 100644
--- a/server/src/test/java/org/elasticsearch/persistent/StartPersistentActionRequestTests.java
+++ b/server/src/test/java/org/elasticsearch/persistent/StartPersistentActionRequestTests.java
@@ -21,14 +21,15 @@ package org.elasticsearch.persistent;
 import org.elasticsearch.common.UUIDs;
 import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
 import org.elasticsearch.common.io.stream.NamedWriteableRegistry.Entry;
+import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.persistent.StartPersistentTaskAction.Request;
 import org.elasticsearch.persistent.TestPersistentTasksPlugin.TestParams;
 import org.elasticsearch.persistent.TestPersistentTasksPlugin.TestPersistentTasksExecutor;
-import org.elasticsearch.test.AbstractStreamableTestCase;
+import org.elasticsearch.test.AbstractWireSerializingTestCase;
 
 import java.util.Collections;
 
-public class StartPersistentActionRequestTests extends AbstractStreamableTestCase<Request> {
+public class StartPersistentActionRequestTests extends AbstractWireSerializingTestCase<Request> {
 
     @Override
     protected Request createTestInstance() {
@@ -43,8 +44,8 @@ public class StartPersistentActionRequestTests extends AbstractStreamableTestCas
     }
 
     @Override
-    protected Request createBlankInstance() {
-        return new Request();
+    protected Writeable.Reader<Request> instanceReader() {
+        return Request::new;
     }
 
     @Override
diff --git a/server/src/test/java/org/elasticsearch/persistent/UpdatePersistentTaskRequestTests.java b/server/src/test/java/org/elasticsearch/persistent/UpdatePersistentTaskRequestTests.java
index 5ae54640f8e..787b5ad5d89 100644
--- a/server/src/test/java/org/elasticsearch/persistent/UpdatePersistentTaskRequestTests.java
+++ b/server/src/test/java/org/elasticsearch/persistent/UpdatePersistentTaskRequestTests.java
@@ -20,14 +20,15 @@ package org.elasticsearch.persistent;
 
 import org.elasticsearch.common.UUIDs;
 import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
-import org.elasticsearch.test.AbstractStreamableTestCase;
+import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.persistent.TestPersistentTasksPlugin.State;
 import org.elasticsearch.persistent.TestPersistentTasksPlugin.TestPersistentTasksExecutor;
 import org.elasticsearch.persistent.UpdatePersistentTaskStatusAction.Request;
+import org.elasticsearch.test.AbstractWireSerializingTestCase;
 
 import java.util.Collections;
 
-public class UpdatePersistentTaskRequestTests extends AbstractStreamableTestCase<Request> {
+public class UpdatePersistentTaskRequestTests extends AbstractWireSerializingTestCase<Request> {
 
     @Override
     protected Request createTestInstance() {
@@ -35,8 +36,8 @@ public class UpdatePersistentTaskRequestTests extends AbstractStreamableTestCase
     }
 
     @Override
-    protected Request createBlankInstance() {
-        return new Request();
+    protected Writeable.Reader<Request> instanceReader() {
+        return Request::new;
     }
 
     @Override
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/license/PostStartTrialRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/license/PostStartTrialRequest.java
index cf94312b6a7..2de5a857878 100644
--- a/x-pack/plugin/core/src/main/java/org/elasticsearch/license/PostStartTrialRequest.java
+++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/license/PostStartTrialRequest.java
@@ -18,6 +18,19 @@ public class PostStartTrialRequest extends MasterNodeRequest<PostStartTrialReque
     private boolean acknowledge = false;
     private String type;
 
+    public PostStartTrialRequest() {}
+
+    public PostStartTrialRequest(StreamInput in) throws IOException {
+        super(in);
+        if (in.getVersion().onOrAfter(Version.V_6_3_0)) {
+            type = in.readString();
+            acknowledge = in.readBoolean();
+        } else {
+            type = "trial";
+            acknowledge = true;
+        }
+    }
+
     @Override
     public ActionRequestValidationException validate() {
         return null;
@@ -41,18 +54,6 @@ public class PostStartTrialRequest extends MasterNodeRequest<PostStartTrialReque
         return acknowledge;
     }
 
-    @Override
-    public void readFrom(StreamInput in) throws IOException {
-        super.readFrom(in);
-        if (in.getVersion().onOrAfter(Version.V_6_3_0)) {
-            type = in.readString();
-            acknowledge = in.readBoolean();
-        } else {
-            type = "trial";
-            acknowledge = true;
-        }
-    }
-
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         Version version = Version.V_6_3_0;
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/license/TransportPostStartTrialAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/license/TransportPostStartTrialAction.java
index bf77aded5a1..25a809cba5b 100644
--- a/x-pack/plugin/core/src/main/java/org/elasticsearch/license/TransportPostStartTrialAction.java
+++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/license/TransportPostStartTrialAction.java
@@ -26,7 +26,7 @@ public class TransportPostStartTrialAction extends StreamableTransportMasterNode
                                          LicenseService licenseService, ThreadPool threadPool, ActionFilters actionFilters,
                                          IndexNameExpressionResolver indexNameExpressionResolver) {
         super(PostStartTrialAction.NAME, transportService, clusterService, threadPool, actionFilters,
-                indexNameExpressionResolver, PostStartTrialRequest::new);
+                PostStartTrialRequest::new, indexNameExpressionResolver);
         this.licenseService = licenseService;
     }
 
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/XPackUsageRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/XPackUsageRequest.java
index 83621a9ac3d..61e3923b94e 100644
--- a/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/XPackUsageRequest.java
+++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/XPackUsageRequest.java
@@ -7,9 +7,18 @@ package org.elasticsearch.protocol.xpack;
 
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.support.master.MasterNodeRequest;
+import org.elasticsearch.common.io.stream.StreamInput;
+
+import java.io.IOException;
 
 public class XPackUsageRequest extends MasterNodeRequest<XPackUsageRequest> {
 
+    public XPackUsageRequest() {}
+
+    public XPackUsageRequest(StreamInput in) throws IOException {
+        super(in);
+    }
+
     @Override
     public ActionRequestValidationException validate() {
         return null;
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/migration/IndexUpgradeInfoRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/migration/IndexUpgradeInfoRequest.java
index 17afee59fa1..d09b1344627 100644
--- a/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/migration/IndexUpgradeInfoRequest.java
+++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/migration/IndexUpgradeInfoRequest.java
@@ -64,11 +64,6 @@ public class IndexUpgradeInfoRequest extends MasterNodeReadRequest<IndexUpgradeI
         return null;
     }
 
-    @Override
-    public void readFrom(StreamInput in) throws IOException {
-        throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable");
-    }
-
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/TransportXPackUsageAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/TransportXPackUsageAction.java
index 03f270dd5e4..32c43f55802 100644
--- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/TransportXPackUsageAction.java
+++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/TransportXPackUsageAction.java
@@ -36,8 +36,8 @@ public class TransportXPackUsageAction extends StreamableTransportMasterNodeActi
     public TransportXPackUsageAction(ThreadPool threadPool, TransportService transportService,
                                      ClusterService clusterService, ActionFilters actionFilters,
                                      IndexNameExpressionResolver indexNameExpressionResolver, Set<XPackFeatureSet> featureSets) {
-        super(XPackUsageAction.NAME, transportService, clusterService, threadPool, actionFilters, indexNameExpressionResolver,
-                XPackUsageRequest::new);
+        super(XPackUsageAction.NAME, transportService, clusterService, threadPool, actionFilters, XPackUsageRequest::new,
+            indexNameExpressionResolver);
         this.featureSets = Collections.unmodifiableList(new ArrayList<>(featureSets));
     }
 
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/deprecation/DeprecationInfoAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/deprecation/DeprecationInfoAction.java
index 897690891b0..5c0589ddf44 100644
--- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/deprecation/DeprecationInfoAction.java
+++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/deprecation/DeprecationInfoAction.java
@@ -270,11 +270,6 @@ public class DeprecationInfoAction extends StreamableResponseActionType<Deprecat
             return validationException;
         }
 
-        @Override
-        public void readFrom(StreamInput in) throws IOException {
-            throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable");
-        }
-
         @Override
         public boolean equals(Object o) {
             if (this == o) return true;
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/FinalizeJobExecutionAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/FinalizeJobExecutionAction.java
index 51005636c8f..a00b5b9b4bd 100644
--- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/FinalizeJobExecutionAction.java
+++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/FinalizeJobExecutionAction.java
@@ -51,11 +51,6 @@ public class FinalizeJobExecutionAction extends ActionType<AcknowledgedResponse>
             return jobIds;
         }
 
-        @Override
-        public void readFrom(StreamInput in) throws IOException {
-            throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable");
-        }
-
         @Override
         public void writeTo(StreamOutput out) throws IOException {
             super.writeTo(out);
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetDatafeedsAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetDatafeedsAction.java
index a107f8bef1e..0bc3a058053 100644
--- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetDatafeedsAction.java
+++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetDatafeedsAction.java
@@ -84,11 +84,6 @@ public class GetDatafeedsAction extends ActionType<GetDatafeedsAction.Response>
             return null;
         }
 
-        @Override
-        public void readFrom(StreamInput in) throws IOException {
-            throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable");
-        }
-
         @Override
         public int hashCode() {
             return Objects.hash(datafeedId, allowNoDatafeeds);
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetDatafeedsStatsAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetDatafeedsStatsAction.java
index bdb5858f755..d08415ce412 100644
--- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetDatafeedsStatsAction.java
+++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetDatafeedsStatsAction.java
@@ -96,11 +96,6 @@ public class GetDatafeedsStatsAction extends ActionType<GetDatafeedsStatsAction.
             return null;
         }
 
-        @Override
-        public void readFrom(StreamInput in) throws IOException {
-            throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable");
-        }
-
         @Override
         public int hashCode() {
             return Objects.hash(datafeedId, allowNoDatafeeds);
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetJobsAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetJobsAction.java
index 52875dd98b4..aa3d065d5d9 100644
--- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetJobsAction.java
+++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetJobsAction.java
@@ -82,11 +82,6 @@ public class GetJobsAction extends ActionType<GetJobsAction.Response> {
             return null;
         }
 
-        @Override
-        public void readFrom(StreamInput in) throws IOException {
-            throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable");
-        }
-
         @Override
         public int hashCode() {
             return Objects.hash(jobId, allowNoJobs);
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/OpenJobAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/OpenJobAction.java
index 1a0bd92eede..e146e39b638 100644
--- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/OpenJobAction.java
+++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/OpenJobAction.java
@@ -74,7 +74,8 @@ public class OpenJobAction extends ActionType<AcknowledgedResponse> {
         }
 
         public Request(StreamInput in) throws IOException {
-            readFrom(in);
+            super(in);
+            jobParams = new JobParams(in);
         }
 
         public Request() {
@@ -89,12 +90,6 @@ public class OpenJobAction extends ActionType<AcknowledgedResponse> {
             return null;
         }
 
-        @Override
-        public void readFrom(StreamInput in) throws IOException {
-            super.readFrom(in);
-            jobParams = new JobParams(in);
-        }
-
         @Override
         public void writeTo(StreamOutput out) throws IOException {
             super.writeTo(out);
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/StartDatafeedAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/StartDatafeedAction.java
index 0240d8fb4ac..138915ca90e 100644
--- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/StartDatafeedAction.java
+++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/StartDatafeedAction.java
@@ -86,7 +86,8 @@ public class StartDatafeedAction extends ActionType<AcknowledgedResponse> {
         }
 
         public Request(StreamInput in) throws IOException {
-            readFrom(in);
+            super(in);
+            params = new DatafeedParams(in);
         }
 
         public Request() {
@@ -107,12 +108,6 @@ public class StartDatafeedAction extends ActionType<AcknowledgedResponse> {
             return e;
         }
 
-        @Override
-        public void readFrom(StreamInput in) throws IOException {
-            super.readFrom(in);
-            params = new DatafeedParams(in);
-        }
-
         @Override
         public void writeTo(StreamOutput out) throws IOException {
             super.writeTo(out);
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/upgrade/actions/IndexUpgradeAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/upgrade/actions/IndexUpgradeAction.java
index 2cc6c9431d6..9398012662e 100644
--- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/upgrade/actions/IndexUpgradeAction.java
+++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/upgrade/actions/IndexUpgradeAction.java
@@ -113,11 +113,6 @@ public class IndexUpgradeAction extends StreamableResponseActionType<BulkByScrol
             return validationException;
         }
 
-        @Override
-        public void readFrom(StreamInput in) throws IOException {
-            throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable");
-        }
-
         @Override
         public boolean equals(Object o) {
             if (this == o) return true;
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transport/actions/service/WatcherServiceRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transport/actions/service/WatcherServiceRequest.java
index 64fc7abc2ae..5c37de33d5c 100644
--- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transport/actions/service/WatcherServiceRequest.java
+++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transport/actions/service/WatcherServiceRequest.java
@@ -20,6 +20,11 @@ public class WatcherServiceRequest extends MasterNodeRequest<WatcherServiceReque
 
     private Command command;
 
+    public WatcherServiceRequest(StreamInput in) throws IOException {
+        super(in);
+        command = Command.valueOf(in.readString().toUpperCase(Locale.ROOT));
+    }
+
     public WatcherServiceRequest() {
     }
 
@@ -52,12 +57,6 @@ public class WatcherServiceRequest extends MasterNodeRequest<WatcherServiceReque
         }
     }
 
-    @Override
-    public void readFrom(StreamInput in) throws IOException {
-        super.readFrom(in);
-        command = Command.valueOf(in.readString().toUpperCase(Locale.ROOT));
-    }
-
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/OpenJobActionRequestTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/OpenJobActionRequestTests.java
index da1ce5fdd0f..008757d3f45 100644
--- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/OpenJobActionRequestTests.java
+++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/OpenJobActionRequestTests.java
@@ -5,27 +5,28 @@
  */
 package org.elasticsearch.xpack.core.ml.action;
 
+import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.xcontent.XContentParser;
-import org.elasticsearch.test.AbstractStreamableXContentTestCase;
+import org.elasticsearch.test.AbstractSerializingTestCase;
 import org.elasticsearch.xpack.core.ml.action.OpenJobAction.Request;
 
-public class OpenJobActionRequestTests extends AbstractStreamableXContentTestCase<Request> {
+public class OpenJobActionRequestTests extends AbstractSerializingTestCase<Request> {
 
     @Override
     protected Request createTestInstance() {
         return new Request(JobParamsTests.createJobParams());
     }
 
+    @Override
+    protected Writeable.Reader<Request> instanceReader() {
+        return Request::new;
+    }
+
     @Override
     protected boolean supportsUnknownFields() {
         return false;
     }
 
-    @Override
-    protected Request createBlankInstance() {
-        return new Request();
-    }
-
     @Override
     protected Request doParseInstance(XContentParser parser) {
         return Request.parseRequest(null, parser);
diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/StartDatafeedActionRequestTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/StartDatafeedActionRequestTests.java
index fe2bb5d6508..3b8eb0254ec 100644
--- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/StartDatafeedActionRequestTests.java
+++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/StartDatafeedActionRequestTests.java
@@ -6,13 +6,14 @@
 package org.elasticsearch.xpack.core.ml.action;
 
 import org.elasticsearch.ElasticsearchParseException;
+import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.xcontent.XContentParser;
-import org.elasticsearch.test.AbstractStreamableXContentTestCase;
+import org.elasticsearch.test.AbstractSerializingTestCase;
 import org.elasticsearch.xpack.core.ml.action.StartDatafeedAction.Request;
 
 import static org.hamcrest.Matchers.equalTo;
 
-public class StartDatafeedActionRequestTests extends AbstractStreamableXContentTestCase<Request> {
+public class StartDatafeedActionRequestTests extends AbstractSerializingTestCase<Request> {
 
     @Override
     protected Request createTestInstance() {
@@ -20,13 +21,13 @@ public class StartDatafeedActionRequestTests extends AbstractStreamableXContentT
     }
 
     @Override
-    protected boolean supportsUnknownFields() {
-        return false;
+    protected Writeable.Reader<Request> instanceReader() {
+        return Request::new;
     }
 
     @Override
-    protected Request createBlankInstance() {
-        return new Request();
+    protected boolean supportsUnknownFields() {
+        return false;
     }
 
     @Override
diff --git a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/TransportWatcherServiceAction.java b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/TransportWatcherServiceAction.java
index 8a2d52b8316..74c27c4edb5 100644
--- a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/TransportWatcherServiceAction.java
+++ b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/TransportWatcherServiceAction.java
@@ -50,7 +50,7 @@ public class TransportWatcherServiceAction extends TransportMasterNodeAction<Wat
                                          ThreadPool threadPool, ActionFilters actionFilters,
                                          IndexNameExpressionResolver indexNameExpressionResolver) {
         super(WatcherServiceAction.NAME, transportService, clusterService, threadPool, actionFilters,
-                indexNameExpressionResolver, WatcherServiceRequest::new);
+            WatcherServiceRequest::new, indexNameExpressionResolver);
     }
 
     @Override