Skip to content

Commit 5157a2a

Browse files
authored
Remove uses of TransportVersion.after (elastic#139558)
Clean up and remove uses of `TransportVersion.after`.
1 parent 966ddbf commit 5157a2a

File tree

6 files changed

+11
-6
lines changed

6 files changed

+11
-6
lines changed

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,11 @@
6767
*/
6868
public record TransportVersion(String name, int id, TransportVersion nextPatchVersion) implements VersionId<TransportVersion> {
6969

70+
@Deprecated(forRemoval = true)
71+
public boolean after(TransportVersion version) {
72+
return version.id < id;
73+
}
74+
7075
@Deprecated(forRemoval = true)
7176
public boolean onOrAfter(TransportVersion version) {
7277
throw new UnsupportedOperationException("use TransportVersion.supports(...) instead");
@@ -345,7 +350,7 @@ public TransportVersion bestKnownVersion() {
345350
}
346351
TransportVersion bestSoFar = VersionsHolder.ZERO;
347352
for (final var knownVersion : VersionsHolder.ALL_VERSIONS_BY_ID.values()) {
348-
if (knownVersion.after(bestSoFar) && knownVersion.before(this)) {
353+
if (knownVersion.id > bestSoFar.id && knownVersion.id < this.id) {
349354
bestSoFar = knownVersion;
350355
}
351356
}

server/src/main/java/org/elasticsearch/common/io/stream/VersionCheckingStreamOutput.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public void writeOptionalNamedWriteable(@Nullable NamedWriteable namedWriteable)
6363
}
6464

6565
private void checkVersionCompatibility(VersionedNamedWriteable namedWriteable) {
66-
if (namedWriteable.getMinimalSupportedVersion().after(getTransportVersion())) {
66+
if (getTransportVersion().supports(namedWriteable.getMinimalSupportedVersion()) == false) {
6767
throw new IllegalArgumentException(
6868
"["
6969
+ namedWriteable.getWriteableName()

test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2556,7 +2556,7 @@ protected static TransportVersion minimumTransportVersion() throws IOException {
25562556
objectPath.evaluate("nodes." + id + ".transport_version"),
25572557
() -> TransportVersion.minimumCompatible()
25582558
);
2559-
if (minTransportVersion == null || minTransportVersion.after(transportVersion)) {
2559+
if (minTransportVersion == null || transportVersion.supports(minTransportVersion) == false) {
25602560
minTransportVersion = transportVersion;
25612561
}
25622562
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ private static String maybeRewriteSingleAuthenticationHeaderForVersion(
158158
) {
159159
try {
160160
final Authentication authentication = authenticationReader.apply(authenticationHeaderKey);
161-
if (authentication != null && authentication.getEffectiveSubject().getTransportVersion().after(minNodeVersion)) {
161+
if (authentication != null && minNodeVersion.supports(authentication.getEffectiveSubject().getTransportVersion()) == false) {
162162
return authentication.maybeRewriteForOlderVersion(minNodeVersion).encode();
163163
}
164164
} catch (IOException e) {

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/Authentication.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1589,7 +1589,7 @@ static Map<String, Object> maybeRewriteMetadataForCrossClusterAccessAuthenticati
15891589
: "metadata must contain authentication object for cross cluster access authentication";
15901590
final Authentication authenticationFromMetadata = (Authentication) metadata.get(CROSS_CLUSTER_ACCESS_AUTHENTICATION_KEY);
15911591
final TransportVersion effectiveSubjectVersion = authenticationFromMetadata.getEffectiveSubject().getTransportVersion();
1592-
if (effectiveSubjectVersion.after(olderVersion)) {
1592+
if (olderVersion.supports(effectiveSubjectVersion) == false) {
15931593
logger.trace(
15941594
() -> "Cross cluster access authentication has authentication field in metadata ["
15951595
+ authenticationFromMetadata

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/action/TransportPutInferenceModelAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ protected void masterOperation(
170170
}
171171

172172
// Check if all the nodes in this cluster know about the service
173-
if (service.get().getMinimalSupportedVersion().after(state.getMinTransportVersion())) {
173+
if (state.getMinTransportVersion().supports(service.get().getMinimalSupportedVersion()) == false) {
174174
logger.warn(
175175
format(
176176
"Service [%s] requires version [%s] but minimum cluster version is [%s]",

0 commit comments

Comments
 (0)