Revert "Remove most remaining uses of V_8_0_0 transport version (#136054)"

This reverts commit 175fe4c.

Author: jdconrad

server/src/main/java/org/elasticsearch/action/RoutingMissingException.java

@@ -10,8 +10,10 @@
 package org.elasticsearch.action;
 
 import org.elasticsearch.ElasticsearchException;
+import org.elasticsearch.TransportVersions;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
+import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.rest.RestStatus;
 
 import java.io.IOException;
@@ -40,12 +42,18 @@ public RestStatus status() {
 
     public RoutingMissingException(StreamInput in) throws IOException {
         super(in);
+        if (in.getTransportVersion().before(TransportVersions.V_8_0_0)) {
+            in.readString();
+        }
         id = in.readString();
     }
 
     @Override
     protected void writeTo(StreamOutput out, Writer<Throwable> nestedExceptionsWriter) throws IOException {
         super.writeTo(out, nestedExceptionsWriter);
+        if (out.getTransportVersion().before(TransportVersions.V_8_0_0)) {
+            out.writeString(MapperService.SINGLE_MAPPING_NAME);
+        }
         out.writeString(id);
     }
 }

server/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequest.java

@@ -9,6 +9,7 @@
 
 package org.elasticsearch.action.admin.indices.get;
 
+import org.elasticsearch.TransportVersions;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.IndicesRequest;
 import org.elasticsearch.action.support.IndicesOptions;
@@ -112,6 +113,9 @@ public GetIndexRequest(TimeValue masterTimeout) {
     public GetIndexRequest(StreamInput in) throws IOException {
         super(in);
         indices = in.readStringArray();
+        if (in.getTransportVersion().before(TransportVersions.V_8_0_0)) {
+            in.readStringArray();
+        }
         indicesOptions = IndicesOptions.readIndicesOptions(in);
         features = in.readArray(i -> Feature.fromId(i.readByte()), Feature[]::new);
         humanReadable = in.readBoolean();

server/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexResponse.java

@@ -9,6 +9,7 @@
 
 package org.elasticsearch.action.admin.indices.get;
 
+import org.elasticsearch.TransportVersions;
 import org.elasticsearch.action.ActionResponse;
 import org.elasticsearch.cluster.metadata.AliasMetadata;
 import org.elasticsearch.cluster.metadata.MappingMetadata;
@@ -19,6 +20,7 @@
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.ChunkedToXContentObject;
 import org.elasticsearch.core.UpdateForV10;
+import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.xcontent.ToXContent;
 
 import java.io.IOException;
@@ -75,10 +77,18 @@ public GetIndexResponse(
     @UpdateForV10(owner = UpdateForV10.Owner.DATA_MANAGEMENT)
     GetIndexResponse(StreamInput in) throws IOException {
         this.indices = in.readStringArray();
-        mappings = in.readImmutableOpenMap(
-            StreamInput::readString,
-            i -> i.readBoolean() ? new MappingMetadata(i) : MappingMetadata.EMPTY_MAPPINGS
-        );
+        mappings = in.readImmutableOpenMap(StreamInput::readString, in.getTransportVersion().before(TransportVersions.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) {
+                String type = i.readString();
+                assert MapperService.SINGLE_MAPPING_NAME.equals(type) : "Expected [_doc] but got [" + type + "]";
+                return new MappingMetadata(i);
+            } else {
+                return MappingMetadata.EMPTY_MAPPINGS;
+            }
+        } : i -> i.readBoolean() ? new MappingMetadata(i) : MappingMetadata.EMPTY_MAPPINGS);
+
         aliases = in.readImmutableOpenMap(StreamInput::readString, i -> i.readCollectionAsList(AliasMetadata::new));
         settings = in.readImmutableOpenMap(StreamInput::readString, Settings::readSettingsFromStream);
         defaultSettings = in.readImmutableOpenMap(StreamInput::readString, Settings::readSettingsFromStream);

server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsIndexRequest.java

@@ -9,10 +9,12 @@
 
 package org.elasticsearch.action.admin.indices.mapping.get;
 
+import org.elasticsearch.TransportVersions;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.OriginalIndices;
 import org.elasticsearch.action.support.IndicesOptions;
 import org.elasticsearch.action.support.single.shard.SingleShardRequest;
+import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 
@@ -27,8 +29,14 @@ public class GetFieldMappingsIndexRequest extends SingleShardRequest<GetFieldMap
 
     GetFieldMappingsIndexRequest(StreamInput in) throws IOException {
         super(in);
+        if (in.getTransportVersion().before(TransportVersions.V_8_0_0)) {
+            in.readStringArray();   // former types array
+        }
         fields = in.readStringArray();
         includeDefaults = in.readBoolean();
+        if (in.getTransportVersion().before(TransportVersions.V_8_0_0)) {
+            in.readBoolean();       // former probablySingleField boolean
+        }
         originalIndices = OriginalIndices.readOriginalIndices(in);
     }
 
@@ -66,8 +74,14 @@ public IndicesOptions indicesOptions() {
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
+        if (out.getTransportVersion().before(TransportVersions.V_8_0_0)) {
+            out.writeStringArray(Strings.EMPTY_ARRAY);
+        }
         out.writeStringArray(fields);
         out.writeBoolean(includeDefaults);
+        if (out.getTransportVersion().before(TransportVersions.V_8_0_0)) {
+            out.writeBoolean(false);
+        }
         OriginalIndices.writeOriginalIndices(originalIndices, out);
     }
 

server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsRequest.java

@@ -9,6 +9,7 @@
 
 package org.elasticsearch.action.admin.indices.mapping.get;
 
+import org.elasticsearch.TransportVersions;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.IndicesRequest;
 import org.elasticsearch.action.LegacyActionRequest;
@@ -18,6 +19,7 @@
 import org.elasticsearch.common.io.stream.StreamOutput;
 
 import java.io.IOException;
+import java.util.Arrays;
 
 /**
  * Request the mappings of specific fields
@@ -40,7 +42,18 @@ public GetFieldMappingsRequest() {}
     public GetFieldMappingsRequest(StreamInput in) throws IOException {
         super(in);
         indices = in.readStringArray();
+        if (in.getTransportVersion().before(TransportVersions.V_8_0_0)) {
+            String[] types = in.readStringArray();
+            if (types != Strings.EMPTY_ARRAY) {
+                throw new IllegalArgumentException("Expected empty type array but received [" + Arrays.toString(types) + "]");
+            }
+
+        }
         indicesOptions = IndicesOptions.readIndicesOptions(in);
+        // Consume the deprecated local parameter
+        if (in.getTransportVersion().before(TransportVersions.V_8_0_0)) {
+            in.readBoolean();
+        }
         fields = in.readStringArray();
         includeDefaults = in.readBoolean();
     }
@@ -104,7 +117,13 @@ public ActionRequestValidationException validate() {
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
         out.writeStringArray(indices);
+        if (out.getTransportVersion().before(TransportVersions.V_8_0_0)) {
+            out.writeStringArray(Strings.EMPTY_ARRAY);
+        }
         indicesOptions.writeIndicesOptions(out);
+        if (out.getTransportVersion().before(TransportVersions.V_8_0_0)) {
+            out.writeBoolean(true);
+        }
         out.writeStringArray(fields);
         out.writeBoolean(includeDefaults);
     }

server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsResponse.java

@@ -9,12 +9,14 @@
 
 package org.elasticsearch.action.admin.indices.mapping.get;
 
+import org.elasticsearch.TransportVersions;
 import org.elasticsearch.action.ActionResponse;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.xcontent.XContentHelper;
 import org.elasticsearch.index.mapper.Mapper;
+import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.xcontent.ParseField;
 import org.elasticsearch.xcontent.ToXContentFragment;
 import org.elasticsearch.xcontent.ToXContentObject;
@@ -23,6 +25,7 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.Collections;
 import java.util.Map;
 import java.util.Objects;
 
@@ -43,9 +46,17 @@ public class GetFieldMappingsResponse extends ActionResponse implements ToXConte
     }
 
     GetFieldMappingsResponse(StreamInput in) throws IOException {
-        mappings = in.readImmutableMap(
-            mapIn -> mapIn.readImmutableMap(inpt -> new FieldMappingMetadata(inpt.readString(), inpt.readBytesReference()))
-        );
+        mappings = in.readImmutableMap(mapIn -> {
+            if (mapIn.getTransportVersion().before(TransportVersions.V_8_0_0)) {
+                int typesSize = mapIn.readVInt();
+                assert typesSize == 1 || typesSize == 0 : "Expected 0 or 1 types but got " + typesSize;
+                if (typesSize == 0) {
+                    return Collections.emptyMap();
+                }
+                mapIn.readString(); // type
+            }
+            return mapIn.readImmutableMap(inpt -> new FieldMappingMetadata(inpt.readString(), inpt.readBytesReference()));
+        });
     }
 
     /** returns the retrieved field mapping. The return map keys are index, field (as specified in the request). */
@@ -123,6 +134,10 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         out.writeMap(mappings, (outpt, map) -> {
+            if (outpt.getTransportVersion().before(TransportVersions.V_8_0_0)) {
+                outpt.writeVInt(1);
+                outpt.writeString(MapperService.SINGLE_MAPPING_NAME);
+            }
             outpt.writeMap(map, (o, v) -> {
                 o.writeString(v.fullName());
                 o.writeBytesReference(v.source);

server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsRequest.java

@@ -9,6 +9,7 @@
 
 package org.elasticsearch.action.admin.indices.mapping.get;
 
+import org.elasticsearch.TransportVersions;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.IndicesRequest;
 import org.elasticsearch.action.support.IndicesOptions;
@@ -42,6 +43,9 @@ public GetMappingsRequest(TimeValue masterTimeout) {
     public GetMappingsRequest(StreamInput in) throws IOException {
         super(in);
         indices = in.readStringArray();
+        if (in.getTransportVersion().before(TransportVersions.V_8_0_0)) {
+            in.readStringArray();
+        }
         indicesOptions = IndicesOptions.readIndicesOptions(in);
     }
 

server/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequest.java

@@ -10,6 +10,7 @@
 package org.elasticsearch.action.admin.indices.mapping.put;
 
 import org.elasticsearch.ElasticsearchGenerationException;
+import org.elasticsearch.TransportVersions;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.IndicesRequest;
 import org.elasticsearch.action.support.IndicesOptions;
@@ -23,6 +24,7 @@
 import org.elasticsearch.common.util.CollectionUtils;
 import org.elasticsearch.common.xcontent.XContentHelper;
 import org.elasticsearch.index.Index;
+import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.xcontent.XContentBuilder;
 import org.elasticsearch.xcontent.XContentFactory;
 import org.elasticsearch.xcontent.XContentType;
@@ -95,6 +97,12 @@ public PutMappingRequest(StreamInput in) throws IOException {
         super(in);
         indices = in.readStringArray();
         indicesOptions = IndicesOptions.readIndicesOptions(in);
+        if (in.getTransportVersion().before(TransportVersions.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 + "]");
+            }
+        }
         source = in.readString();
         concreteIndex = in.readOptionalWriteable(Index::new);
         origin = in.readOptionalString();
@@ -322,6 +330,9 @@ public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
         out.writeStringArrayNullable(indices);
         indicesOptions.writeIndicesOptions(out);
+        if (out.getTransportVersion().before(TransportVersions.V_8_0_0)) {
+            out.writeOptionalString(MapperService.SINGLE_MAPPING_NAME);
+        }
         out.writeString(source);
         out.writeOptionalWriteable(concreteIndex);
         out.writeOptionalString(origin);

server/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequest.java

@@ -31,6 +31,9 @@ public IndicesSegmentsRequest() {
 
     public IndicesSegmentsRequest(StreamInput in) throws IOException {
         super(in);
+        if (in.getTransportVersion().before(TransportVersions.V_8_0_0)) {
+            in.readBoolean();   // old 'verbose' option, since removed
+        }
         if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) {
             this.includeVectorFormatsInfo = in.readBoolean();
         }
@@ -53,6 +56,9 @@ public boolean isIncludeVectorFormatsInfo() {
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
+        if (out.getTransportVersion().before(TransportVersions.V_8_0_0)) {
+            out.writeBoolean(false);
+        }
         if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) {
             out.writeBoolean(includeVectorFormatsInfo);
         }

server/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequest.java

@@ -10,6 +10,7 @@
 
 import org.elasticsearch.ElasticsearchGenerationException;
 import org.elasticsearch.ElasticsearchParseException;
+import org.elasticsearch.TransportVersions;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.IndicesRequest;
 import org.elasticsearch.action.admin.indices.alias.Alias;
@@ -76,7 +77,15 @@ public PutIndexTemplateRequest(StreamInput in) throws IOException {
         order = in.readInt();
         create = in.readBoolean();
         settings = readSettingsFromStream(in);
-        mappings = in.readOptionalString();
+        if (in.getTransportVersion().before(TransportVersions.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
+                this.mappings = in.readString();
+            }
+        } else {
+            this.mappings = in.readOptionalString();
+        }
         int aliasesSize = in.readVInt();
         for (int i = 0; i < aliasesSize; i++) {
             aliases.add(new Alias(in));
@@ -441,7 +450,15 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeInt(order);
         out.writeBoolean(create);
         settings.writeTo(out);
-        out.writeOptionalString(mappings);
+        if (out.getTransportVersion().before(TransportVersions.V_8_0_0)) {
+            out.writeVInt(mappings == null ? 0 : 1);
+            if (mappings != null) {
+                out.writeString(MapperService.SINGLE_MAPPING_NAME);
+                out.writeString(mappings);
+            }
+        } else {
+            out.writeOptionalString(mappings);
+        }
         out.writeCollection(aliases);
         out.writeOptionalVInt(version);
     }