better exception message for MappingParser.parse

server/src/main/java/org/elasticsearch/index/mapper/MappingParser.java

@@ -112,7 +112,7 @@ private Mapping parse(String type, Map<String, Object> mapping) throws MapperPar
             if (typeParser != null) {
                 iterator.remove();
                 if (false == fieldNode instanceof Map) {
-                    throw new IllegalArgumentException("[_parent] must be an object containing [type]");
+                    throw new IllegalArgumentException("[" + fieldName + "] config must be an object");
                 }
                 @SuppressWarnings("unchecked")
                 Map<String, Object> fieldNodeMap = (Map<String, Object>) fieldNode;

server/src/test/java/org/elasticsearch/index/mapper/MappingParserTests.java

@@ -133,4 +133,13 @@ public void testMultiFieldsWithFieldAlias() throws IOException {
         );
         assertEquals("Type [alias] cannot be used in multi field", e.getMessage());
     }
+
+    public void testBadMetadataMapper() throws IOException {
+        XContentBuilder builder = topMapping(b -> { b.field(RoutingFieldMapper.NAME, "required"); });
+        IllegalArgumentException e = expectThrows(
+            IllegalArgumentException.class,
+            () -> createMappingParser(Settings.EMPTY).parse("_doc", new CompressedXContent(BytesReference.bytes(builder)))
+        );
+        assertEquals("[_routing] config must be an object", e.getMessage());
+    }
 }