extract common functionality of DefaultPluginXmlFactory

Author: Vincent Potucek

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

@@ -78,9 +78,9 @@ interface Transformer {
         String transform(String source, String fieldName);
     }
 
-    default void assertReadable() {
+    default void throwIfIncomplete() {
         if (getInputStream() == null && getReader() == null && getPath() == null && getURL() == null) {
-            throw new IllegalArgumentException("writer, outputStream or path must be non null");
+            throw new IllegalArgumentException("writer, outputStream, or path must be non null");
         }
     }
 

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

@@ -55,9 +55,9 @@ static <T> XmlWriterRequestBuilder<T> builder() {
         return new XmlWriterRequestBuilder<>();
     }
 
-    default void assertWritable() {
+    default void throwIfIncomplete() {
         if (getWriter() == null && getOutputStream() == null && getPath() == null) {
-            throw new IllegalArgumentException("writer, outputStream or path must be non null");
+            throw new IllegalArgumentException("writer, outputStream, or path must be non null");
         }
     }
 

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

@@ -83,9 +83,7 @@ private Model doRead(XmlReaderRequest request) throws XmlReaderException {
         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");
-        }
+        request.throwIfIncomplete();
         try {
             InputSource source = null;
             if (request.getModelId() != null || request.getLocation() != null) {
@@ -120,7 +118,7 @@ public void write(XmlWriterRequest<Model> request) throws XmlWriterException {
         OutputStream outputStream = request.getOutputStream();
         Writer writer = request.getWriter();
         Function<Object, String> inputLocationFormatter = request.getInputLocationFormatter();
-        request.assertWritable();
+        request.throwIfIncomplete();
         try {
             MavenStaxWriter w = new MavenStaxWriter();
             if (inputLocationFormatter != null) {

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

@@ -21,6 +21,8 @@
 import javax.xml.stream.XMLStreamException;
 
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.nio.file.Files;
 
 import org.apache.maven.api.annotations.Nonnull;
@@ -53,18 +55,18 @@ public void write(XmlWriterRequest<PluginDescriptor> request) throws XmlWriterEx
     }
 
     private static PluginDescriptor read(XmlReaderRequest request, PluginDescriptorStaxReader reader) {
-        request.assertReadable();
+        request.throwIfIncomplete();
         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())) {
+                try (InputStream is = Files.newInputStream(request.getPath())) {
                     return reader.read(is, request.isStrict());
                 }
             } else {
-                try (var is = request.getURL().openStream()) {
+                try (InputStream is = request.getURL().openStream()) {
                     return reader.read(is, request.isStrict());
                 }
             }
@@ -80,14 +82,14 @@ private static PluginDescriptorStaxReader setAddDefaultEntities(
     }
 
     private static void write(XmlWriterRequest<PluginDescriptor> request, PluginDescriptorStaxWriter writer) {
-        request.assertWritable();
+        request.throwIfIncomplete();
         try {
             if (request.getWriter() != null) {
                 writer.write(request.getWriter(), request.getContent());
             } else if (request.getOutputStream() != null) {
                 writer.write(request.getOutputStream(), request.getContent());
             } else {
-                try (var os = Files.newOutputStream(request.getPath())) {
+                try (OutputStream os = Files.newOutputStream(request.getPath())) {
                     writer.write(os, request.getContent());
                 }
             }

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

@@ -229,7 +229,7 @@ void writeWithNoTargetThrowsIllegalArgumentException() {
                                                 .build())
                                         .build()))
                         .getMessage())
-                .isEqualTo("writer, outputStream or path must be non null");
+                .isEqualTo("writer, outputStream, or path must be non null");
     }
 
     @Test