From 76cd7b1eb2cf7f87081c24ae6362ae1d9dec6100 Mon Sep 17 00:00:00 2001
From: Colin Goodheart-Smithe <colings86@users.noreply.github.com>
Date: Tue, 18 Apr 2017 12:50:05 +0100
Subject: [PATCH] Fixes compile errors in Eclipse due to generics

PersistentTasksCustomMetadata was using a generic param named `Params`. This conflicted with the imported interface `ToXContent.Params`. The java compiler was preferring the generic param over the interface so everything was fine but Eclipse apparently prefers the interface int his case which was screwing up the Hierarchy and causing compile errors in Eclipse. This changes fixes it by renaming the Generic param to `P`
---
 .../PersistentTasksCustomMetaData.java           | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/server/src/main/java/org/elasticsearch/persistent/PersistentTasksCustomMetaData.java b/server/src/main/java/org/elasticsearch/persistent/PersistentTasksCustomMetaData.java
index 7dfccfdddd3..c24dd6c1b28 100644
--- a/server/src/main/java/org/elasticsearch/persistent/PersistentTasksCustomMetaData.java
+++ b/server/src/main/java/org/elasticsearch/persistent/PersistentTasksCustomMetaData.java
@@ -266,12 +266,12 @@ public final class PersistentTasksCustomMetaData extends AbstractNamedDiffable<M
     /**
      * A record that represents a single running persistent task
      */
-    public static class PersistentTask<Params extends PersistentTaskParams> implements Writeable, ToXContent {
+    public static class PersistentTask<P extends PersistentTaskParams> implements Writeable, ToXContent {
         private final String id;
         private final long allocationId;
         private final String taskName;
         @Nullable
-        private final Params params;
+        private final P params;
         @Nullable
         private final Status status;
         private final Assignment assignment;
@@ -279,21 +279,21 @@ public final class PersistentTasksCustomMetaData extends AbstractNamedDiffable<M
         private final Long allocationIdOnLastStatusUpdate;
 
 
-        public PersistentTask(String id, String taskName, Params params, long allocationId, Assignment assignment) {
+        public PersistentTask(String id, String taskName, P params, long allocationId, Assignment assignment) {
             this(id, allocationId, taskName, params, null, assignment, null);
         }
 
-        public PersistentTask(PersistentTask<Params> task, long allocationId, Assignment assignment) {
+        public PersistentTask(PersistentTask<P> task, long allocationId, Assignment assignment) {
             this(task.id, allocationId, task.taskName, task.params, task.status,
                     assignment, task.allocationId);
         }
 
-        public PersistentTask(PersistentTask<Params> task, Status status) {
+        public PersistentTask(PersistentTask<P> task, Status status) {
             this(task.id, task.allocationId, task.taskName, task.params, status,
                     task.assignment, task.allocationId);
         }
 
-        private PersistentTask(String id, long allocationId, String taskName, Params params,
+        private PersistentTask(String id, long allocationId, String taskName, P params,
                                Status status, Assignment assignment, Long allocationIdOnLastStatusUpdate) {
             this.id = id;
             this.allocationId = allocationId;
@@ -321,7 +321,7 @@ public final class PersistentTasksCustomMetaData extends AbstractNamedDiffable<M
             id = in.readString();
             allocationId = in.readLong();
             taskName = in.readString();
-            params = (Params) in.readOptionalNamedWriteable(PersistentTaskParams.class);
+            params = (P) in.readOptionalNamedWriteable(PersistentTaskParams.class);
             status = in.readOptionalNamedWriteable(Task.Status.class);
             assignment = new Assignment(in.readOptionalString(), in.readString());
             allocationIdOnLastStatusUpdate = in.readOptionalLong();
@@ -377,7 +377,7 @@ public final class PersistentTasksCustomMetaData extends AbstractNamedDiffable<M
         }
 
         @Nullable
-        public Params getParams() {
+        public P getParams() {
             return params;
         }