Directly check mapping non-recursively

Author: Christoph Büscher

x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/ClusterDeprecationChecks.java

@@ -107,7 +107,10 @@ static DeprecationIssue checkTemplatesWithFieldNamesDisabled(ClusterState state)
             templateCursor.value.getMappings().forEach((mappingCursor) -> {
                 Map<String, Object> map = XContentHelper.convertToMap(mappingCursor.value.compressedReference(), false, XContentType.JSON)
                         .v2();
-                if (mapContainsFieldNamesDisabled(map)) {
+                // map should contain only type name at this level
+                assert map.size() == 1;
+                String type = map.keySet().iterator().next();
+                if (mapContainsFieldNamesDisabled((Map<?,?>) map.get(type))) {
                     templatesContainingFieldNames.add(templateName);
                 }
             });
@@ -127,18 +130,10 @@ static DeprecationIssue checkTemplatesWithFieldNamesDisabled(ClusterState state)
      * check for "_field_names" entries in the map that contain another property "enabled" in the sub-map
      */
     static boolean mapContainsFieldNamesDisabled(Map<?, ?> map) {
-        if (map != null) {
-            Object fieldNamesMapping = map.get(FieldNamesFieldMapper.NAME);
-            if (fieldNamesMapping != null && fieldNamesMapping instanceof Map) {
-                if (((Map<?, ?>) fieldNamesMapping).keySet().contains("enabled")) {
-                    return true;
-                }
-            } else {
-                for (Object value : map.values()) {
-                    if (value instanceof Map) {
-                        return mapContainsFieldNamesDisabled((Map<?, ?>) value);
-                    }
-                }
+        Object fieldNamesMapping = map.get(FieldNamesFieldMapper.NAME);
+        if (fieldNamesMapping != null) {
+            if (((Map<?, ?>) fieldNamesMapping).keySet().contains("enabled")) {
+                return true;
             }
         }
         return false;

x-pack/plugin/deprecation/src/test/java/org/elasticsearch/xpack/deprecation/ClusterDeprecationChecksTests.java

@@ -176,33 +176,22 @@ public void testTemplatesWithFieldNamesDisabled() throws IOException {
         goodMappingBuilder.endObject();
         assertFieldNamesEnabledTemplate(goodMappingBuilder, false);
 
-        XContentBuilder badMappingWithTypeBuilder = jsonBuilder();
-        badMappingWithTypeBuilder.startObject();
+        XContentBuilder badMappingBuilder = jsonBuilder();
+        badMappingBuilder.startObject();
         {
-            badMappingWithTypeBuilder.startObject("_doc");
+            // we currently always store a type level internally
+            badMappingBuilder.startObject("_doc");
             {
-                badMappingWithTypeBuilder.startObject(FieldNamesFieldMapper.NAME);
+                badMappingBuilder.startObject(FieldNamesFieldMapper.NAME);
                 {
-                    badMappingWithTypeBuilder.field("enabled", randomBoolean());
+                    badMappingBuilder.field("enabled", randomBoolean());
                 }
-                badMappingWithTypeBuilder.endObject();
-            }
-            badMappingWithTypeBuilder.endObject();
-        }
-        badMappingWithTypeBuilder.endObject();
-        assertFieldNamesEnabledTemplate(badMappingWithTypeBuilder, true);
-
-        XContentBuilder badMappingWithoutTypeBuilder = jsonBuilder();
-        badMappingWithoutTypeBuilder.startObject();
-        {
-            badMappingWithoutTypeBuilder.startObject(FieldNamesFieldMapper.NAME);
-            {
-                badMappingWithoutTypeBuilder.field("enabled", randomBoolean());
+                badMappingBuilder.endObject();
             }
-            badMappingWithoutTypeBuilder.endObject();
+            badMappingBuilder.endObject();
         }
-        badMappingWithoutTypeBuilder.endObject();
-        assertFieldNamesEnabledTemplate(badMappingWithoutTypeBuilder, true);
+        badMappingBuilder.endObject();
+        assertFieldNamesEnabledTemplate(badMappingBuilder, true);
     }
 
     private void assertFieldNamesEnabledTemplate(XContentBuilder templateBuilder, boolean expectIssue) throws IOException {