Remove unused internal waitForAck field from UpdateJobAction

davidkyle · Oct 3, 2018 · e647611 · e647611
1 parent d0da950
commit e647611
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 20 deletions.
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/UpdateJobAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/UpdateJobAction.java
@@ -54,7 +54,6 @@ public static UpdateJobAction.Request parseRequest(String jobId, XContentParser
 
         /** Indicates an update that was not triggered by a user */
         private boolean isInternal;
-        private boolean waitForAck = true;
 
         public Request(String jobId, JobUpdate update) {
             this(jobId, update, false);
@@ -88,14 +87,6 @@ public boolean isInternal() {
             return isInternal;
         }
 
-        public boolean isWaitForAck() {
-            return waitForAck;
-        }
-
-        public void setWaitForAck(boolean waitForAck) {
-            this.waitForAck = waitForAck;
-        }
-
         @Override
         public ActionRequestValidationException validate() {
             return null;
@@ -111,11 +102,6 @@ public void readFrom(StreamInput in) throws IOException {
             } else {
                 isInternal = false;
             }
-            if (in.getVersion().onOrAfter(Version.V_6_3_0)) {
-                waitForAck = in.readBoolean();
-            } else {
-                waitForAck = true;
-            }
         }
 
         @Override
@@ -126,9 +112,6 @@ public void writeTo(StreamOutput out) throws IOException {
             if (out.getVersion().onOrAfter(Version.V_6_2_2)) {
                 out.writeBoolean(isInternal);
             }
-            if (out.getVersion().onOrAfter(Version.V_6_3_0)) {
-                out.writeBoolean(waitForAck);
-            }
         }
 
         @Override
@@ -144,8 +127,7 @@ public boolean equals(Object o) {
             if (o == null || getClass() != o.getClass()) return false;
             UpdateJobAction.Request that = (UpdateJobAction.Request) o;
             return Objects.equals(jobId, that.jobId) &&
-                    Objects.equals(update, that.update) &&
-                    isInternal == that.isInternal;
+                    Objects.equals(update, that.update);
         }
 
         @Override

diff --git a/...ore/src/test/java/org/elasticsearch/xpack/core/ml/action/UpdateJobActionRequestTests.java b/...ore/src/test/java/org/elasticsearch/xpack/core/ml/action/UpdateJobActionRequestTests.java
@@ -19,7 +19,6 @@ protected UpdateJobAction.Request createTestInstance() {
         JobUpdate.Builder jobUpdate = new JobUpdate.Builder(jobId);
         jobUpdate.setAnalysisLimits(new AnalysisLimits(100L, 100L));
         UpdateJobAction.Request request = new UpdateJobAction.Request(jobId, jobUpdate.build());
-        request.setWaitForAck(randomBoolean());
         return request;
     }