Skip to content

Commit bef85c6

Browse files
thecoopthecoop
authored
Migrate VersionedWriteable & NamedDiff to TransportVersion (#93076)
InferenceConfig is kept on Version, as that existed before VersionedNamedWriteable came along
1 parent 7721377 commit bef85c6

File tree

296 files changed

+920
-858
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

296 files changed

+920
-858
lines changed

‎client/rest-high-level/src/main/java/org/elasticsearch/client/analytics/StringStatsAggregationBuilder.java‎

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

99
package org.elasticsearch.client.analytics;
1010

11-
import org.elasticsearch.Version;
11+
import org.elasticsearch.TransportVersion;
1212
import org.elasticsearch.common.io.stream.StreamOutput;
1313
import org.elasticsearch.common.io.stream.Writeable;
1414
import org.elasticsearch.index.query.QueryRewriteContext;
@@ -124,7 +124,7 @@ public boolean equals(Object obj) {
124124
}
125125

126126
@Override
127-
public Version getMinimalSupportedVersion() {
128-
return Version.V_EMPTY;
127+
public TransportVersion getMinimalSupportedVersion() {
128+
return TransportVersion.ZERO;
129129
}
130130
}

‎client/rest-high-level/src/main/java/org/elasticsearch/client/analytics/TopMetricsAggregationBuilder.java‎

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

99
package org.elasticsearch.client.analytics;
1010

11-
import org.elasticsearch.Version;
11+
import org.elasticsearch.TransportVersion;
1212
import org.elasticsearch.common.io.stream.StreamOutput;
1313
import org.elasticsearch.common.io.stream.Writeable;
1414
import org.elasticsearch.index.query.QueryRewriteContext;
@@ -101,7 +101,7 @@ protected AggregationBuilder shallowCopy(Builder factoriesBuilder, Map<String, O
101101
}
102102

103103
@Override
104-
public Version getMinimalSupportedVersion() {
105-
return Version.V_7_7_0;
104+
public TransportVersion getMinimalSupportedVersion() {
105+
return TransportVersion.V_7_7_0;
106106
}
107107
}

‎modules/aggregations/src/main/java/org/elasticsearch/aggregations/bucket/adjacency/AdjacencyMatrixAggregationBuilder.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
package org.elasticsearch.aggregations.bucket.adjacency;
1010

1111
import org.apache.lucene.search.IndexSearcher;
12-
import org.elasticsearch.Version;
12+
import org.elasticsearch.TransportVersion;
1313
import org.elasticsearch.aggregations.bucket.adjacency.AdjacencyMatrixAggregator.KeyedFilter;
1414
import org.elasticsearch.common.io.stream.StreamInput;
1515
import org.elasticsearch.common.io.stream.StreamOutput;
@@ -261,7 +261,7 @@ public String getType() {
261261
}
262262

263263
@Override
264-
public Version getMinimalSupportedVersion() {
265-
return Version.V_EMPTY;
264+
public TransportVersion getMinimalSupportedVersion() {
265+
return TransportVersion.ZERO;
266266
}
267267
}

‎modules/aggregations/src/main/java/org/elasticsearch/aggregations/bucket/histogram/AutoDateHistogramAggregationBuilder.java‎

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

99
package org.elasticsearch.aggregations.bucket.histogram;
1010

11+
import org.elasticsearch.TransportVersion;
1112
import org.elasticsearch.Version;
1213
import org.elasticsearch.common.Rounding;
1314
import org.elasticsearch.common.io.stream.StreamInput;
@@ -267,8 +268,8 @@ public boolean equals(Object obj) {
267268
}
268269

269270
@Override
270-
public Version getMinimalSupportedVersion() {
271-
return Version.V_EMPTY;
271+
public TransportVersion getMinimalSupportedVersion() {
272+
return TransportVersion.ZERO;
272273
}
273274

274275
public static class RoundingInfo implements Writeable {

‎modules/aggregations/src/main/java/org/elasticsearch/aggregations/bucket/timeseries/TimeSeriesAggregationBuilder.java‎

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

99
package org.elasticsearch.aggregations.bucket.timeseries;
1010

11-
import org.elasticsearch.Version;
11+
import org.elasticsearch.TransportVersion;
1212
import org.elasticsearch.common.io.stream.StreamInput;
1313
import org.elasticsearch.common.io.stream.StreamOutput;
1414
import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
@@ -133,7 +133,7 @@ public int hashCode() {
133133
}
134134

135135
@Override
136-
public Version getMinimalSupportedVersion() {
137-
return Version.V_8_1_0;
136+
public TransportVersion getMinimalSupportedVersion() {
137+
return TransportVersion.V_8_1_0;
138138
}
139139
}

‎modules/aggregations/src/main/java/org/elasticsearch/aggregations/metric/MatrixStatsAggregationBuilder.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
*/
88
package org.elasticsearch.aggregations.metric;
99

10+
import org.elasticsearch.TransportVersion;
1011
import org.elasticsearch.Version;
1112
import org.elasticsearch.common.io.stream.StreamInput;
1213
import org.elasticsearch.common.io.stream.StreamOutput;
@@ -98,7 +99,7 @@ public String getType() {
9899
}
99100

100101
@Override
101-
public Version getMinimalSupportedVersion() {
102-
return Version.V_EMPTY;
102+
public TransportVersion getMinimalSupportedVersion() {
103+
return TransportVersion.ZERO;
103104
}
104105
}

‎modules/aggregations/src/main/java/org/elasticsearch/aggregations/pipeline/BucketSelectorPipelineAggregationBuilder.java‎

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

99
package org.elasticsearch.aggregations.pipeline;
1010

11-
import org.elasticsearch.Version;
11+
import org.elasticsearch.TransportVersion;
1212
import org.elasticsearch.common.ParsingException;
1313
import org.elasticsearch.common.io.stream.StreamInput;
1414
import org.elasticsearch.common.io.stream.StreamOutput;
@@ -214,7 +214,7 @@ public String getWriteableName() {
214214
}
215215

216216
@Override
217-
public Version getMinimalSupportedVersion() {
218-
return Version.V_EMPTY;
217+
public TransportVersion getMinimalSupportedVersion() {
218+
return TransportVersion.ZERO;
219219
}
220220
}

‎modules/aggregations/src/main/java/org/elasticsearch/aggregations/pipeline/BucketSortPipelineAggregationBuilder.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88
package org.elasticsearch.aggregations.pipeline;
99

10-
import org.elasticsearch.Version;
10+
import org.elasticsearch.TransportVersion;
1111
import org.elasticsearch.common.io.stream.StreamInput;
1212
import org.elasticsearch.common.io.stream.StreamOutput;
1313
import org.elasticsearch.search.aggregations.pipeline.AbstractPipelineAggregationBuilder;
@@ -193,7 +193,7 @@ public String getWriteableName() {
193193
}
194194

195195
@Override
196-
public Version getMinimalSupportedVersion() {
197-
return Version.V_EMPTY;
196+
public TransportVersion getMinimalSupportedVersion() {
197+
return TransportVersion.ZERO;
198198
}
199199
}

‎modules/aggregations/src/main/java/org/elasticsearch/aggregations/pipeline/DerivativePipelineAggregationBuilder.java‎

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

99
package org.elasticsearch.aggregations.pipeline;
1010

11-
import org.elasticsearch.Version;
11+
import org.elasticsearch.TransportVersion;
1212
import org.elasticsearch.common.ParsingException;
1313
import org.elasticsearch.common.Rounding;
1414
import org.elasticsearch.common.io.stream.StreamInput;
@@ -256,7 +256,7 @@ public String getWriteableName() {
256256
}
257257

258258
@Override
259-
public Version getMinimalSupportedVersion() {
260-
return Version.V_7_4_0;
259+
public TransportVersion getMinimalSupportedVersion() {
260+
return TransportVersion.V_7_4_0;
261261
}
262262
}

‎modules/aggregations/src/main/java/org/elasticsearch/aggregations/pipeline/MovFnPipelineAggregationBuilder.java‎

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

99
package org.elasticsearch.aggregations.pipeline;
1010

11-
import org.elasticsearch.Version;
11+
import org.elasticsearch.TransportVersion;
1212
import org.elasticsearch.common.Strings;
1313
import org.elasticsearch.common.io.stream.StreamInput;
1414
import org.elasticsearch.common.io.stream.StreamOutput;
@@ -239,7 +239,7 @@ public String getWriteableName() {
239239
}
240240

241241
@Override
242-
public Version getMinimalSupportedVersion() {
243-
return Version.V_EMPTY;
242+
public TransportVersion getMinimalSupportedVersion() {
243+
return TransportVersion.ZERO;
244244
}
245245
}

0 commit comments

Comments
 (0)