Pull apache#2287: Modernize codebase with Java improvements - functional DefaultModelProcessor#read

Author: Vincent Potucek

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

@@ -22,7 +22,6 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -37,7 +36,6 @@
 import org.apache.maven.api.services.xml.ModelXmlFactory;
 import org.apache.maven.api.services.xml.XmlReaderRequest;
 import org.apache.maven.api.spi.ModelParser;
-import org.apache.maven.api.spi.ModelParserException;
 
 /**
  *
@@ -97,30 +95,20 @@ public Path locateExistingPom(Path projectDirectory) {
     @Override
     public Model read(XmlReaderRequest request) throws IOException {
         Objects.requireNonNull(request, "source cannot be null");
-        Path pomFile = request.getPath();
-        if (pomFile != null) {
-            Path projectDirectory = pomFile.getParent();
-            List<ModelParserException> exceptions = new ArrayList<>();
-            for (ModelParser parser : modelParsers) {
-                try {
-                    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 doRead(request);
-            } catch (IOException e) {
-                exceptions.forEach(e::addSuppressed);
-                throw e;
-            }
-        } else {
-            return doRead(request);
-        }
+        return read(request, request.getPath());
+    }
+
+    private Model read(XmlReaderRequest request, Path pomFile) throws IOException {
+        return pomFile == null
+                ? doRead(request)
+                : modelParsers.stream()
+                        .map(parser -> parser.locateAndParse(
+                                pomFile.getParent(), Map.of(ModelParser.STRICT, request.isStrict())))
+                        .filter(Optional::isPresent)
+                        .map(Optional::get)
+                        .map(model -> model.withPomFile(pomFile))
+                        .findFirst()
+                        .orElse(doRead(request));
     }
 
     private Path doLocateExistingPom(Path project) {