Mappings get put and get mappings

modules/rest-compatibility/src/main/java/org/elasticsearch/rest/action/admin/indices/RestCreateIndexActionV7.java

@@ -42,6 +42,7 @@ public class RestCreateIndexActionV7 extends RestCreateIndexAction {
      * Parameter that controls whether certain REST apis should include type names in their requests.
      */
     public static final String INCLUDE_TYPE_NAME_PARAMETER = "include_type_name";
+    public static final boolean DEFAULT_INCLUDE_TYPE_NAME_POLICY = false;
 
     @Override
     public String getName() {

modules/rest-compatibility/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetFieldMappingActionV7.java

@@ -0,0 +1,88 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.rest.action.admin.indices;
+
+import org.elasticsearch.Version;
+import org.elasticsearch.client.node.NodeClient;
+import org.elasticsearch.common.logging.DeprecationLogger;
+import org.elasticsearch.rest.RestRequest;
+
+import java.io.IOException;
+import java.util.List;
+
+import static org.elasticsearch.rest.RestRequest.Method.GET;
+
+public class RestGetFieldMappingActionV7 extends RestGetFieldMappingAction {
+
+    private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(RestGetFieldMappingActionV7.class);
+    public static final String TYPES_DEPRECATION_MESSAGE = "[types removal] Using include_type_name in get "
+        + "field mapping requests is deprecated. The parameter will be removed in the next major version.";
+
+    @Override
+    public List<Route> routes() {
+        return List.of(
+            new Route(GET, "/_mapping/field/{fields}"),
+            new Route(GET, "/{index}/_mapping/field/{fields}"),
+
+            new Route(GET, "/_mapping/{type}/field/{fields}"),
+            new Route(GET, "/{index}/{type}/_mapping/field/{fields}"),
+            new Route(GET, "/{index}/_mapping/{type}/field/{fields}")
+        );
+    }
+
+    @Override
+    public String getName() {
+        return "get_field_mapping_action_v7";
+    }
+
+    @Override
+    public Version compatibleWithVersion() {
+        return Version.V_7_0_0;
+    }
+
+    @Override
+    public RestChannelConsumer prepareRequest(final RestRequest request, final NodeClient client) throws IOException {
+        final String[] types = request.paramAsStringArrayOrEmptyIfAll("type");
+
+        boolean includeTypeName = request.paramAsBoolean(
+            RestCreateIndexActionV7.INCLUDE_TYPE_NAME_PARAMETER,
+            RestCreateIndexActionV7.DEFAULT_INCLUDE_TYPE_NAME_POLICY
+        );
+        if (includeTypeName == false && types.length > 0) {
+            throw new IllegalArgumentException("Types cannot be specified unless include_type_name" + " is set to true.");
+        }
+        if (request.hasParam(RestCreateIndexActionV7.INCLUDE_TYPE_NAME_PARAMETER)) {
+            request.param(RestCreateIndexActionV7.INCLUDE_TYPE_NAME_PARAMETER);
+            deprecationLogger.deprecate("get_field_mapping_with_types", TYPES_DEPRECATION_MESSAGE);
+            // todo compatible log about using INCLUDE_TYPE_NAME_PARAMETER
+        }
+        if (types.length > 0) {
+            // todo compatible log about using types in path
+        }
+        if (request.hasParam("local")) {
+            request.param("local");
+            deprecationLogger.deprecate(
+                "get_field_mapping_local",
+                "Use [local] in get field mapping requests is deprecated. " + "The parameter will be removed in the next major version"
+            );
+        }
+        return super.prepareRequest(request, client);
+    }
+}

modules/rest-compatibility/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetMappingActionV7.java

@@ -0,0 +1,86 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.rest.action.admin.indices;
+
+import org.elasticsearch.Version;
+import org.elasticsearch.client.node.NodeClient;
+import org.elasticsearch.common.logging.DeprecationLogger;
+import org.elasticsearch.rest.RestRequest;
+
+import java.io.IOException;
+import java.util.List;
+
+import static org.elasticsearch.rest.RestRequest.Method.GET;
+import static org.elasticsearch.rest.RestRequest.Method.HEAD;
+import static org.elasticsearch.rest.action.admin.indices.RestCreateIndexActionV7.DEFAULT_INCLUDE_TYPE_NAME_POLICY;
+import static org.elasticsearch.rest.action.admin.indices.RestCreateIndexActionV7.INCLUDE_TYPE_NAME_PARAMETER;
+
+public class RestGetMappingActionV7 extends RestGetMappingAction {
+    private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(RestGetMappingActionV7.class);
+    public static final String TYPES_DEPRECATION_MESSAGE = "[types removal] Using include_type_name in get"
+        + " mapping requests is deprecated. The parameter will be removed in the next major version.";
+
+    @Override
+    public List<Route> routes() {
+        return List.of(
+            new Route(GET, "/{index}/{type}/_mapping"),
+            new Route(GET, "/{index}/_mappings/{type}"),
+            new Route(GET, "/{index}/_mapping/{type}"),
+            new Route(HEAD, "/{index}/_mapping/{type}"),
+            new Route(GET, "/_mapping/{type}"),
+            new Route(GET, "/_mapping"),
+            new Route(GET, "/_mappings"),
+            new Route(GET, "/{index}/_mapping"),
+            new Route(GET, "/{index}/_mappings")
+        );
+    }
+
+    @Override
+    public String getName() {
+        return "get_mapping_action_v7";
+    }
+
+    @Override
+    public Version compatibleWithVersion() {
+        return Version.V_7_0_0;
+    }
+
+    @Override
+    public RestChannelConsumer prepareRequest(final RestRequest request, final NodeClient client) throws IOException {
+        final String[] types = request.paramAsStringArrayOrEmptyIfAll("type");
+        boolean includeTypeName = request.paramAsBoolean(INCLUDE_TYPE_NAME_PARAMETER, DEFAULT_INCLUDE_TYPE_NAME_POLICY);
+
+        if (request.method().equals(HEAD)) {
+            deprecationLogger.deprecate("get_mapping_with_types", "Type exists requests are deprecated, as types have been deprecated.");
+        } else if (includeTypeName == false && types.length > 0) {
+            throw new IllegalArgumentException(
+                "Types cannot be provided in get mapping requests, unless" + " include_type_name is set to true."
+            );
+        }
+        if (request.hasParam(INCLUDE_TYPE_NAME_PARAMETER)) {
+            request.paramAsBoolean(INCLUDE_TYPE_NAME_PARAMETER, DEFAULT_INCLUDE_TYPE_NAME_POLICY);
+            deprecationLogger.deprecate("get_mapping_with_types", TYPES_DEPRECATION_MESSAGE);
+        }
+        if (types.length > 0) {
+            // todo compatible log about using types in path
+        }
+        return super.prepareRequest(request, client);
+    }
+}

modules/rest-compatibility/src/main/java/org/elasticsearch/rest/action/admin/indices/RestPutMappingActionV7.java

@@ -0,0 +1,111 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.rest.action.admin.indices;
+
+import org.elasticsearch.Version;
+import org.elasticsearch.client.node.NodeClient;
+import org.elasticsearch.common.logging.DeprecationLogger;
+import org.elasticsearch.common.xcontent.XContentHelper;
+import org.elasticsearch.index.mapper.MapperService;
+import org.elasticsearch.rest.RestRequest;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import static org.elasticsearch.rest.RestRequest.Method.POST;
+import static org.elasticsearch.rest.RestRequest.Method.PUT;
+import static org.elasticsearch.rest.action.admin.indices.RestCreateIndexActionV7.DEFAULT_INCLUDE_TYPE_NAME_POLICY;
+import static org.elasticsearch.rest.action.admin.indices.RestCreateIndexActionV7.INCLUDE_TYPE_NAME_PARAMETER;
+
+public class RestPutMappingActionV7 extends RestPutMappingAction {
+    private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(RestPutMappingActionV7.class);
+    public static final String TYPES_DEPRECATION_MESSAGE = "[types removal] Using include_type_name in put "
+        + "mapping requests is deprecated. The parameter will be removed in the next major version.";
+
+    @Override
+    public List<Route> routes() {
+        return List.of(
+            new Route(PUT, "/{index}/{type}/_mapping"),
+            new Route(PUT, "/{index}/_mapping/{type}"),
+            new Route(PUT, "/_mapping/{type}"),
+
+            new Route(POST, "/{index}/{type}/_mapping"),
+            new Route(POST, "/{index}/_mapping/{type}"),
+            new Route(POST, "/_mapping/{type}"),
+
+            // register the same paths, but with plural form _mappings
+            new Route(PUT, "/{index}/{type}/_mappings"),
+            new Route(PUT, "/{index}/_mappings/{type}"),
+            new Route(PUT, "/_mappings/{type}"),
+
+            new Route(POST, "/{index}/{type}/_mappings"),
+            new Route(POST, "/{index}/_mappings/{type}"),
+            new Route(POST, "/_mappings/{type}"),
+
+            // no types in path, but type can be provided in body
+            new Route(POST, "/{index}/_mapping/"),
+            new Route(PUT, "/{index}/_mapping/"),
+            new Route(POST, "/{index}/_mappings/"),
+            new Route(PUT, "/{index}/_mappings/")
+        );
+    }
+
+    @Override
+    public String getName() {
+        return "put_mapping_action_v7";
+    }
+
+    @Override
+    public Version compatibleWithVersion() {
+        return Version.V_7_0_0;
+    }
+
+    @Override
+    public RestChannelConsumer prepareRequest(final RestRequest request, final NodeClient client) throws IOException {
+        final boolean includeTypeName = request.paramAsBoolean(INCLUDE_TYPE_NAME_PARAMETER, DEFAULT_INCLUDE_TYPE_NAME_POLICY);
+
+        String type = request.param("type");
+        Map<String, Object> sourceAsMap = XContentHelper.convertToMap(request.requiredContent(), false, request.getXContentType()).v2();
+        if (includeTypeName == false
+            && (type != null || MapperService.isMappingSourceTyped(MapperService.SINGLE_MAPPING_NAME, sourceAsMap))) {
+            throw new IllegalArgumentException(
+                "Types cannot be provided in put mapping requests, unless the include_type_name parameter is set to true."
+            );
+        }
+        if (request.hasParam(INCLUDE_TYPE_NAME_PARAMETER)) {
+            deprecationLogger.deprecate("put_mapping_with_types", TYPES_DEPRECATION_MESSAGE);
+        }
+        if (includeTypeName) {
+            sourceAsMap = prepareMappingsV7(sourceAsMap, request);
+        }
+        return super.sendPutMappingRequest(request, client, sourceAsMap);
+    }
+
+    private Map<String, Object> prepareMappingsV7(Map<String, Object> mappings, RestRequest request) {
+        String typeName = mappings.keySet().iterator().next();
+        @SuppressWarnings("unchecked")
+        Map<String, Object> typedMappings = (Map<String, Object>) mappings.get(typeName);
+
+        // no matter what the type was, replace it with _doc, because the internal representation still uses single type `_doc`.
+        return Collections.singletonMap(MapperService.SINGLE_MAPPING_NAME, typedMappings);
+    }
+}

qa/rest-compat-tests/build.gradle

@@ -15,6 +15,8 @@ task copyRestTestsResources(type: Copy) {
   dependsOn ':distribution:bwc:minor:checkoutBwcBranch'
 }
 
+//copyOverrides.dependsOn(copyRestTestsResources)
+processTestResources.dependsOn(copyRestTestsResources)
 integTest.dependsOn(copyRestTestsResources)
 
 dependencies {

qa/rest-compat-tests/src/test/resources/rest-api-spec/test/indices.get_field_mapping/11_basic_with_types.yml

@@ -0,0 +1,85 @@
+---
+setup:
+  - do:
+        indices.create:
+          include_type_name: true
+          index: test_index
+          body:
+              mappings:
+                test_type:
+                  properties:
+                    text:
+                      type:     text
+
+---
+"Get field mapping with no index and type":
+
+  - do:
+      indices.get_field_mapping:
+        include_type_name: true
+        fields: text
+  #- match: {test_index.mappings.test_type.text.mapping.text.type:     text}
+  - match: {test_index.mappings._doc.text.mapping.text.type:     text}
+
+---
+"Get field mapping by index only":
+  - do:
+      indices.get_field_mapping:
+        include_type_name: true
+        index: test_index
+        fields: text
+#  - match: {test_index.mappings.test_type.text.mapping.text.type:     text}
+  - match: {test_index.mappings._doc.text.mapping.text.type:     text}
+
+---
+"Get field mapping by type & field":
+
+  - do:
+      indices.get_field_mapping:
+        include_type_name: true
+        index: test_index
+        type: test_type
+        fields: text
+#  - match: {test_index.mappings.test_type.text.mapping.text.type:     text}
+  - match: {test_index.mappings._doc.text.mapping.text.type:     text}
+
+---
+"Get field mapping by type & field, with another field that doesn't exist":
+
+  - do:
+      indices.get_field_mapping:
+        include_type_name: true
+        index: test_index
+        type: test_type
+        fields: [ text , text1 ]
+#- match: {test_index.mappings.test_type.text.mapping.text.type:     text}
+#  - is_false: test_index.mappings.test_type.text1
+  - match: {test_index.mappings._doc.text.mapping.text.type:     text}
+  - is_false: test_index.mappings._doc.text1
+
+---
+"Get field mapping with include_defaults":
+
+  - do:
+      indices.get_field_mapping:
+        include_type_name: true
+        index: test_index
+        type: test_type
+        fields: text
+        include_defaults: true
+#- match: {test_index.mappings.test_type.text.mapping.text.type:     text}
+#  - match: {test_index.mappings.test_type.text.mapping.text.analyzer: default}
+  - match: {test_index.mappings._doc.text.mapping.text.type:     text}
+  - match: {test_index.mappings._doc.text.mapping.text.analyzer: default}
+
+---
+"Get field mapping should work without index specifying type and fields":
+
+  - do:
+      indices.get_field_mapping:
+        include_type_name: true
+        type: test_type
+        fields: text
+#  - match: {test_index.mappings.test_type.text.mapping.text.type:     text}
+  - match: {test_index.mappings._doc.text.mapping.text.type:     text}
+