Support include_type_name in the field mapping and index template APIs (backport to 6.x)

rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_field_mapping.json

@@ -21,6 +21,10 @@
         }
       },
       "params": {
+        "include_type_name": {
+          "type" : "boolean",
+          "description" : "Whether a type should be returned in the body of the mappings."
+        },
         "include_defaults": {
           "type" : "boolean",
           "description" : "Whether the default mapping values should be returned as well"

rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_template.json

@@ -16,6 +16,10 @@
         }
       },
       "params": {
+        "include_type_name": {
+          "type" : "boolean",
+          "description" : "Whether a type should be returned in the body of the mappings."
+        },
         "flat_settings": {
           "type": "boolean",
           "description": "Return settings in flat format (default: false)"

rest-api-spec/src/main/resources/rest-api-spec/api/indices.put_template.json

@@ -13,6 +13,10 @@
         }
       },
       "params": {
+        "include_type_name": {
+          "type" : "boolean",
+          "description" : "Whether a type should be returned in the body of the mappings."
+        },
         "order": {
           "type" : "number",
           "description" : "The order for this template when merging multiple matching ones (higher numbers are merged later, overriding the lower numbers)"

rest-api-spec/src/main/resources/rest-api-spec/test/indices.create/10_basic.yml

@@ -2,7 +2,7 @@
 "Create index with mappings":
   - skip:
       version: " - 6.6.99"
-      reason: include_type_name was introduced in 6.7
+      reason: include_type_name was introduced in 6.7.0
   - do:
       indices.create:
         include_type_name: false
@@ -22,7 +22,7 @@
 "Create index with settings":
   - skip:
       version: " - 6.6.99"
-      reason: include_type_name was introduced in 6.7
+      reason: include_type_name was introduced in 6.7.0
   - do:
       indices.create:
         include_type_name: false
@@ -41,7 +41,7 @@
 "Create index":
   - skip:
       version: " - 6.6.99"
-      reason: include_type_name was introduced in 6.7
+      reason: include_type_name was introduced in 6.7.0
   - do:
       indices.create:
         include_type_name: false
@@ -54,7 +54,7 @@
 "Create index with wait_for_active_shards set to all":
   - skip:
       version: " - 6.6.99"
-      reason: include_type_name was introduced in 6.7
+      reason: include_type_name was introduced in 6.7.0
   - do:
       indices.create:
         include_type_name: false
@@ -71,7 +71,7 @@
 "Create index with aliases":
   - skip:
       version: " - 6.6.99"
-      reason: include_type_name was introduced in 6.7
+      reason: include_type_name was introduced in 6.7.0
   - do:
       indices.create:
         include_type_name: false

rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_field_mapping/10_basic.yml

@@ -1,76 +1,59 @@
 ---
 setup:
+  - skip:
+      version: " - 6.6.99"
+      reason: include_type_name was introduced in 6.7.0
   - do:
         indices.create:
+          include_type_name: false
           index: test_index
           body:
               mappings:
-                test_type:
-                  properties:
-                    text:
-                      type:     text
+                properties:
+                  text:
+                    type:     text
 
 ---
-"Get field mapping with no index and type":
+"Get field mapping with no index":
 
   - do:
       indices.get_field_mapping:
+        include_type_name: false
         fields: text
 
-  - match: {test_index.mappings.test_type.text.mapping.text.type:     text}
+  - match: {test_index.mappings.text.mapping.text.type:     text}
 
 ---
 "Get field mapping by index only":
   - do:
       indices.get_field_mapping:
+        include_type_name: false
         index: test_index
         fields: text
 
-  - match: {test_index.mappings.test_type.text.mapping.text.type:     text}
+  - match: {test_index.mappings.text.mapping.text.type:     text}
 
 ---
-"Get field mapping by type & field":
+"Get field mapping by field, with another field that doesn't exist":
 
   - do:
       indices.get_field_mapping:
+        include_type_name: false
         index: test_index
-        type: test_type
-        fields: text
-
-  - match: {test_index.mappings.test_type.text.mapping.text.type:     text}
-
----
-"Get field mapping by type & field, with another field that doesn't exist":
-
-  - do:
-      indices.get_field_mapping:
-        index: test_index
-        type: test_type
         fields: [ text , text1 ]
 
-  - match: {test_index.mappings.test_type.text.mapping.text.type:     text}
+  - match: {test_index.mappings.text.mapping.text.type:     text}
   - is_false: test_index.mappings.test_type.text1
 
 ---
 "Get field mapping with include_defaults":
 
   - do:
       indices.get_field_mapping:
+        include_type_name: false
         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}
-
----
-"Get field mapping should work without index specifying type and fields":
-
-  - do:
-      indices.get_field_mapping:
-        type: test_type
-        fields: text
-
-  - match: {test_index.mappings.test_type.text.mapping.text.type:     text}
-
+  - match: {test_index.mappings.text.mapping.text.type:     text}
+  - match: {test_index.mappings.text.mapping.text.analyzer: default}

rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_field_mapping/11_basic_with_types.yml

@@ -0,0 +1,76 @@
+---
+setup:
+  - do:
+        indices.create:
+          index: test_index
+          body:
+              mappings:
+                test_type:
+                  properties:
+                    text:
+                      type:     text
+
+---
+"Get field mapping with no index and type":
+
+  - do:
+      indices.get_field_mapping:
+        fields: text
+
+  - match: {test_index.mappings.test_type.text.mapping.text.type:     text}
+
+---
+"Get field mapping by index only":
+  - do:
+      indices.get_field_mapping:
+        index: test_index
+        fields: text
+
+  - match: {test_index.mappings.test_type.text.mapping.text.type:     text}
+
+---
+"Get field mapping by type & field":
+
+  - do:
+      indices.get_field_mapping:
+        index: test_index
+        type: test_type
+        fields: text
+
+  - match: {test_index.mappings.test_type.text.mapping.text.type:     text}
+
+---
+"Get field mapping by type & field, with another field that doesn't exist":
+
+  - do:
+      indices.get_field_mapping:
+        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
+
+---
+"Get field mapping with include_defaults":
+
+  - do:
+      indices.get_field_mapping:
+        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}
+
+---
+"Get field mapping should work without index specifying type and fields":
+
+  - do:
+      indices.get_field_mapping:
+        type: test_type
+        fields: text
+
+  - match: {test_index.mappings.test_type.text.mapping.text.type:     text}
+

rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_field_mapping/20_missing_field.yml

@@ -1,21 +1,22 @@
 ---
 "Return empty object if field doesn't exist, but type and index do":
-
+  - skip:
+      version: " - 6.99.99"
+      reason: types are required in requests before 7.0.0
   - do:
         indices.create:
+          include_type_name: false
           index: test_index
           body:
-              mappings:
-                test_type:
-                  properties:
-                    text:
-                      type:     text
-                      analyzer: whitespace
+            mappings:
+              properties:
+                text:
+                  type:     text
+                  analyzer: whitespace
 
   - do:
       indices.get_field_mapping:
         index: test_index
-        type: test_type
         fields: not_existent
-  
-  - match: { '': {}}
+
+  - match: { 'test_index.mappings': {}}

rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_field_mapping/21_missing_field_with_types.yml

@@ -0,0 +1,21 @@
+---
+"Return empty object if field doesn't exist, but type and index do":
+
+  - do:
+        indices.create:
+          index: test_index
+          body:
+              mappings:
+                test_type:
+                  properties:
+                    text:
+                      type:     text
+                      analyzer: whitespace
+
+  - do:
+      indices.get_field_mapping:
+        index: test_index
+        type: test_type
+        fields: not_existent
+
+  - match: { '': {}}

rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_field_mapping/40_missing_index.yml

@@ -5,7 +5,6 @@
       catch: missing
       indices.get_field_mapping:
         index: test_index
-        type: type
         fields: field