Give SPOT to DefaultPluginXmlFactory cure feature envy leveraging OOP

Author: Vincent Potucek

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

@@ -80,7 +80,7 @@ interface Transformer {
 
     default void assertReadable() {
         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

@@ -57,7 +57,7 @@ static <T> XmlWriterRequestBuilder<T> builder() {
 
     default void assertWritable() {
         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

@@ -84,7 +84,7 @@ private Model doRead(XmlReaderRequest request) throws XmlReaderException {
         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");
+            throw new IllegalArgumentException("path, url, reader, or inputStream must be non null");
         }
         try {
             InputSource source = null;

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