Remove type field from internal PutMappingRequest (elastic#48793)

External API requests can no longer include types, so we have no need to pass this
information along in internal PutMappingClusterStateUpdateRequest objects, or on
PutMappingRequests used by the internal node client.

Relates to elastic#41059

Author: romseygeek

modules/reindex/src/test/java/org/elasticsearch/client/documentation/ReindexDocumentationIT.java

@@ -101,7 +101,7 @@ public void testUpdateByQuery() {
         Client client = client();
         client.admin().indices().prepareCreate("foo").get();
         client.admin().indices().prepareCreate("bar").get();
-        client.admin().indices().preparePutMapping(INDEX_NAME).setType("_doc").setSource("cat", "type=keyword").get();
+        client.admin().indices().preparePutMapping(INDEX_NAME).setSource("cat", "type=keyword").get();
         {
             // tag::update-by-query
             UpdateByQueryRequestBuilder updateByQuery =

plugins/mapper-size/src/test/java/org/elasticsearch/index/mapper/size/SizeMappingIT.java

@@ -63,7 +63,7 @@ public void testThatUpdatingMappingShouldNotRemoveSizeMappingConfiguration() thr
             jsonBuilder().startObject().startObject("properties").startObject("otherField").field("type", "text")
                 .endObject().endObject().endObject();
         AcknowledgedResponse putMappingResponse =
-            client().admin().indices().preparePutMapping(index).setType(type).setSource(updateMappingBuilder).get();
+            client().admin().indices().preparePutMapping(index).setSource(updateMappingBuilder).get();
         assertAcked(putMappingResponse);
 
         // make sure size field is still in mapping
@@ -85,7 +85,7 @@ public void testThatSizeCanBeSwitchedOnAndOff() throws Exception {
         XContentBuilder updateMappingBuilder =
             jsonBuilder().startObject().startObject("_size").field("enabled", false).endObject().endObject();
         AcknowledgedResponse putMappingResponse =
-            client().admin().indices().preparePutMapping(index).setType(type).setSource(updateMappingBuilder).get();
+            client().admin().indices().preparePutMapping(index).setSource(updateMappingBuilder).get();
         assertAcked(putMappingResponse);
 
         // make sure size field is still in mapping

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

@@ -26,29 +26,14 @@
  */
 public class PutMappingClusterStateUpdateRequest extends IndicesClusterStateUpdateRequest<PutMappingClusterStateUpdateRequest> {
 
-    private String type;
+    private final String source;
 
-    private String source;
-
-    public PutMappingClusterStateUpdateRequest() {
-
-    }
-
-    public String type() {
-        return type;
-    }
-
-    public PutMappingClusterStateUpdateRequest type(String type) {
-        this.type = type;
-        return this;
+    public PutMappingClusterStateUpdateRequest(String source) {
+        this.source = source;
     }
 
     public String source() {
         return source;
     }
 
-    public PutMappingClusterStateUpdateRequest source(String source) {
-        this.source = source;
-        return this;
-    }
 }

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

@@ -21,6 +21,7 @@
 
 import com.carrotsearch.hppc.ObjectHashSet;
 import org.elasticsearch.ElasticsearchGenerationException;
+import org.elasticsearch.Version;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.IndicesRequest;
 import org.elasticsearch.action.support.IndicesOptions;
@@ -37,6 +38,7 @@
 import org.elasticsearch.common.xcontent.XContentHelper;
 import org.elasticsearch.common.xcontent.XContentType;
 import org.elasticsearch.index.Index;
+import org.elasticsearch.index.mapper.MapperService;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -48,7 +50,7 @@
 import static org.elasticsearch.action.ValidateActions.addValidationError;
 
 /**
- * Puts mapping definition registered under a specific type into one or more indices. Best created with
+ * Puts mapping definition into one or more indices. Best created with
  * {@link org.elasticsearch.client.Requests#putMappingRequest(String...)}.
  * <p>
  * If the mappings already exists, the new mappings will be merged with the new one. If there are elements
@@ -69,8 +71,6 @@ public class PutMappingRequest extends AcknowledgedRequest<PutMappingRequest> im
 
     private IndicesOptions indicesOptions = IndicesOptions.fromOptions(false, false, true, true);
 
-    private String type;
-
     private String source;
     private String origin = "";
 
@@ -80,7 +80,12 @@ public PutMappingRequest(StreamInput in) throws IOException {
         super(in);
         indices = in.readStringArray();
         indicesOptions = IndicesOptions.readIndicesOptions(in);
-        type = in.readOptionalString();
+        if (in.getVersion().before(Version.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();
@@ -100,11 +105,6 @@ public PutMappingRequest(String... indices) {
     @Override
     public ActionRequestValidationException validate() {
         ActionRequestValidationException validationException = null;
-        if (type == null) {
-            validationException = addValidationError("mapping type is missing", validationException);
-        }else if (type.isEmpty()) {
-            validationException = addValidationError("mapping type is empty", validationException);
-        }
         if (source == null) {
             validationException = addValidationError("mapping source is missing", validationException);
         } else if (source.isEmpty()) {
@@ -160,21 +160,6 @@ public PutMappingRequest indicesOptions(IndicesOptions indicesOptions) {
         return this;
     }
 
-    /**
-     * The mapping type.
-     */
-    public String type() {
-        return type;
-    }
-
-    /**
-     * The type of the mappings.
-     */
-    public PutMappingRequest type(String type) {
-        this.type = type;
-        return this;
-    }
-
     /**
      * The mapping source definition.
      */
@@ -190,7 +175,7 @@ public String source() {
      * mapping fields will automatically be put on the top level mapping object.
      */
     public PutMappingRequest source(Object... source) {
-        return source(buildFromSimplifiedDef(type, source));
+        return source(buildFromSimplifiedDef(MapperService.SINGLE_MAPPING_NAME, source));
     }
 
     public String origin() {
@@ -314,7 +299,9 @@ public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
         out.writeStringArrayNullable(indices);
         indicesOptions.writeIndicesOptions(out);
-        out.writeOptionalString(type);
+        if (out.getVersion().before(Version.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/mapping/put/PutMappingRequestBuilder.java

@@ -59,14 +59,6 @@ public PutMappingRequestBuilder setIndicesOptions(IndicesOptions options) {
         return this;
     }
 
-    /**
-     * The type of the mappings.
-     */
-    public PutMappingRequestBuilder setType(String type) {
-        request.type(type);
-        return this;
-    }
-
     /**
      * The mapping source definition.
      */

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

@@ -43,6 +43,7 @@
 import org.elasticsearch.transport.TransportService;
 
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.Objects;
 import java.util.Optional;
 
@@ -105,10 +106,9 @@ protected void masterOperation(Task task, final PutMappingRequest request, final
                 listener.onFailure(maybeValidationException.get());
                 return;
             }
-            PutMappingClusterStateUpdateRequest updateRequest = new PutMappingClusterStateUpdateRequest()
-                    .ackTimeout(request.timeout()).masterNodeTimeout(request.masterNodeTimeout())
-                    .indices(concreteIndices).type(request.type())
-                    .source(request.source());
+            PutMappingClusterStateUpdateRequest updateRequest = new PutMappingClusterStateUpdateRequest(request.source())
+                .indices(concreteIndices)
+                .ackTimeout(request.timeout()).masterNodeTimeout(request.masterNodeTimeout());
 
             metaDataMappingService.putMapping(updateRequest, new ActionListener<ClusterStateUpdateResponse>() {
 
@@ -119,14 +119,14 @@ public void onResponse(ClusterStateUpdateResponse response) {
 
                 @Override
                 public void onFailure(Exception t) {
-                    logger.debug(() -> new ParameterizedMessage("failed to put mappings on indices [{}], type [{}]",
-                        concreteIndices, request.type()), t);
+                    logger.debug(() -> new ParameterizedMessage("failed to put mappings on indices [{}]",
+                        Arrays.asList(concreteIndices)), t);
                     listener.onFailure(t);
                 }
             });
         } catch (IndexNotFoundException ex) {
-            logger.debug(() -> new ParameterizedMessage("failed to put mappings on indices [{}], type [{}]",
-                request.indices(), request.type()), ex);
+            logger.debug(() -> new ParameterizedMessage("failed to put mappings on indices [{}]",
+                Arrays.asList(request.indices())), ex);
             throw ex;
         }
     }

server/src/main/java/org/elasticsearch/action/bulk/MappingUpdatePerformer.java

@@ -28,6 +28,6 @@ public interface MappingUpdatePerformer {
     /**
      * Update the mappings on the master.
      */
-    void updateMappings(Mapping update, ShardId shardId, String type, ActionListener<Void> listener);
+    void updateMappings(Mapping update, ShardId shardId, ActionListener<Void> listener);
 
 }

server/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java

@@ -121,10 +121,10 @@ protected void shardOperationOnPrimary(BulkShardRequest request, IndexShard prim
             ActionListener<PrimaryResult<BulkShardRequest, BulkShardResponse>> listener) {
         ClusterStateObserver observer = new ClusterStateObserver(clusterService, request.timeout(), logger, threadPool.getThreadContext());
         performOnPrimary(request, primary, updateHelper, threadPool::absoluteTimeInMillis,
-            (update, shardId, type, mappingListener) -> {
+            (update, shardId, mappingListener) -> {
                 assert update != null;
                 assert shardId != null;
-                mappingUpdatedAction.updateMappingOnMaster(shardId.getIndex(), type, update, mappingListener);
+                mappingUpdatedAction.updateMappingOnMaster(shardId.getIndex(), update, mappingListener);
             },
             mappingUpdateListener -> observer.waitForNextChange(new ClusterStateObserver.Listener() {
                 @Override
@@ -277,7 +277,6 @@ static boolean executeBulkItemRequest(BulkPrimaryExecutionContext context, Updat
             }
 
             mappingUpdater.updateMappings(result.getRequiredMappingUpdate(), primary.shardId(),
-                MapperService.SINGLE_MAPPING_NAME,
                 new ActionListener<>() {
                     @Override
                     public void onResponse(Void v) {

server/src/main/java/org/elasticsearch/cluster/action/index/MappingUpdatedAction.java

@@ -69,8 +69,8 @@ public void setClient(Client client) {
      * {@code timeout} is the master node timeout ({@link MasterNodeRequest#masterNodeTimeout()}),
      * potentially waiting for a master node to be available.
      */
-    public void updateMappingOnMaster(Index index, String type, Mapping mappingUpdate, ActionListener<Void> listener) {
-        client.preparePutMapping().setConcreteIndex(index).setType(type).setSource(mappingUpdate.toString(), XContentType.JSON)
+    public void updateMappingOnMaster(Index index, Mapping mappingUpdate, ActionListener<Void> listener) {
+        client.preparePutMapping().setConcreteIndex(index).setSource(mappingUpdate.toString(), XContentType.JSON)
             .setMasterNodeTimeout(dynamicMappingUpdateTimeout).setTimeout(TimeValue.ZERO)
             .execute(new ActionListener<AcknowledgedResponse>() {
                 @Override

server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataMappingService.java

@@ -252,7 +252,7 @@ private ClusterState applyRequest(ClusterState currentState, PutMappingClusterSt
                 updateList.add(indexMetaData);
                 // try and parse it (no need to add it here) so we can bail early in case of parsing exception
                 DocumentMapper existingMapper = mapperService.documentMapper();
-                DocumentMapper newMapper = mapperService.parse(request.type(), mappingUpdateSource);
+                DocumentMapper newMapper = mapperService.parse(MapperService.SINGLE_MAPPING_NAME, mappingUpdateSource);
                 if (existingMapper != null) {
                     // first, simulate: just call merge and ignore the result
                     existingMapper.merge(newMapper.mapping());
@@ -272,7 +272,8 @@ private ClusterState applyRequest(ClusterState currentState, PutMappingClusterSt
                 if (existingMapper != null) {
                     existingSource = existingMapper.mappingSource();
                 }
-                DocumentMapper mergedMapper = mapperService.merge(request.type(), mappingUpdateSource, MergeReason.MAPPING_UPDATE);
+                DocumentMapper mergedMapper
+                    = mapperService.merge(MapperService.SINGLE_MAPPING_NAME, mappingUpdateSource, MergeReason.MAPPING_UPDATE);
                 CompressedXContent updatedSource = mergedMapper.mappingSource();
 
                 if (existingSource != null) {
@@ -322,10 +323,6 @@ private ClusterState applyRequest(ClusterState currentState, PutMappingClusterSt
             }
         }
 
-        @Override
-        public String describeTasks(List<PutMappingClusterStateUpdateRequest> tasks) {
-            return String.join(", ", tasks.stream().map(t -> (CharSequence)t.type())::iterator);
-        }
     }
 
     public void putMapping(final PutMappingClusterStateUpdateRequest request, final ActionListener<ClusterStateUpdateResponse> listener) {