Internal refactoring

Special case for using System.out as the default

Author: garydgregory

src/conf/spotbugs-exclude-filter.xml

@@ -84,6 +84,12 @@
     <Field name="defaultWidth" />
     <Bug pattern="PA_PUBLIC_PRIMITIVE_ATTRIBUTE" />
   </Match>
+  <Match>
+    <!-- Special case for using System.out as the default. -->
+    <Class name="org.apache.commons.cli.HelpFormatter" />
+    <Method name="createDefaultPrintWriter" />
+    <Bug pattern="DM_DEFAULT_ENCODING" />
+  </Match>
 
   <Match>
     <!-- TODO ? -->

src/main/java/org/apache/commons/cli/HelpFormatter.java

@@ -82,7 +82,7 @@ public static final class Builder implements Supplier<HelpFormatter> {
         /**
          * The output PrintWriter, defaults to wrapping {@link System#out}.
          */
-        private PrintWriter printStream = new PrintWriter(System.out);
+        private PrintWriter printStream = createDefaultPrintWriter();
 
         @Override
         public HelpFormatter get() {
@@ -174,6 +174,10 @@ public static Builder builder() {
         return new Builder();
     }
 
+    private static PrintWriter createDefaultPrintWriter() {
+        return new PrintWriter(System.out);
+    }
+
     /**
      * Number of characters per line
      *
@@ -264,7 +268,7 @@ public static Builder builder() {
      * Constructs a new instance.
      */
     public HelpFormatter() {
-        this(false, new PrintWriter(System.out));
+        this(false, createDefaultPrintWriter());
     }
 
     /**
@@ -546,7 +550,6 @@ public void printHelp(final PrintWriter pw, final int width, final String cmdLin
      * @param descPad the number of characters of padding to be prefixed to each description line
      * @param footer the banner to display at the end of the help
      * @param autoUsage whether to print an automatically generated usage statement
-     *
      * @throws IllegalStateException if there is no room to print a line
      */
     public void printHelp(final PrintWriter pw, final int width, final String cmdLineSyntax, final String header, final Options options, final int leftPad,
@@ -863,7 +866,6 @@ private Appendable renderWrappedTextBlock(final StringBuffer sb, final int width
      * Removes the trailing whitespace from the specified String.
      *
      * @param s The String to remove the trailing padding from.
-     *
      * @return The String of without the trailing padding
      */
     protected String rtrim(final String s) {