Fix transport version issues after they were consolidated in main

Author: kderusso

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

@@ -336,7 +336,6 @@ static TransportVersion def(int id) {
     public static final TransportVersion ML_INFERENCE_LLAMA_ADDED = def(9_125_0_00);
     public static final TransportVersion SHARD_WRITE_LOAD_IN_CLUSTER_INFO = def(9_126_0_00);
     public static final TransportVersion ESQL_SAMPLE_OPERATOR_STATUS = def(9_127_0_00);
-    public static final TransportVersion RERANK_RESCORE_CHUNKS = def(9_130_0_00);
     public static final TransportVersion PROJECT_RESERVED_STATE_MOVE_TO_REGISTRY = def(9_147_0_00);
     public static final TransportVersion STREAMS_ENDPOINT_PARAM_RESTRICTIONS = def(9_148_0_00);
     public static final TransportVersion RESOLVE_INDEX_MODE_FILTER = def(9_149_0_00);

server/src/main/java/org/elasticsearch/search/rank/feature/RankFeatureDoc.java

@@ -39,7 +39,7 @@ public RankFeatureDoc(int doc, float score, int shardIndex) {
 
     public RankFeatureDoc(StreamInput in) throws IOException {
         super(in);
-        if (in.getTransportVersion().onOrAfter(TransportVersions.RERANK_RESCORE_CHUNKS)) {
+        if (in.getTransportVersion().supports(RERANK_SNIPPETS)) {
             featureData = in.readOptionalStringCollectionAsList();
         } else {
             String featureDataString = in.readOptionalString();
@@ -58,7 +58,7 @@ public void featureData(List<String> featureData) {
 
     @Override
     protected void doWriteTo(StreamOutput out) throws IOException {
-        if (out.getTransportVersion().onOrAfter(TransportVersions.RERANK_RESCORE_CHUNKS)) {
+        if (out.getTransportVersion().supports(RERANK_SNIPPETS)) {
             out.writeOptionalStringCollection(featureData);
         } else {
             out.writeOptionalString(featureData.get(0));

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/chunking/RecursiveChunkingSettings.java

@@ -56,15 +56,9 @@ public RecursiveChunkingSettings(StreamInput in) throws IOException {
     public void validate() {
         ValidationException validationException = new ValidationException();
 
-        if (maxChunkSize < MAX_CHUNK_SIZE_LOWER_LIMIT || maxChunkSize > MAX_CHUNK_SIZE_UPPER_LIMIT) {
+        if (maxChunkSize < MAX_CHUNK_SIZE_LOWER_LIMIT) {
             validationException.addValidationError(
-                ChunkingSettingsOptions.MAX_CHUNK_SIZE
-                    + "["
-                    + maxChunkSize
-                    + "] must be between "
-                    + MAX_CHUNK_SIZE_LOWER_LIMIT
-                    + " and "
-                    + MAX_CHUNK_SIZE_UPPER_LIMIT
+                ChunkingSettingsOptions.MAX_CHUNK_SIZE + "[" + maxChunkSize + "] must be above " + MAX_CHUNK_SIZE_LOWER_LIMIT
             );
 
             if (separators != null && separators.isEmpty()) {

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/chunking/WordBoundaryChunkingSettings.java

@@ -52,15 +52,9 @@ public WordBoundaryChunkingSettings(StreamInput in) throws IOException {
     public void validate() {
         ValidationException validationException = new ValidationException();
 
-        if (maxChunkSize < MAX_CHUNK_SIZE_LOWER_LIMIT || maxChunkSize > MAX_CHUNK_SIZE_UPPER_LIMIT) {
+        if (maxChunkSize < MAX_CHUNK_SIZE_LOWER_LIMIT) {
             validationException.addValidationError(
-                ChunkingSettingsOptions.MAX_CHUNK_SIZE
-                    + "["
-                    + maxChunkSize
-                    + "] must be between "
-                    + MAX_CHUNK_SIZE_LOWER_LIMIT
-                    + " and "
-                    + MAX_CHUNK_SIZE_UPPER_LIMIT
+                ChunkingSettingsOptions.MAX_CHUNK_SIZE + "[" + maxChunkSize + "] must be above " + MAX_CHUNK_SIZE_LOWER_LIMIT
             );
         }
 

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/rank/textsimilarity/TextSimilarityRankBuilder.java

@@ -90,7 +90,7 @@ public TextSimilarityRankBuilder(StreamInput in) throws IOException {
         } else {
             this.failuresAllowed = false;
         }
-        if (in.getTransportVersion().onOrAfter(TransportVersions.RERANK_RESCORE_CHUNKS)) {
+        if (in.getTransportVersion().supports(RERANK_SNIPPETS)) {
             this.chunkScorerConfig = in.readOptionalWriteable(ChunkScorerConfig::new);
         } else {
             this.chunkScorerConfig = null;
@@ -118,7 +118,7 @@ public void doWriteTo(StreamOutput out) throws IOException {
             || out.getTransportVersion().onOrAfter(TransportVersions.RERANKER_FAILURES_ALLOWED)) {
             out.writeBoolean(failuresAllowed);
         }
-        if (out.getTransportVersion().onOrAfter(TransportVersions.RERANK_RESCORE_CHUNKS)) {
+        if (out.getTransportVersion().supports(RERANK_SNIPPETS)) {
             out.writeOptionalWriteable(chunkScorerConfig);
         }
     }