Reducing number of classes; No singleton but static.

Signed-off-by: Markus KARG <[email protected]>

Author: mkarg

src/main/java/org/codehaus/plexus/util/CommonImplementation.java

@@ -156,7 +156,7 @@ private IOUtil()
     public static void copy( final InputStream input, final OutputStream output )
         throws IOException
     {
-        VersionSpecifics.INSTANCE.copy( input, output );
+        VersionSpecifics.copy( input, output );
     }
 
     /**
@@ -186,7 +186,7 @@ public static void copy( final InputStream input, final OutputStream output, fin
     public static void copy( final Reader input, final Writer output )
         throws IOException
     {
-        VersionSpecifics.INSTANCE.copy( input, output );
+        VersionSpecifics.copy( input, output );
     }
 
     /**

src/main/java/org/codehaus/plexus/util/IOUtil.java

@@ -1,13 +1,31 @@
 package org.codehaus.plexus.util;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.io.Writer;
+
 /**
  * Implementation specific to Java SE 8 version.
  */
-final class VersionSpecifics extends CommonImplementation
+final class VersionSpecifics
 {
-    static final VersionSpecifics INSTANCE = new VersionSpecifics();
+    private static final int DEFAULT_BUFFER_SIZE = 1024 * 16;
 
     private VersionSpecifics() {
         // singleton
     }
+
+    static void copy( final InputStream input, final OutputStream output )
+        throws IOException
+    {
+        IOUtil.copy( input, output, DEFAULT_BUFFER_SIZE );
+    }
+
+    static void copy( final Reader input, final Writer output )
+        throws IOException
+    {
+        IOUtil.copy( input, output, DEFAULT_BUFFER_SIZE );
+    }
 }

src/main/java/org/codehaus/plexus/util/VersionSpecifics.java

@@ -9,21 +9,19 @@
 /**
  * Implementation specific to Java SE 10 version.
  */
-final class VersionSpecifics extends CommonImplementation
+final class VersionSpecifics
 {
-    static final VersionSpecifics INSTANCE = new VersionSpecifics();
-
     private VersionSpecifics() {
         // singleton
     }
 
-    void copy( final InputStream input, final OutputStream output )
+    static void copy( final InputStream input, final OutputStream output )
         throws IOException
     {
         input.transferTo( output );
     }
 
-    void copy( final Reader input, final Writer output )
+    static void copy( final Reader input, final Writer output )
         throws IOException
     {
         input.transferTo( output );

src/main/java10/org/codehaus/plexus/util/VersionSpecifics.java

@@ -9,17 +9,23 @@
 /**
  * Implementation specific to Java SE 9 version.
  */
-final class VersionSpecifics extends CommonImplementation
+final class VersionSpecifics
 {
-    static final VersionSpecifics INSTANCE = new VersionSpecifics();
+    private static final int DEFAULT_BUFFER_SIZE = 1024 * 16;
 
     private VersionSpecifics() {
         // singleton
     }
 
-    void copy( final InputStream input, final OutputStream output )
+    static void copy( final InputStream input, final OutputStream output )
         throws IOException
     {
         input.transferTo( output );
     }
+ 
+    static void copy( final Reader input, final Writer output )
+        throws IOException
+    {
+        IOUtil.copy( input, output, DEFAULT_BUFFER_SIZE );
+    }
 }