Skip to content

Commit 368d471

Browse files
authored
Remove various references to 7.0 and 7.1 transport versions (#118075)
1 parent 1e5d9b9 commit 368d471

File tree

21 files changed

+23
-58
lines changed

21 files changed

+23
-58
lines changed

modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/MultiSearchTemplateResponse.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
import org.elasticsearch.ElasticsearchException;
1313
import org.elasticsearch.ExceptionsHelper;
14-
import org.elasticsearch.TransportVersions;
1514
import org.elasticsearch.action.ActionResponse;
1615
import org.elasticsearch.common.Strings;
1716
import org.elasticsearch.common.collect.Iterators;
@@ -131,9 +130,7 @@ public TimeValue getTook() {
131130
@Override
132131
public void writeTo(StreamOutput out) throws IOException {
133132
out.writeArray(items);
134-
if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_0_0)) {
135-
out.writeVLong(tookInMillis);
136-
}
133+
out.writeVLong(tookInMillis);
137134
}
138135

139136
@Override

server/src/main/java/org/elasticsearch/ElasticsearchException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1781,7 +1781,7 @@ private enum ElasticsearchExceptionHandle {
17811781
org.elasticsearch.cluster.coordination.CoordinationStateRejectedException.class,
17821782
org.elasticsearch.cluster.coordination.CoordinationStateRejectedException::new,
17831783
150,
1784-
TransportVersions.V_7_0_0
1784+
UNKNOWN_VERSION_ADDED
17851785
),
17861786
SNAPSHOT_IN_PROGRESS_EXCEPTION(
17871787
org.elasticsearch.snapshots.SnapshotInProgressException.class,

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ static TransportVersion def(int id) {
5252
@UpdateForV9(owner = UpdateForV9.Owner.CORE_INFRA) // remove the transport versions with which v9 will not need to interact
5353
public static final TransportVersion ZERO = def(0);
5454
public static final TransportVersion V_7_0_0 = def(7_00_00_99);
55-
public static final TransportVersion V_7_0_1 = def(7_00_01_99);
5655
public static final TransportVersion V_7_2_0 = def(7_02_00_99);
5756
public static final TransportVersion V_7_2_1 = def(7_02_01_99);
5857
public static final TransportVersion V_7_3_0 = def(7_03_00_99);

server/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoTileGridAggregationBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,6 @@ public String getType() {
109109

110110
@Override
111111
public TransportVersion getMinimalSupportedVersion() {
112-
return TransportVersions.V_7_0_0;
112+
return TransportVersions.ZERO;
113113
}
114114
}

server/src/test/java/org/elasticsearch/ExceptionSerializationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ public void testSearchContextMissingException() throws IOException {
359359
public void testCircuitBreakingException() throws IOException {
360360
CircuitBreakingException ex = serialize(
361361
new CircuitBreakingException("Too large", 0, 100, CircuitBreaker.Durability.TRANSIENT),
362-
TransportVersions.V_7_0_0
362+
TransportVersions.V_8_0_0
363363
);
364364
assertEquals("Too large", ex.getMessage());
365365
assertEquals(100, ex.getByteLimit());

server/src/test/java/org/elasticsearch/cluster/metadata/MetadataCreateIndexServiceTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1299,7 +1299,7 @@ public void testBuildIndexMetadataWithTransportVersionBeforeEventIngestedRangeAd
12991299
4,
13001300
sourceIndexMetadata,
13011301
false,
1302-
randomFrom(TransportVersions.V_7_0_0, TransportVersions.V_8_0_0)
1302+
TransportVersions.V_8_0_0
13031303
);
13041304

13051305
assertThat(indexMetadata.getAliases().size(), is(1));

server/src/test/java/org/elasticsearch/cluster/serialization/ClusterSerializationTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ public void testClusterStateSerialization() throws Exception {
8888

8989
public void testClusterStateSerializationWithTimestampRangesWithOlderTransportVersion() throws Exception {
9090
TransportVersion versionBeforeEventIngestedInClusterState = randomFrom(
91-
TransportVersions.V_7_0_0,
9291
TransportVersions.V_8_0_0,
9392
TransportVersionUtils.getPreviousVersion(TransportVersions.V_8_15_0)
9493
);

server/src/test/java/org/elasticsearch/common/settings/SettingsTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -619,7 +619,7 @@ public void testMissingValue() throws Exception {
619619

620620
public void testReadWriteArray() throws IOException {
621621
BytesStreamOutput output = new BytesStreamOutput();
622-
output.setTransportVersion(randomFrom(TransportVersion.current(), TransportVersions.V_7_0_0));
622+
output.setTransportVersion(randomFrom(TransportVersion.current(), TransportVersions.V_8_0_0));
623623
Settings settings = Settings.builder().putList("foo.bar", "0", "1", "2", "3").put("foo.bar.baz", "baz").build();
624624
settings.writeTo(output);
625625
StreamInput in = StreamInput.wrap(BytesReference.toBytes(output.bytes()));

x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/CCRInfoTransportAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public Usage(StreamInput in) throws IOException {
9090

9191
@Override
9292
public TransportVersion getMinimalSupportedVersion() {
93-
return TransportVersions.V_7_0_0;
93+
return TransportVersions.ZERO;
9494
}
9595

9696
public int getNumberOfFollowerIndices() {

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/graph/GraphFeatureSetUsage.java

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

2727
@Override
2828
public TransportVersion getMinimalSupportedVersion() {
29-
return TransportVersions.V_7_0_0;
29+
return TransportVersions.ZERO;
3030
}
3131

3232
}

0 commit comments

Comments
 (0)