elastic · jtibshirani · Feb 1, 2019 · Jan 29, 2019 · Jan 30, 2019 · Jan 29, 2019
diff --git a/modules/aggs-matrix-stats/src/test/resources/rest-api-spec/test/stats/20_empty_bucket.yml b/modules/aggs-matrix-stats/src/test/resources/rest-api-spec/test/stats/20_empty_bucket.yml
@@ -2,7 +2,6 @@
 "Empty Bucket Aggregation":
   - do:
       indices.create:
-        include_type_name: false
         index: empty_bucket_idx
         body:
           settings:

diff --git a/...s/aggs-matrix-stats/src/test/resources/rest-api-spec/test/stats/30_single_value_field.yml b/...s/aggs-matrix-stats/src/test/resources/rest-api-spec/test/stats/30_single_value_field.yml
@@ -3,7 +3,6 @@ setup:
 
   - do:
       indices.create:
-        include_type_name: false
         index: test
         body:
           settings:

diff --git a/...es/aggs-matrix-stats/src/test/resources/rest-api-spec/test/stats/40_multi_value_field.yml b/...es/aggs-matrix-stats/src/test/resources/rest-api-spec/test/stats/40_multi_value_field.yml
@@ -3,7 +3,6 @@ setup:
 
   - do:
       indices.create:
-        include_type_name: false
         index: test
         body:
           settings:

diff --git a/modules/analysis-common/src/test/resources/rest-api-spec/test/indices.analyze/10_analyze.yml b/modules/analysis-common/src/test/resources/rest-api-spec/test/indices.analyze/10_analyze.yml
@@ -23,7 +23,6 @@
 
     - do:
         indices.create:
-          include_type_name: false
           index: test_deprecated_htmlstrip
           body:
             settings:

diff --git a/...lysis-common/src/test/resources/rest-api-spec/test/indices/validate_query/10_synonyms.yml b/...lysis-common/src/test/resources/rest-api-spec/test/indices/validate_query/10_synonyms.yml
@@ -2,7 +2,6 @@
 "validate query with synonyms":
   - do:
       indices.create:
-        include_type_name: false
         index: test
         body:
           settings:

diff --git a/modules/analysis-common/src/test/resources/rest-api-spec/test/search.query/10_match.yml b/modules/analysis-common/src/test/resources/rest-api-spec/test/search.query/10_match.yml
@@ -5,7 +5,6 @@
   # versions in the same position.
   - do:
       indices.create:
-        include_type_name: false
         index: test
         body:
           settings:

diff --git a/...es/analysis-common/src/test/resources/rest-api-spec/test/search.query/20_ngram_search.yml b/...es/analysis-common/src/test/resources/rest-api-spec/test/search.query/20_ngram_search.yml
@@ -1,7 +1,6 @@
 "ngram search":
   - do:
       indices.create:
-        include_type_name: false
         index: test
         body:
           settings:
@@ -44,7 +43,6 @@
 "testNGramCopyField":
   - do:
       indices.create:
-        include_type_name: false
         index: test
         body:
           settings:

diff --git a/...lysis-common/src/test/resources/rest-api-spec/test/search.query/30_ngram_highligthing.yml b/...lysis-common/src/test/resources/rest-api-spec/test/search.query/30_ngram_highligthing.yml
@@ -1,7 +1,6 @@
 "ngram highlighting":
   - do:
       indices.create:
-        include_type_name: false
         index: test
         body:
           settings:

diff --git a/...es/analysis-common/src/test/resources/rest-api-spec/test/search.query/40_query_string.yml b/...es/analysis-common/src/test/resources/rest-api-spec/test/search.query/40_query_string.yml
@@ -2,7 +2,6 @@
 "Test query string with snowball":
   - do:
       indices.create:
-          include_type_name: false
           index:  test
           body:
             mappings:

diff --git a/...is-common/src/test/resources/rest-api-spec/test/search.query/50_queries_with_synonyms.yml b/...is-common/src/test/resources/rest-api-spec/test/search.query/50_queries_with_synonyms.yml
@@ -2,7 +2,6 @@
 "Test common terms query with stacked tokens":
   - do:
       indices.create:
-          include_type_name: false
           index: test
           body:
             settings:
@@ -220,7 +219,6 @@
 "Test match query with synonyms - see #3881 for extensive description of the issue":
   - do:
       indices.create:
-          include_type_name: false
           index: test
           body:
             settings:

diff --git a/...s/analysis-common/src/test/resources/rest-api-spec/test/search.query/60_synonym_graph.yml b/...s/analysis-common/src/test/resources/rest-api-spec/test/search.query/60_synonym_graph.yml
@@ -1,7 +1,6 @@
 setup:
   - do:
       indices.create:
-        include_type_name: false
         index: test
         body:
           settings:

diff --git a/modules/analysis-common/src/test/resources/rest-api-spec/test/search.suggest/20_phrase.yml b/modules/analysis-common/src/test/resources/rest-api-spec/test/search.suggest/20_phrase.yml
@@ -3,7 +3,6 @@
 setup:
   - do:
       indices.create:
-        include_type_name: false
         index: test
         body:
           settings:

diff --git a/modules/analysis-common/src/test/resources/rest-api-spec/test/search.suggest/30_synonyms.yml b/modules/analysis-common/src/test/resources/rest-api-spec/test/search.suggest/30_synonyms.yml
@@ -2,7 +2,6 @@
 "suggestions with synonyms":
   - do:
       indices.create:
-          include_type_name: false
           index: test
           body:
             settings:

diff --git a/modules/analysis-common/src/test/resources/rest-api-spec/test/termvectors/10_payloads.yml b/modules/analysis-common/src/test/resources/rest-api-spec/test/termvectors/10_payloads.yml
@@ -3,7 +3,6 @@
   # because there are no token filters that support payloads in core.
   - do:
       indices.create:
-        include_type_name: false
         index: test
         body:
           settings:

diff --git a/modules/lang-expression/src/test/resources/rest-api-spec/test/lang_expression/20_search.yml b/modules/lang-expression/src/test/resources/rest-api-spec/test/lang_expression/20_search.yml
@@ -2,7 +2,6 @@
 setup:
   - do:
       indices.create:
-        include_type_name: false
         index: test123
         body:
           mappings:

diff --git a/modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/60_typed_keys.yml b/modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/60_typed_keys.yml
@@ -1,7 +1,6 @@
 setup:
   - do:
       indices.put_template:
-        include_type_name: false
         name: index_template
         body:
           index_patterns: test-*

diff --git a/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/20_scriptfield.yml b/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/20_scriptfield.yml
@@ -3,7 +3,6 @@
 setup:
     - do:
         indices.create:
-          include_type_name: false
           index: test
           body:
             mappings:

diff --git a/...les/lang-painless/src/test/resources/rest-api-spec/test/painless/50_script_doc_values.yml b/...les/lang-painless/src/test/resources/rest-api-spec/test/painless/50_script_doc_values.yml
@@ -1,7 +1,6 @@
 setup:
     - do:
         indices.create:
-            include_type_name: false
             index: test
             body:
                 settings:

diff --git a/...g-painless/src/test/resources/rest-api-spec/test/painless/60_script_doc_values_binary.yml b/...g-painless/src/test/resources/rest-api-spec/test/painless/60_script_doc_values_binary.yml
@@ -4,7 +4,6 @@
         features: ["headers"]
     - do:
         indices.create:
-            include_type_name: false
             index: test
             body:
                 mappings:

diff --git a/...g-painless/src/test/resources/rest-api-spec/test/painless/70_execute_painless_scripts.yml b/...g-painless/src/test/resources/rest-api-spec/test/painless/70_execute_painless_scripts.yml
@@ -1,7 +1,6 @@
 setup:
   - do:
       indices.create:
-        include_type_name: false
         index: my-index
         body:
           mappings:

diff --git a/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/70_mov_fn_agg.yml b/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/70_mov_fn_agg.yml
@@ -6,7 +6,6 @@ setup:
         reason:  "moving_fn added in 6.4.0"
   - do:
       indices.create:
-        include_type_name: false
         index: test
         body:
             mappings:

diff --git a/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/80_script_score.yml b/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/80_script_score.yml
@@ -80,7 +80,6 @@ setup:
 "Random functions":
     - do:
         indices.create:
-            include_type_name: false
             index: test
             body:
                 settings:
@@ -136,7 +135,6 @@ setup:
 "Decay geo functions":
     - do:
         indices.create:
-            include_type_name: false
             index: test
             body:
                 settings:

diff --git a/...lang-painless/src/test/resources/rest-api-spec/test/painless/90_interval_query_filter.yml b/...lang-painless/src/test/resources/rest-api-spec/test/painless/90_interval_query_filter.yml
@@ -5,7 +5,6 @@ setup:
 
   - do:
       indices.create:
-        include_type_name: false
         index:  test
         body:
           mappings:

diff --git a/modules/mapper-extras/src/test/resources/rest-api-spec/test/dense-vector/10_indexing.yml b/modules/mapper-extras/src/test/resources/rest-api-spec/test/dense-vector/10_indexing.yml
@@ -5,7 +5,6 @@ setup:
 
   - do:
       indices.create:
-        include_type_name: false
         index: test-index
         body:
           settings:

diff --git a/modules/mapper-extras/src/test/resources/rest-api-spec/test/rank_feature/10_basic.yml b/modules/mapper-extras/src/test/resources/rest-api-spec/test/rank_feature/10_basic.yml
@@ -5,7 +5,6 @@ setup:
 
   - do:
       indices.create:
-          include_type_name: false
           index: test
           body:
             settings:

diff --git a/modules/mapper-extras/src/test/resources/rest-api-spec/test/rank_features/10_basic.yml b/modules/mapper-extras/src/test/resources/rest-api-spec/test/rank_features/10_basic.yml
@@ -5,7 +5,6 @@ setup:
 
   - do:
       indices.create:
-          include_type_name: false
           index: test
           body:
             settings:

diff --git a/modules/mapper-extras/src/test/resources/rest-api-spec/test/scaled_float/10_basic.yml b/modules/mapper-extras/src/test/resources/rest-api-spec/test/scaled_float/10_basic.yml
@@ -1,7 +1,6 @@
 setup:
   - do:
       indices.create:
-          include_type_name: false
           index: test
           body:
             settings:

diff --git a/modules/mapper-extras/src/test/resources/rest-api-spec/test/sparse-vector/10_indexing.yml b/modules/mapper-extras/src/test/resources/rest-api-spec/test/sparse-vector/10_indexing.yml
@@ -5,7 +5,6 @@ setup:
 
   - do:
       indices.create:
-        include_type_name: false
         index: test-index
         body:
           settings:

diff --git a/modules/parent-join/src/test/resources/rest-api-spec/test/11_parent_child.yml b/modules/parent-join/src/test/resources/rest-api-spec/test/11_parent_child.yml
@@ -1,7 +1,6 @@
 setup:
   - do:
       indices.create:
-        include_type_name: false
         index: test
         body:
             mappings:

diff --git a/modules/parent-join/src/test/resources/rest-api-spec/test/20_parent_join.yml b/modules/parent-join/src/test/resources/rest-api-spec/test/20_parent_join.yml
@@ -1,7 +1,6 @@
 setup:
   - do:
       indices.create:
-        include_type_name: false
         index: test
         body:
           mappings:

diff --git a/modules/percolator/src/test/resources/rest-api-spec/test/10_basic.yml b/modules/percolator/src/test/resources/rest-api-spec/test/10_basic.yml
@@ -2,7 +2,6 @@
 "Test percolator basics via rest":
   - do:
       indices.create:
-        include_type_name: false
         index: queries_index
         body:
           mappings:

diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/30_new_fields.yml b/modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/30_new_fields.yml
@@ -18,7 +18,6 @@
 
   - do:
       indices.put_mapping:
-        include_type_name: false
         index: test
         body:
           properties:

diff --git a/plugins/analysis-icu/src/test/resources/rest-api-spec/test/analysis_icu/20_search.yml b/plugins/analysis-icu/src/test/resources/rest-api-spec/test/analysis_icu/20_search.yml
@@ -4,7 +4,6 @@
 "Index ICU content":
     - do:
         indices.create:
-            include_type_name: false
             index:  test
             body:
                 settings:

diff --git a/...s/analysis-phonetic/src/test/resources/rest-api-spec/test/analysis_phonetic/40_search.yml b/...s/analysis-phonetic/src/test/resources/rest-api-spec/test/analysis_phonetic/40_search.yml
@@ -4,7 +4,6 @@
 "Index phonetic content":
     - do:
         indices.create:
-            include_type_name: false
             index:  phonetic_sample
             body:
                 settings:

diff --git a/...ins/analysis-smartcn/src/test/resources/rest-api-spec/test/analysis_smartcn/20_search.yml b/...ins/analysis-smartcn/src/test/resources/rest-api-spec/test/analysis_smartcn/20_search.yml
@@ -4,7 +4,6 @@
 "Index Smartcn content":
     - do:
         indices.create:
-            include_type_name: false
             index:  test
             body:
                 mappings:

diff --git a/...ins/analysis-stempel/src/test/resources/rest-api-spec/test/analysis_stempel/20_search.yml b/...ins/analysis-stempel/src/test/resources/rest-api-spec/test/analysis_stempel/20_search.yml
@@ -4,7 +4,6 @@
 "Index Stempel content":
     - do:
         indices.create:
-            include_type_name: false
             index:  test
             body:
                 mappings:

diff --git a/...analysis-ukrainian/src/test/resources/rest-api-spec/test/analysis_ukrainian/20_search.yml b/...analysis-ukrainian/src/test/resources/rest-api-spec/test/analysis_ukrainian/20_search.yml
@@ -4,7 +4,6 @@
 "Index Stempel content":
     - do:
         indices.create:
-            include_type_name: false
             index:  test
             body:
                 mappings:

diff --git a/...er-annotated-text/src/test/resources/rest-api-spec/test/mapper_annotatedtext/10_basic.yml b/...er-annotated-text/src/test/resources/rest-api-spec/test/mapper_annotatedtext/10_basic.yml
@@ -9,7 +9,6 @@
 
   - do:
       indices.create:
-        include_type_name: false
         index: annotated
         body:
           settings:

diff --git a/plugins/mapper-murmur3/src/test/resources/rest-api-spec/test/mapper_murmur3/10_basic.yml b/plugins/mapper-murmur3/src/test/resources/rest-api-spec/test/mapper_murmur3/10_basic.yml
@@ -6,7 +6,6 @@
 
     - do:
         indices.create:
-            include_type_name: false
             index: test
             body:
                 mappings:

diff --git a/plugins/mapper-size/src/test/resources/rest-api-spec/test/mapper_size/10_basic.yml b/plugins/mapper-size/src/test/resources/rest-api-spec/test/mapper_size/10_basic.yml
@@ -6,7 +6,6 @@
 
     - do:
         indices.create:
-            include_type_name: false
             index: test
             body:
                 mappings:

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.aliases/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.aliases/10_basic.yml
@@ -54,7 +54,6 @@
 
   - do:
         indices.create:
-            include_type_name: false
             index: test
             body:
                 mappings:

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.fielddata/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.fielddata/10_basic.yml
@@ -22,7 +22,6 @@
 
   - do:
       indices.create:
-        include_type_name: false
         index:  index
         body:
           settings:

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/count/20_query_string.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/count/20_query_string.yml
@@ -2,7 +2,6 @@
 "count with query_string parameters":
   - do:
       indices.create:
-          include_type_name: false
           index:  test
           body:
             mappings:

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/create/70_nested.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/create/70_nested.yml
@@ -5,7 +5,6 @@ setup:
       reason: types are required in requests before 7.0.0
   - do:
       indices.create:
-          include_type_name: false
           index: test_1
           body:
               settings:

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/delete/11_shard_header.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/delete/11_shard_header.yml
@@ -7,7 +7,6 @@
 
  - do:
       indices.create:
-        include_type_name: false
         index: foobar
         body:
           settings:

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/delete/30_routing.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/delete/30_routing.yml
@@ -7,7 +7,6 @@
 
  - do:
       indices.create:
-          include_type_name: false
           index: test_1
           body:
             settings:

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/delete/50_refresh.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/delete/50_refresh.yml
@@ -7,7 +7,6 @@
 
  - do:
       indices.create:
-          include_type_name: false
           index:    test_1
           body:
               settings: