Refactor common code

Author: garydgregory

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

@@ -449,7 +449,7 @@ private void handleProperties(final Properties properties) throws ParseException
                 final String value = properties.getProperty(option);
 
                 if (opt.hasArg()) {
-                    if (opt.getValues() == null || opt.getValues().length == 0) {
+                    if (Util.isEmpty(opt.getValues())) {
                         opt.processValue(stripLeadingAndTrailingQuotesDefaultOff(value));
                     }
                 } else if (!("yes".equalsIgnoreCase(value) || "true".equalsIgnoreCase(value) || "1".equalsIgnoreCase(value))) {

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

@@ -580,7 +580,7 @@ public void printHelp(final PrintWriter pw, final int width, final String cmdLin
      */
     public void printHelp(final PrintWriter pw, final int width, final String cmdLineSyntax, final String header, final Options options, final int leftPad,
         final int descPad, final String footer, final boolean autoUsage) {
-        if (cmdLineSyntax == null || cmdLineSyntax.isEmpty()) {
+        if (Util.isEmpty(cmdLineSyntax)) {
             throw new IllegalArgumentException("cmdLineSyntax not provided");
         }
         if (autoUsage) {
@@ -891,7 +891,7 @@ private Appendable renderWrappedTextBlock(final StringBuffer sb, final int width
      * @return The String of without the trailing padding
      */
     protected String rtrim(final String s) {
-        if (s == null || s.isEmpty()) {
+        if (Util.isEmpty(s)) {
             return s;
         }
         int pos = s.length();

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

@@ -684,7 +684,6 @@ public String getValue(final int index) throws IndexOutOfBoundsException {
      */
     public String getValue(final String defaultValue) {
         final String value = getValue();
-
         return value != null ? value : defaultValue;
     }
 

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

@@ -278,7 +278,7 @@ protected void processProperties(final Properties properties) throws ParseExcept
                 // get the value from the properties instance
                 final String value = properties.getProperty(option);
                 if (opt.hasArg()) {
-                    if (opt.getValues() == null || opt.getValues().length == 0) {
+                    if (Util.isEmpty(opt.getValues())) {
                         try {
                             opt.processValue(value);
                         } catch (final RuntimeException exp) { // NOPMD

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

@@ -27,13 +27,23 @@ final class Util {
      */
     static final String[] EMPTY_STRING_ARRAY = {};
 
+    /**
+     * Tests whether the given array is null or empty.
+     *
+     * @param array the array to test.
+     * @return the given array is null or empty.
+     */
+    static boolean isEmpty(final Object[] array) {
+        return array == null || array.length == 0;
+    }
+
     /**
      * Tests whether the given string is null or empty.
      *
      * @param str The string to test.
      * @return Whether the given string is null or empty.
      */
-    private static boolean isEmpty(final String str) {
+    static boolean isEmpty(final String str) {
         return str == null || str.isEmpty();
     }