Move TaskResponse

Author: jasontedor

x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/CcrStatsAction.java

@@ -14,11 +14,13 @@
 import org.elasticsearch.action.support.tasks.BaseTasksResponse;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
+import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.unit.ByteSizeUnit;
 import org.elasticsearch.common.unit.ByteSizeValue;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.index.shard.ShardId;
 import org.elasticsearch.tasks.Task;
 
 import java.io.IOException;
@@ -45,7 +47,7 @@ public TasksResponse newResponse() {
 
     public static class TasksResponse extends BaseTasksResponse implements ToXContentObject {
 
-        private final List<TransportCcrStatsAction.TaskResponse> taskResponses;
+        private final List<TaskResponse> taskResponses;
 
         public TasksResponse() {
             this(Collections.emptyList(), Collections.emptyList(), Collections.emptyList());
@@ -54,25 +56,25 @@ public TasksResponse() {
         TasksResponse(
                 final List<TaskOperationFailure> taskFailures,
                 final List<? extends FailedNodeException> nodeFailures,
-                final List<TransportCcrStatsAction.TaskResponse> taskResponses) {
+                final List<TaskResponse> taskResponses) {
             super(taskFailures, nodeFailures);
             this.taskResponses = taskResponses;
         }
 
         @Override
         public XContentBuilder toXContent(final XContentBuilder builder, final Params params) throws IOException {
-            final Map<String, Map<Integer, TransportCcrStatsAction.TaskResponse>> taskResponsesByIndex = new TreeMap<>();
-            for (final TransportCcrStatsAction.TaskResponse taskResponse : taskResponses) {
+            final Map<String, Map<Integer, TaskResponse>> taskResponsesByIndex = new TreeMap<>();
+            for (final TaskResponse taskResponse : taskResponses) {
                 taskResponsesByIndex.computeIfAbsent(
                         taskResponse.followerShardId().getIndexName(),
                         k -> new TreeMap<>()).put(taskResponse.followerShardId().getId(), taskResponse);
             }
             builder.startObject();
             {
-                for (final Map.Entry<String, Map<Integer, TransportCcrStatsAction.TaskResponse>> index : taskResponsesByIndex.entrySet()) {
+                for (final Map.Entry<String, Map<Integer, TaskResponse>> index : taskResponsesByIndex.entrySet()) {
                     builder.startObject(index.getKey());
                     {
-                        for (final Map.Entry<Integer, TransportCcrStatsAction.TaskResponse> shard : index.getValue().entrySet()) {
+                        for (final Map.Entry<Integer, TaskResponse> shard : index.getValue().entrySet()) {
                             builder.startObject(Integer.toString(shard.getKey()));
                             {
                                 final ShardFollowNodeTask.Status status = shard.getValue().status();
@@ -153,4 +155,36 @@ public void writeTo(StreamOutput out) throws IOException {
     }
 
 
+    public static class TaskResponse implements Writeable {
+
+        private final ShardId followerShardId;
+
+        ShardId followerShardId() {
+            return followerShardId;
+        }
+
+        private final ShardFollowNodeTask.Status status;
+
+        ShardFollowNodeTask.Status status() {
+            return status;
+        }
+
+        TaskResponse(final ShardId followerShardId, final ShardFollowNodeTask.Status status) {
+            this.followerShardId = followerShardId;
+            this.status = status;
+        }
+
+        TaskResponse(final StreamInput in) throws IOException {
+            this.followerShardId = ShardId.readShardId(in);
+            this.status = new ShardFollowNodeTask.Status(in);
+        }
+
+        @Override
+        public void writeTo(final StreamOutput out) throws IOException {
+            followerShardId.writeTo(out);
+            status.writeTo(out);
+        }
+
+    }
+
 }

x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/TransportCcrStatsAction.java

@@ -14,10 +14,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.Writeable;
 import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.index.shard.ShardId;
 import org.elasticsearch.transport.TransportService;
 import org.elasticsearch.xpack.ccr.Ccr;
 
@@ -27,7 +24,7 @@
 public class TransportCcrStatsAction extends TransportTasksAction<
         ShardFollowNodeTask,
         CcrStatsAction.TasksRequest,
-        CcrStatsAction.TasksResponse, TransportCcrStatsAction.TaskResponse> {
+        CcrStatsAction.TasksResponse, CcrStatsAction.TaskResponse> {
 
     @Inject
     public TransportCcrStatsAction(
@@ -49,53 +46,23 @@ public TransportCcrStatsAction(
     @Override
     protected CcrStatsAction.TasksResponse newResponse(
             final CcrStatsAction.TasksRequest request,
-            final List<TaskResponse> taskResponses,
+            final List<CcrStatsAction.TaskResponse> taskResponses,
             final List<TaskOperationFailure> taskOperationFailures,
             final List<FailedNodeException> failedNodeExceptions) {
         return new CcrStatsAction.TasksResponse(taskOperationFailures, failedNodeExceptions, taskResponses);
     }
 
     @Override
-    protected TaskResponse readTaskResponse(final StreamInput in) throws IOException {
-        return new TaskResponse(in);
+    protected CcrStatsAction.TaskResponse readTaskResponse(final StreamInput in) throws IOException {
+        return new CcrStatsAction.TaskResponse(in);
     }
 
     @Override
     protected void taskOperation(
-            final CcrStatsAction.TasksRequest request, final ShardFollowNodeTask task, final ActionListener<TaskResponse> listener) {
-        listener.onResponse(new TaskResponse(task.getFollowShardId(), task.getStatus()));
-    }
-
-    public static class TaskResponse implements Writeable {
-
-        private final ShardId followerShardId;
-
-        public ShardId followerShardId() {
-            return followerShardId;
-        }
-
-        private final ShardFollowNodeTask.Status status;
-
-        public ShardFollowNodeTask.Status status() {
-            return status;
-        }
-
-        private TaskResponse(final ShardId followerShardId, final ShardFollowNodeTask.Status status) {
-            this.followerShardId = followerShardId;
-            this.status = status;
-        }
-
-        private TaskResponse(final StreamInput in) throws IOException {
-            this.followerShardId = ShardId.readShardId(in);
-            this.status = new ShardFollowNodeTask.Status(in);
-        }
-
-        @Override
-        public void writeTo(final StreamOutput out) throws IOException {
-            followerShardId.writeTo(out);
-            status.writeTo(out);
-        }
-
+            final CcrStatsAction.TasksRequest request,
+            final ShardFollowNodeTask task,
+            final ActionListener<CcrStatsAction.TaskResponse> listener) {
+        listener.onResponse(new CcrStatsAction.TaskResponse(task.getFollowShardId(), task.getStatus()));
     }
 
 }