Apply Java language level migration aids

  - 'for' loop replaceable with 'foreach'.
  - Identical 'catch' branches in 'try' statement.
  - Explicit type argument can be replaced with <>.

16 files changed, 33 insertions, 52 deletions

diff --git a/src/main/java/com/beust/jcommander/JCommander.java b/src/main/java/com/beust/jcommander/JCommander.java
index 7a781c7..5ca2bb9 100644
--- a/src/main/java/com/beust/jcommander/JCommander.java
+++ b/src/main/java/com/beust/jcommander/JCommander.java
@@ -394,8 +394,7 @@ public class JCommander {
     // Expand separators
     //
     List<String> vResult2 = Lists.newArrayList();
-    for (int i = 0; i < vResult1.size(); i++) {
-      String arg = vResult1.get(i);
+    for (String arg : vResult1) {
       if (isOption(arg)) {
         String sep = getSeparatorFor(arg);
         if (! " ".equals(sep)) {
@@ -1136,7 +1135,7 @@ public class JCommander {
    * format (e.g. HTML).
    */
   public List<ParameterDescription> getParameters() {
-    return new ArrayList<ParameterDescription>(m_fields.values());
+    return new ArrayList<>(m_fields.values());
   }
 
   /**
diff --git a/src/main/java/com/beust/jcommander/ParameterDescription.java b/src/main/java/com/beust/jcommander/ParameterDescription.java
index be531ba..a812f49 100644
--- a/src/main/java/com/beust/jcommander/ParameterDescription.java
+++ b/src/main/java/com/beust/jcommander/ParameterDescription.java
@@ -291,9 +291,7 @@ public class ParameterDescription {
         p("Validating value parameter:" + name + " value:" + value + " validator:" + validator);
       }
       validator.newInstance().validate(name, value);
-    } catch (InstantiationException e) {
-      throw new ParameterException("Can't instantiate validator:" + e);
-    } catch (IllegalAccessException e) {
+    } catch (InstantiationException | IllegalAccessException e) {
       throw new ParameterException("Can't instantiate validator:" + e);
     }
   }
@@ -310,9 +308,7 @@ public class ParameterDescription {
         IParameterValidator2 instance = (IParameterValidator2) validator.newInstance();
         instance.validate(name, value, pd);
       }
-    } catch (InstantiationException e) {
-      throw new ParameterException("Can't instantiate validator:" + e);
-    } catch (IllegalAccessException e) {
+    } catch (InstantiationException | IllegalAccessException e) {
       throw new ParameterException("Can't instantiate validator:" + e);
     } catch(ParameterException ex) {
       throw ex;
diff --git a/src/main/java/com/beust/jcommander/Parameterized.java b/src/main/java/com/beust/jcommander/Parameterized.java
index f35c001..9fdc84a 100644
--- a/src/main/java/com/beust/jcommander/Parameterized.java
+++ b/src/main/java/com/beust/jcommander/Parameterized.java
@@ -173,7 +173,7 @@ public class Parameterized {
       } else {
         return m_field.get(object);
       }
-    } catch (SecurityException e) {
+    } catch (SecurityException | IllegalArgumentException | InvocationTargetException | IllegalAccessException e) {
       throw new ParameterException(e);
     } catch (NoSuchMethodException e) {
       // Try to find a field
@@ -186,18 +186,10 @@ public class Parameterized {
           setFieldAccessible(field);
           result = field.get(object);
         }
-      } catch(NoSuchFieldException ex) {
-        // ignore
-      } catch(IllegalAccessException ex) {
+      } catch(NoSuchFieldException | IllegalAccessException ex) {
         // ignore
       }
       return result;
-    } catch (IllegalArgumentException e) {
-      throw new ParameterException(e);
-    } catch (IllegalAccessException e) {
-      throw new ParameterException(e);
-    } catch (InvocationTargetException e) {
-      throw new ParameterException(e);
     }
   }
 
diff --git a/src/main/java/com/beust/jcommander/WrappedParameter.java b/src/main/java/com/beust/jcommander/WrappedParameter.java
index f4e7d56..e5ca291 100644
--- a/src/main/java/com/beust/jcommander/WrappedParameter.java
+++ b/src/main/java/com/beust/jcommander/WrappedParameter.java
@@ -86,13 +86,7 @@ public class WrappedParameter {
       Method m;
       m = findPut(parameterized.getType());
       m.invoke(parameterized.get(object), key, value);
-    } catch (SecurityException e) {
-      e.printStackTrace();
-    } catch(IllegalAccessException e) {
-      e.printStackTrace();
-    } catch(InvocationTargetException e) {
-      e.printStackTrace();
-    } catch (NoSuchMethodException e) {
+    } catch (SecurityException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
       e.printStackTrace();
     }
   }
diff --git a/src/main/java/com/beust/jcommander/internal/Lists.java b/src/main/java/com/beust/jcommander/internal/Lists.java
index fdbee55..f18e6cc 100644
--- a/src/main/java/com/beust/jcommander/internal/Lists.java
+++ b/src/main/java/com/beust/jcommander/internal/Lists.java
@@ -27,27 +27,27 @@ import java.util.List;
 public class Lists {
 
     public static <K> List<K> newArrayList() {
-        return new ArrayList<K>();
+        return new ArrayList<>();
     }
 
     public static <K> List<K> newArrayList(Collection<K> c) {
-        return new ArrayList<K>(c);
+        return new ArrayList<>(c);
     }
 
     public static <K> List<K> newArrayList(K... c) {
-      return new ArrayList<K>(Arrays.asList(c));
+      return new ArrayList<>(Arrays.asList(c));
     }
 
     public static <K> List<K> newArrayList(int size) {
-        return new ArrayList<K>(size);
+        return new ArrayList<>(size);
     }
 
     public static <K> LinkedList<K> newLinkedList() {
-        return new LinkedList<K>();
+        return new LinkedList<>();
     }
 
     public static <K> LinkedList<K> newLinkedList(Collection<K> c) {
-        return new LinkedList<K>(c);
+        return new LinkedList<>(c);
     }
 
 
diff --git a/src/main/java/com/beust/jcommander/internal/Maps.java b/src/main/java/com/beust/jcommander/internal/Maps.java
index e272122..2f45010 100644
--- a/src/main/java/com/beust/jcommander/internal/Maps.java
+++ b/src/main/java/com/beust/jcommander/internal/Maps.java
@@ -25,11 +25,11 @@ import java.util.Map;
 public class Maps {
 
   public static <K, V> Map<K,V> newHashMap() {
-    return new HashMap<K, V>();
+    return new HashMap<>();
   }
 
   public static <K, V> Map<K,V> newLinkedHashMap() {
-    return new LinkedHashMap<K, V>();
+    return new LinkedHashMap<>();
   }
 
   public static <T> Map<T, T> newHashMap(T... parameters) {
diff --git a/src/main/java/com/beust/jcommander/internal/Sets.java b/src/main/java/com/beust/jcommander/internal/Sets.java
index 77949c3..168c55f 100644
--- a/src/main/java/com/beust/jcommander/internal/Sets.java
+++ b/src/main/java/com/beust/jcommander/internal/Sets.java
@@ -25,11 +25,11 @@ import java.util.Set;
 public class Sets {
 
   public static <K> Set<K> newHashSet() {
-    return new HashSet<K>();
+    return new HashSet<>();
   }
 
   public static <K> Set<K> newLinkedHashSet() {
-    return new LinkedHashSet<K>();
+    return new LinkedHashSet<>();
   }
 
 }
diff --git a/src/test/java/com/beust/jcommander/CmdTest.java b/src/test/java/com/beust/jcommander/CmdTest.java
index 76007ea..229517d 100644
--- a/src/test/java/com/beust/jcommander/CmdTest.java
+++ b/src/test/java/com/beust/jcommander/CmdTest.java
@@ -17,7 +17,7 @@ public class CmdTest {
     @Parameters(commandNames = "--cmd-two")
     class CmdTwo {
         @Parameter
-        List<String> params = new java.util.LinkedList<String>();
+        List<String> params = new java.util.LinkedList<>();
     }
 
     public String parseArgs(boolean withDefault, String[] args) {
@@ -35,7 +35,7 @@ public class CmdTest {
             // is named "WithoutValidation".
             jc.parseWithoutValidation(args);
             if (jc.getParsedCommand() == null) {
-                LinkedList<String> newArgs = new LinkedList<String>();
+                LinkedList<String> newArgs = new LinkedList<>();
                 newArgs.add("--cmd-two");
                 newArgs.addAll(Arrays.asList(args));
                 jc.parse(newArgs.toArray(new String[0]));
diff --git a/src/test/java/com/beust/jcommander/JCommanderTest.java b/src/test/java/com/beust/jcommander/JCommanderTest.java
index e53f45f..f655b60 100644
--- a/src/test/java/com/beust/jcommander/JCommanderTest.java
+++ b/src/test/java/com/beust/jcommander/JCommanderTest.java
@@ -594,7 +594,7 @@ public class JCommanderTest {
       public static final String NAME = "help";
 
       @Parameter(description = "List of commands.")
-      public List<String> commands=new ArrayList<String>();
+      public List<String> commands=new ArrayList<>();
   }
 
   @Test(expectedExceptions = ParameterException.class,
@@ -1060,7 +1060,7 @@ public class JCommanderTest {
   public void spaces() {
     class Arg {
       @Parameter(names = "-rule", description = "rule")
-      private List<String> rules = new ArrayList<String>();
+      private List<String> rules = new ArrayList<>();
     }
     Arg a = new Arg();
     new JCommander(a, "-rule", "some test");
diff --git a/src/test/java/com/beust/jcommander/ParametersDelegateTest.java b/src/test/java/com/beust/jcommander/ParametersDelegateTest.java
index 46c7c6a..1f9f9e0 100644
--- a/src/test/java/com/beust/jcommander/ParametersDelegateTest.java
+++ b/src/test/java/com/beust/jcommander/ParametersDelegateTest.java
@@ -143,7 +143,7 @@ public class ParametersDelegateTest {
   public void mainParametersTest() {
     class Delegate {
       @Parameter
-      public List<String> mainParams = new ArrayList<String>();
+      public List<String> mainParams = new ArrayList<>();
     }
     class Command {
       @ParametersDelegate
@@ -200,11 +200,11 @@ public class ParametersDelegateTest {
   public void duplicateMainParametersAreNotAllowed() {
     class Delegate1 {
       @Parameter
-      public List<String> mainParams1 = new ArrayList<String>();
+      public List<String> mainParams1 = new ArrayList<>();
     }
     class Delegate2 {
       @Parameter
-      public List<String> mainParams2 = new ArrayList<String>();
+      public List<String> mainParams2 = new ArrayList<>();
     }
     class Command {
       @ParametersDelegate
diff --git a/src/test/java/com/beust/jcommander/SetConverter.java b/src/test/java/com/beust/jcommander/SetConverter.java
index c19df11..580fd98 100644
--- a/src/test/java/com/beust/jcommander/SetConverter.java
+++ b/src/test/java/com/beust/jcommander/SetConverter.java
@@ -6,7 +6,7 @@ import java.util.TreeSet;
 public class SetConverter implements IStringConverter<SortedSet<Integer>> {
  
   public SortedSet<Integer> convert(String value) {
-    SortedSet<Integer> set = new TreeSet<Integer>();
+    SortedSet<Integer> set = new TreeSet<>();
     String[] values = value.split(",");
     for (String num : values) {
       set.add(Integer.parseInt(num));
diff --git a/src/test/java/com/beust/jcommander/VariableArityTest.java b/src/test/java/com/beust/jcommander/VariableArityTest.java
index a90392f..5ca3f2e 100644
--- a/src/test/java/com/beust/jcommander/VariableArityTest.java
+++ b/src/test/java/com/beust/jcommander/VariableArityTest.java
@@ -13,15 +13,15 @@ public class VariableArityTest {
 
     @Parameter(names = { "-m", "--matrixData" }, variableArity = true,
         description = "File containing a list of instances and their runtimes on various configurations", required = false)
-    public List<String> modelMatrixFile = new LinkedList<String>();
+    public List<String> modelMatrixFile = new LinkedList<>();
 
     @Parameter(names = { "-f", "--featureData" }, variableArity = true,
         description = "File containing a list of instances and their corresponding features", required = true)
-    public List<String> featureFile = new LinkedList<String>();
+    public List<String> featureFile = new LinkedList<>();
 
     @Parameter(names = { "-c", "--configData" }, variableArity = true,
         description = "File containing a list of configuration parameter values")
-    public List<String> configFile = new LinkedList<String>();
+    public List<String> configFile = new LinkedList<>();
 
     @Parameter(names = { "-o", "--outputFile" },
         description = "File to output the resulting data to. Defaults to ./matrix-generation.zip", required = false)
diff --git a/src/test/java/com/beust/jcommander/args/ArgsEnum.java b/src/test/java/com/beust/jcommander/args/ArgsEnum.java
index 29b43a7..ba0628d 100644
--- a/src/test/java/com/beust/jcommander/args/ArgsEnum.java
+++ b/src/test/java/com/beust/jcommander/args/ArgsEnum.java
@@ -39,7 +39,7 @@ public class ArgsEnum {
   public ChoiceType choice = ChoiceType.ONE;
   
   @Parameter(names = "-choices", variableArity = true)
-  public List<ChoiceType> choices = new ArrayList<ChoiceType>();
+  public List<ChoiceType> choices = new ArrayList<>();
 
   public static void main(String[] args1) {
     ArgsEnum args = new ArgsEnum();
diff --git a/src/test/java/com/beust/jcommander/args/ArgsLongMainParameterDescription.java b/src/test/java/com/beust/jcommander/args/ArgsLongMainParameterDescription.java
index d498b54..18bb06c 100644
--- a/src/test/java/com/beust/jcommander/args/ArgsLongMainParameterDescription.java
+++ b/src/test/java/com/beust/jcommander/args/ArgsLongMainParameterDescription.java
@@ -10,7 +10,7 @@ public class ArgsLongMainParameterDescription {
     @Parameter(description = "[text] [text] text text text text text text text text " +
             "text text text text text text text text " +
             "really-really-really-long-word-or-url text text text text text text text.")
-    public List<String> main = new ArrayList<String>();
+    public List<String> main = new ArrayList<>();
 
     @Parameter(names = {"-b"}, description = "boolean parameter")
     public boolean var;
diff --git a/src/test/java/com/beust/jcommander/args/VariableArity.java b/src/test/java/com/beust/jcommander/args/VariableArity.java
index 21a861d..e92ab26 100644
--- a/src/test/java/com/beust/jcommander/args/VariableArity.java
+++ b/src/test/java/com/beust/jcommander/args/VariableArity.java
@@ -15,10 +15,10 @@ public class VariableArity implements IVariableArity {
   }
 
   @Parameter
-  public List<String> main = new ArrayList<String>();
+  public List<String> main = new ArrayList<>();
 
   @Parameter(names = "-variable", variableArity = true)
-  public List<String> var = new ArrayList<String>();
+  public List<String> var = new ArrayList<>();
 
   public int processVariableArity(String optionName, String[] options) {
     return m_count;
diff --git a/src/test/java/test/QuotedMainTest.java b/src/test/java/test/QuotedMainTest.java
index abb97c0..68126ea 100644
--- a/src/test/java/test/QuotedMainTest.java
+++ b/src/test/java/test/QuotedMainTest.java
@@ -11,7 +11,7 @@ import com.beust.jcommander.Parameter;
 
 public class QuotedMainTest {
   @Parameter
-  List<String> args = new ArrayList<String>();
+  List<String> args = new ArrayList<>();
   
   String quoted = "\" \"";