Better use of toArray()

Author: garydgregory

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

@@ -17,16 +17,15 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 package org.apache.commons.cli;
 
+import static org.apache.commons.cli.Util.EMPTY_STRING_ARRAY;
+
 import java.io.Serializable;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Properties;
 
-import static org.apache.commons.cli.Util.EMPTY_STRING_ARRAY;
-
 /**
  * Represents list of arguments parsed against a {@link Options} descriptor.
  * <p>
@@ -125,11 +124,7 @@ public List<String> getArgList() {
      * @return remaining items passed in but not parsed as an array.
      */
     public String[] getArgs() {
-        final String[] answer = new String[args.size()];
-
-        args.toArray(answer);
-
-        return answer;
+        return args.toArray(Util.EMPTY_STRING_ARRAY);
     }
 
     /**
@@ -225,13 +220,7 @@ public Properties getOptionProperties(final String opt) {
      * @return an array of the processed {@link Option}s.
      */
     public Option[] getOptions() {
-        final Collection<Option> processed = options;
-
-        // reinitialize array
-        final Option[] optionsArray = new Option[processed.size()];
-
-        // return the array
-        return processed.toArray(optionsArray);
+        return options.toArray(Option.EMPTY_ARRAY);
     }
 
     /**

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

@@ -17,13 +17,13 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 package org.apache.commons.cli;
 
+import static org.apache.commons.cli.Util.EMPTY_STRING_ARRAY;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
-import static org.apache.commons.cli.Util.EMPTY_STRING_ARRAY;
-
 /**
  * Describes a single command-line option. It maintains information regarding the short-name of the option, the
  * long-name, if any exists, a flag indicating if an argument is required for this option, and a self-documenting
@@ -280,6 +280,9 @@ public Builder valueSeparator(final char sep) {
     /** The serial version UID. */
     private static final long serialVersionUID = 1L;
 
+    /** Empty array. */
+    static final Option[] EMPTY_ARRAY = {};
+
     /**
      * Returns a {@link Builder} to create an {@link Option} using descriptive methods.
      *