Fixes after review

Author: gnodet

maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java

@@ -234,8 +234,8 @@ void testReadInvalidPom() throws Exception {
                 getContainer().lookup(org.apache.maven.project.ProjectBuilder.class);
 
         // single project build entry point
-        Exception ex = assertThrows(Exception.class, () -> projectBuilder.build(pomFile, configuration));
-        assertThat(ex.getMessage(), containsString("expected START_TAG or END_TAG, not CHARACTERS"));
+        ProjectBuildingException ex =
+                assertThrows(ProjectBuildingException.class, () -> projectBuilder.build(pomFile, configuration));
 
         // multi projects build entry point
         ProjectBuildingException pex = assertThrows(
@@ -244,9 +244,6 @@ void testReadInvalidPom() throws Exception {
         assertEquals(1, pex.getResults().size());
         assertNotNull(pex.getResults().get(0).getPomFile());
         assertThat(pex.getResults().get(0).getProblems().size(), greaterThan(0));
-        assertThat(
-                pex.getResults(),
-                contains(projectBuildingResultWithProblemMessage("expected START_TAG or END_TAG, not CHARACTERS")));
     }
 
     @Test

maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelReader.java

@@ -62,13 +62,11 @@ public DefaultModelReader(ModelSourceTransformer transformer) {
     public Model read(File input, Map<String, ?> options) throws IOException {
         Objects.requireNonNull(input, "input cannot be null");
 
-        try (InputStream in = Files.newInputStream(input.toPath())) {
-            Model model = read(in, input.toPath(), options);
+        Model model = read(null, input, options);
 
-            model.setPomFile(input);
+        model.setPomFile(input);
 
-            return model;
-        }
+        return model;
     }
 
     @Override
@@ -109,25 +107,21 @@ private boolean getXInclude(Map<String, ?> options) {
         return value instanceof Boolean && (Boolean) value;
     }
 
-    private Model read(InputStream input, Path pomFile, Map<String, ?> options) throws IOException {
+    private Model read(InputStream input, File pomFile, Map<String, ?> options) throws IOException {
         try {
             InputSource source = getSource(options);
             boolean strict = isStrict(options);
             Path rootDirectory = getRootDirectory(options);
 
             Source xmlSource;
             if (pomFile != null) {
-                if (input != null) {
-                    xmlSource = new StaxPathInputSource(pomFile, input);
-                } else {
-                    xmlSource = new Stax2FileSource(pomFile.toFile());
-                }
+                xmlSource = new Stax2FileSource(pomFile);
             } else {
                 xmlSource = new StreamSource(input);
             }
 
             XMLStreamReader parser;
-            // We only support xml entities and xinclude when reading a file in strict mode
+            // We only support general external entities and XInclude when reading a file in strict mode
             if (pomFile != null && strict && getXInclude(options)) {
                 parser = XInclude.xinclude(xmlSource, new LocalXmlResolver(rootDirectory));
             } else {
@@ -176,17 +170,4 @@ private Model read(Reader reader, Path pomFile, Map<String, ?> options) throws I
         }
     }
 
-    private static class StaxPathInputSource extends Stax2FileSource {
-        private final InputStream input;
-
-        StaxPathInputSource(Path pomFile, InputStream input) {
-            super(pomFile.toFile());
-            this.input = input;
-        }
-
-        @Override
-        public InputStream constructInputStream() throws IOException {
-            return input;
-        }
-    }
 }

maven-model-builder/src/main/java/org/apache/maven/model/io/ModelReader.java

@@ -46,7 +46,7 @@ public interface ModelReader {
     String INPUT_SOURCE = "org.apache.maven.model.io.inputSource";
 
     /**
-     * Name of the property used to store a boolean {@code true} if XInclude supports
+     * Name of the property used to store a boolean {@code true} if XInclude support
      * is needed.
      */
     String XINCLUDE = "xinclude";

maven-stax-xinclude/pom.xml

@@ -26,8 +26,8 @@ under the License.
   </parent>
 
   <artifactId>maven-stax-xinclude</artifactId>
-  <name>Implementation of Maven API XML</name>
-  <description>Provides the implementation classes for the Maven API XML</description>
+  <name>Maven StaX XInclude implementation</name>
+  <description>Provides the classes for StaX XInclude implementation</description>
 
   <dependencies>
     <dependency>

maven-stax-xinclude/src/main/java/org/apache/maven/stax/xinclude/DOMXMLElementEvaluator.java

@@ -79,7 +79,7 @@ public boolean testElementShorthand(XMLElement<Element> element, String shorthan
     /**
      * Evaluates the XPointer on the root Element and returns the resulting Element or null.
      *
-     * @return an Element from the resultant evaluation of the root Element or null if evaluation fails
+     * @return an Element from the evaluation of the root Element or null if evaluation fails
      */
     public Element evaluateElement() {
         XMLElement<Element> element = evaluate();

maven-stax-xinclude/src/main/java/org/apache/maven/stax/xinclude/ElementPointerPart.java

@@ -167,25 +167,23 @@ private String serialiseChildSequence() {
     static ElementPointerPart parseFromString(final String schemeData) throws InvalidXPointerException {
         List<Integer> childSequence;
         String elementID = null;
-        int startChar;
-        int endChar;
 
         // Find an NCName if it exists?
-        startChar = schemeData.indexOf("/");
+        int startChar = schemeData.indexOf("/");
         // -1 Only an NCName. 0 No NCName. > 1 An NCName.
 
         switch (startChar) {
             case -1: // Only an NCName.
                 elementID = schemeData;
-                if (!NCName.isValid(elementID)) {
+                if (XPointerParser.isInvalidNCName(elementID)) {
                     throw new InvalidXPointerException("Invalid NCName in the XPointer", schemeData);
                 }
                 return new ElementPointerPart(elementID);
             case 0: // No NCName.
                 break;
             default: // An NCName.
                 elementID = schemeData.substring(0, startChar);
-                if (!NCName.isValid(elementID)) {
+                if (XPointerParser.isInvalidNCName(elementID)) {
                     throw new InvalidXPointerException("Invalid NCName in the XPointer", schemeData, 0, startChar);
                 }
                 break;
@@ -194,7 +192,7 @@ static ElementPointerPart parseFromString(final String schemeData) throws Invali
         // Find remaining child sequence.
         childSequence = new ArrayList<>();
 
-        endChar = schemeData.indexOf("/", startChar + 1);
+        int endChar = schemeData.indexOf("/", startChar + 1);
         // -1 Only single child sequence element. > 0 A childSequence.
 
         if (endChar < 0) { // Only single child sequence element.

maven-stax-xinclude/src/main/java/org/apache/maven/stax/xinclude/InvalidXPointerException.java

@@ -19,7 +19,7 @@
 package org.apache.maven.stax.xinclude;
 
 /**
- * This class represents Exceptions that can happen during parsing an XPointer Expression.
+ * This class represents Exceptions that can happen while parsing an XPointer Expression.
  * <p>
  * This class is based upon a class of the same name in Apache Woden.
  */

maven-stax-xinclude/src/main/java/org/apache/maven/stax/xinclude/NCName.java

@@ -52,7 +52,7 @@ abstract class XMLElementEvaluator<T> {
     /**
      * Evaluates the XPointer on the root XMLElement and returns the resulting XMLElement or null.
      *
-     * @return an XMLElement from the resultant evaluation of the root XMLElement or null if evaluation fails.
+     * @return an XMLElement from the evaluation of the root XMLElement or null if evaluation fails.
      */
     public XMLElement<T> evaluate() {
         if (xpointer.hasPointerParts()) { // Scheme based pointer.