Skip to content

Commit 0d5cc32

Browse files
author
Hendrik Muhs
authored
[Transform] remove old mixed cluster BWC layers, not required for 8x (elastic#79927)
remove old mixed cluster BWC layers, not required for 8x and remove constructor indirection previously used for old endpoints
1 parent 74d4abf commit 0d5cc32

29 files changed

+56
-865
lines changed

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/DeleteTransformAction.java

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
*/
77
package org.elasticsearch.xpack.core.transform.action;
88

9-
import org.elasticsearch.Version;
109
import org.elasticsearch.action.ActionRequestValidationException;
1110
import org.elasticsearch.action.ActionType;
1211
import org.elasticsearch.action.support.master.AcknowledgedRequest;
@@ -42,11 +41,7 @@ public Request(String id, boolean force, TimeValue timeout) {
4241
public Request(StreamInput in) throws IOException {
4342
super(in);
4443
id = in.readString();
45-
if (in.getVersion().onOrAfter(Version.V_7_4_0)) {
46-
force = in.readBoolean();
47-
} else {
48-
force = false;
49-
}
44+
force = in.readBoolean();
5045
}
5146

5247
public String getId() {
@@ -61,9 +56,7 @@ public boolean isForce() {
6156
public void writeTo(StreamOutput out) throws IOException {
6257
super.writeTo(out);
6358
out.writeString(id);
64-
if (out.getVersion().onOrAfter(Version.V_7_4_0)) {
65-
out.writeBoolean(force);
66-
}
59+
out.writeBoolean(force);
6760
}
6861

6962
@Override

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/GetTransformStatsAction.java

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
package org.elasticsearch.xpack.core.transform.action;
99

1010
import org.elasticsearch.ElasticsearchException;
11-
import org.elasticsearch.Version;
1211
import org.elasticsearch.action.ActionRequestValidationException;
1312
import org.elasticsearch.action.ActionType;
1413
import org.elasticsearch.action.TaskOperationFailure;
@@ -66,9 +65,7 @@ public Request(StreamInput in) throws IOException {
6665
id = in.readString();
6766
expandedIds = Collections.unmodifiableList(in.readStringList());
6867
pageParams = new PageParams(in);
69-
if (in.getVersion().onOrAfter(Version.V_7_3_0)) {
70-
allowNoMatch = in.readBoolean();
71-
}
68+
allowNoMatch = in.readBoolean();
7269
}
7370

7471
@Override
@@ -112,9 +109,7 @@ public void writeTo(StreamOutput out) throws IOException {
112109
out.writeString(id);
113110
out.writeStringCollection(expandedIds);
114111
pageParams.writeTo(out);
115-
if (out.getVersion().onOrAfter(Version.V_7_3_0)) {
116-
out.writeBoolean(allowNoMatch);
117-
}
112+
out.writeBoolean(allowNoMatch);
118113
}
119114

120115
@Override
@@ -178,12 +173,7 @@ private Response(
178173

179174
public Response(StreamInput in) throws IOException {
180175
super(in);
181-
if (in.getVersion().onOrAfter(Version.V_7_3_0)) {
182-
transformsStats = new QueryPage<>(in, TransformStats::new);
183-
} else {
184-
List<TransformStats> stats = in.readList(TransformStats::new);
185-
transformsStats = new QueryPage<>(stats, stats.size(), TransformField.TRANSFORMS);
186-
}
176+
transformsStats = new QueryPage<>(in, TransformStats::new);
187177
}
188178

189179
public List<TransformStats> getTransformsStats() {
@@ -197,11 +187,7 @@ public long getCount() {
197187
@Override
198188
public void writeTo(StreamOutput out) throws IOException {
199189
super.writeTo(out);
200-
if (out.getVersion().onOrAfter(Version.V_7_3_0)) {
201-
transformsStats.writeTo(out);
202-
} else {
203-
out.writeList(transformsStats.results());
204-
}
190+
transformsStats.writeTo(out);
205191
}
206192

207193
@Override

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/PreviewTransformAction.java

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

88
package org.elasticsearch.xpack.core.transform.action;
99

10-
import org.elasticsearch.Version;
1110
import org.elasticsearch.action.ActionRequestValidationException;
1211
import org.elasticsearch.action.ActionResponse;
1312
import org.elasticsearch.action.ActionType;
@@ -177,14 +176,7 @@ public Response(StreamInput in) throws IOException {
177176
for (int i = 0; i < size; i++) {
178177
this.docs.add(in.readMap());
179178
}
180-
if (in.getVersion().onOrAfter(Version.V_7_7_0)) {
181-
this.generatedDestIndexSettings = new TransformDestIndexSettings(in);
182-
} else if (in.getVersion().onOrAfter(Version.V_7_3_0)) {
183-
Map<String, Object> objectMap = in.readMap();
184-
this.generatedDestIndexSettings = new TransformDestIndexSettings(objectMap, null, null);
185-
} else {
186-
this.generatedDestIndexSettings = new TransformDestIndexSettings(null, null, null);
187-
}
179+
this.generatedDestIndexSettings = new TransformDestIndexSettings(in);
188180
}
189181

190182
public List<Map<String, Object>> getDocs() {
@@ -201,11 +193,7 @@ public void writeTo(StreamOutput out) throws IOException {
201193
for (Map<String, Object> doc : docs) {
202194
out.writeMapWithConsistentOrder(doc);
203195
}
204-
if (out.getVersion().onOrAfter(Version.V_7_7_0)) {
205-
generatedDestIndexSettings.writeTo(out);
206-
} else if (out.getVersion().onOrAfter(Version.V_7_3_0)) {
207-
out.writeMap(generatedDestIndexSettings.getMappings());
208-
}
196+
generatedDestIndexSettings.writeTo(out);
209197
}
210198

211199
@Override

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/PutTransformAction.java

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

88
package org.elasticsearch.xpack.core.transform.action;
99

10-
import org.elasticsearch.Version;
1110
import org.elasticsearch.action.ActionRequestValidationException;
1211
import org.elasticsearch.action.ActionType;
1312
import org.elasticsearch.action.support.master.AcknowledgedRequest;
@@ -53,11 +52,7 @@ public Request(TransformConfig config, boolean deferValidation, TimeValue timeou
5352
public Request(StreamInput in) throws IOException {
5453
super(in);
5554
this.config = new TransformConfig(in);
56-
if (in.getVersion().onOrAfter(Version.V_7_4_0)) {
57-
this.deferValidation = in.readBoolean();
58-
} else {
59-
this.deferValidation = false;
60-
}
55+
this.deferValidation = in.readBoolean();
6156
}
6257

6358
public static Request fromXContent(
@@ -122,9 +117,7 @@ public boolean isDeferValidation() {
122117
public void writeTo(StreamOutput out) throws IOException {
123118
super.writeTo(out);
124119
this.config.writeTo(out);
125-
if (out.getVersion().onOrAfter(Version.V_7_4_0)) {
126-
out.writeBoolean(this.deferValidation);
127-
}
120+
out.writeBoolean(this.deferValidation);
128121
}
129122

130123
@Override

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/StartTransformAction.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
package org.elasticsearch.xpack.core.transform.action;
99

10-
import org.elasticsearch.Version;
1110
import org.elasticsearch.action.ActionRequestValidationException;
1211
import org.elasticsearch.action.ActionType;
1312
import org.elasticsearch.action.support.master.AcknowledgedRequest;
@@ -45,9 +44,6 @@ public Request(String id, TimeValue timeout) {
4544
public Request(StreamInput in) throws IOException {
4645
super(in);
4746
id = in.readString();
48-
if (in.getVersion().before(Version.V_7_5_0)) {
49-
in.readBoolean();
50-
}
5147
}
5248

5349
public String getId() {
@@ -58,9 +54,6 @@ public String getId() {
5854
public void writeTo(StreamOutput out) throws IOException {
5955
super.writeTo(out);
6056
out.writeString(id);
61-
if (out.getVersion().before(Version.V_7_5_0)) {
62-
out.writeBoolean(false);
63-
}
6457
}
6558

6659
@Override

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/StopTransformAction.java

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
import org.apache.logging.log4j.message.ParameterizedMessage;
1010
import org.elasticsearch.ElasticsearchException;
11-
import org.elasticsearch.Version;
1211
import org.elasticsearch.action.ActionRequestValidationException;
1312
import org.elasticsearch.action.ActionType;
1413
import org.elasticsearch.action.TaskOperationFailure;
@@ -81,16 +80,8 @@ public Request(StreamInput in) throws IOException {
8180
if (in.readBoolean()) {
8281
expandedIds = new HashSet<>(Arrays.asList(in.readStringArray()));
8382
}
84-
if (in.getVersion().onOrAfter(Version.V_7_3_0)) {
85-
this.allowNoMatch = in.readBoolean();
86-
} else {
87-
this.allowNoMatch = true;
88-
}
89-
if (in.getVersion().onOrAfter(Version.V_7_6_0)) {
90-
this.waitForCheckpoint = in.readBoolean();
91-
} else {
92-
this.waitForCheckpoint = false;
93-
}
83+
this.allowNoMatch = in.readBoolean();
84+
this.waitForCheckpoint = in.readBoolean();
9485
}
9586

9687
public String getId() {
@@ -132,12 +123,8 @@ public void writeTo(StreamOutput out) throws IOException {
132123
if (hasExpandedIds) {
133124
out.writeStringArray(expandedIds.toArray(new String[0]));
134125
}
135-
if (out.getVersion().onOrAfter(Version.V_7_3_0)) {
136-
out.writeBoolean(allowNoMatch);
137-
}
138-
if (out.getVersion().onOrAfter(Version.V_7_6_0)) {
139-
out.writeBoolean(waitForCheckpoint);
140-
}
126+
out.writeBoolean(allowNoMatch);
127+
out.writeBoolean(waitForCheckpoint);
141128
}
142129

143130
@Override

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/UpdateTransformAction.java

Lines changed: 13 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
package org.elasticsearch.xpack.core.transform.action;
99

10-
import org.elasticsearch.Version;
1110
import org.elasticsearch.action.ActionRequestValidationException;
1211
import org.elasticsearch.action.ActionType;
1312
import org.elasticsearch.action.support.tasks.BaseTasksRequest;
@@ -20,7 +19,6 @@
2019
import org.elasticsearch.xcontent.XContentParser;
2120
import org.elasticsearch.xpack.core.common.validation.SourceDestValidator;
2221
import org.elasticsearch.xpack.core.transform.TransformField;
23-
import org.elasticsearch.xpack.core.transform.action.compat.UpdateTransformActionPre78;
2422
import org.elasticsearch.xpack.core.transform.transforms.TransformConfig;
2523
import org.elasticsearch.xpack.core.transform.transforms.TransformConfigUpdate;
2624

@@ -56,8 +54,7 @@ public Request(TransformConfigUpdate update, String id, boolean deferValidation,
5654
this.setTimeout(timeout);
5755
}
5856

59-
// use fromStreamWithBWC, this can be changed back to public after BWC is not required anymore
60-
private Request(StreamInput in) throws IOException {
57+
public Request(StreamInput in) throws IOException {
6158
super(in);
6259
this.update = new TransformConfigUpdate(in);
6360
this.id = in.readString();
@@ -67,14 +64,6 @@ private Request(StreamInput in) throws IOException {
6764
}
6865
}
6966

70-
public static Request fromStreamWithBWC(StreamInput in) throws IOException {
71-
if (in.getVersion().onOrAfter(Version.V_7_8_0)) {
72-
return new Request(in);
73-
}
74-
UpdateTransformActionPre78.Request r = new UpdateTransformActionPre78.Request(in);
75-
return new Request(r.getUpdate(), r.getId(), r.isDeferValidation(), r.timeout());
76-
}
77-
7867
public static Request fromXContent(
7968
final XContentParser parser,
8069
final String id,
@@ -137,22 +126,16 @@ public void setConfig(TransformConfig config) {
137126

138127
@Override
139128
public void writeTo(StreamOutput out) throws IOException {
140-
if (out.getVersion().onOrAfter(Version.V_7_8_0)) {
141-
super.writeTo(out);
142-
update.writeTo(out);
143-
out.writeString(id);
144-
out.writeBoolean(deferValidation);
145-
if (config == null) {
146-
out.writeBoolean(false);
147-
} else {
148-
out.writeBoolean(true);
149-
config.writeTo(out);
150-
}
151-
return;
129+
super.writeTo(out);
130+
update.writeTo(out);
131+
out.writeString(id);
132+
out.writeBoolean(deferValidation);
133+
if (config == null) {
134+
out.writeBoolean(false);
135+
} else {
136+
out.writeBoolean(true);
137+
config.writeTo(out);
152138
}
153-
154-
UpdateTransformActionPre78.Request r = new UpdateTransformActionPre78.Request(update, id, deferValidation);
155-
r.writeTo(out);
156139
}
157140

158141
@Override
@@ -190,34 +173,19 @@ public Response(TransformConfig config) {
190173
this.config = config;
191174
}
192175

193-
// use fromStreamWithBWC, this can be changed back to public after BWC is not required anymore
194-
private Response(StreamInput in) throws IOException {
176+
public Response(StreamInput in) throws IOException {
195177
super(in);
196178
this.config = new TransformConfig(in);
197179
}
198180

199-
public static Response fromStreamWithBWC(StreamInput in) throws IOException {
200-
if (in.getVersion().onOrAfter(Version.V_7_8_0)) {
201-
return new Response(in);
202-
}
203-
UpdateTransformActionPre78.Response r = new UpdateTransformActionPre78.Response(in);
204-
return new Response(r.getConfig());
205-
}
206-
207181
public TransformConfig getConfig() {
208182
return config;
209183
}
210184

211185
@Override
212186
public void writeTo(StreamOutput out) throws IOException {
213-
if (out.getVersion().onOrAfter(Version.V_7_8_0)) {
214-
super.writeTo(out);
215-
config.writeTo(out);
216-
return;
217-
}
218-
219-
UpdateTransformActionPre78.Response r = new UpdateTransformActionPre78.Response(config);
220-
r.writeTo(out);
187+
super.writeTo(out);
188+
config.writeTo(out);
221189
}
222190

223191
@Override

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/compat/DeleteTransformActionDeprecated.java

Lines changed: 0 additions & 21 deletions
This file was deleted.

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/compat/GetTransformActionDeprecated.java

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)