Cure feature envy of DefaultPluginXmlFactory leveraging OOP

Author: Vincent Potucek

api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/XmlReaderRequest.java

@@ -78,6 +78,13 @@ interface Transformer {
         String transform(String source, String fieldName);
     }
 
+    default XmlReaderRequest assertReadable() {
+        if (getInputStream() == null && getReader() == null && getPath() == null && getURL() == null) {
+            throw new IllegalArgumentException("writer, outputStream or path must be non null");
+        }
+        return this;
+    }
+
     @Nonnull
     static XmlReaderRequestBuilder builder() {
         return new XmlReaderRequestBuilder();

api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/XmlWriterRequest.java

@@ -55,6 +55,13 @@ static <T> XmlWriterRequestBuilder<T> builder() {
         return new XmlWriterRequestBuilder<>();
     }
 
+    default XmlWriterRequest<T> assertWritable() {
+        if (getWriter() == null && getOutputStream() == null && getPath() == null) {
+            throw new IllegalArgumentException("writer, outputStream or path must be non null");
+        }
+        return this;
+    }
+
     class XmlWriterRequestBuilder<T> {
         Path path;
         OutputStream outputStream;

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

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