Remove redundant generic type arguments.

Author: garydgregory

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

@@ -41,10 +41,10 @@ public class CommandLine implements Serializable
     private static final long serialVersionUID = 1L;
 
     /** the unrecognized options/arguments */
-    private final List<String> args = new LinkedList<String>();
+    private final List<String> args = new LinkedList<>();
 
     /** the processed options */
-    private final List<Option> options = new ArrayList<Option>();
+    private final List<Option> options = new ArrayList<>();
 
     /**
      * Creates a command line.
@@ -224,7 +224,7 @@ public String getOptionValue(final char opt)
      */
     public String[] getOptionValues(final Option option)
     {
-        final List<String> values = new ArrayList<String>();
+        final List<String> values = new ArrayList<>();
 
         for (final Option processedOption : options)
         {

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

@@ -716,7 +716,7 @@ private List<String> getMatchingLongOptions(final String token)
         }
         else
         {
-            List<String> matches = new ArrayList<String>(1);
+            List<String> matches = new ArrayList<>(1);
             if (options.hasLongOption(token))
             {
                 Option option = options.getOption(token);

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

@@ -49,7 +49,7 @@ public class GnuParser extends Parser
     @Override
     protected String[] flatten(final Options options, final String[] arguments, final boolean stopAtNonOption)
     {
-        final List<String> tokens = new ArrayList<String>();
+        final List<String> tokens = new ArrayList<>();
 
         boolean eatTheRest = false;
 

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

@@ -580,9 +580,9 @@ public void printUsage(final PrintWriter pw, final int width, final String app,
         final StringBuffer buff = new StringBuffer(getSyntaxPrefix()).append(app).append(" ");
 
         // create a list for processed option groups
-        final Collection<OptionGroup> processedGroups = new ArrayList<OptionGroup>();
+        final Collection<OptionGroup> processedGroups = new ArrayList<>();
 
-        final List<Option> optList = new ArrayList<Option>(options.getOptions());
+        final List<Option> optList = new ArrayList<>(options.getOptions());
         if (getOptionComparator() != null)
         {
             Collections.sort(optList, getOptionComparator());
@@ -646,7 +646,7 @@ private void appendOptionGroup(final StringBuffer buff, final OptionGroup group)
             buff.append("[");
         }
 
-        final List<Option> optList = new ArrayList<Option>(group.getOptions());
+        final List<Option> optList = new ArrayList<>(group.getOptions());
         if (getOptionComparator() != null)
         {
             Collections.sort(optList, getOptionComparator());
@@ -796,7 +796,7 @@ protected StringBuffer renderOptions(final StringBuffer sb, final int width, fin
         // the longest opt string this list will be then used to
         // sort options ascending
         int max = 0;
-        final List<StringBuffer> prefixList = new ArrayList<StringBuffer>();
+        final List<StringBuffer> prefixList = new ArrayList<>();
 
         final List<Option> optList = options.helpOptions();
 

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

@@ -73,7 +73,7 @@ public class Option implements Cloneable, Serializable
     private Class<?> type = String.class;
 
     /** the list of argument values **/
-    private List<String> values = new ArrayList<String>();
+    private List<String> values = new ArrayList<>();
 
     /** the character that is the value separator */
     private char valuesep;
@@ -680,7 +680,7 @@ public Object clone()
         try
         {
             final Option option = (Option) super.clone();
-            option.values = new ArrayList<String>(values);
+            option.values = new ArrayList<>(values);
             return option;
         }
         catch (final CloneNotSupportedException cnse)

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

@@ -32,7 +32,7 @@ public class OptionGroup implements Serializable
     private static final long serialVersionUID = 1L;
 
     /** hold the options */
-    private final Map<String, Option> optionMap = new LinkedHashMap<String, Option>();
+    private final Map<String, Option> optionMap = new LinkedHashMap<>();
 
     /** the name of the selected option */
     private String selected;

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

@@ -44,18 +44,18 @@ public class Options implements Serializable
     private static final long serialVersionUID = 1L;
 
     /** a map of the options with the character key */
-    private final Map<String, Option> shortOpts = new LinkedHashMap<String, Option>();
+    private final Map<String, Option> shortOpts = new LinkedHashMap<>();
 
     /** a map of the options with the long key */
-    private final Map<String, Option> longOpts = new LinkedHashMap<String, Option>();
+    private final Map<String, Option> longOpts = new LinkedHashMap<>();
 
     /** a map of the required options */
     // N.B. This can contain either a String (addOption) or an OptionGroup (addOptionGroup)
     // TODO this seems wrong
-    private final List<Object> requiredOpts = new ArrayList<Object>();
+    private final List<Object> requiredOpts = new ArrayList<>();
 
     /** a map of the option groups */
-    private final Map<String, OptionGroup> optionGroups = new LinkedHashMap<String, OptionGroup>();
+    private final Map<String, OptionGroup> optionGroups = new LinkedHashMap<>();
 
     /**
      * Add the specified option group.
@@ -91,7 +91,7 @@ public Options addOptionGroup(final OptionGroup group)
      */
     Collection<OptionGroup> getOptionGroups()
     {
-        return new HashSet<OptionGroup>(optionGroups.values());
+        return new HashSet<>(optionGroups.values());
     }
 
     /**
@@ -227,7 +227,7 @@ public Collection<Option> getOptions()
      */
     List<Option> helpOptions()
     {
-        return new ArrayList<Option>(shortOpts.values());
+        return new ArrayList<>(shortOpts.values());
     }
 
     /**
@@ -273,7 +273,7 @@ public List<String> getMatchingOptions(String opt)
     {
         opt = Util.stripLeadingHyphens(opt);
 
-        final List<String> matchingOpts = new ArrayList<String>();
+        final List<String> matchingOpts = new ArrayList<>();
 
         // for a perfect match return the single option only
         if (longOpts.keySet().contains(opt))

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

@@ -32,7 +32,7 @@
 public class PosixParser extends Parser
 {
     /** holder for flattened tokens */
-    private final List<String> tokens = new ArrayList<String>();
+    private final List<String> tokens = new ArrayList<>();
 
     /** specifies if bursting should continue */
     private boolean eatTheRest;

src/test/java/org/apache/commons/cli/OptionsTest.java

@@ -91,7 +91,7 @@ public void testHelpOptions()
         options.addOption(bothA);
         options.addOption(bothB);
 
-        final Collection<Option> allOptions = new ArrayList<Option>();
+        final Collection<Option> allOptions = new ArrayList<>();
         allOptions.add(longOnly1);
         allOptions.add(longOnly2);
         allOptions.add(shortOnly1);

src/test/java/org/apache/commons/cli/PatternOptionBuilderTest.java

@@ -50,7 +50,7 @@ public void testSimplePattern() throws Exception
 
         assertEquals("flag a", "foo", line.getOptionValue("a"));
         assertEquals("string flag a", "foo", line.getOptionObject("a"));
-        assertEquals("object flag b", new Vector<Object>(), line.getOptionObject("b"));
+        assertEquals("object flag b", new Vector<>(), line.getOptionObject("b"));
         assertTrue("boolean true flag c", line.hasOption("c"));
         assertFalse("boolean false flag d", line.hasOption("d"));
         assertEquals("file flag e", new File("build.xml"), line.getOptionObject("e"));
@@ -61,7 +61,7 @@ public void testSimplePattern() throws Exception
         // tests the char methods of CommandLine that delegate to the String methods
         assertEquals("flag a", "foo", line.getOptionValue('a'));
         assertEquals("string flag a", "foo", line.getOptionObject('a'));
-        assertEquals("object flag b", new Vector<Object>(), line.getOptionObject('b'));
+        assertEquals("object flag b", new Vector<>(), line.getOptionObject('b'));
         assertTrue("boolean true flag c", line.hasOption('c'));
         assertFalse("boolean false flag d", line.hasOption('d'));
         assertEquals("file flag e", new File("build.xml"), line.getOptionObject('e'));