Object and Type parsing: Fix include_in_all in type

include_in_all can also be set on type level (root object). This fixes a regression introduced in elastic#6093 closes elastic#6304
mute · Jun 2, 2014 · 78b266a · 78b266a
1 parent 7452671
commit 78b266a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/main/java/org/elasticsearch/index/mapper/object/ObjectMapper.java b/src/main/java/org/elasticsearch/index/mapper/object/ObjectMapper.java
@@ -211,15 +211,16 @@ protected static boolean parseObjectOrDocumentTypeProperties(String fieldName, O
                     parseProperties(builder, (Map<String, Object>) fieldNode, parserContext);
                 }
                 return true;
+            } else if (fieldName.equals("include_in_all")) {
+                builder.includeInAll(nodeBooleanValue(fieldNode));
+                return true;
             }
             return false;
         }
 
         protected static void parseObjectProperties(String name, String fieldName, Object fieldNode, ObjectMapper.Builder builder) {
            if (fieldName.equals("path")) {
                 builder.pathType(parsePathType(name, fieldNode.toString()));
-            } else if (fieldName.equals("include_in_all")) {
-                builder.includeInAll(nodeBooleanValue(fieldNode));
             }
         }
 

diff --git a/src/test/java/org/elasticsearch/index/mapper/all/SimpleAllMapperTests.java b/src/test/java/org/elasticsearch/index/mapper/all/SimpleAllMapperTests.java
@@ -367,6 +367,13 @@ public void testRootMappersStillWorking() {
         rootTypes.put(IndexFieldMapper.NAME, "{\"enabled\" : true}");
         rootTypes.put(SourceFieldMapper.NAME, "{\"enabled\" : true}");
         rootTypes.put(TypeFieldMapper.NAME, "{\"store\" : true}");
+        rootTypes.put("include_in_all", "true");
+        rootTypes.put("index_analyzer", "\"standard\"");
+        rootTypes.put("search_analyzer", "\"standard\"");
+        rootTypes.put("analyzer", "\"standard\"");
+        rootTypes.put("dynamic_date_formats", "[\"yyyy-MM-dd\", \"dd-MM-yyyy\"]");
+        rootTypes.put("numeric_detection", "true");
+        rootTypes.put("dynamic_templates", "[]");
         for (String key : rootTypes.keySet()) {
             mapping += "\"" + key+ "\"" + ":" + rootTypes.get(key) + ",\n";
         }