Changed runtime field validation to be done in one place: RuntimeField.parseRuntimeFields.

Removed checks from RootObjectMapper and IndexService.
This checks both query-time and index-time runtime field mappings.

Author: quux00

server/src/main/java/org/elasticsearch/index/IndexService.java

@@ -1409,11 +1409,6 @@ public static Map<String, MappedFieldType> parseRuntimeMappings(
         // TODO add specific tests to SearchExecutionTests similar to the ones in FieldTypeLookupTests
         MappingParserContext parserContext = mapperService.parserContext();
         Map<String, RuntimeField> runtimeFields = RuntimeField.parseRuntimeFields(new HashMap<>(runtimeMappings), parserContext, false);
-        if (parserContext.getNamespaceValidator() != null) {
-            for (String runtimeFieldName : runtimeFields.keySet()) {
-                parserContext.getNamespaceValidator().validateNamespace(null, runtimeFieldName);
-            }
-        }
         Map<String, MappedFieldType> runtimeFieldTypes = RuntimeField.collectFieldTypes(runtimeFields.values());
         if (false == indexSettings.getIndexMetadata().getRoutingPaths().isEmpty()) {
             for (String r : runtimeMappings.keySet()) {

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

@@ -470,7 +470,7 @@ public static RootObjectMapper.Builder parse(String name, Map<String, Object> no
             String fieldName = entry.getKey();
             Object fieldNode = entry.getValue();
             if (parseObjectOrDocumentTypeProperties(fieldName, fieldNode, parserContext, builder)
-                || processField(builder, fieldName, fieldNode, parserContext, parserContext.getNamespaceValidator())) {
+                || processField(builder, fieldName, fieldNode, parserContext)) {
                 iterator.remove();
             }
         }
@@ -482,8 +482,7 @@ private static boolean processField(
         RootObjectMapper.Builder builder,
         String fieldName,
         Object fieldNode,
-        MappingParserContext parserContext,
-        RootObjectMapperNamespaceValidator namespaceValidator
+        MappingParserContext parserContext
     ) {
         if (fieldName.equals("date_formats") || fieldName.equals("dynamic_date_formats")) {
             if (fieldNode instanceof List) {
@@ -541,11 +540,6 @@ private static boolean processField(
         } else if (fieldName.equals("runtime")) {
             if (fieldNode instanceof Map) {
                 Map<String, RuntimeField> fields = RuntimeField.parseRuntimeFields((Map<String, Object>) fieldNode, parserContext, true);
-                if (namespaceValidator != null) {
-                    for (String runtimeField : fields.keySet()) {
-                        namespaceValidator.validateNamespace(null, runtimeField);
-                    }
-                }
                 builder.addRuntimeFields(fields);
                 return true;
             } else {

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

@@ -189,6 +189,9 @@ static Map<String, RuntimeField> parseRuntimeFields(
                             + " Check the documentation."
                     );
                 }
+                if (parserContext.getNamespaceValidator() != null) {
+                    parserContext.getNamespaceValidator().validateNamespace(null, fieldName);
+                }
                 runtimeFields.put(fieldName, builder.apply(typeParser.parse(fieldName, propNode, parserContext)));
                 propNode.remove("type");
                 MappingParser.checkNoRemainingFields(fieldName, propNode);