Pull apache#2304: Modernize codebase with Java improvements - test DefaultModelProcessor#read

Author: Vincent Potucek

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

@@ -114,9 +114,9 @@ public Model read(XmlReaderRequest request) throws IOException {
             }
             try {
                 return doRead(request);
-            } catch (IOException e) {
-                exceptions.forEach(e::addSuppressed);
-                throw e;
+            } catch (RuntimeException ex) {
+                exceptions.forEach(ex::addSuppressed);
+                throw ex;
             }
         } else {
             return doRead(request);
@@ -126,18 +126,14 @@ public Model read(XmlReaderRequest request) throws IOException {
     private Path doLocateExistingPom(Path project) {
         if (project == null) {
             project = Paths.get(System.getProperty("user.dir"));
-        }
-        if (Files.isDirectory(project)) {
+        } else 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 doRead(XmlReaderRequest request) throws IOException {
+    private Model doRead(XmlReaderRequest request) {
         return modelXmlFactory.read(request);
     }
 }