fix comment. no hardcode

Author: arturobernalg

impl/maven-support/src/test/java/org/apache/maven/model/v4/MavenStaxReaderNamespaceTest.java

@@ -21,6 +21,7 @@
 import javax.xml.stream.XMLStreamException;
 
 import java.io.StringReader;
+import java.util.Locale;
 
 import org.apache.maven.api.model.InputSource;
 import org.apache.maven.api.model.Model;
@@ -105,6 +106,6 @@ void rejectsUnexpectedPomNamespace() {
         XMLStreamException ex = assertThrows(
                 XMLStreamException.class, () -> reader.read(new StringReader(POM_BAD_NS), true, NO_INPUT_SOURCE));
         // sanity check: message mentions unrecognized namespace
-        assertTrue(ex.getMessage().toLowerCase().contains("unrecognized pom namespace"));
+        assertTrue(ex.getMessage().toLowerCase(Locale.ROOT).contains("unrecognized pom namespace"));
     }
 }

impl/maven-support/src/test/java/org/apache/maven/model/v4/MetadataStaxReaderNamespaceTest.java

@@ -61,21 +61,21 @@ class MetadataStaxReaderNamespaceTest {
     @Test
     void acceptsMetadata110() throws Exception {
         MetadataStaxReader reader = new MetadataStaxReader();
-        Metadata md = reader.read(new StringReader(META_110), /*strict*/ true);
-        assertNotNull(md);
-        assertEquals("com.acme", md.getGroupId());
-        assertEquals("demo", md.getArtifactId());
-        assertNotNull(md.getVersioning());
-        assertEquals("1.0", md.getVersioning().getLatest());
+        Metadata metadata = reader.read(new StringReader(META_110), /*strict*/ true);
+        assertNotNull(metadata);
+        assertEquals("com.acme", metadata.getGroupId());
+        assertEquals("demo", metadata.getArtifactId());
+        assertNotNull(metadata.getVersioning());
+        assertEquals("1.0", metadata.getVersioning().getLatest());
     }
 
     @Test
     void acceptsMetadataWithoutNamespace() throws Exception {
         MetadataStaxReader reader = new MetadataStaxReader();
-        Metadata md = reader.read(new StringReader(META_NO_NS), true);
-        assertNotNull(md);
-        assertEquals("com.acme", md.getGroupId());
-        assertEquals("demo", md.getArtifactId());
+        Metadata metadata = reader.read(new StringReader(META_NO_NS), true);
+        assertNotNull(metadata);
+        assertEquals("com.acme", metadata.getGroupId());
+        assertEquals("demo", metadata.getArtifactId());
     }
 
     @Test

src/mdo/reader-stax.vm

@@ -246,21 +246,22 @@ public class ${className} {
 #end
     } //-- ${root.name} read(InputStream, boolean)
 
-/**
-* Method read.
-*
-* @param parser a parser object.
-* @param strict a strict object.
-* @throws XMLStreamException XMLStreamException if any.
-* @return ${root.name}
-*/
+    /**
+     * Method read.
+     *
+     * @param parser a parser object.
+     * @param strict a strict object.
+     * @throws XMLStreamException XMLStreamException if
+     * any.
+     * @return ${root.name}
+     */
 #if ( $locationTracking )
-public ${root.name} read(XMLStreamReader parser, boolean strict, InputSource inputSrc) throws XMLStreamException {
+    public ${root.name} read(XMLStreamReader parser, boolean strict, InputSource inputSrc) throws XMLStreamException {
 #else
-public ${root.name} read(XMLStreamReader parser, boolean strict) throws XMLStreamException {
+    public ${root.name} read(XMLStreamReader parser, boolean strict) throws XMLStreamException {
 #end
 #if ( $needXmlContext )
-Deque<Object> context = new ArrayDeque<>();
+        Deque<Object> context = new ArrayDeque<>();
 #end
 $rootUcapName $rootLcapName = null;
     int eventType = parser.getEventType();
@@ -272,50 +273,50 @@ $rootUcapName $rootLcapName = null;
     } else if (parsed) {
     throw new XMLStreamException("Duplicated tag: '${rootTag}'", parser.getLocation(), null);
     }
-
-    // Enforce root namespace per model (strict mode).
-    String rootNs = parser.getNamespaceURI();
-    boolean hasNs = rootNs != null && !rootNs.isEmpty();
-    if (strict && hasNs) {
-    if ("project".equals("${rootTag}")) {
-    // Accept any official POM namespace version (e.g., 4.0.0, 4.1.0)
-    if (!rootNs.startsWith("http://maven.apache.org/POM/")) {
-    throw new XMLStreamException(
-    "Unrecognized POM namespace '" + rootNs
-    + "'. Expected something like 'http://maven.apache.org/POM/4.x.y' or no namespace.",
-    parser.getLocation(), null);
-    }
-    } else if ("metadata".equals("${rootTag}")) {
-    // Accept official METADATA namespaces (e.g., 1.1.0)
-    if (!rootNs.startsWith("http://maven.apache.org/METADATA/")) {
-    throw new XMLStreamException(
-    "Unrecognized METADATA namespace '" + rootNs
-    + "'. Expected something like 'http://maven.apache.org/METADATA/1.x.y' or no namespace.",
-    parser.getLocation(), null);
-    }
-    } else {
-    // Other models: do not enforce at root level.
-    }
+    // Root namespace policy:
+    //  - POM ('project'): allow no namespace or any http://maven.apache.org/POM/<version>
+    //  - METADATA ('metadata'): allow no namespace or any http://maven.apache.org/METADATA/<version>
+    //  - Other readers: do not enforce root namespace here (child checks still apply when strict)
+    if (strict) {
+        final String rootNs = parser.getNamespaceURI();
+        final boolean hasNs = rootNs != null && !rootNs.isEmpty();
+
+        if ("project".equals("${rootTag}")) {
+            if (hasNs && !rootNs.startsWith("http://maven.apache.org/POM/")) {
+            throw new XMLStreamException("Unrecognized POM namespace '" + rootNs + "'. Expected something like 'http://maven.apache.org/POM/4.x.y' or no namespace.",
+            parser.getLocation(), null);
+            }
+        } else if ("metadata".equals("${rootTag}")) {
+            if (hasNs && !rootNs.startsWith("http://maven.apache.org/METADATA/")) {
+               throw new XMLStreamException("Unrecognized METADATA namespace '" + rootNs  + "'. Expected something like 'http://maven.apache.org/METADATA/1.x.y' or no namespace.",
+                parser.getLocation(), null);
+            }
+        } else {
+            // Other generated models (settings, lifecycles, extensions, plugin, toolchains, …):
+            // no hard-coded enforcement at the root level.
+            }
     }
 
-#if ( $locationTracking )
-    $rootLcapName = parse${rootUcapName}(parser, strict, rootNs, inputSrc);
-#elseif ( $needXmlContext )
-    $rootLcapName = parse${rootUcapName}(parser, strict, rootNs, context);
-#else
-    $rootLcapName = parse${rootUcapName}(parser, strict, rootNs);
-#end
+    #if ( $locationTracking )
+        $rootLcapName = parse${rootUcapName}(parser, strict, parser.getNamespaceURI(), inputSrc);
+    #elseif ( $needXmlContext )
+        $rootLcapName = parse${rootUcapName}(parser, strict, parser.getNamespaceURI(), context);
+    #else
+        $rootLcapName = parse${rootUcapName}(parser, strict, parser.getNamespaceURI());
+    #end
     parsed = true;
     }
     eventType = parser.next();
     }
+
     if (parsed) {
     return $rootLcapName;
     }
-    throw new XMLStreamException("Expected root element '${rootTag}' but found no element at all: invalid XML document", parser.getLocation(), null);
+    throw new XMLStreamException(
+    "Expected root element '${rootTag}' but found no element at all: invalid XML document",
+    parser.getLocation(), null);
     } //-- ${root.name} read(XMLStreamReader, boolean)
 
-
 #foreach ( $class in $model.allClasses )
  #if ( $class.name != "InputSource" && $class.name != "InputLocation" )
   #set ( $classUcapName = $Helper.capitalise( $class.name ) )