reuse timeout from base class

Author: Hendrik Muhs

x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/action/StopDataFrameJobAction.java

@@ -47,12 +47,13 @@ public Response newResponse() {
     public static class Request extends BaseTasksRequest<Request> implements ToXContent {
         private String id;
         private final boolean waitForCompletion;
-        private final TimeValue timeout;
 
         public Request(String id, boolean waitForCompletion, @Nullable TimeValue timeout) {
             this.id = ExceptionsHelper.requireNonNull(id, DataFrameField.ID.getPreferredName());
             this.waitForCompletion = waitForCompletion;
-            this.timeout = timeout == null ? DEFAULT_TIMEOUT : timeout;
+
+            // use the timeout value already present in BaseTasksRequest
+            this.setTimeout(timeout == null ? DEFAULT_TIMEOUT : timeout);
         }
 
         public Request() {
@@ -63,7 +64,6 @@ public Request(StreamInput in) throws IOException {
             super(in);
             id = in.readString();
             waitForCompletion = in.readBoolean();
-            timeout = in.readTimeValue();
         }
 
         public String getId() {
@@ -74,10 +74,6 @@ public void setId(String id) {
             this.id = id;
         }
 
-        public TimeValue getTimeout() {
-            return timeout;
-        }
-
         public boolean waitForCompletion() {
             return waitForCompletion;
         }
@@ -87,7 +83,6 @@ public void writeTo(StreamOutput out) throws IOException {
             super.writeTo(out);
             out.writeString(id);
             out.writeBoolean(waitForCompletion);
-            out.writeTimeValue(timeout);
         }
 
         @Override
@@ -99,15 +94,16 @@ public ActionRequestValidationException validate() {
         public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
             builder.field(DataFrameField.ID.getPreferredName(), id);
             builder.field(DataFrameField.WAIT_FOR_COMPLETION.getPreferredName(), waitForCompletion);
-            if (timeout != null) {
-                builder.field(DataFrameField.TIMEOUT.getPreferredName(), timeout);
+            if (this.getTimeout() != null) {
+                builder.field(DataFrameField.TIMEOUT.getPreferredName(), this.getTimeout());
             }
             return builder;
         }
 
         @Override
         public int hashCode() {
-            return Objects.hash(id, waitForCompletion, timeout);
+            // the base class does not implement hashCode, therefore we need to hash timeout ourselves
+            return Objects.hash(id, waitForCompletion, this.getTimeout());
         }
 
         @Override
@@ -120,8 +116,13 @@ public boolean equals(Object obj) {
                 return false;
             }
             Request other = (Request) obj;
-            return Objects.equals(id, other.id) && Objects.equals(waitForCompletion, other.waitForCompletion)
-                    && Objects.equals(timeout, other.timeout);
+
+            // the base class does not implement equals, therefore we need to compare timeout ourselves
+            if (Objects.equals(this.getTimeout(), other.getTimeout()) == false) {
+                return false;
+            }
+
+            return Objects.equals(id, other.id) && Objects.equals(waitForCompletion, other.waitForCompletion);
         }
 
         @Override

x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/action/StopDataFrameJobActionRequestTests.java

@@ -23,4 +23,15 @@ protected Request createTestInstance() {
     protected Writeable.Reader<Request> instanceReader() {
         return Request::new;
     }
+
+    public void testSameButDifferentTimeout() {
+        String id = randomAlphaOfLengthBetween(1, 10);
+        boolean waitForCompletion = randomBoolean();
+
+        Request r1 = new Request(id, waitForCompletion, TimeValue.timeValueSeconds(10));
+        Request r2 = new Request(id, waitForCompletion, TimeValue.timeValueSeconds(20));
+
+        assertNotEquals(r1,r2);
+        assertNotEquals(r1.hashCode(),r2.hashCode());
+    }
 }