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

@@ -127,14 +127,11 @@ 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 {

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

@@ -36,9 +36,7 @@
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
 
 class DefaultModelProcessorTest {
 
@@ -249,7 +247,91 @@ void readWithParserThrowingModelParserExceptionShouldAddAsSuppressed() throws Ex
         // In this case, since factory succeeds, no exception is thrown
     }
 
+    @Test
+    void readWithParserReturningEmptyShouldTryNextParser() 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);
+        when(expectedModel.withPomFile(pomPath)).thenReturn(expectedModel);
+
+        // First parser returns empty
+        when(parser1.locateAndParse(any(), any())).thenReturn(Optional.empty());
+        // Second parser returns model
+        when(parser2.locateAndParse(any(), any())).thenReturn(Optional.of(expectedModel));
+
+        Model result = new DefaultModelProcessor(factory, List.of(parser1, parser2)).read(request);
+
+        assertSame(expectedModel, result);
+    }
+
+    @Test
+    void readWithAllParsersReturningEmptyShouldFallbackToFactory() 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)).thenReturn(expectedModel);
+
+        Model result = new DefaultModelProcessor(factory, List.of(parser1, parser2)).read(request);
+
+        assertSame(expectedModel, result);
+    }
 
+    @Test
+    void readWithParserReturningModelShouldUseThatModel() throws Exception {
+        ModelXmlFactory factory = mock(ModelXmlFactory.class);
+        ModelParser parser = 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);
+        when(expectedModel.withPomFile(pomPath)).thenReturn(expectedModel);
+        when(parser.locateAndParse(any(), any())).thenReturn(Optional.of(expectedModel));
+
+        Model result = new DefaultModelProcessor(factory, List.of(parser)).read(request);
+
+        assertSame(expectedModel, result);
+        // Verify factory was not called
+        verify(factory, never()).read((Path) any());
+    }
+
+    @Test
+    void readWithParserReturningModelShouldSetPomFile() throws Exception {
+        ModelXmlFactory factory = mock(ModelXmlFactory.class);
+        ModelParser parser = 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 originalModel = mock(Model.class);
+        Model modelWithPom = mock(Model.class);
+        when(originalModel.withPomFile(pomPath)).thenReturn(modelWithPom);
+        when(parser.locateAndParse(any(), any())).thenReturn(Optional.of(originalModel));
+
+        Model result = new DefaultModelProcessor(factory, List.of(parser)).read(request);
+
+        assertSame(modelWithPom, result);
+        verify(originalModel).withPomFile(pomPath);
+    }
 
 
 }