Refactored validateNamespace signature so that RootObjectMapper.processField can call it without a Mapper reference

Author: quux00

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

@@ -14,7 +14,7 @@
  */
 public class DefaultRootObjectMapperNamespaceValidator implements RootObjectMapperNamespaceValidator {
     @Override
-    public void validateNamespace(ObjectMapper.Subobjects subobjects, Mapper mapper) {}
+    public void validateNamespace(ObjectMapper.Subobjects subobjects, String name) {}
 
     // MP FIXME remove
     @Override

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

@@ -43,7 +43,7 @@ public MapperRegistry(
         // MP TODO: remove this no-op RootObjectMapperNamespaceValidator once we know how all this is going to work
         this(mapperParsers, runtimeFieldParsers, metadataMapperParsers, fieldFilter, new RootObjectMapperNamespaceValidator() {
             @Override
-            public void validateNamespace(ObjectMapper.Subobjects subobjects, Mapper mapper) {}
+            public void validateNamespace(ObjectMapper.Subobjects subobjects, String name) {}
         });
     }
 

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

@@ -543,12 +543,7 @@ private static boolean processField(
                 Map<String, RuntimeField> fields = RuntimeField.parseRuntimeFields((Map<String, Object>) fieldNode, parserContext, true);
                 if (namespaceValidator != null) {
                     for (String runtimeField : fields.keySet()) {
-                        if ("_project".equals(runtimeField) || runtimeField.startsWith("_project.")) {
-                            throw new IllegalArgumentException(
-                                "Runtime mapping rejected. No mappings of [_project] are allowed in order "
-                                    + "to avoid conflicts with project metadata tags in serverless."
-                            );
-                        }
+                        namespaceValidator.validateNamespace(null, runtimeField);
                     }
                 }
                 builder.addRuntimeFields(fields);
@@ -568,7 +563,7 @@ public int getTotalFieldsCount() {
     @Override
     protected void validateSubField(Mapper mapper, MappingLookup mappers) {
         if (namespaceValidator != null) {
-            namespaceValidator.validateNamespace(subobjects(), mapper);
+            namespaceValidator.validateNamespace(subobjects(), mapper.leafName());
         }
         super.validateSubField(mapper, mappers);
     }

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

@@ -17,5 +17,5 @@ public interface RootObjectMapperNamespaceValidator {
     /**
      * If the namespace in the mapper is not allowed, an Exception should be thrown.
      */
-    void validateNamespace(ObjectMapper.Subobjects subobjects, Mapper mapper);
+    void validateNamespace(ObjectMapper.Subobjects subobjects, String name);
 }

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

@@ -10,6 +10,7 @@
 package org.elasticsearch.index.mapper;
 
 import org.elasticsearch.common.Strings;
+import org.elasticsearch.core.Nullable;
 
 /**
  * In serverless, prohibits mappings that start with _project, including subfields such as _project.foo.
@@ -19,24 +20,14 @@
 public class ServerlessRootObjectMapperNamespaceValidator implements RootObjectMapperNamespaceValidator {
     private static final String SERVERLESS_RESERVED_NAMESPACE = "_project";
 
-    // MP TODO: we can also pass in a MappingLookup - would that help here?
     @Override
-    public void validateNamespace(ObjectMapper.Subobjects subobjects, Mapper mapper) {   // TODO: stop passing in Mapper and pass in String
-                                                                                         // fieldName
-        if (mapper.leafName().equals(SERVERLESS_RESERVED_NAMESPACE)) {
-            System.err.println("XX: 1A: " + mapper.leafName());
-            System.err.println("XX: 1B: " + mapper.fullPath());
-            System.err.println("XX: 1C: " + mapper.typeName());
-            System.err.println("XX: 1D: " + mapper);
+    public void validateNamespace(@Nullable ObjectMapper.Subobjects subobjects, String name) {
+        if (name.equals(SERVERLESS_RESERVED_NAMESPACE)) {
             throw new IllegalArgumentException(generateErrorMessage());
         } else if (subobjects != ObjectMapper.Subobjects.ENABLED) {
-            System.err.println("YYY: 2A: " + mapper.leafName());
-            System.err.println("YYY: 2B: " + mapper.fullPath());
-            System.err.println("YYY: 2C: " + mapper.typeName());
-            System.err.println("YYY: 2D: " + mapper);
-            // leafName here will be something like _project.myfield, rather than just _project
-            if (mapper.leafName().startsWith(SERVERLESS_RESERVED_NAMESPACE + ".")) {
-                throw new IllegalArgumentException(generateErrorMessage(mapper.leafName()));
+            // name here will be something like _project.my_field, rather than just _project
+            if (name.startsWith(SERVERLESS_RESERVED_NAMESPACE + ".")) {
+                throw new IllegalArgumentException(generateErrorMessage(name));
             }
         }
     }