diff --git a/server/src/main/java/org/elasticsearch/action/DocWriteResponse.java b/server/src/main/java/org/elasticsearch/action/DocWriteResponse.java index f2715710ed51d..2226d3be323d6 100644 --- a/server/src/main/java/org/elasticsearch/action/DocWriteResponse.java +++ b/server/src/main/java/org/elasticsearch/action/DocWriteResponse.java @@ -7,7 +7,7 @@ */ package org.elasticsearch.action; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.action.support.WriteRequest; import org.elasticsearch.action.support.WriteRequest.RefreshPolicy; import org.elasticsearch.action.support.WriteResponse; @@ -118,7 +118,7 @@ public DocWriteResponse(ShardId shardId, String id, long seqNo, long primaryTerm protected DocWriteResponse(ShardId shardId, StreamInput in) throws IOException { super(in); this.shardId = shardId; - if (in.getVersion().before(Version.V_8_0_0)) { + if (in.getTransportVersion().before(TransportVersion.V_8_0_0)) { String type = in.readString(); assert MapperService.SINGLE_MAPPING_NAME.equals(type) : "Expected [_doc] but received [" + type + "]"; } @@ -137,7 +137,7 @@ protected DocWriteResponse(ShardId shardId, StreamInput in) throws IOException { protected DocWriteResponse(StreamInput in) throws IOException { super(in); shardId = new ShardId(in); - if (in.getVersion().before(Version.V_8_0_0)) { + if (in.getTransportVersion().before(TransportVersion.V_8_0_0)) { String type = in.readString(); assert MapperService.SINGLE_MAPPING_NAME.equals(type) : "Expected [_doc] but received [" + type + "]"; } @@ -266,7 +266,7 @@ public void writeTo(StreamOutput out) throws IOException { } private void writeWithoutShardId(StreamOutput out) throws IOException { - if (out.getVersion().before(Version.V_8_0_0)) { + if (out.getTransportVersion().before(TransportVersion.V_8_0_0)) { out.writeString(MapperService.SINGLE_MAPPING_NAME); } out.writeString(id); diff --git a/server/src/main/java/org/elasticsearch/action/RoutingMissingException.java b/server/src/main/java/org/elasticsearch/action/RoutingMissingException.java index ab8a3f199230c..000ba521b7631 100644 --- a/server/src/main/java/org/elasticsearch/action/RoutingMissingException.java +++ b/server/src/main/java/org/elasticsearch/action/RoutingMissingException.java @@ -9,7 +9,7 @@ package org.elasticsearch.action; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.index.mapper.MapperService; @@ -41,7 +41,7 @@ public RestStatus status() { public RoutingMissingException(StreamInput in) throws IOException { super(in); - if (in.getVersion().before(Version.V_8_0_0)) { + if (in.getTransportVersion().before(TransportVersion.V_8_0_0)) { in.readString(); } id = in.readString(); @@ -50,7 +50,7 @@ public RoutingMissingException(StreamInput in) throws IOException { @Override public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); - if (out.getVersion().before(Version.V_8_0_0)) { + if (out.getTransportVersion().before(TransportVersion.V_8_0_0)) { out.writeString(MapperService.SINGLE_MAPPING_NAME); } out.writeString(id); diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplanation.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplanation.java index dfb5c2ef02af2..fd2721241fb96 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplanation.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplanation.java @@ -8,7 +8,7 @@ package org.elasticsearch.action.admin.cluster.allocation; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.cluster.ClusterInfo; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.cluster.routing.ShardRouting; @@ -67,7 +67,7 @@ public ClusterAllocationExplanation( } public ClusterAllocationExplanation(StreamInput in) throws IOException { - if (in.getVersion().onOrAfter(Version.V_7_15_0)) { + if (in.getTransportVersion().onOrAfter(TransportVersion.V_7_15_0)) { this.specificShard = in.readBoolean(); } else { this.specificShard = true; // suppress "this is a random shard" warning in BwC situations @@ -81,7 +81,7 @@ public ClusterAllocationExplanation(StreamInput in) throws IOException { @Override public void writeTo(StreamOutput out) throws IOException { - if (out.getVersion().onOrAfter(Version.V_7_15_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_7_15_0)) { out.writeBoolean(specificShard); } // else suppress "this is a random shard" warning in BwC situations shardRouting.writeTo(out); diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/DesiredBalanceResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/DesiredBalanceResponse.java index cd93840df560f..053ffee1cbb91 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/DesiredBalanceResponse.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/DesiredBalanceResponse.java @@ -7,7 +7,7 @@ */ package org.elasticsearch.action.admin.cluster.allocation; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.cluster.routing.AllocationId; import org.elasticsearch.cluster.routing.ShardRoutingState; @@ -34,7 +34,7 @@ public class DesiredBalanceResponse extends ActionResponse implements ChunkedToXContentObject { - private static final Version CLUSTER_BALANCE_STATS_VERSION = Version.V_8_7_0; + private static final TransportVersion CLUSTER_BALANCE_STATS_VERSION = TransportVersion.V_8_7_0; private final DesiredBalanceStats stats; private final ClusterBalanceStats clusterBalanceStats; @@ -53,7 +53,9 @@ public DesiredBalanceResponse( public static DesiredBalanceResponse from(StreamInput in) throws IOException { return new DesiredBalanceResponse( DesiredBalanceStats.readFrom(in), - in.getVersion().onOrAfter(CLUSTER_BALANCE_STATS_VERSION) ? ClusterBalanceStats.readFrom(in) : ClusterBalanceStats.EMPTY, + in.getTransportVersion().onOrAfter(CLUSTER_BALANCE_STATS_VERSION) + ? ClusterBalanceStats.readFrom(in) + : ClusterBalanceStats.EMPTY, in.readImmutableMap(StreamInput::readString, v -> v.readImmutableMap(StreamInput::readVInt, DesiredShards::from)) ); } @@ -61,7 +63,7 @@ public static DesiredBalanceResponse from(StreamInput in) throws IOException { @Override public void writeTo(StreamOutput out) throws IOException { stats.writeTo(out); - if (out.getVersion().onOrAfter(CLUSTER_BALANCE_STATS_VERSION)) { + if (out.getTransportVersion().onOrAfter(CLUSTER_BALANCE_STATS_VERSION)) { clusterBalanceStats.writeTo(out); } out.writeMap( @@ -176,10 +178,10 @@ public record ShardView( @Nullable Long forecastedShardSizeInBytes ) implements Writeable, ToXContentObject { - private static final Version ADD_FORECASTS_VERSION = Version.V_8_7_0; + private static final TransportVersion ADD_FORECASTS_VERSION = TransportVersion.V_8_7_0; public static ShardView from(StreamInput in) throws IOException { - if (in.getVersion().onOrAfter(ADD_FORECASTS_VERSION)) { + if (in.getTransportVersion().onOrAfter(ADD_FORECASTS_VERSION)) { return new ShardView( ShardRoutingState.fromValue(in.readByte()), in.readBoolean(), @@ -220,7 +222,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeBoolean(relocatingNodeIsDesired); out.writeVInt(shardId); out.writeString(index); - if (out.getVersion().onOrAfter(ADD_FORECASTS_VERSION)) { + if (out.getTransportVersion().onOrAfter(ADD_FORECASTS_VERSION)) { out.writeOptionalDouble(forecastedWriteLoad); out.writeOptionalLong(forecastedShardSizeInBytes); } else { diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/configuration/AddVotingConfigExclusionsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/configuration/AddVotingConfigExclusionsRequest.java index 75d512683e318..01bd97bdc5fb0 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/configuration/AddVotingConfigExclusionsRequest.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/configuration/AddVotingConfigExclusionsRequest.java @@ -7,7 +7,7 @@ */ package org.elasticsearch.action.admin.cluster.configuration; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.support.master.MasterNodeRequest; import org.elasticsearch.cluster.ClusterState; @@ -72,7 +72,7 @@ public AddVotingConfigExclusionsRequest(String[] nodeIds, String[] nodeNames, Ti public AddVotingConfigExclusionsRequest(StreamInput in) throws IOException { super(in); - if (in.getVersion().before(Version.V_8_0_0)) { + if (in.getTransportVersion().before(TransportVersion.V_8_0_0)) { final String[] legacyNodeDescriptions = in.readStringArray(); if (legacyNodeDescriptions.length > 0) { throw new IllegalArgumentException("legacy [node_name] field was deprecated and must be empty"); @@ -185,7 +185,7 @@ public ActionRequestValidationException validate() { @Override public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); - if (out.getVersion().before(Version.V_8_0_0)) { + if (out.getTransportVersion().before(TransportVersion.V_8_0_0)) { out.writeStringArray(Strings.EMPTY_ARRAY); } out.writeStringArray(nodeIds); diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/desirednodes/UpdateDesiredNodesRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/desirednodes/UpdateDesiredNodesRequest.java index b4d7ffbc3d0d9..fa95c4a7df69e 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/desirednodes/UpdateDesiredNodesRequest.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/desirednodes/UpdateDesiredNodesRequest.java @@ -8,6 +8,7 @@ package org.elasticsearch.action.admin.cluster.desirednodes; +import org.elasticsearch.TransportVersion; import org.elasticsearch.Version; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ValidateActions; @@ -24,7 +25,7 @@ import java.util.Objects; public class UpdateDesiredNodesRequest extends AcknowledgedRequest { - private static final Version DRY_RUN_VERSION = Version.V_8_4_0; + private static final TransportVersion DRY_RUN_VERSION = TransportVersion.V_8_4_0; private final String historyID; private final long version; @@ -58,7 +59,7 @@ public UpdateDesiredNodesRequest(StreamInput in) throws IOException { this.historyID = in.readString(); this.version = in.readLong(); this.nodes = in.readList(DesiredNode::readFrom); - if (in.getVersion().onOrAfter(DRY_RUN_VERSION)) { + if (in.getTransportVersion().onOrAfter(DRY_RUN_VERSION)) { this.dryRun = in.readBoolean(); } else { this.dryRun = false; @@ -71,7 +72,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeString(historyID); out.writeLong(version); out.writeList(nodes); - if (out.getVersion().onOrAfter(DRY_RUN_VERSION)) { + if (out.getTransportVersion().onOrAfter(DRY_RUN_VERSION)) { out.writeBoolean(dryRun); } } diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/desirednodes/UpdateDesiredNodesResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/desirednodes/UpdateDesiredNodesResponse.java index 5cf4354099ead..0d99cc9d693ef 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/desirednodes/UpdateDesiredNodesResponse.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/desirednodes/UpdateDesiredNodesResponse.java @@ -8,7 +8,7 @@ package org.elasticsearch.action.admin.cluster.desirednodes; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -19,7 +19,7 @@ import java.util.Objects; public class UpdateDesiredNodesResponse extends ActionResponse implements ToXContentObject { - private static final Version DRY_RUN_SUPPORTING_VERSION = Version.V_8_4_0; + private static final TransportVersion DRY_RUN_SUPPORTING_VERSION = TransportVersion.V_8_4_0; private final boolean replacedExistingHistoryId; private final boolean dryRun; @@ -36,13 +36,13 @@ public UpdateDesiredNodesResponse(boolean replacedExistingHistoryId, boolean dry public UpdateDesiredNodesResponse(StreamInput in) throws IOException { super(in); this.replacedExistingHistoryId = in.readBoolean(); - dryRun = in.getVersion().onOrAfter(DRY_RUN_SUPPORTING_VERSION) ? in.readBoolean() : false; + dryRun = in.getTransportVersion().onOrAfter(DRY_RUN_SUPPORTING_VERSION) ? in.readBoolean() : false; } @Override public void writeTo(StreamOutput out) throws IOException { out.writeBoolean(replacedExistingHistoryId); - if (out.getVersion().onOrAfter(DRY_RUN_SUPPORTING_VERSION)) { + if (out.getTransportVersion().onOrAfter(DRY_RUN_SUPPORTING_VERSION)) { out.writeBoolean(dryRun); } } diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequest.java index 3d4b690c5bba7..e87427c3fdef6 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequest.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequest.java @@ -8,7 +8,7 @@ package org.elasticsearch.action.admin.cluster.node.hotthreads; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.action.support.nodes.BaseNodesRequest; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.common.io.stream.StreamInput; @@ -36,7 +36,7 @@ public NodesHotThreadsRequest(StreamInput in) throws IOException { type = HotThreads.ReportType.of(in.readString()); interval = in.readTimeValue(); snapshots = in.readInt(); - if (in.getVersion().onOrAfter(Version.V_7_16_0)) { + if (in.getTransportVersion().onOrAfter(TransportVersion.V_7_16_0)) { sortOrder = HotThreads.SortOrder.of(in.readString()); } } @@ -118,7 +118,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeString(type.getTypeValue()); out.writeTimeValue(interval); out.writeInt(snapshots); - if (out.getVersion().onOrAfter(Version.V_7_16_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_7_16_0)) { out.writeString(sortOrder.getOrderValue()); } } diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java index ca9be0a651784..03f66b5e6d2f0 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java @@ -9,6 +9,7 @@ package org.elasticsearch.action.admin.cluster.node.info; import org.elasticsearch.Build; +import org.elasticsearch.TransportVersion; import org.elasticsearch.Version; import org.elasticsearch.action.support.nodes.BaseNodeResponse; import org.elasticsearch.cluster.node.DiscoveryNode; @@ -72,7 +73,7 @@ public NodeInfo(StreamInput in) throws IOException { addInfoIfNonNull(HttpInfo.class, in.readOptionalWriteable(HttpInfo::new)); addInfoIfNonNull(PluginsAndModules.class, in.readOptionalWriteable(PluginsAndModules::new)); addInfoIfNonNull(IngestInfo.class, in.readOptionalWriteable(IngestInfo::new)); - if (in.getVersion().onOrAfter(Version.V_7_10_0)) { + if (in.getTransportVersion().onOrAfter(TransportVersion.V_7_10_0)) { addInfoIfNonNull(AggregationInfo.class, in.readOptionalWriteable(AggregationInfo::new)); } } @@ -193,7 +194,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeOptionalWriteable(getInfo(HttpInfo.class)); out.writeOptionalWriteable(getInfo(PluginsAndModules.class)); out.writeOptionalWriteable(getInfo(IngestInfo.class)); - if (out.getVersion().onOrAfter(Version.V_7_10_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_7_10_0)) { out.writeOptionalWriteable(getInfo(AggregationInfo.class)); } } diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/NodesRemovalPrevalidation.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/NodesRemovalPrevalidation.java index 0b34c3d91699e..4f6ea0d5b83d8 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/NodesRemovalPrevalidation.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/NodesRemovalPrevalidation.java @@ -8,7 +8,7 @@ package org.elasticsearch.action.admin.cluster.node.shutdown; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Writeable; @@ -148,14 +148,14 @@ static void configureParser(ConstructingObjectParser parser) { @Override public void writeTo(StreamOutput out) throws IOException { out.writeBoolean(isSafe); - if (out.getVersion().onOrAfter(Version.V_8_7_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_8_7_0)) { reason.writeTo(out); } out.writeString(message); } public static Result readFrom(final StreamInput in) throws IOException { - if (in.getVersion().before(Version.V_8_7_0)) { + if (in.getTransportVersion().before(TransportVersion.V_8_7_0)) { return new Result(in.readBoolean(), null, in.readString()); } return new Result(in.readBoolean(), Reason.readFrom(in), in.readString()); diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/PrevalidateNodeRemovalRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/PrevalidateNodeRemovalRequest.java index 9f65b98799ed3..5073090567936 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/PrevalidateNodeRemovalRequest.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/PrevalidateNodeRemovalRequest.java @@ -8,7 +8,7 @@ package org.elasticsearch.action.admin.cluster.node.shutdown; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.support.master.MasterNodeReadRequest; import org.elasticsearch.common.Strings; @@ -44,7 +44,7 @@ public PrevalidateNodeRemovalRequest(final StreamInput in) throws IOException { names = in.readStringArray(); ids = in.readStringArray(); externalIds = in.readStringArray(); - if (in.getVersion().onOrAfter(Version.V_8_7_0)) { + if (in.getTransportVersion().onOrAfter(TransportVersion.V_8_7_0)) { timeout = in.readTimeValue(); } } @@ -55,7 +55,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeStringArray(names); out.writeStringArray(ids); out.writeStringArray(externalIds); - if (out.getVersion().onOrAfter(Version.V_8_7_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_8_7_0)) { out.writeTimeValue(timeout); } } diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksRequest.java index 3cd7c36fafc3a..5b0194c81283e 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksRequest.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksRequest.java @@ -8,7 +8,7 @@ package org.elasticsearch.action.admin.cluster.node.tasks.list; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.support.tasks.BaseTasksRequest; import org.elasticsearch.common.Strings; @@ -40,7 +40,7 @@ public ListTasksRequest(StreamInput in) throws IOException { super(in); detailed = in.readBoolean(); waitForCompletion = in.readBoolean(); - if (in.getVersion().onOrAfter(Version.V_7_13_0)) { + if (in.getTransportVersion().onOrAfter(TransportVersion.V_7_13_0)) { descriptions = in.readStringArray(); } } @@ -50,7 +50,7 @@ public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); out.writeBoolean(detailed); out.writeBoolean(waitForCompletion); - if (out.getVersion().onOrAfter(Version.V_7_13_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_7_13_0)) { out.writeStringArray(descriptions); } } diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterGetSettingsAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterGetSettingsAction.java index 15af362fe4a46..76d59660da0b4 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterGetSettingsAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterGetSettingsAction.java @@ -8,7 +8,7 @@ package org.elasticsearch.action.admin.cluster.settings; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; @@ -37,12 +37,12 @@ public Request() {} public Request(StreamInput in) throws IOException { super(in); - assert in.getVersion().onOrAfter(Version.V_8_3_0); + assert in.getTransportVersion().onOrAfter(TransportVersion.V_8_3_0); } @Override public void writeTo(StreamOutput out) throws IOException { - assert out.getVersion().onOrAfter(Version.V_8_3_0); + assert out.getTransportVersion().onOrAfter(TransportVersion.V_8_3_0); super.writeTo(out); } @@ -77,7 +77,7 @@ public int hashCode() { public Response(StreamInput in) throws IOException { super(in); - assert in.getVersion().onOrAfter(Version.V_8_3_0); + assert in.getTransportVersion().onOrAfter(TransportVersion.V_8_3_0); persistentSettings = Settings.readSettingsFromStream(in); transientSettings = Settings.readSettingsFromStream(in); settings = Settings.readSettingsFromStream(in); @@ -91,7 +91,7 @@ public Response(Settings persistentSettings, Settings transientSettings, Setting @Override public void writeTo(StreamOutput out) throws IOException { - assert out.getVersion().onOrAfter(Version.V_8_3_0); + assert out.getTransportVersion().onOrAfter(TransportVersion.V_8_3_0); persistentSettings.writeTo(out); transientSettings.writeTo(out); settings.writeTo(out); diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java index 04acdb7a3fa40..e0085a45cd3ca 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java @@ -9,7 +9,7 @@ package org.elasticsearch.action.admin.cluster.snapshots.create; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.IndicesRequest; import org.elasticsearch.action.support.IndicesOptions; @@ -54,7 +54,7 @@ public class CreateSnapshotRequest extends MasterNodeRequest { - private static final Version FEATURE_RESET_ON_MASTER = Version.V_7_14_0; + private static final TransportVersion FEATURE_RESET_ON_MASTER = TransportVersion.V_7_14_0; public static ResetFeatureStateRequest fromStream(StreamInput in) throws IOException { - if (in.getVersion().before(FEATURE_RESET_ON_MASTER)) { + if (in.getTransportVersion().before(FEATURE_RESET_ON_MASTER)) { throw new IllegalStateException( "feature reset is not available in a cluster that have nodes with version before " + FEATURE_RESET_ON_MASTER ); @@ -38,7 +38,7 @@ private ResetFeatureStateRequest(StreamInput in) throws IOException { @Override public void writeTo(StreamOutput out) throws IOException { - if (out.getVersion().before(FEATURE_RESET_ON_MASTER)) { + if (out.getTransportVersion().before(FEATURE_RESET_ON_MASTER)) { throw new IllegalStateException( "feature reset is not available in a cluster that have nodes with version before " + FEATURE_RESET_ON_MASTER ); diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsRequest.java index 30938d91b29a5..35b6abed2c2f9 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsRequest.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsRequest.java @@ -8,7 +8,7 @@ package org.elasticsearch.action.admin.cluster.snapshots.get; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.support.master.MasterNodeRequest; import org.elasticsearch.common.Strings; @@ -40,19 +40,19 @@ public class GetSnapshotsRequest extends MasterNodeRequest public static final String NO_POLICY_PATTERN = "_none"; public static final boolean DEFAULT_VERBOSE_MODE = true; - public static final Version SLM_POLICY_FILTERING_VERSION = Version.V_7_16_0; + public static final TransportVersion SLM_POLICY_FILTERING_VERSION = TransportVersion.V_7_16_0; - public static final Version FROM_SORT_VALUE_VERSION = Version.V_7_16_0; + public static final TransportVersion FROM_SORT_VALUE_VERSION = TransportVersion.V_7_16_0; - public static final Version MULTIPLE_REPOSITORIES_SUPPORT_ADDED = Version.V_7_14_0; + public static final TransportVersion MULTIPLE_REPOSITORIES_SUPPORT_ADDED = TransportVersion.V_7_14_0; - public static final Version PAGINATED_GET_SNAPSHOTS_VERSION = Version.V_7_14_0; + public static final TransportVersion PAGINATED_GET_SNAPSHOTS_VERSION = TransportVersion.V_7_14_0; - public static final Version NUMERIC_PAGINATION_VERSION = Version.V_7_15_0; + public static final TransportVersion NUMERIC_PAGINATION_VERSION = TransportVersion.V_7_15_0; - private static final Version SORT_BY_SHARDS_OR_REPO_VERSION = Version.V_7_16_0; + private static final TransportVersion SORT_BY_SHARDS_OR_REPO_VERSION = TransportVersion.V_7_16_0; - private static final Version INDICES_FLAG_VERSION = Version.V_8_3_0; + private static final TransportVersion INDICES_FLAG_VERSION = TransportVersion.V_8_3_0; public static final int NO_LIMIT = -1; @@ -112,7 +112,7 @@ public GetSnapshotsRequest(String... repositories) { public GetSnapshotsRequest(StreamInput in) throws IOException { super(in); - if (in.getVersion().onOrAfter(MULTIPLE_REPOSITORIES_SUPPORT_ADDED)) { + if (in.getTransportVersion().onOrAfter(MULTIPLE_REPOSITORIES_SUPPORT_ADDED)) { repositories = in.readStringArray(); } else { repositories = new String[] { in.readString() }; @@ -120,21 +120,21 @@ public GetSnapshotsRequest(StreamInput in) throws IOException { snapshots = in.readStringArray(); ignoreUnavailable = in.readBoolean(); verbose = in.readBoolean(); - if (in.getVersion().onOrAfter(PAGINATED_GET_SNAPSHOTS_VERSION)) { + if (in.getTransportVersion().onOrAfter(PAGINATED_GET_SNAPSHOTS_VERSION)) { after = in.readOptionalWriteable(After::new); sort = in.readEnum(SortBy.class); size = in.readVInt(); order = SortOrder.readFromStream(in); - if (in.getVersion().onOrAfter(NUMERIC_PAGINATION_VERSION)) { + if (in.getTransportVersion().onOrAfter(NUMERIC_PAGINATION_VERSION)) { offset = in.readVInt(); } - if (in.getVersion().onOrAfter(SLM_POLICY_FILTERING_VERSION)) { + if (in.getTransportVersion().onOrAfter(SLM_POLICY_FILTERING_VERSION)) { policies = in.readStringArray(); } - if (in.getVersion().onOrAfter(FROM_SORT_VALUE_VERSION)) { + if (in.getTransportVersion().onOrAfter(FROM_SORT_VALUE_VERSION)) { fromSortValue = in.readOptionalString(); } - if (in.getVersion().onOrAfter(INDICES_FLAG_VERSION)) { + if (in.getTransportVersion().onOrAfter(INDICES_FLAG_VERSION)) { includeIndexNames = in.readBoolean(); } } @@ -143,7 +143,7 @@ public GetSnapshotsRequest(StreamInput in) throws IOException { @Override public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); - if (out.getVersion().onOrAfter(MULTIPLE_REPOSITORIES_SUPPORT_ADDED)) { + if (out.getTransportVersion().onOrAfter(MULTIPLE_REPOSITORIES_SUPPORT_ADDED)) { out.writeStringArray(repositories); } else { if (repositories.length != 1) { @@ -158,40 +158,44 @@ public void writeTo(StreamOutput out) throws IOException { out.writeStringArray(snapshots); out.writeBoolean(ignoreUnavailable); out.writeBoolean(verbose); - if (out.getVersion().onOrAfter(PAGINATED_GET_SNAPSHOTS_VERSION)) { + if (out.getTransportVersion().onOrAfter(PAGINATED_GET_SNAPSHOTS_VERSION)) { out.writeOptionalWriteable(after); if ((sort == SortBy.SHARDS || sort == SortBy.FAILED_SHARDS || sort == SortBy.REPOSITORY) - && out.getVersion().before(SORT_BY_SHARDS_OR_REPO_VERSION)) { + && out.getTransportVersion().before(SORT_BY_SHARDS_OR_REPO_VERSION)) { throw new IllegalArgumentException( - "can't use sort by shard count or repository name with node version [" + out.getVersion() + "]" + "can't use sort by shard count or repository name in transport version [" + out.getTransportVersion() + "]" ); } out.writeEnum(sort); out.writeVInt(size); order.writeTo(out); - if (out.getVersion().onOrAfter(NUMERIC_PAGINATION_VERSION)) { + if (out.getTransportVersion().onOrAfter(NUMERIC_PAGINATION_VERSION)) { out.writeVInt(offset); } else if (offset != 0) { throw new IllegalArgumentException( - "can't use numeric offset in get snapshots request with node version [" + out.getVersion() + "]" + "can't use numeric offset in get snapshots request in transport version [" + out.getTransportVersion() + "]" ); } } else if (sort != SortBy.START_TIME || size != NO_LIMIT || after != null || order != SortOrder.ASC) { - throw new IllegalArgumentException("can't use paginated get snapshots request with node version [" + out.getVersion() + "]"); + throw new IllegalArgumentException( + "can't use paginated get snapshots request in transport version [" + out.getTransportVersion() + "]" + ); } - if (out.getVersion().onOrAfter(SLM_POLICY_FILTERING_VERSION)) { + if (out.getTransportVersion().onOrAfter(SLM_POLICY_FILTERING_VERSION)) { out.writeStringArray(policies); } else if (policies.length > 0) { throw new IllegalArgumentException( - "can't use slm policy filter in snapshots request with node version [" + out.getVersion() + "]" + "can't use slm policy filter in snapshots request in transport version [" + out.getTransportVersion() + "]" ); } - if (out.getVersion().onOrAfter(FROM_SORT_VALUE_VERSION)) { + if (out.getTransportVersion().onOrAfter(FROM_SORT_VALUE_VERSION)) { out.writeOptionalString(fromSortValue); } else if (fromSortValue != null) { - throw new IllegalArgumentException("can't use after-value in snapshot request with node version [" + out.getVersion() + "]"); + throw new IllegalArgumentException( + "can't use after-value in snapshot request in transport version [" + out.getTransportVersion() + "]" + ); } - if (out.getVersion().onOrAfter(INDICES_FLAG_VERSION)) { + if (out.getTransportVersion().onOrAfter(INDICES_FLAG_VERSION)) { out.writeBoolean(includeIndexNames); } } diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsResponse.java index 7becf3eca8e63..91b1740777d82 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsResponse.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsResponse.java @@ -93,7 +93,7 @@ public GetSnapshotsResponse( public GetSnapshotsResponse(StreamInput in) throws IOException { this.snapshots = in.readImmutableList(SnapshotInfo::readFrom); - if (in.getVersion().onOrAfter(GetSnapshotsRequest.MULTIPLE_REPOSITORIES_SUPPORT_ADDED)) { + if (in.getTransportVersion().onOrAfter(GetSnapshotsRequest.MULTIPLE_REPOSITORIES_SUPPORT_ADDED)) { final Map failedResponses = in.readMap(StreamInput::readString, StreamInput::readException); this.failures = Collections.unmodifiableMap(failedResponses); this.next = in.readOptionalString(); @@ -101,7 +101,7 @@ public GetSnapshotsResponse(StreamInput in) throws IOException { this.failures = Collections.emptyMap(); this.next = null; } - if (in.getVersion().onOrAfter(GetSnapshotsRequest.NUMERIC_PAGINATION_VERSION)) { + if (in.getTransportVersion().onOrAfter(GetSnapshotsRequest.NUMERIC_PAGINATION_VERSION)) { this.total = in.readVInt(); this.remaining = in.readVInt(); } else { @@ -149,7 +149,7 @@ public int remaining() { @Override public void writeTo(StreamOutput out) throws IOException { out.writeList(snapshots); - if (out.getVersion().onOrAfter(GetSnapshotsRequest.MULTIPLE_REPOSITORIES_SUPPORT_ADDED)) { + if (out.getTransportVersion().onOrAfter(GetSnapshotsRequest.MULTIPLE_REPOSITORIES_SUPPORT_ADDED)) { out.writeMap(failures, StreamOutput::writeString, StreamOutput::writeException); out.writeOptionalString(next); } else { @@ -158,7 +158,7 @@ public void writeTo(StreamOutput out) throws IOException { throw failures.values().iterator().next(); } } - if (out.getVersion().onOrAfter(GetSnapshotsRequest.NUMERIC_PAGINATION_VERSION)) { + if (out.getTransportVersion().onOrAfter(GetSnapshotsRequest.NUMERIC_PAGINATION_VERSION)) { out.writeVInt(total); out.writeVInt(remaining); } diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java index a561ac48ed793..259a70fa6ff36 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java @@ -8,7 +8,7 @@ package org.elasticsearch.action.admin.cluster.snapshots.restore; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.action.support.master.MasterNodeRequest; @@ -48,7 +48,7 @@ public class RestoreSnapshotRequest extends MasterNodeRequest { + mappings = in.readImmutableOpenMap(StreamInput::readString, in.getTransportVersion().before(TransportVersion.V_8_0_0) ? i -> { int numMappings = i.readVInt(); assert numMappings == 0 || numMappings == 1 : "Expected 0 or 1 mappings but got " + numMappings; if (numMappings == 1) { diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsIndexRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsIndexRequest.java index f8fd09fcadfd7..47a17006dc4bf 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsIndexRequest.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsIndexRequest.java @@ -8,7 +8,7 @@ package org.elasticsearch.action.admin.indices.mapping.get; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.OriginalIndices; import org.elasticsearch.action.support.IndicesOptions; @@ -28,12 +28,12 @@ public class GetFieldMappingsIndexRequest extends SingleShardRequest { - if (mapIn.getVersion().before(Version.V_8_0_0)) { + if (mapIn.getTransportVersion().before(TransportVersion.V_8_0_0)) { int typesSize = mapIn.readVInt(); assert typesSize == 1 || typesSize == 0 : "Expected 0 or 1 types but got " + typesSize; if (typesSize == 0) { @@ -157,7 +157,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws @Override public void writeTo(StreamOutput out) throws IOException { out.writeMap(mappings, StreamOutput::writeString, (outpt, map) -> { - if (outpt.getVersion().before(Version.V_8_0_0)) { + if (outpt.getTransportVersion().before(TransportVersion.V_8_0_0)) { outpt.writeVInt(1); outpt.writeString(MapperService.SINGLE_MAPPING_NAME); } diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsResponse.java index 9574cd7e2b49a..22688f9f81a62 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsResponse.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsResponse.java @@ -8,7 +8,7 @@ package org.elasticsearch.action.admin.indices.mapping.get; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.cluster.metadata.MappingMetadata; import org.elasticsearch.common.Strings; @@ -40,7 +40,7 @@ public GetMappingsResponse(Map mappings) { GetMappingsResponse(StreamInput in) throws IOException { super(in); - mappings = in.readImmutableMap(StreamInput::readString, in.getVersion().before(Version.V_8_0_0) ? i -> { + mappings = in.readImmutableMap(StreamInput::readString, in.getTransportVersion().before(TransportVersion.V_8_0_0) ? i -> { int mappingCount = i.readVInt(); assert mappingCount == 1 || mappingCount == 0 : "Expected 0 or 1 mappings but got " + mappingCount; if (mappingCount == 1) { diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequest.java index 80a032c4542c7..5635b39d01995 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequest.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequest.java @@ -9,7 +9,7 @@ package org.elasticsearch.action.admin.indices.mapping.put; import org.elasticsearch.ElasticsearchGenerationException; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.IndicesRequest; import org.elasticsearch.action.support.IndicesOptions; @@ -81,7 +81,7 @@ public PutMappingRequest(StreamInput in) throws IOException { super(in); indices = in.readStringArray(); indicesOptions = IndicesOptions.readIndicesOptions(in); - if (in.getVersion().before(Version.V_8_0_0)) { + if (in.getTransportVersion().before(TransportVersion.V_8_0_0)) { String type = in.readOptionalString(); if (MapperService.SINGLE_MAPPING_NAME.equals(type) == false) { throw new IllegalArgumentException("Expected type [_doc] but received [" + type + "]"); @@ -90,7 +90,7 @@ public PutMappingRequest(StreamInput in) throws IOException { source = in.readString(); concreteIndex = in.readOptionalWriteable(Index::new); origin = in.readOptionalString(); - if (in.getVersion().onOrAfter(Version.V_7_9_0)) { + if (in.getTransportVersion().onOrAfter(TransportVersion.V_7_9_0)) { writeIndexOnly = in.readBoolean(); } } @@ -313,13 +313,13 @@ public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); out.writeStringArrayNullable(indices); indicesOptions.writeIndicesOptions(out); - if (out.getVersion().before(Version.V_8_0_0)) { + if (out.getTransportVersion().before(TransportVersion.V_8_0_0)) { out.writeOptionalString(MapperService.SINGLE_MAPPING_NAME); } out.writeString(source); out.writeOptionalWriteable(concreteIndex); out.writeOptionalString(origin); - if (out.getVersion().onOrAfter(Version.V_7_9_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_7_9_0)) { out.writeBoolean(writeIndexOnly); } } diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/refresh/ReplicaShardRefreshRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/refresh/ReplicaShardRefreshRequest.java index 86038db90f404..a10d03bf30c10 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/refresh/ReplicaShardRefreshRequest.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/refresh/ReplicaShardRefreshRequest.java @@ -8,7 +8,7 @@ package org.elasticsearch.action.admin.indices.refresh; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.action.support.replication.ReplicationRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -31,7 +31,7 @@ public ReplicaShardRefreshRequest(ShardId shardId, TaskId parentTaskId, @Nullabl public ReplicaShardRefreshRequest(StreamInput in) throws IOException { super(in); - if (in.getVersion().onOrAfter(Version.V_8_7_0)) { + if (in.getTransportVersion().onOrAfter(TransportVersion.V_8_7_0)) { this.segmentGeneration = in.readOptionalVLong(); } else { this.segmentGeneration = null; @@ -41,7 +41,7 @@ public ReplicaShardRefreshRequest(StreamInput in) throws IOException { @Override public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); - if (out.getVersion().onOrAfter(Version.V_8_7_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_8_7_0)) { out.writeOptionalVLong(segmentGeneration); } } diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequest.java index 12ac412845881..204474654bb0d 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequest.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequest.java @@ -8,7 +8,7 @@ package org.elasticsearch.action.admin.indices.segments; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.action.support.broadcast.BroadcastRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; @@ -28,7 +28,7 @@ public IndicesSegmentsRequest() { public IndicesSegmentsRequest(StreamInput in) throws IOException { super(in); - if (in.getVersion().before(Version.V_8_0_0)) { + if (in.getTransportVersion().before(TransportVersion.V_8_0_0)) { in.readBoolean(); // old 'verbose' option, since removed } } @@ -40,7 +40,7 @@ public IndicesSegmentsRequest(String... indices) { @Override public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); - if (out.getVersion().before(Version.V_8_0_0)) { + if (out.getTransportVersion().before(TransportVersion.V_8_0_0)) { out.writeBoolean(false); } } diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsRequest.java index 6e443744b8835..ad9c4904ecc86 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsRequest.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsRequest.java @@ -9,7 +9,7 @@ package org.elasticsearch.action.admin.indices.settings.put; import org.elasticsearch.ElasticsearchParseException; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.IndicesRequest; import org.elasticsearch.action.support.IndicesOptions; @@ -54,7 +54,7 @@ public UpdateSettingsRequest(StreamInput in) throws IOException { indicesOptions = IndicesOptions.readIndicesOptions(in); settings = readSettingsFromStream(in); preserveExisting = in.readBoolean(); - if (in.getVersion().onOrAfter(Version.V_7_12_0)) { + if (in.getTransportVersion().onOrAfter(TransportVersion.V_7_12_0)) { origin = in.readString(); } } @@ -183,7 +183,7 @@ public void writeTo(StreamOutput out) throws IOException { indicesOptions.writeIndicesOptions(out); settings.writeTo(out); out.writeBoolean(preserveExisting); - if (out.getVersion().onOrAfter(Version.V_7_12_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_7_12_0)) { out.writeString(origin); } } diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStats.java b/server/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStats.java index 64af5d7dc3b2d..abdc269818456 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStats.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStats.java @@ -9,7 +9,7 @@ package org.elasticsearch.action.admin.indices.stats; import org.apache.lucene.store.AlreadyClosedException; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Writeable; @@ -45,7 +45,7 @@ public class CommonStats implements Writeable, ToXContentFragment { - private static final Version VERSION_SUPPORTING_NODE_MAPPINGS = Version.V_8_5_0; + private static final TransportVersion VERSION_SUPPORTING_NODE_MAPPINGS = TransportVersion.V_8_5_0; @Nullable public DocsStats docs; @@ -201,11 +201,11 @@ public CommonStats(StreamInput in) throws IOException { translog = in.readOptionalWriteable(TranslogStats::new); requestCache = in.readOptionalWriteable(RequestCacheStats::new); recoveryStats = in.readOptionalWriteable(RecoveryStats::new); - if (in.getVersion().onOrAfter(Version.V_8_0_0)) { + if (in.getTransportVersion().onOrAfter(TransportVersion.V_8_0_0)) { bulk = in.readOptionalWriteable(BulkStats::new); } shards = in.readOptionalWriteable(ShardCountStats::new); - if (in.getVersion().onOrAfter(VERSION_SUPPORTING_NODE_MAPPINGS)) { + if (in.getTransportVersion().onOrAfter(VERSION_SUPPORTING_NODE_MAPPINGS)) { nodeMappings = in.readOptionalWriteable(NodeMappingStats::new); } } @@ -228,11 +228,11 @@ public void writeTo(StreamOutput out) throws IOException { out.writeOptionalWriteable(translog); out.writeOptionalWriteable(requestCache); out.writeOptionalWriteable(recoveryStats); - if (out.getVersion().onOrAfter(Version.V_8_0_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_8_0_0)) { out.writeOptionalWriteable(bulk); } out.writeOptionalWriteable(shards); - if (out.getVersion().onOrAfter(VERSION_SUPPORTING_NODE_MAPPINGS)) { + if (out.getTransportVersion().onOrAfter(VERSION_SUPPORTING_NODE_MAPPINGS)) { out.writeOptionalWriteable(nodeMappings); } } diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStatsFlags.java b/server/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStatsFlags.java index d56c344a05c48..24fea14e5321c 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStatsFlags.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStatsFlags.java @@ -8,7 +8,7 @@ package org.elasticsearch.action.admin.indices.stats; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -55,7 +55,7 @@ public CommonStatsFlags(StreamInput in) throws IOException { flags.add(flag); } } - if (in.getVersion().before(Version.V_8_0_0)) { + if (in.getTransportVersion().before(TransportVersion.V_8_0_0)) { in.readStringArray(); } groups = in.readStringArray(); @@ -73,7 +73,7 @@ public void writeTo(StreamOutput out) throws IOException { } out.writeLong(longFlags); - if (out.getVersion().before(Version.V_8_0_0)) { + if (out.getTransportVersion().before(TransportVersion.V_8_0_0)) { out.writeStringArrayNullable(Strings.EMPTY_ARRAY); } out.writeStringArrayNullable(groups); diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponse.java index 2c6d357443ac0..7c7add9262fda 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponse.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponse.java @@ -8,7 +8,7 @@ package org.elasticsearch.action.admin.indices.stats; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.action.admin.indices.stats.IndexStats.IndexStatsBuilder; import org.elasticsearch.action.support.DefaultShardOperationFailedException; import org.elasticsearch.action.support.broadcast.ChunkedBroadcastResponse; @@ -50,7 +50,7 @@ public class IndicesStatsResponse extends ChunkedBroadcastResponse { IndicesStatsResponse(StreamInput in) throws IOException { super(in); shards = in.readArray(ShardStats::new, ShardStats[]::new); - if (in.getVersion().onOrAfter(Version.V_8_1_0)) { + if (in.getTransportVersion().onOrAfter(TransportVersion.V_8_1_0)) { indexHealthMap = in.readMap(StreamInput::readString, ClusterHealthStatus::readFrom); indexStateMap = in.readMap(StreamInput::readString, IndexMetadata.State::readFrom); } else { @@ -170,7 +170,7 @@ public CommonStats getPrimaries() { public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); out.writeArray(shards); - if (out.getVersion().onOrAfter(Version.V_8_1_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_8_1_0)) { out.writeMap(indexHealthMap, StreamOutput::writeString, (o, s) -> s.writeTo(o)); out.writeMap(indexStateMap, StreamOutput::writeString, (o, s) -> s.writeTo(o)); } diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/stats/ShardStats.java b/server/src/main/java/org/elasticsearch/action/admin/indices/stats/ShardStats.java index 457f7219a5696..d5a7d17f2a4b5 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/stats/ShardStats.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/stats/ShardStats.java @@ -8,7 +8,7 @@ package org.elasticsearch.action.admin.indices.stats; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.cluster.routing.ShardRouting; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -26,7 +26,7 @@ public class ShardStats implements Writeable, ToXContentFragment { - private static final Version DEDUPLICATE_SHARD_PATH_VERSION = Version.V_8_4_0; + private static final TransportVersion DEDUPLICATE_SHARD_PATH_VERSION = TransportVersion.V_8_4_0; private final ShardRouting shardRouting; private final CommonStats commonStats; @@ -46,7 +46,7 @@ public ShardStats(StreamInput in) throws IOException { commonStats = new CommonStats(in); commitStats = CommitStats.readOptionalCommitStatsFrom(in); statePath = in.readString(); - if (in.getVersion().onOrAfter(DEDUPLICATE_SHARD_PATH_VERSION)) { + if (in.getTransportVersion().onOrAfter(DEDUPLICATE_SHARD_PATH_VERSION)) { dataPath = Objects.requireNonNullElse(in.readOptionalString(), this.statePath); } else { dataPath = in.readString(); @@ -164,7 +164,7 @@ public void writeTo(StreamOutput out) throws IOException { commonStats.writeTo(out); out.writeOptionalWriteable(commitStats); out.writeString(statePath); - if (out.getVersion().onOrAfter(DEDUPLICATE_SHARD_PATH_VERSION)) { + if (out.getTransportVersion().onOrAfter(DEDUPLICATE_SHARD_PATH_VERSION)) { out.writeOptionalString(statePath.equals(dataPath) ? null : dataPath); } else { out.writeString(dataPath); diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequest.java index a332b57cd475f..b2fb169b1f629 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequest.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequest.java @@ -9,7 +9,7 @@ import org.elasticsearch.ElasticsearchGenerationException; import org.elasticsearch.ElasticsearchParseException; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.IndicesRequest; import org.elasticsearch.action.admin.indices.alias.Alias; @@ -76,7 +76,7 @@ public PutIndexTemplateRequest(StreamInput in) throws IOException { order = in.readInt(); create = in.readBoolean(); settings = readSettingsFromStream(in); - if (in.getVersion().before(Version.V_8_0_0)) { + if (in.getTransportVersion().before(TransportVersion.V_8_0_0)) { int size = in.readVInt(); for (int i = 0; i < size; i++) { in.readString(); // type - cannot assert on _doc because 7x allows arbitrary type names @@ -446,7 +446,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeInt(order); out.writeBoolean(create); settings.writeTo(out); - if (out.getVersion().before(Version.V_8_0_0)) { + if (out.getTransportVersion().before(TransportVersion.V_8_0_0)) { out.writeVInt(mappings == null ? 0 : 1); if (mappings != null) { out.writeString(MapperService.SINGLE_MAPPING_NAME); diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryRequest.java index 0721f499d600b..e5a399aed85fe 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryRequest.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryRequest.java @@ -8,7 +8,7 @@ package org.elasticsearch.action.admin.indices.validate.query; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.action.support.broadcast.BroadcastShardRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -33,7 +33,7 @@ public class ShardValidateQueryRequest extends BroadcastShardRequest { public ShardValidateQueryRequest(StreamInput in) throws IOException { super(in); query = in.readNamedWriteable(QueryBuilder.class); - if (in.getVersion().before(Version.V_8_0_0)) { + if (in.getTransportVersion().before(TransportVersion.V_8_0_0)) { int typesSize = in.readVInt(); if (typesSize > 0) { for (int i = 0; i < typesSize; i++) { @@ -80,7 +80,7 @@ public long nowInMillis() { public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); out.writeNamedWriteable(query); - if (out.getVersion().before(Version.V_8_0_0)) { + if (out.getTransportVersion().before(TransportVersion.V_8_0_0)) { out.writeVInt(0); // no types to filter } filteringAliases.writeTo(out); diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryRequest.java index 57c66605e315e..6747b76f2aec0 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryRequest.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryRequest.java @@ -8,7 +8,7 @@ package org.elasticsearch.action.admin.indices.validate.query; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ValidateActions; import org.elasticsearch.action.support.IndicesOptions; @@ -48,7 +48,7 @@ public ValidateQueryRequest() { public ValidateQueryRequest(StreamInput in) throws IOException { super(in); query = in.readNamedWriteable(QueryBuilder.class); - if (in.getVersion().before(Version.V_8_0_0)) { + if (in.getTransportVersion().before(TransportVersion.V_8_0_0)) { int typesSize = in.readVInt(); if (typesSize > 0) { for (int i = 0; i < typesSize; i++) { @@ -137,7 +137,7 @@ public boolean allShards() { public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); out.writeNamedWriteable(query); - if (out.getVersion().before(Version.V_8_0_0)) { + if (out.getTransportVersion().before(TransportVersion.V_8_0_0)) { out.writeVInt(0); // no types to filter } out.writeBoolean(explain); diff --git a/server/src/main/java/org/elasticsearch/action/bulk/BulkItemResponse.java b/server/src/main/java/org/elasticsearch/action/bulk/BulkItemResponse.java index 79c9dd2e6182d..1f140be7522ad 100644 --- a/server/src/main/java/org/elasticsearch/action/bulk/BulkItemResponse.java +++ b/server/src/main/java/org/elasticsearch/action/bulk/BulkItemResponse.java @@ -10,6 +10,7 @@ import org.elasticsearch.ElasticsearchException; import org.elasticsearch.ExceptionsHelper; +import org.elasticsearch.TransportVersion; import org.elasticsearch.Version; import org.elasticsearch.action.DocWriteRequest.OpType; import org.elasticsearch.action.DocWriteResponse; @@ -237,7 +238,7 @@ private Failure(String index, String id, Exception cause, RestStatus status, lon */ public Failure(StreamInput in) throws IOException { index = in.readString(); - if (in.getVersion().before(Version.V_8_0_0)) { + if (in.getTransportVersion().before(TransportVersion.V_8_0_0)) { in.readString(); // can't make an assertion about type names here because too many tests still set their own // types bypassing various checks diff --git a/server/src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java b/server/src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java index 0f2298424221b..f2ee085e9ac19 100644 --- a/server/src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java +++ b/server/src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java @@ -244,7 +244,7 @@ protected void doInternalExecute(Task task, BulkRequest bulkRequest, String exec } if (actionRequest instanceof IndexRequest ir) { - ir.checkAutoIdWithOpTypeCreateSupportedByVersion(minNodeVersion); + ir.checkAutoIdWithOpTypeCreateSupportedByVersion(minNodeVersion.transportVersion); if (ir.getAutoGeneratedTimestamp() != IndexRequest.UNSET_AUTO_GENERATED_TIMESTAMP) { throw new IllegalArgumentException("autoGeneratedTimestamp should not be set externally"); } diff --git a/server/src/main/java/org/elasticsearch/action/datastreams/CreateDataStreamAction.java b/server/src/main/java/org/elasticsearch/action/datastreams/CreateDataStreamAction.java index 49bcf38ac0e5f..f4eae07cc291d 100644 --- a/server/src/main/java/org/elasticsearch/action/datastreams/CreateDataStreamAction.java +++ b/server/src/main/java/org/elasticsearch/action/datastreams/CreateDataStreamAction.java @@ -7,7 +7,7 @@ */ package org.elasticsearch.action.datastreams; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionType; import org.elasticsearch.action.IndicesRequest; @@ -66,7 +66,7 @@ public ActionRequestValidationException validate() { public Request(StreamInput in) throws IOException { super(in); this.name = in.readString(); - if (in.getVersion().onOrAfter(Version.V_7_16_0)) { + if (in.getTransportVersion().onOrAfter(TransportVersion.V_7_16_0)) { this.startTime = in.readVLong(); } else { this.startTime = System.currentTimeMillis(); @@ -77,7 +77,7 @@ public Request(StreamInput in) throws IOException { public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); out.writeString(name); - if (out.getVersion().onOrAfter(Version.V_7_16_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_7_16_0)) { out.writeVLong(startTime); } } diff --git a/server/src/main/java/org/elasticsearch/action/datastreams/GetDataStreamAction.java b/server/src/main/java/org/elasticsearch/action/datastreams/GetDataStreamAction.java index 00bd66fc91b3b..6ab2d390be37f 100644 --- a/server/src/main/java/org/elasticsearch/action/datastreams/GetDataStreamAction.java +++ b/server/src/main/java/org/elasticsearch/action/datastreams/GetDataStreamAction.java @@ -7,7 +7,7 @@ */ package org.elasticsearch.action.datastreams; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; @@ -161,7 +161,7 @@ public DataStreamInfo( ClusterHealthStatus.readFrom(in), in.readOptionalString(), in.readOptionalString(), - in.getVersion().onOrAfter(Version.V_8_3_0) ? in.readOptionalWriteable(TimeSeries::new) : null + in.getTransportVersion().onOrAfter(TransportVersion.V_8_3_0) ? in.readOptionalWriteable(TimeSeries::new) : null ); } @@ -194,7 +194,7 @@ public void writeTo(StreamOutput out) throws IOException { dataStreamStatus.writeTo(out); out.writeOptionalString(indexTemplate); out.writeOptionalString(ilmPolicyName); - if (out.getVersion().onOrAfter(Version.V_8_3_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_8_3_0)) { out.writeOptionalWriteable(timeSeries); } } diff --git a/server/src/main/java/org/elasticsearch/action/delete/DeleteRequest.java b/server/src/main/java/org/elasticsearch/action/delete/DeleteRequest.java index 42914d85bdeba..d944ada2f424d 100644 --- a/server/src/main/java/org/elasticsearch/action/delete/DeleteRequest.java +++ b/server/src/main/java/org/elasticsearch/action/delete/DeleteRequest.java @@ -9,7 +9,7 @@ package org.elasticsearch.action.delete; import org.apache.lucene.util.RamUsageEstimator; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.CompositeIndicesRequest; import org.elasticsearch.action.DocWriteRequest; @@ -64,7 +64,7 @@ public DeleteRequest(StreamInput in) throws IOException { public DeleteRequest(@Nullable ShardId shardId, StreamInput in) throws IOException { super(shardId, in); - if (in.getVersion().before(Version.V_8_0_0)) { + if (in.getTransportVersion().before(TransportVersion.V_8_0_0)) { String type = in.readString(); assert MapperService.SINGLE_MAPPING_NAME.equals(type) : "Expected [_doc] but received [" + type + "]"; } @@ -256,7 +256,7 @@ public void writeThin(StreamOutput out) throws IOException { } private void writeBody(StreamOutput out) throws IOException { - if (out.getVersion().before(Version.V_8_0_0)) { + if (out.getTransportVersion().before(TransportVersion.V_8_0_0)) { out.writeString(MapperService.SINGLE_MAPPING_NAME); } out.writeString(id); diff --git a/server/src/main/java/org/elasticsearch/action/explain/ExplainRequest.java b/server/src/main/java/org/elasticsearch/action/explain/ExplainRequest.java index aceeb3bde53a7..43a00accdb998 100644 --- a/server/src/main/java/org/elasticsearch/action/explain/ExplainRequest.java +++ b/server/src/main/java/org/elasticsearch/action/explain/ExplainRequest.java @@ -8,6 +8,7 @@ package org.elasticsearch.action.explain; +import org.elasticsearch.TransportVersion; import org.elasticsearch.Version; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ValidateActions; @@ -54,7 +55,7 @@ public ExplainRequest(String index, String id) { ExplainRequest(StreamInput in) throws IOException { super(in); - if (in.getVersion().before(Version.V_8_0_0)) { + if (in.getTransportVersion().before(TransportVersion.V_8_0_0)) { String type = in.readString(); assert MapperService.SINGLE_MAPPING_NAME.equals(type); } diff --git a/server/src/main/java/org/elasticsearch/action/explain/ExplainResponse.java b/server/src/main/java/org/elasticsearch/action/explain/ExplainResponse.java index 0b0f340cf61e9..880ed44db4460 100644 --- a/server/src/main/java/org/elasticsearch/action/explain/ExplainResponse.java +++ b/server/src/main/java/org/elasticsearch/action/explain/ExplainResponse.java @@ -9,6 +9,7 @@ package org.elasticsearch.action.explain; import org.apache.lucene.search.Explanation; +import org.elasticsearch.TransportVersion; import org.elasticsearch.Version; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.common.io.stream.StreamInput; @@ -69,7 +70,7 @@ public ExplainResponse(String index, String id, boolean exists, Explanation expl public ExplainResponse(StreamInput in) throws IOException { super(in); index = in.readString(); - if (in.getVersion().before(Version.V_8_0_0)) { + if (in.getTransportVersion().before(TransportVersion.V_8_0_0)) { in.readString(); } id = in.readString(); diff --git a/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilities.java b/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilities.java index 9888240021c37..daa9ee30bf9aa 100644 --- a/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilities.java +++ b/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilities.java @@ -8,7 +8,7 @@ package org.elasticsearch.action.fieldcaps; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -227,7 +227,7 @@ public FieldCapabilities( this.isMetadataField = in.readBoolean(); this.isSearchable = in.readBoolean(); this.isAggregatable = in.readBoolean(); - if (in.getVersion().onOrAfter(Version.V_8_0_0)) { + if (in.getTransportVersion().onOrAfter(TransportVersion.V_8_0_0)) { this.isDimension = in.readBoolean(); this.metricType = in.readOptionalEnum(TimeSeriesParams.MetricType.class); } else { @@ -237,7 +237,7 @@ public FieldCapabilities( this.indices = in.readOptionalStringArray(); this.nonSearchableIndices = in.readOptionalStringArray(); this.nonAggregatableIndices = in.readOptionalStringArray(); - if (in.getVersion().onOrAfter(Version.V_8_0_0)) { + if (in.getTransportVersion().onOrAfter(TransportVersion.V_8_0_0)) { this.nonDimensionIndices = in.readOptionalStringArray(); this.metricConflictsIndices = in.readOptionalStringArray(); } else { @@ -254,14 +254,14 @@ public void writeTo(StreamOutput out) throws IOException { out.writeBoolean(isMetadataField); out.writeBoolean(isSearchable); out.writeBoolean(isAggregatable); - if (out.getVersion().onOrAfter(Version.V_8_0_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_8_0_0)) { out.writeBoolean(isDimension); out.writeOptionalEnum(metricType); } out.writeOptionalStringArray(indices); out.writeOptionalStringArray(nonSearchableIndices); out.writeOptionalStringArray(nonAggregatableIndices); - if (out.getVersion().onOrAfter(Version.V_8_0_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_8_0_0)) { out.writeOptionalStringArray(nonDimensionIndices); out.writeOptionalStringArray(metricConflictsIndices); } diff --git a/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesIndexResponse.java b/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesIndexResponse.java index 3d03cfc92e1e2..ab13525014cc4 100644 --- a/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesIndexResponse.java +++ b/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesIndexResponse.java @@ -8,7 +8,7 @@ package org.elasticsearch.action.fieldcaps; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Writeable; @@ -23,14 +23,14 @@ import java.util.stream.Stream; final class FieldCapabilitiesIndexResponse implements Writeable { - private static final Version MAPPING_HASH_VERSION = Version.V_8_2_0; + private static final TransportVersion MAPPING_HASH_VERSION = TransportVersion.V_8_2_0; private final String indexName; @Nullable private final String indexMappingHash; private final Map responseMap; private final boolean canMatch; - private final transient Version originVersion; + private final transient TransportVersion originVersion; FieldCapabilitiesIndexResponse( String indexName, @@ -42,15 +42,15 @@ final class FieldCapabilitiesIndexResponse implements Writeable { this.indexMappingHash = indexMappingHash; this.responseMap = responseMap; this.canMatch = canMatch; - this.originVersion = Version.CURRENT; + this.originVersion = TransportVersion.CURRENT; } FieldCapabilitiesIndexResponse(StreamInput in) throws IOException { this.indexName = in.readString(); this.responseMap = in.readMap(StreamInput::readString, IndexFieldCapabilities::new); this.canMatch = in.readBoolean(); - this.originVersion = in.getVersion(); - if (in.getVersion().onOrAfter(MAPPING_HASH_VERSION)) { + this.originVersion = in.getTransportVersion(); + if (in.getTransportVersion().onOrAfter(MAPPING_HASH_VERSION)) { this.indexMappingHash = in.readOptionalString(); } else { this.indexMappingHash = null; @@ -62,7 +62,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeString(indexName); out.writeMap(responseMap, StreamOutput::writeString, (valueOut, fc) -> fc.writeTo(valueOut)); out.writeBoolean(canMatch); - if (out.getVersion().onOrAfter(MAPPING_HASH_VERSION)) { + if (out.getTransportVersion().onOrAfter(MAPPING_HASH_VERSION)) { out.writeOptionalString(indexMappingHash); } } @@ -87,7 +87,7 @@ List getResponses() { } static List readList(StreamInput input) throws IOException { - if (input.getVersion().before(MAPPING_HASH_VERSION)) { + if (input.getTransportVersion().before(MAPPING_HASH_VERSION)) { return input.readList(FieldCapabilitiesIndexResponse::new); } final List ungroupedList = input.readList(FieldCapabilitiesIndexResponse::new); @@ -96,7 +96,7 @@ static List readList(StreamInput input) throws I } static void writeList(StreamOutput output, List responses) throws IOException { - if (output.getVersion().before(MAPPING_HASH_VERSION)) { + if (output.getTransportVersion().before(MAPPING_HASH_VERSION)) { output.writeCollection(responses); return; } @@ -152,7 +152,7 @@ public IndexFieldCapabilities getField(String field) { return responseMap.get(field); } - Version getOriginVersion() { + TransportVersion getOriginVersion() { return originVersion; } diff --git a/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesNodeRequest.java b/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesNodeRequest.java index fee75023d7238..ef1c068bdc3eb 100644 --- a/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesNodeRequest.java +++ b/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesNodeRequest.java @@ -8,7 +8,7 @@ package org.elasticsearch.action.fieldcaps; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.IndicesRequest; @@ -44,7 +44,7 @@ class FieldCapabilitiesNodeRequest extends ActionRequest implements IndicesReque super(in); shardIds = in.readList(ShardId::new); fields = in.readStringArray(); - if (in.getVersion().onOrAfter(Version.V_8_2_0)) { + if (in.getTransportVersion().onOrAfter(TransportVersion.V_8_2_0)) { filters = in.readStringArray(); allowedTypes = in.readStringArray(); } else { @@ -124,7 +124,7 @@ public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); out.writeList(shardIds); out.writeStringArray(fields); - if (out.getVersion().onOrAfter(Version.V_8_2_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_8_2_0)) { out.writeStringArray(filters); out.writeStringArray(allowedTypes); } diff --git a/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequest.java b/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequest.java index d2d7e6574cc88..a197670026232 100644 --- a/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequest.java +++ b/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequest.java @@ -8,7 +8,7 @@ package org.elasticsearch.action.fieldcaps; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.IndicesRequest; @@ -58,7 +58,7 @@ public FieldCapabilitiesRequest(StreamInput in) throws IOException { indexFilter = in.readOptionalNamedWriteable(QueryBuilder.class); nowInMillis = in.readOptionalLong(); runtimeFields = in.readMap(); - if (in.getVersion().onOrAfter(Version.V_8_2_0)) { + if (in.getTransportVersion().onOrAfter(TransportVersion.V_8_2_0)) { filters = in.readStringArray(); types = in.readStringArray(); } @@ -96,7 +96,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeOptionalNamedWriteable(indexFilter); out.writeOptionalLong(nowInMillis); out.writeGenericMap(runtimeFields); - if (out.getVersion().onOrAfter(Version.V_8_2_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_8_2_0)) { out.writeStringArray(filters); out.writeStringArray(types); } diff --git a/server/src/main/java/org/elasticsearch/action/fieldcaps/IndexFieldCapabilities.java b/server/src/main/java/org/elasticsearch/action/fieldcaps/IndexFieldCapabilities.java index 383f5f2a0d4f2..9b3b7cd08c6cc 100644 --- a/server/src/main/java/org/elasticsearch/action/fieldcaps/IndexFieldCapabilities.java +++ b/server/src/main/java/org/elasticsearch/action/fieldcaps/IndexFieldCapabilities.java @@ -8,7 +8,7 @@ package org.elasticsearch.action.fieldcaps; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Writeable; @@ -68,7 +68,7 @@ public class IndexFieldCapabilities implements Writeable { this.isMetadatafield = in.readBoolean(); this.isSearchable = in.readBoolean(); this.isAggregatable = in.readBoolean(); - if (in.getVersion().onOrAfter(Version.V_8_0_0)) { + if (in.getTransportVersion().onOrAfter(TransportVersion.V_8_0_0)) { this.isDimension = in.readBoolean(); this.metricType = in.readOptionalEnum(TimeSeriesParams.MetricType.class); } else { @@ -85,7 +85,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeBoolean(isMetadatafield); out.writeBoolean(isSearchable); out.writeBoolean(isAggregatable); - if (out.getVersion().onOrAfter(Version.V_8_0_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_8_0_0)) { out.writeBoolean(isDimension); out.writeOptionalEnum(metricType); } diff --git a/server/src/main/java/org/elasticsearch/action/fieldcaps/ResponseRewriter.java b/server/src/main/java/org/elasticsearch/action/fieldcaps/ResponseRewriter.java index aad38a5bf48a1..d7d923ec089aa 100644 --- a/server/src/main/java/org/elasticsearch/action/fieldcaps/ResponseRewriter.java +++ b/server/src/main/java/org/elasticsearch/action/fieldcaps/ResponseRewriter.java @@ -8,7 +8,7 @@ package org.elasticsearch.action.fieldcaps; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import java.util.HashMap; import java.util.Map; @@ -24,12 +24,12 @@ final class ResponseRewriter { public static Map rewriteOldResponses( - Version version, + TransportVersion version, Map input, String[] filters, String[] allowedTypes ) { - if (version.onOrAfter(Version.V_8_2_0)) { + if (version.onOrAfter(TransportVersion.V_8_2_0)) { return input; // nothing needs to be done } Function transformer = buildTransformer(input, filters, allowedTypes); diff --git a/server/src/main/java/org/elasticsearch/action/get/GetRequest.java b/server/src/main/java/org/elasticsearch/action/get/GetRequest.java index 4f1a8d5f9d54d..9ed35e303b4e9 100644 --- a/server/src/main/java/org/elasticsearch/action/get/GetRequest.java +++ b/server/src/main/java/org/elasticsearch/action/get/GetRequest.java @@ -8,7 +8,7 @@ package org.elasticsearch.action.get; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.RealtimeRequest; import org.elasticsearch.action.ValidateActions; @@ -68,7 +68,7 @@ public GetRequest() {} GetRequest(StreamInput in) throws IOException { super(in); - if (in.getVersion().before(Version.V_8_0_0)) { + if (in.getTransportVersion().before(TransportVersion.V_8_0_0)) { in.readString(); } id = in.readString(); @@ -81,7 +81,7 @@ public GetRequest() {} this.versionType = VersionType.fromValue(in.readByte()); this.version = in.readLong(); fetchSourceContext = in.readOptionalWriteable(FetchSourceContext::readFrom); - if (in.getVersion().onOrAfter(Version.V_8_4_0)) { + if (in.getTransportVersion().onOrAfter(TransportVersion.V_8_4_0)) { forceSyntheticSource = in.readBoolean(); } else { forceSyntheticSource = false; @@ -91,7 +91,7 @@ public GetRequest() {} @Override public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); - if (out.getVersion().before(Version.V_8_0_0)) { + if (out.getTransportVersion().before(TransportVersion.V_8_0_0)) { out.writeString(MapperService.SINGLE_MAPPING_NAME); } out.writeString(id); @@ -104,7 +104,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeByte(versionType.getValue()); out.writeLong(version); out.writeOptionalWriteable(fetchSourceContext); - if (out.getVersion().onOrAfter(Version.V_8_4_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_8_4_0)) { out.writeBoolean(forceSyntheticSource); } else { if (forceSyntheticSource) { diff --git a/server/src/main/java/org/elasticsearch/action/get/MultiGetRequest.java b/server/src/main/java/org/elasticsearch/action/get/MultiGetRequest.java index 09f24eec52962..5774fc58d9999 100644 --- a/server/src/main/java/org/elasticsearch/action/get/MultiGetRequest.java +++ b/server/src/main/java/org/elasticsearch/action/get/MultiGetRequest.java @@ -9,7 +9,7 @@ package org.elasticsearch.action.get; import org.elasticsearch.ElasticsearchParseException; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.CompositeIndicesRequest; @@ -85,7 +85,7 @@ public Item() { public Item(StreamInput in) throws IOException { index = in.readString(); - if (in.getVersion().before(Version.V_8_0_0)) { + if (in.getTransportVersion().before(TransportVersion.V_8_0_0)) { in.readOptionalString(); } id = in.readString(); @@ -179,7 +179,7 @@ public Item fetchSourceContext(FetchSourceContext fetchSourceContext) { @Override public void writeTo(StreamOutput out) throws IOException { out.writeString(index); - if (out.getVersion().before(Version.V_8_0_0)) { + if (out.getTransportVersion().before(TransportVersion.V_8_0_0)) { out.writeOptionalString(MapperService.SINGLE_MAPPING_NAME); } out.writeString(id); @@ -263,7 +263,7 @@ public MultiGetRequest(StreamInput in) throws IOException { refresh = in.readBoolean(); realtime = in.readBoolean(); items = in.readList(Item::new); - if (in.getVersion().onOrAfter(Version.V_8_4_0)) { + if (in.getTransportVersion().onOrAfter(TransportVersion.V_8_4_0)) { forceSyntheticSource = in.readBoolean(); } else { forceSyntheticSource = false; @@ -277,7 +277,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeBoolean(refresh); out.writeBoolean(realtime); out.writeList(items); - if (out.getVersion().onOrAfter(Version.V_8_4_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_8_4_0)) { out.writeBoolean(forceSyntheticSource); } else { if (forceSyntheticSource) { diff --git a/server/src/main/java/org/elasticsearch/action/get/MultiGetResponse.java b/server/src/main/java/org/elasticsearch/action/get/MultiGetResponse.java index eb979bc578554..b7c68a51ed604 100644 --- a/server/src/main/java/org/elasticsearch/action/get/MultiGetResponse.java +++ b/server/src/main/java/org/elasticsearch/action/get/MultiGetResponse.java @@ -9,7 +9,7 @@ package org.elasticsearch.action.get; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.common.collect.Iterators; import org.elasticsearch.common.io.stream.StreamInput; @@ -57,7 +57,7 @@ public Failure(String index, String id, Exception exception) { Failure(StreamInput in) throws IOException { index = in.readString(); - if (in.getVersion().before(Version.V_8_0_0)) { + if (in.getTransportVersion().before(TransportVersion.V_8_0_0)) { in.readOptionalString(); } id = in.readString(); @@ -88,7 +88,7 @@ public String getMessage() { @Override public void writeTo(StreamOutput out) throws IOException { out.writeString(index); - if (out.getVersion().before(Version.V_8_0_0)) { + if (out.getTransportVersion().before(TransportVersion.V_8_0_0)) { out.writeOptionalString(MapperService.SINGLE_MAPPING_NAME); } out.writeString(id); diff --git a/server/src/main/java/org/elasticsearch/action/get/MultiGetShardRequest.java b/server/src/main/java/org/elasticsearch/action/get/MultiGetShardRequest.java index fc641c31512a7..9b63fcc469a8a 100644 --- a/server/src/main/java/org/elasticsearch/action/get/MultiGetShardRequest.java +++ b/server/src/main/java/org/elasticsearch/action/get/MultiGetShardRequest.java @@ -8,7 +8,7 @@ package org.elasticsearch.action.get; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.support.single.shard.SingleShardRequest; import org.elasticsearch.common.io.stream.StreamInput; @@ -62,7 +62,7 @@ public class MultiGetShardRequest extends SingleShardRequest 0) { @@ -177,7 +177,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeOptionalWriteable(source); indicesOptions.writeIndicesOptions(out); out.writeByte(searchType.id()); - if (out.getVersion().before(Version.V_8_0_0)) { + if (out.getTransportVersion().before(TransportVersion.V_8_0_0)) { // types not supported so send an empty array to previous versions out.writeStringArray(Strings.EMPTY_ARRAY); } diff --git a/server/src/main/java/org/elasticsearch/action/search/SearchRequest.java b/server/src/main/java/org/elasticsearch/action/search/SearchRequest.java index 83f7caae58ec6..412f90db7908a 100644 --- a/server/src/main/java/org/elasticsearch/action/search/SearchRequest.java +++ b/server/src/main/java/org/elasticsearch/action/search/SearchRequest.java @@ -8,6 +8,7 @@ package org.elasticsearch.action.search; +import org.elasticsearch.TransportVersion; import org.elasticsearch.Version; import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; @@ -238,7 +239,7 @@ public SearchRequest(StreamInput in) throws IOException { preference = in.readOptionalString(); scroll = in.readOptionalWriteable(Scroll::new); source = in.readOptionalWriteable(SearchSourceBuilder::new); - if (in.getVersion().before(Version.V_8_0_0)) { + if (in.getTransportVersion().before(TransportVersion.V_8_0_0)) { // types no longer relevant so ignore String[] types = in.readStringArray(); if (types.length > 0) { @@ -262,16 +263,16 @@ public SearchRequest(StreamInput in) throws IOException { finalReduce = true; } ccsMinimizeRoundtrips = in.readBoolean(); - if (in.getVersion().onOrAfter(Version.V_7_12_0) && in.readBoolean()) { + if (in.getTransportVersion().onOrAfter(TransportVersion.V_7_12_0) && in.readBoolean()) { minCompatibleShardNode = Version.readVersion(in); } else { minCompatibleShardNode = null; } - if (in.getVersion().onOrAfter(Version.V_7_16_0)) { + if (in.getTransportVersion().onOrAfter(TransportVersion.V_7_16_0)) { waitForCheckpoints = in.readMap(StreamInput::readString, StreamInput::readLongArray); waitForCheckpointsTimeout = in.readTimeValue(); } - if (in.getVersion().onOrAfter(Version.V_8_4_0)) { + if (in.getTransportVersion().onOrAfter(TransportVersion.V_8_4_0)) { forceSyntheticSource = in.readBoolean(); } else { forceSyntheticSource = false; @@ -287,7 +288,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeOptionalString(preference); out.writeOptionalWriteable(scroll); out.writeOptionalWriteable(source); - if (out.getVersion().before(Version.V_8_0_0)) { + if (out.getTransportVersion().before(TransportVersion.V_8_0_0)) { // types not supported so send an empty array to previous versions out.writeStringArray(Strings.EMPTY_ARRAY); } @@ -303,27 +304,27 @@ public void writeTo(StreamOutput out) throws IOException { out.writeBoolean(finalReduce); } out.writeBoolean(ccsMinimizeRoundtrips); - if (out.getVersion().onOrAfter(Version.V_7_12_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_7_12_0)) { out.writeBoolean(minCompatibleShardNode != null); if (minCompatibleShardNode != null) { Version.writeVersion(minCompatibleShardNode, out); } } - Version waitForCheckpointsVersion = Version.V_7_16_0; - if (out.getVersion().onOrAfter(waitForCheckpointsVersion)) { + TransportVersion waitForCheckpointsVersion = TransportVersion.V_7_16_0; + if (out.getTransportVersion().onOrAfter(waitForCheckpointsVersion)) { out.writeMap(waitForCheckpoints, StreamOutput::writeString, StreamOutput::writeLongArray); out.writeTimeValue(waitForCheckpointsTimeout); } else if (waitForCheckpoints.isEmpty() == false) { throw new IllegalArgumentException( - "Remote node version [" - + out.getVersion() + "Remote transport version [" + + out.getTransportVersion() + " incompatible with " - + "wait_for_checkpoints. All nodes must be version [" + + "wait_for_checkpoints. All nodes must use transport version [" + waitForCheckpointsVersion + "] or greater." ); } - if (out.getVersion().onOrAfter(Version.V_8_4_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_8_4_0)) { out.writeBoolean(forceSyntheticSource); } else { if (forceSyntheticSource) { diff --git a/server/src/main/java/org/elasticsearch/action/search/SearchResponse.java b/server/src/main/java/org/elasticsearch/action/search/SearchResponse.java index bfef22dd12ece..5f42c1543da8c 100644 --- a/server/src/main/java/org/elasticsearch/action/search/SearchResponse.java +++ b/server/src/main/java/org/elasticsearch/action/search/SearchResponse.java @@ -9,7 +9,7 @@ package org.elasticsearch.action.search; import org.apache.lucene.search.TotalHits; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; @@ -84,7 +84,7 @@ public SearchResponse(StreamInput in) throws IOException { scrollId = in.readOptionalString(); tookInMillis = in.readVLong(); skippedShards = in.readVInt(); - if (in.getVersion().onOrAfter(Version.V_7_10_0)) { + if (in.getTransportVersion().onOrAfter(TransportVersion.V_7_10_0)) { pointInTimeId = in.readOptionalString(); } else { pointInTimeId = null; @@ -443,7 +443,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeOptionalString(scrollId); out.writeVLong(tookInMillis); out.writeVInt(skippedShards); - if (out.getVersion().onOrAfter(Version.V_7_10_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_7_10_0)) { out.writeOptionalString(pointInTimeId); } } diff --git a/server/src/main/java/org/elasticsearch/action/support/master/info/ClusterInfoRequest.java b/server/src/main/java/org/elasticsearch/action/support/master/info/ClusterInfoRequest.java index d07cee07a0d05..8e80444cc125c 100644 --- a/server/src/main/java/org/elasticsearch/action/support/master/info/ClusterInfoRequest.java +++ b/server/src/main/java/org/elasticsearch/action/support/master/info/ClusterInfoRequest.java @@ -8,7 +8,7 @@ package org.elasticsearch.action.support.master.info; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.action.IndicesRequest; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.action.support.master.MasterNodeReadRequest; @@ -31,7 +31,7 @@ public ClusterInfoRequest() {} public ClusterInfoRequest(StreamInput in) throws IOException { super(in); indices = in.readStringArray(); - if (in.getVersion().before(Version.V_8_0_0)) { + if (in.getTransportVersion().before(TransportVersion.V_8_0_0)) { in.readStringArray(); } indicesOptions = IndicesOptions.readIndicesOptions(in); @@ -41,7 +41,7 @@ public ClusterInfoRequest(StreamInput in) throws IOException { public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); out.writeStringArray(indices); - if (out.getVersion().before(Version.V_8_0_0)) { + if (out.getTransportVersion().before(TransportVersion.V_8_0_0)) { out.writeStringArray(Strings.EMPTY_ARRAY); } indicesOptions.writeIndicesOptions(out); diff --git a/server/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsResponse.java b/server/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsResponse.java index bfa07fa55d3f9..150545f51b14e 100644 --- a/server/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsResponse.java +++ b/server/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsResponse.java @@ -9,7 +9,7 @@ package org.elasticsearch.action.termvectors; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.common.collect.Iterators; import org.elasticsearch.common.io.stream.StreamInput; @@ -41,7 +41,7 @@ public Failure(String index, String id, Exception cause) { public Failure(StreamInput in) throws IOException { index = in.readString(); - if (in.getVersion().before(Version.V_8_0_0)) { + if (in.getTransportVersion().before(TransportVersion.V_8_0_0)) { // types no longer relevant so ignore String type = in.readOptionalString(); if (type != null) { @@ -76,7 +76,7 @@ public Exception getCause() { @Override public void writeTo(StreamOutput out) throws IOException { out.writeString(index); - if (out.getVersion().before(Version.V_8_0_0)) { + if (out.getTransportVersion().before(TransportVersion.V_8_0_0)) { // types not supported so send an empty array to previous versions out.writeOptionalString(null); } diff --git a/server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequest.java b/server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequest.java index 6a77388bcd5fa..fb5f1f6ee1348 100644 --- a/server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequest.java +++ b/server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequest.java @@ -9,7 +9,7 @@ package org.elasticsearch.action.termvectors; import org.elasticsearch.ElasticsearchParseException; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.RealtimeRequest; import org.elasticsearch.action.ValidateActions; @@ -128,7 +128,7 @@ public TermVectorsRequest() {} TermVectorsRequest(StreamInput in) throws IOException { super(in); - if (in.getVersion().before(Version.V_8_0_0)) { + if (in.getTransportVersion().before(TransportVersion.V_8_0_0)) { // types no longer relevant so ignore in.readString(); } @@ -477,7 +477,7 @@ public ActionRequestValidationException validate() { @Override public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); - if (out.getVersion().before(Version.V_8_0_0)) { + if (out.getTransportVersion().before(TransportVersion.V_8_0_0)) { // types not supported so send an empty array to previous versions out.writeString("_doc"); } diff --git a/server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsResponse.java b/server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsResponse.java index b30cb8a7a7f8b..82174485d8292 100644 --- a/server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsResponse.java +++ b/server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsResponse.java @@ -16,7 +16,7 @@ import org.apache.lucene.util.ArrayUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.CharsRefBuilder; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.termvectors.TermVectorsRequest.Flag; import org.elasticsearch.common.bytes.BytesArray; @@ -91,7 +91,7 @@ public TermVectorsResponse(String index, String id) { TermVectorsResponse(StreamInput in) throws IOException { index = in.readString(); - if (in.getVersion().before(Version.V_8_0_0)) { + if (in.getTransportVersion().before(TransportVersion.V_8_0_0)) { // types no longer relevant so ignore in.readString(); } @@ -109,7 +109,7 @@ public TermVectorsResponse(String index, String id) { @Override public void writeTo(StreamOutput out) throws IOException { out.writeString(index); - if (out.getVersion().before(Version.V_8_0_0)) { + if (out.getTransportVersion().before(TransportVersion.V_8_0_0)) { // types not supported so send an empty array to previous versions out.writeString(MapperService.SINGLE_MAPPING_NAME); } diff --git a/server/src/main/java/org/elasticsearch/action/update/UpdateRequest.java b/server/src/main/java/org/elasticsearch/action/update/UpdateRequest.java index 1c222590597b7..6801bf2c0fd10 100644 --- a/server/src/main/java/org/elasticsearch/action/update/UpdateRequest.java +++ b/server/src/main/java/org/elasticsearch/action/update/UpdateRequest.java @@ -9,7 +9,7 @@ package org.elasticsearch.action.update; import org.apache.lucene.util.RamUsageEstimator; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.DocWriteRequest; import org.elasticsearch.action.index.IndexRequest; @@ -136,7 +136,7 @@ public UpdateRequest(StreamInput in) throws IOException { public UpdateRequest(@Nullable ShardId shardId, StreamInput in) throws IOException { super(shardId, in); waitForActiveShards = ActiveShardCount.readFrom(in); - if (in.getVersion().before(Version.V_8_0_0)) { + if (in.getTransportVersion().before(TransportVersion.V_8_0_0)) { String type = in.readString(); assert MapperService.SINGLE_MAPPING_NAME.equals(type) : "Expected [_doc] but received [" + type + "]"; } @@ -159,7 +159,7 @@ public UpdateRequest(@Nullable ShardId shardId, StreamInput in) throws IOExcepti ifPrimaryTerm = in.readVLong(); detectNoop = in.readBoolean(); scriptedUpsert = in.readBoolean(); - if (in.getVersion().onOrAfter(Version.V_7_10_0)) { + if (in.getTransportVersion().onOrAfter(TransportVersion.V_7_10_0)) { requireAlias = in.readBoolean(); } else { requireAlias = false; @@ -860,7 +860,7 @@ public void writeThin(StreamOutput out) throws IOException { private void doWrite(StreamOutput out, boolean thin) throws IOException { waitForActiveShards.writeTo(out); - if (out.getVersion().before(Version.V_8_0_0)) { + if (out.getTransportVersion().before(TransportVersion.V_8_0_0)) { out.writeString(MapperService.SINGLE_MAPPING_NAME); } out.writeString(id); @@ -905,7 +905,7 @@ private void doWrite(StreamOutput out, boolean thin) throws IOException { out.writeVLong(ifPrimaryTerm); out.writeBoolean(detectNoop); out.writeBoolean(scriptedUpsert); - if (out.getVersion().onOrAfter(Version.V_7_10_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_7_10_0)) { out.writeBoolean(requireAlias); } } diff --git a/server/src/main/java/org/elasticsearch/cluster/RestoreInProgress.java b/server/src/main/java/org/elasticsearch/cluster/RestoreInProgress.java index 6a5edfc2df6b8..4d41473b2d0c7 100644 --- a/server/src/main/java/org/elasticsearch/cluster/RestoreInProgress.java +++ b/server/src/main/java/org/elasticsearch/cluster/RestoreInProgress.java @@ -361,7 +361,7 @@ public RestoreInProgress(StreamInput in) throws IOException { Snapshot snapshot = new Snapshot(in); State state = State.fromValue(in.readByte()); boolean quiet; - if (in.getVersion().onOrAfter(RestoreSnapshotRequest.VERSION_SUPPORTING_QUIET_PARAMETER)) { + if (in.getTransportVersion().onOrAfter(RestoreSnapshotRequest.VERSION_SUPPORTING_QUIET_PARAMETER)) { quiet = in.readBoolean(); } else { // Backwards compatibility: previously there was no logging of the start or completion of a snapshot restore @@ -389,7 +389,7 @@ public void writeTo(StreamOutput out) throws IOException { o.writeString(entry.uuid); entry.snapshot().writeTo(o); o.writeByte(entry.state().value()); - if (out.getVersion().onOrAfter(RestoreSnapshotRequest.VERSION_SUPPORTING_QUIET_PARAMETER)) { + if (out.getTransportVersion().onOrAfter(RestoreSnapshotRequest.VERSION_SUPPORTING_QUIET_PARAMETER)) { o.writeBoolean(entry.quiet()); } o.writeStringCollection(entry.indices); diff --git a/server/src/main/java/org/elasticsearch/snapshots/SnapshotInfo.java b/server/src/main/java/org/elasticsearch/snapshots/SnapshotInfo.java index f5372b359e890..0742036d81df9 100644 --- a/server/src/main/java/org/elasticsearch/snapshots/SnapshotInfo.java +++ b/server/src/main/java/org/elasticsearch/snapshots/SnapshotInfo.java @@ -497,7 +497,7 @@ public SnapshotInfo withoutIndices() { */ public static SnapshotInfo readFrom(final StreamInput in) throws IOException { final Snapshot snapshot; - if (in.getVersion().onOrAfter(GetSnapshotsRequest.PAGINATED_GET_SNAPSHOTS_VERSION)) { + if (in.getTransportVersion().onOrAfter(GetSnapshotsRequest.PAGINATED_GET_SNAPSHOTS_VERSION)) { snapshot = new Snapshot(in); } else { snapshot = new Snapshot(UNKNOWN_REPO_NAME, new SnapshotId(in)); @@ -1018,7 +1018,7 @@ public static SnapshotInfo fromXContentInternal(final String repoName, final XCo @Override public void writeTo(final StreamOutput out) throws IOException { - if (out.getVersion().onOrAfter(GetSnapshotsRequest.PAGINATED_GET_SNAPSHOTS_VERSION)) { + if (out.getTransportVersion().onOrAfter(GetSnapshotsRequest.PAGINATED_GET_SNAPSHOTS_VERSION)) { snapshot.writeTo(out); } else { snapshot.getSnapshotId().writeTo(out); diff --git a/server/src/test/java/org/elasticsearch/action/fieldcaps/ResponseRewriterTests.java b/server/src/test/java/org/elasticsearch/action/fieldcaps/ResponseRewriterTests.java index e757bdf0423b8..9264db0c5aefc 100644 --- a/server/src/test/java/org/elasticsearch/action/fieldcaps/ResponseRewriterTests.java +++ b/server/src/test/java/org/elasticsearch/action/fieldcaps/ResponseRewriterTests.java @@ -8,7 +8,7 @@ package org.elasticsearch.action.fieldcaps; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.common.Strings; import org.elasticsearch.test.ESTestCase; @@ -26,7 +26,7 @@ public void testExcludeMetadata() { ); Map rewritten = ResponseRewriter.rewriteOldResponses( - Version.V_8_0_0, + TransportVersion.V_8_0_0, oldResponse, new String[] { "-metadata" }, Strings.EMPTY_ARRAY @@ -45,7 +45,7 @@ public void testIncludeOnlyMetadata() { ); Map rewritten = ResponseRewriter.rewriteOldResponses( - Version.V_8_0_0, + TransportVersion.V_8_0_0, oldResponse, new String[] { "+metadata" }, Strings.EMPTY_ARRAY @@ -66,7 +66,7 @@ public void testExcludeNested() { ); Map rewritten = ResponseRewriter.rewriteOldResponses( - Version.V_8_0_0, + TransportVersion.V_8_0_0, oldResponse, new String[] { "-nested" }, Strings.EMPTY_ARRAY @@ -90,7 +90,7 @@ public void testExcludeMultifield() { ); Map rewritten = ResponseRewriter.rewriteOldResponses( - Version.V_8_0_0, + TransportVersion.V_8_0_0, oldResponse, new String[] { "-multifield" }, Strings.EMPTY_ARRAY @@ -112,7 +112,7 @@ public void testExcludeParents() { ); Map rewritten = ResponseRewriter.rewriteOldResponses( - Version.V_8_0_0, + TransportVersion.V_8_0_0, oldResponse, new String[] { "-parent" }, Strings.EMPTY_ARRAY @@ -134,7 +134,7 @@ public void testAllowedTypes() { ); Map rewritten = ResponseRewriter.rewriteOldResponses( - Version.V_8_0_0, + TransportVersion.V_8_0_0, oldResponse, Strings.EMPTY_ARRAY, new String[] { "text", "keyword" }