Pull apache#2292: Modernize codebase with Java improvements - functionalize DefaultModelProcessor#read

Author: Vincent Potucek

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

@@ -114,7 +114,7 @@ public Model read(XmlReaderRequest request) throws IOException {
             }
             try {
                 return doRead(request);
-            } catch (IOException e) {
+            } catch (Exception e) {
                 exceptions.forEach(e::addSuppressed);
                 throw e;
             }
@@ -134,7 +134,7 @@ else if (Files.isDirectory(project)) {
         return project;
     }
 
-    private Model doRead(XmlReaderRequest request) throws IOException {
+    private Model doRead(XmlReaderRequest request) {
         return modelXmlFactory.read(request);
     }
 }

impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultModelProcessorTest.java

@@ -83,6 +83,27 @@ void readNullPomPathShouldUseFactoryDirectly() throws Exception {
         assertEquals(model, result);
     }
 
+    @Test
+    void readNullPomPathShouldUseFactoryDirectly22() throws Exception {
+        ModelXmlFactory factory = mock(ModelXmlFactory.class);
+        ModelParser parser1 = mock(ModelParser.class);
+        ModelParser parser2 = mock(ModelParser.class);
+        XmlReaderRequest request = mock(XmlReaderRequest.class);
+        Path pomPath = Path.of("project/pom.xml");
+        when(request.getPath()).thenReturn(pomPath);
+        when(request.isStrict()).thenReturn(true);
+
+        Model expectedModel = mock(Model.class);
+
+        // Both parsers return empty
+        when(parser1.locateAndParse(any(), any())).thenReturn(Optional.empty());
+        when(parser2.locateAndParse(any(), any())).thenReturn(Optional.empty());
+        // Factory returns model
+        when(factory.read(request)).thenThrow(new IllegalStateException(new IOException()));
+        assertThrows(
+                IllegalStateException.class, () -> new DefaultModelProcessor(factory, List.of()).read(request));
+    }
+
     @Test
     void locateExistingPomWithParsersShouldReturnFirstValid() {
         Path expectedPom = Path.of("project/pom.xml");