Skip to content

Commit 106d7ea

Browse files
thecoopthecoop
authored
Remove 7.11 and 7.12 transport versions (#124024)
1 parent 22a7b5e commit 106d7ea

File tree

25 files changed

+39
-258
lines changed

25 files changed

+39
-258
lines changed

‎server/src/main/java/org/elasticsearch/TransportVersions.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@ static TransportVersion def(int id) {
6161
public static final TransportVersion V_7_8_1 = def(7_08_01_99);
6262
public static final TransportVersion V_7_9_0 = def(7_09_00_99);
6363
public static final TransportVersion V_7_10_0 = def(7_10_00_99);
64-
public static final TransportVersion V_7_11_0 = def(7_11_00_99);
65-
public static final TransportVersion V_7_12_0 = def(7_12_00_99);
6664
public static final TransportVersion V_7_13_0 = def(7_13_00_99);
6765
public static final TransportVersion V_7_14_0 = def(7_14_00_99);
6866
public static final TransportVersion V_7_15_0 = def(7_15_00_99);

‎server/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,7 @@ public CreateIndexRequest(StreamInput in) throws IOException {
105105
aliases.add(new Alias(in));
106106
}
107107
waitForActiveShards = ActiveShardCount.readFrom(in);
108-
if (in.getTransportVersion().onOrAfter(TransportVersions.V_7_12_0)) {
109-
origin = in.readString();
110-
}
108+
origin = in.readString();
111109
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) {
112110
requireDataStream = in.readBoolean();
113111
} else {
@@ -518,9 +516,7 @@ public void writeTo(StreamOutput out) throws IOException {
518516
}
519517
out.writeCollection(aliases);
520518
waitForActiveShards.writeTo(out);
521-
if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_12_0)) {
522-
out.writeString(origin);
523-
}
519+
out.writeString(origin);
524520
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) {
525521
out.writeBoolean(this.requireDataStream);
526522
}

‎server/src/main/java/org/elasticsearch/cluster/metadata/RepositoryMetadata.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -143,11 +143,7 @@ public long pendingGeneration() {
143143

144144
public RepositoryMetadata(StreamInput in) throws IOException {
145145
name = in.readString();
146-
if (in.getTransportVersion().onOrAfter(SnapshotsService.UUIDS_IN_REPO_DATA_TRANSPORT_VERSION)) {
147-
uuid = in.readString();
148-
} else {
149-
uuid = RepositoryData.MISSING_UUID;
150-
}
146+
uuid = in.readString();
151147
type = in.readString();
152148
settings = Settings.readSettingsFromStream(in);
153149
generation = in.readLong();
@@ -162,9 +158,7 @@ public RepositoryMetadata(StreamInput in) throws IOException {
162158
@Override
163159
public void writeTo(StreamOutput out) throws IOException {
164160
out.writeString(name);
165-
if (out.getTransportVersion().onOrAfter(SnapshotsService.UUIDS_IN_REPO_DATA_TRANSPORT_VERSION)) {
166-
out.writeString(uuid);
167-
}
161+
out.writeString(uuid);
168162
out.writeString(type);
169163
settings.writeTo(out);
170164
out.writeLong(generation);

‎server/src/main/java/org/elasticsearch/plugins/PluginDescriptor.java

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ public class PluginDescriptor implements Writeable, ToXContentObject {
4848

4949
public static final String ES_PLUGIN_POLICY = "plugin-security.policy";
5050

51-
private static final TransportVersion LICENSED_PLUGINS_SUPPORT = TransportVersions.V_7_11_0;
5251
private static final TransportVersion MODULE_NAME_SUPPORT = TransportVersions.V_8_3_0;
5352
private static final TransportVersion BOOTSTRAP_SUPPORT_REMOVED = TransportVersions.V_8_4_0;
5453

@@ -140,15 +139,11 @@ public PluginDescriptor(final StreamInput in) throws IOException {
140139
extendedPlugins = in.readStringCollectionAsList();
141140
hasNativeController = in.readBoolean();
142141

143-
if (in.getTransportVersion().onOrAfter(LICENSED_PLUGINS_SUPPORT)) {
144-
if (in.getTransportVersion().before(BOOTSTRAP_SUPPORT_REMOVED)) {
145-
in.readString(); // plugin type
146-
in.readOptionalString(); // java opts
147-
}
148-
isLicensed = in.readBoolean();
149-
} else {
150-
isLicensed = false;
142+
if (in.getTransportVersion().before(BOOTSTRAP_SUPPORT_REMOVED)) {
143+
in.readString(); // plugin type
144+
in.readOptionalString(); // java opts
151145
}
146+
isLicensed = in.readBoolean();
152147

153148
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_4_0)) {
154149
isModular = in.readBoolean();
@@ -183,13 +178,11 @@ public void writeTo(final StreamOutput out) throws IOException {
183178
out.writeStringCollection(extendedPlugins);
184179
out.writeBoolean(hasNativeController);
185180

186-
if (out.getTransportVersion().onOrAfter(LICENSED_PLUGINS_SUPPORT)) {
187-
if (out.getTransportVersion().before(BOOTSTRAP_SUPPORT_REMOVED)) {
188-
out.writeString("ISOLATED");
189-
out.writeOptionalString(null);
190-
}
191-
out.writeBoolean(isLicensed);
181+
if (out.getTransportVersion().before(BOOTSTRAP_SUPPORT_REMOVED)) {
182+
out.writeString("ISOLATED");
183+
out.writeOptionalString(null);
192184
}
185+
out.writeBoolean(isLicensed);
193186
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_4_0)) {
194187
out.writeBoolean(isModular);
195188
out.writeBoolean(isStable);

‎server/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import org.apache.logging.log4j.LogManager;
1414
import org.apache.logging.log4j.Logger;
1515
import org.elasticsearch.ExceptionsHelper;
16-
import org.elasticsearch.TransportVersion;
1716
import org.elasticsearch.TransportVersions;
1817
import org.elasticsearch.action.ActionListener;
1918
import org.elasticsearch.action.ActionResponse;
@@ -146,7 +145,6 @@ public final class SnapshotsService extends AbstractLifecycleComponent implement
146145
public static final IndexVersion INDEX_GEN_IN_REPO_DATA_VERSION = IndexVersions.V_7_9_0;
147146

148147
public static final IndexVersion UUIDS_IN_REPO_DATA_VERSION = IndexVersions.V_7_12_0;
149-
public static final TransportVersion UUIDS_IN_REPO_DATA_TRANSPORT_VERSION = TransportVersions.V_7_12_0;
150148

151149
public static final IndexVersion FILE_INFO_WRITER_UUIDS_IN_SHARD_DATA_VERSION = IndexVersions.V_7_16_0;
152150

‎server/src/test/java/org/elasticsearch/action/search/SearchRequestTests.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,10 +172,6 @@ private static RescoreVectorBuilder randomRescoreVectorBuilder() {
172172
public void testRandomVersionSerialization() throws IOException {
173173
SearchRequest searchRequest = createSearchRequest();
174174
TransportVersion version = TransportVersionUtils.randomVersion(random());
175-
if (version.before(TransportVersions.V_7_11_0) && searchRequest.source() != null) {
176-
// Versions before 7.11.0 don't support runtime mappings
177-
searchRequest.source().runtimeMappings(emptyMap());
178-
}
179175
if (version.before(TransportVersions.V_8_4_0)) {
180176
// Versions before 8.4.0 don't support force_synthetic_source
181177
searchRequest.setForceSyntheticSource(false);

‎server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeTests.java

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
package org.elasticsearch.cluster.node;
1111

1212
import org.elasticsearch.TransportVersion;
13-
import org.elasticsearch.TransportVersions;
1413
import org.elasticsearch.Version;
1514
import org.elasticsearch.common.Strings;
1615
import org.elasticsearch.common.io.stream.BytesStreamOutput;
@@ -113,24 +112,6 @@ public void testDiscoveryNodeRoleWithOldVersion() throws Exception {
113112
assertThat(role.roleNameAbbreviation(), equalTo("z"));
114113
assertTrue(role.canContainData());
115114
}
116-
117-
{
118-
BytesStreamOutput streamOutput = new BytesStreamOutput();
119-
streamOutput.setTransportVersion(TransportVersions.V_7_11_0);
120-
node.writeTo(streamOutput);
121-
122-
StreamInput in = StreamInput.wrap(streamOutput.bytes().toBytesRef().bytes);
123-
in.setTransportVersion(TransportVersions.V_7_11_0);
124-
DiscoveryNode serialized = new DiscoveryNode(in);
125-
final Set<DiscoveryNodeRole> roles = serialized.getRoles();
126-
assertThat(roles, hasSize(1));
127-
@SuppressWarnings("OptionalGetWithoutIsPresent")
128-
final DiscoveryNodeRole role = roles.stream().findFirst().get();
129-
assertThat(role.roleName(), equalTo("data_custom_role"));
130-
assertThat(role.roleNameAbbreviation(), equalTo("z"));
131-
assertTrue(role.canContainData());
132-
}
133-
134115
}
135116

136117
public void testDiscoveryNodeIsRemoteClusterClientDefault() {

‎x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/multiterms/MultiTermsAggregationBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,6 @@ public boolean equals(Object obj) {
394394

395395
@Override
396396
public TransportVersion getMinimalSupportedVersion() {
397-
return TransportVersions.V_7_12_0;
397+
return TransportVersions.ZERO;
398398
}
399399
}

‎x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/rate/RateAggregationBuilder.java

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,8 @@ public RateAggregationBuilder(StreamInput in) throws IOException {
8888
} else {
8989
rateUnit = null;
9090
}
91-
if (in.getTransportVersion().onOrAfter(TransportVersions.V_7_11_0)) {
92-
if (in.readBoolean()) {
93-
rateMode = in.readEnum(RateMode.class);
94-
}
91+
if (in.readBoolean()) {
92+
rateMode = in.readEnum(RateMode.class);
9593
}
9694
}
9795

@@ -107,13 +105,11 @@ protected void innerWriteTo(StreamOutput out) throws IOException {
107105
} else {
108106
out.writeByte((byte) 0);
109107
}
110-
if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_11_0)) {
111-
if (rateMode != null) {
112-
out.writeBoolean(true);
113-
out.writeEnum(rateMode);
114-
} else {
115-
out.writeBoolean(false);
116-
}
108+
if (rateMode != null) {
109+
out.writeBoolean(true);
110+
out.writeEnum(rateMode);
111+
} else {
112+
out.writeBoolean(false);
117113
}
118114
}
119115

‎x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/aggregatemetric/AggregateMetricFeatureSetUsage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public AggregateMetricFeatureSetUsage(boolean available, boolean enabled) {
2828

2929
@Override
3030
public TransportVersion getMinimalSupportedVersion() {
31-
return TransportVersions.V_7_11_0;
31+
return TransportVersions.ZERO;
3232
}
3333

3434
@Override

‎x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/datafeed/DatafeedConfig.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import org.apache.logging.log4j.Logger;
1111
import org.elasticsearch.ElasticsearchException;
1212
import org.elasticsearch.TransportVersion;
13-
import org.elasticsearch.TransportVersions;
1413
import org.elasticsearch.action.search.SearchRequest;
1514
import org.elasticsearch.action.support.IndicesOptions;
1615
import org.elasticsearch.cluster.SimpleDiffable;
@@ -86,8 +85,6 @@
8685
*/
8786
public class DatafeedConfig implements SimpleDiffable<DatafeedConfig>, ToXContentObject {
8887

89-
private static final TransportVersion RUNTIME_MAPPINGS_INTRODUCED = TransportVersions.V_7_11_0;
90-
9188
public static final int DEFAULT_SCROLL_SIZE = 1000;
9289

9390
private static final int SECONDS_IN_MINUTE = 60;
@@ -341,9 +338,7 @@ public Integer getScrollSize() {
341338
}
342339

343340
public Optional<Tuple<TransportVersion, String>> minRequiredTransportVersion() {
344-
return runtimeMappings.isEmpty()
345-
? Optional.empty()
346-
: Optional.of(Tuple.tuple(RUNTIME_MAPPINGS_INTRODUCED, SearchSourceBuilder.RUNTIME_MAPPINGS_FIELD.getPreferredName()));
341+
return Optional.empty();
347342
}
348343

349344
/**

‎x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/snapshot/upgrade/SnapshotUpgradeTaskParams.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public String getWriteableName() {
6969

7070
@Override
7171
public TransportVersion getMinimalSupportedVersion() {
72-
return TransportVersions.V_7_11_0;
72+
return TransportVersions.ZERO;
7373
}
7474

7575
@Override

‎x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/SecurityFeatureSetUsage.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,7 @@ public SecurityFeatureSetUsage(StreamInput in) throws IOException {
6464
anonymousUsage = in.readGenericMap();
6565
roleMappingStoreUsage = in.readGenericMap();
6666
fips140Usage = in.readGenericMap();
67-
if (in.getTransportVersion().onOrAfter(TransportVersions.V_7_11_0)) {
68-
operatorPrivilegesUsage = in.readGenericMap();
69-
}
67+
operatorPrivilegesUsage = in.readGenericMap();
7068
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_2_0)) {
7169
domainsUsage = in.readGenericMap();
7270
}
@@ -132,9 +130,7 @@ public void writeTo(StreamOutput out) throws IOException {
132130
out.writeGenericMap(anonymousUsage);
133131
out.writeGenericMap(roleMappingStoreUsage);
134132
out.writeGenericMap(fips140Usage);
135-
if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_11_0)) {
136-
out.writeGenericMap(operatorPrivilegesUsage);
137-
}
133+
out.writeGenericMap(operatorPrivilegesUsage);
138134
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_2_0)) {
139135
out.writeGenericMap(domainsUsage);
140136
}

‎x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/DelegatePkiAuthenticationResponse.java

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

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

10-
import org.elasticsearch.TransportVersions;
1110
import org.elasticsearch.action.ActionResponse;
1211
import org.elasticsearch.common.io.stream.StreamInput;
1312
import org.elasticsearch.common.io.stream.StreamOutput;
@@ -45,9 +44,7 @@ public DelegatePkiAuthenticationResponse(StreamInput input) throws IOException {
4544
super(input);
4645
accessToken = input.readString();
4746
expiresIn = input.readTimeValue();
48-
if (input.getTransportVersion().onOrAfter(TransportVersions.V_7_11_0)) {
49-
authentication = new Authentication(input);
50-
}
47+
authentication = new Authentication(input);
5148
}
5249

5350
public String getAccessToken() {
@@ -66,9 +63,7 @@ public Authentication getAuthentication() {
6663
public void writeTo(StreamOutput out) throws IOException {
6764
out.writeString(accessToken);
6865
out.writeTimeValue(expiresIn);
69-
if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_11_0)) {
70-
authentication.writeTo(out);
71-
}
66+
authentication.writeTo(out);
7267
}
7368

7469
@Override

‎x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/oidc/OpenIdConnectAuthenticateResponse.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
*/
77
package org.elasticsearch.xpack.core.security.action.oidc;
88

9-
import org.elasticsearch.TransportVersions;
109
import org.elasticsearch.action.ActionResponse;
1110
import org.elasticsearch.common.io.stream.StreamOutput;
1211
import org.elasticsearch.core.TimeValue;
@@ -61,8 +60,6 @@ public void writeTo(StreamOutput out) throws IOException {
6160
out.writeString(accessTokenString);
6261
out.writeString(refreshTokenString);
6362
out.writeTimeValue(expiresIn);
64-
if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_11_0)) {
65-
authentication.writeTo(out);
66-
}
63+
authentication.writeTo(out);
6764
}
6865
}

‎x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/oidc/OpenIdConnectPrepareAuthenticationResponse.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
*/
77
package org.elasticsearch.xpack.core.security.action.oidc;
88

9-
import org.elasticsearch.TransportVersions;
109
import org.elasticsearch.action.ActionResponse;
1110
import org.elasticsearch.common.io.stream.StreamOutput;
1211
import org.elasticsearch.xcontent.ToXContentObject;
@@ -62,9 +61,7 @@ public void writeTo(StreamOutput out) throws IOException {
6261
out.writeString(authenticationRequestUrl);
6362
out.writeString(state);
6463
out.writeString(nonce);
65-
if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_11_0)) {
66-
out.writeString(realmName);
67-
}
64+
out.writeString(realmName);
6865
}
6966

7067
public String toString() {

‎x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/saml/SamlAuthenticateResponse.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,6 @@ public void writeTo(StreamOutput out) throws IOException {
6969
out.writeString(tokenString);
7070
out.writeString(refreshToken);
7171
out.writeTimeValue(expiresIn);
72-
if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_11_0)) {
73-
authentication.writeTo(out);
74-
}
72+
authentication.writeTo(out);
7573
}
76-
7774
}

‎x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/token/CreateTokenResponse.java

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

9-
import org.elasticsearch.TransportVersions;
109
import org.elasticsearch.action.ActionResponse;
1110
import org.elasticsearch.common.io.stream.StreamInput;
1211
import org.elasticsearch.common.io.stream.StreamOutput;
@@ -39,9 +38,7 @@ public CreateTokenResponse(StreamInput in) throws IOException {
3938
scope = in.readOptionalString();
4039
refreshToken = in.readOptionalString();
4140
kerberosAuthenticationResponseToken = in.readOptionalString();
42-
if (in.getTransportVersion().onOrAfter(TransportVersions.V_7_11_0)) {
43-
authentication = new Authentication(in);
44-
}
41+
authentication = new Authentication(in);
4542
}
4643

4744
public CreateTokenResponse(
@@ -91,9 +88,7 @@ public void writeTo(StreamOutput out) throws IOException {
9188
out.writeOptionalString(scope);
9289
out.writeOptionalString(refreshToken);
9390
out.writeOptionalString(kerberosAuthenticationResponseToken);
94-
if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_11_0)) {
95-
authentication.writeTo(out);
96-
}
91+
authentication.writeTo(out);
9792
}
9893

9994
@Override

0 commit comments

Comments
 (0)