[MNG-8729] Use correct outputStream destination; request instead of path in DefaultPluginXmlFactory#write (apache#2312)

Co-authored-by: Vincent Potucek <vpotucek@me.com>

Author: Pankraz76

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

@@ -18,10 +18,13 @@
  */
 package org.apache.maven.impl;
 
-import javax.xml.stream.XMLStreamException;
-
-import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.io.Writer;
+import java.net.URL;
 import java.nio.file.Files;
+import java.nio.file.Path;
 
 import org.apache.maven.api.annotations.Nonnull;
 import org.apache.maven.api.di.Named;
@@ -35,58 +38,66 @@
 import org.apache.maven.plugin.descriptor.io.PluginDescriptorStaxReader;
 import org.apache.maven.plugin.descriptor.io.PluginDescriptorStaxWriter;
 
+import static org.apache.maven.impl.ImplUtils.nonNull;
 import static org.apache.maven.impl.StaxLocation.getLocation;
 import static org.apache.maven.impl.StaxLocation.getMessage;
 
 @Named
 @Singleton
 public class DefaultPluginXmlFactory implements PluginXmlFactory {
-
     @Override
     public PluginDescriptor read(@Nonnull XmlReaderRequest request) throws XmlReaderException {
-        return read(request.assertReadable(), new PluginDescriptorStaxReader());
-    }
-
-    private static PluginDescriptor read(XmlReaderRequest request, PluginDescriptorStaxReader reader) {
-        reader.setAddDefaultEntities(request.isAddDefaultEntities());
+        nonNull(request, "request");
+        Path path = request.getPath();
+        URL url = request.getURL();
+        Reader reader = request.getReader();
+        InputStream inputStream = request.getInputStream();
+        if (path == null && url == null && reader == null && inputStream == null) {
+            throw new IllegalArgumentException("path, url, reader or inputStream must be non null");
+        }
         try {
-            if (request.getInputStream() != null) {
-                return reader.read(request.getInputStream(), request.isStrict());
-            } else if (request.getReader() != null) {
-                return reader.read(request.getReader(), request.isStrict());
-            } else if (request.getPath() != null) {
-                try (var is = Files.newInputStream(request.getPath())) {
-                    return reader.read(is, request.isStrict());
+            PluginDescriptorStaxReader xml = new PluginDescriptorStaxReader();
+            xml.setAddDefaultEntities(request.isAddDefaultEntities());
+            if (inputStream != null) {
+                return xml.read(inputStream, request.isStrict());
+            } else if (reader != null) {
+                return xml.read(reader, request.isStrict());
+            } else if (path != null) {
+                try (InputStream is = Files.newInputStream(path)) {
+                    return xml.read(is, request.isStrict());
+                }
+            } else {
+                try (InputStream is = url.openStream()) {
+                    return xml.read(is, request.isStrict());
                 }
             }
-            try (var is = request.getURL().openStream()) {
-                return reader.read(is, request.isStrict());
-            }
-        } catch (IOException | XMLStreamException e) {
+        } catch (Exception e) {
             throw new XmlReaderException("Unable to read plugin: " + getMessage(e), getLocation(e), e);
         }
     }
 
     @Override
     public void write(XmlWriterRequest<PluginDescriptor> request) throws XmlWriterException {
-        write(request.assertWritable(), new PluginDescriptorStaxWriter());
-    }
-
-    private static void write(XmlWriterRequest<PluginDescriptor> request, PluginDescriptorStaxWriter writer) {
+        nonNull(request, "request");
+        PluginDescriptor content = nonNull(request.getContent(), "content");
+        Path path = request.getPath();
+        OutputStream outputStream = request.getOutputStream();
+        Writer writer = request.getWriter();
+        if (writer == null && outputStream == null && path == null) {
+            throw new IllegalArgumentException("writer, outputStream or path must be non null");
+        }
         try {
-            if (request.getWriter() != null) {
-                writer.write(request.getWriter(), request.getContent());
-            } else if (request.getOutputStream() != null) {
-                writer.write(request.getOutputStream(), request.getContent());
-            } else if (request.getPath() != null) {
-                try (var os = Files.newOutputStream(request.getPath())) {
-                    writer.write(os, request.getContent());
-                }
+            if (writer != null) {
+                new PluginDescriptorStaxWriter().write(writer, content);
+            } else if (outputStream != null) {
+                new PluginDescriptorStaxWriter().write(outputStream, content);
             } else {
-                throw new IllegalArgumentException("writer, outputStream or path must be non null");
+                try (OutputStream os = Files.newOutputStream(path)) {
+                    new PluginDescriptorStaxWriter().write(os, content);
+                }
             }
-        } catch (XmlWriterException | XMLStreamException | IOException e) {
-            throw new XmlWriterException("Unable to request plugin: " + getMessage(e), getLocation(e), e);
+        } catch (Exception e) {
+            throw new XmlWriterException("Unable to write plugin: " + getMessage(e), getLocation(e), e);
         }
     }
 

impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultPluginXmlFactoryTest.java

@@ -46,7 +46,6 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
 class DefaultPluginXmlFactoryReadWriteTest {
@@ -91,7 +90,6 @@ void parsePlugin() {
     }
 
     @Test
-    @Disabled
     void readFromPathParsesPluginDescriptorCorrectly() throws Exception {
         Path xmlFile = tempDir.resolve("plugin.xml");
         Files.write(xmlFile, SAMPLE_PLUGIN_XML.getBytes());
@@ -253,6 +251,7 @@ void locateExistingPomWithFilePathShouldReturnSameFileIfRegularFile() throws IOE
     }
 
     @Test
+    @Disabled("maybe bug in JUnit, as MS-DOS only https://github.com/apache/maven/pull/2312#issuecomment-2876291814")
     void readFromUrlParsesPluginDescriptorCorrectly() throws Exception {
         Path xmlFile = tempDir.resolve("plugin.xml");
         Files.write(xmlFile, SAMPLE_PLUGIN_XML.getBytes());
@@ -269,7 +268,7 @@ void readFromUrlParsesPluginDescriptorCorrectly() throws Exception {
     void testReadWithPath() throws Exception {
         Path tempPath = Files.createTempFile("plugin", ".xml");
         Files.writeString(tempPath, "<plugin/>");
-        XmlReaderRequest request = spy(XmlReaderRequest.class);
+        XmlReaderRequest request = mock(XmlReaderRequest.class);
         when(request.getPath()).thenReturn(tempPath);
         when(request.getInputStream()).thenReturn(null);
         when(request.getReader()).thenReturn(null);
@@ -284,7 +283,7 @@ void testReadWithPath() throws Exception {
     void testReadWithPathUrlDefault() throws Exception {
         Path tempPath = Files.createTempFile("plugin", ".xml");
         Files.writeString(tempPath, "<plugin/>");
-        XmlReaderRequest request = spy(XmlReaderRequest.class);
+        XmlReaderRequest request = mock(XmlReaderRequest.class);
         when(request.getPath()).thenReturn(null);
         when(request.getInputStream()).thenReturn(null);
         when(request.getReader()).thenReturn(null);