Skip to content

Commit 129a01f

Browse files
author
David Roberts
authored
[ML] Adjust BWC for node in start/open responses following backport (#55573)
Once #55570 is merged the master branch BWC code is no longer needed. Relates #55473
1 parent 5074f2c commit 129a01f

File tree

3 files changed

+6
-26
lines changed

3 files changed

+6
-26
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,8 @@ task verifyVersions {
183183
* after the backport of the backcompat code is complete.
184184
*/
185185

186-
boolean bwc_tests_enabled = false
187-
final String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/55573" /* place a PR link here when committing bwc changes */
186+
boolean bwc_tests_enabled = true
187+
final String bwc_tests_disabled_issue = "" /* place a PR link here when committing bwc changes */
188188
if (bwc_tests_enabled == false) {
189189
if (bwc_tests_disabled_issue.isEmpty()) {
190190
throw new GradleException("bwc_tests_disabled_issue must be set when bwc_tests_enabled == false")

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/NodeAcknowledgedResponse.java

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
package org.elasticsearch.xpack.core.ml.action;
88

9-
import org.elasticsearch.Version;
109
import org.elasticsearch.action.support.master.AcknowledgedResponse;
1110
import org.elasticsearch.common.io.stream.StreamInput;
1211
import org.elasticsearch.common.io.stream.StreamOutput;
@@ -28,12 +27,7 @@ public NodeAcknowledgedResponse(boolean acknowledged, String node) {
2827

2928
public NodeAcknowledgedResponse(StreamInput in) throws IOException {
3029
super(in);
31-
// TODO change in backport
32-
if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
33-
node = in.readString();
34-
} else {
35-
node = "";
36-
}
30+
node = in.readString();
3731
}
3832

3933
public String getNode() {
@@ -43,10 +37,7 @@ public String getNode() {
4337
@Override
4438
public void writeTo(StreamOutput out) throws IOException {
4539
super.writeTo(out);
46-
// TODO change in backport
47-
if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
48-
out.writeString(node);
49-
}
40+
out.writeString(node);
5041
}
5142

5243
@Override

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/NodeAcknowledgedResponseTests.java

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@
66

77
package org.elasticsearch.xpack.core.ml.action;
88

9-
import org.elasticsearch.Version;
109
import org.elasticsearch.common.io.stream.Writeable;
11-
import org.elasticsearch.xpack.core.ml.AbstractBWCWireSerializationTestCase;
10+
import org.elasticsearch.test.AbstractWireSerializingTestCase;
1211

13-
public class NodeAcknowledgedResponseTests extends AbstractBWCWireSerializationTestCase<NodeAcknowledgedResponse> {
12+
public class NodeAcknowledgedResponseTests extends AbstractWireSerializingTestCase<NodeAcknowledgedResponse> {
1413

1514
@Override
1615
protected NodeAcknowledgedResponse createTestInstance() {
@@ -30,14 +29,4 @@ protected NodeAcknowledgedResponse mutateInstance(NodeAcknowledgedResponse insta
3029
return new NodeAcknowledgedResponse(true, "");
3130
}
3231
}
33-
34-
@Override
35-
protected NodeAcknowledgedResponse mutateInstanceForVersion(NodeAcknowledgedResponse instance, Version version) {
36-
// TODO change in backport
37-
if (version.onOrAfter(Version.V_8_0_0)) {
38-
return instance;
39-
} else {
40-
return new NodeAcknowledgedResponse(true, "");
41-
}
42-
}
4332
}

0 commit comments

Comments
 (0)