Adjust version compatiblity after backport (#57805)

For the ml delete expired data request changes in #57337
elastic · Jun 8, 2020 · 5a2add9 · 5a2add9
1 parent 695b242
commit 5a2add9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...in/core/src/main/java/org/elasticsearch/xpack/core/ml/action/DeleteExpiredDataAction.java b/...in/core/src/main/java/org/elasticsearch/xpack/core/ml/action/DeleteExpiredDataAction.java
@@ -71,7 +71,7 @@ public Request(StreamInput in) throws IOException {
                 this.requestsPerSecond = null;
                 this.timeout = null;
             }
-            if (in.getVersion().onOrAfter(Version.V_8_0_0)) { // TODO BWC for V_7_9_0
+            if (in.getVersion().onOrAfter(Version.V_7_9_0)) {
                 jobId = in.readString();
             }
         }
@@ -135,7 +135,7 @@ public void writeTo(StreamOutput out) throws IOException {
                 out.writeOptionalFloat(requestsPerSecond);
                 out.writeOptionalTimeValue(timeout);
             }
-            if (out.getVersion().onOrAfter(Version.V_8_0_0)) {  // TODO BWC for V_7_9_0
+            if (out.getVersion().onOrAfter(Version.V_7_9_0)) {
                 out.writeString(jobId);
             }
         }

diff --git a/...test/java/org/elasticsearch/xpack/core/ml/action/DeleteExpiredDataActionRequestTests.java b/...test/java/org/elasticsearch/xpack/core/ml/action/DeleteExpiredDataActionRequestTests.java
@@ -38,7 +38,7 @@ protected Request mutateInstanceForVersion(Request instance, Version version) {
         if (version.before(Version.V_7_8_0)) {
             return new Request();
         }
-        if (version.before(Version.V_8_0_0)) {  // TODO make V_7_9_0
+        if (version.before(Version.V_7_9_0)) {
             Request request = new Request();
             request.setRequestsPerSecond(instance.getRequestsPerSecond());
             request.setTimeout(instance.getTimeout());