Pull #2292: fix: fix os usage

Author: Vincent Potucek

api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/XmlFactory.java

@@ -18,7 +18,6 @@
  */
 package org.apache.maven.api.services.xml;
 
-import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Reader;
@@ -41,37 +40,37 @@
 public interface XmlFactory<T> extends Service {
 
     @Nonnull
-    default T read(@Nonnull Path path) throws XmlReaderException, IOException {
+    default T read(@Nonnull Path path) throws XmlReaderException {
         return read(path, true);
     }
 
     @Nonnull
-    default T read(@Nonnull Path path, boolean strict) throws XmlReaderException, IOException {
+    default T read(@Nonnull Path path, boolean strict) throws XmlReaderException {
         return read(XmlReaderRequest.builder().path(path).strict(strict).build());
     }
 
     @Nonnull
-    default T read(@Nonnull InputStream input) throws XmlReaderException, IOException {
+    default T read(@Nonnull InputStream input) throws XmlReaderException {
         return read(input, true);
     }
 
     @Nonnull
-    default T read(@Nonnull InputStream input, boolean strict) throws XmlReaderException, IOException {
+    default T read(@Nonnull InputStream input, boolean strict) throws XmlReaderException {
         return read(XmlReaderRequest.builder().inputStream(input).strict(strict).build());
     }
 
     @Nonnull
-    default T read(@Nonnull Reader reader) throws XmlReaderException, IOException {
+    default T read(@Nonnull Reader reader) throws XmlReaderException {
         return read(reader, true);
     }
 
     @Nonnull
-    default T read(@Nonnull Reader reader, boolean strict) throws XmlReaderException, IOException {
+    default T read(@Nonnull Reader reader, boolean strict) throws XmlReaderException {
         return read(XmlReaderRequest.builder().reader(reader).strict(strict).build());
     }
 
     @Nonnull
-    T read(@Nonnull XmlReaderRequest request) throws XmlReaderException, IOException;
+    T read(@Nonnull XmlReaderRequest request) throws XmlReaderException;
 
     default void write(@Nonnull T content, @Nonnull Path path) throws XmlWriterException {
         write(XmlWriterRequest.<T>builder().content(content).path(path).build());
@@ -99,7 +98,7 @@ default void write(@Nonnull T content, @Nonnull Writer writer) throws XmlWriterE
      * @see #toXmlString(Object)
      */
     @Nonnull
-    default T fromXmlString(@Nonnull String xml) throws XmlReaderException, IOException {
+    default T fromXmlString(@Nonnull String xml) throws XmlReaderException {
         return read(new StringReader(xml));
     }
 

impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultModelXmlFactory.java

@@ -18,7 +18,6 @@
  */
 package org.apache.maven.impl;
 
-import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Reader;
@@ -151,7 +150,7 @@ public void write(XmlWriterRequest<Model> request) throws XmlWriterException {
      * @throws XmlReaderException if an error occurs during the parsing
      * @see #toXmlString(Object)
      */
-    public static Model fromXml(@Nonnull String xml) throws XmlReaderException, IOException {
+    public static Model fromXml(@Nonnull String xml) throws XmlReaderException {
         return new DefaultModelXmlFactory().fromXmlString(xml);
     }
 

impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultPluginXmlFactory.java

@@ -18,7 +18,6 @@
  */
 package org.apache.maven.impl;
 
-import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Reader;
@@ -110,7 +109,7 @@ public void write(XmlWriterRequest<PluginDescriptor> request) throws XmlWriterEx
      * @throws XmlReaderException if an error occurs during the parsing
      * @see #toXmlString(Object)
      */
-    public static PluginDescriptor fromXml(@Nonnull String xml) throws XmlReaderException, IOException {
+    public static PluginDescriptor fromXml(@Nonnull String xml) throws XmlReaderException {
         return new DefaultPluginXmlFactory().fromXmlString(xml);
     }
 

impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelProcessor.java

@@ -39,29 +39,27 @@
 import org.apache.maven.api.spi.ModelParser;
 import org.apache.maven.api.spi.ModelParserException;
 
-import static org.apache.maven.api.spi.ModelParser.STRICT;
-
 /**
  *
  * Note: uses @Typed to limit the types it is available for injection to just ModelProcessor.
- * <p>
+ *
  * This is because the ModelProcessor interface extends ModelLocator and ModelReader. If we
  * made this component available under all its interfaces then it could end up being injected
  * into itself leading to a stack overflow.
- * <p>
+ *
  * A side effect of using @Typed is that it translates to explicit bindings in the container.
  * So instead of binding the component under a 'wildcard' key it is now bound with an explicit
  * key. Since this is a default component; this will be a plain binding of ModelProcessor to
  * this implementation type; that is, no hint/name.
- * <p>
+ *
  * This leads to a second side effect in that any @Inject request for just ModelProcessor in
  * the same injector is immediately matched to this explicit binding, which means extensions
  * cannot override this binding. This is because the lookup is always short-circuited in this
  * specific situation (plain @Inject request, and plain explicit binding for the same type.)
- * <p>
+ *
  * The simplest solution is to use a custom @Named here so it isn't bound under the plain key.
  * This is only necessary for default components using @Typed that want to support overriding.
- * <p>
+ *
  * As a non-default component this now gets a negative priority relative to other implementations
  * of the same interface. Since we want to allow overriding this doesn't matter in this case.
  * (if it did we could add @Priority of 0 to match the priority given to default components.)
@@ -79,19 +77,17 @@ public DefaultModelProcessor(ModelXmlFactory modelXmlFactory, @Nullable List<Mod
         this.modelParsers = modelParsers;
     }
 
-    /**
-     * @implNote
-     * The ModelProcessor#locatePom never returns null while the ModelParser#locatePom needs to return an existing path!
-     */
     @Override
     public Path locateExistingPom(Path projectDirectory) {
+        // Note that the ModelProcessor#locatePom never returns null
+        // while the ModelParser#locatePom needs to return an existing path!
         Path pom = modelParsers.stream()
                 .map(m -> m.locate(projectDirectory)
                         .map(org.apache.maven.api.services.Source::getPath)
                         .orElse(null))
                 .filter(Objects::nonNull)
                 .findFirst()
-                .orElseGet(() -> locateExistingPomWithUserDirDefault(projectDirectory));
+                .orElseGet(() -> doLocateExistingPom(projectDirectory));
         if (pom != null && !pom.equals(projectDirectory) && !pom.getParent().equals(projectDirectory)) {
             throw new IllegalArgumentException("The POM found does not belong to the given directory: " + pom);
         }
@@ -101,50 +97,47 @@ public Path locateExistingPom(Path projectDirectory) {
     @Override
     public Model read(XmlReaderRequest request) throws IOException {
         Objects.requireNonNull(request, "source cannot be null");
-        return readOnSelfOrParent(request, request.getPath());
-    }
-
-    private Model readOnSelfOrParent(XmlReaderRequest request, Path pomFile) throws IOException {
+        Path pomFile = request.getPath();
         if (pomFile != null) {
+            Path projectDirectory = pomFile.getParent();
             List<ModelParserException> exceptions = new ArrayList<>();
             for (ModelParser parser : modelParsers) {
                 try {
-                    Optional<Model> parent = readParent(request, pomFile, parser);
-                    if (parent.isPresent()) {
-                        return parent.get().withPomFile(pomFile);
+                    Optional<Model> model =
+                            parser.locateAndParse(projectDirectory, Map.of(ModelParser.STRICT, request.isStrict()));
+                    if (model.isPresent()) {
+                        return model.get().withPomFile(pomFile);
                     }
                 } catch (ModelParserException e) {
                     exceptions.add(e);
                 }
             }
             try {
-                return readOnSelf(request);
+                return doRead(request);
             } catch (IOException e) {
                 exceptions.forEach(e::addSuppressed);
                 throw e;
             }
         } else {
-            return readOnSelf(request);
+            return doRead(request);
         }
     }
 
-    private static Optional<Model> readParent(XmlReaderRequest request, Path pomFile, ModelParser parser) {
-        return parser.locateAndParse(pomFile.getParent(), Map.of(STRICT, request.isStrict()));
-    }
-
-    private Path locateExistingPomWithUserDirDefault(Path project) {
-        return locateExistingPomInDirOrFile(project != null ? project : Paths.get(System.getProperty("user.dir")));
-    }
-
-    private static Path locateExistingPomInDirOrFile(Path project) {
+    private Path doLocateExistingPom(Path project) {
+        if (project == null) {
+            project = Paths.get(System.getProperty("user.dir"));
+        }
         if (Files.isDirectory(project)) {
             Path pom = project.resolve("pom.xml");
             return Files.isRegularFile(pom) ? pom : null;
+        } else if (Files.isRegularFile(project)) {
+            return project;
+        } else {
+            return null;
         }
-        return project;
     }
 
-    private Model readOnSelf(XmlReaderRequest request) throws IOException {
+    private Model doRead(XmlReaderRequest request) throws IOException {
         return modelXmlFactory.read(request);
     }
 }