Fix compiler warnings.

Author: garydgregory

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

@@ -578,7 +578,7 @@ public CommandLine parse(final Options options, final String[] arguments, final
         this.stopAtNonOption = stopAtNonOption;
         skipParsing = false;
         currentOption = null;
-        expectedOpts = new ArrayList(options.getRequiredOptions());
+        expectedOpts = new ArrayList<>(options.getRequiredOptions());
 
         // clear the data from the groups
         for (final OptionGroup group : options.getOptionGroups()) {

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

@@ -329,7 +329,7 @@ protected void processProperties(final Properties properties) throws ParseExcept
 
     protected void setOptions(final Options options) {
         this.options = options;
-        this.requiredOptions = new ArrayList(options.getRequiredOptions());
+        this.requiredOptions = new ArrayList<>(options.getRequiredOptions());
     }
 
     /**

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

@@ -29,7 +29,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 public class CommandLineTest {
 
     @Test
-    public void testBuilder() throws Exception {
+    public void testBuilder() {
         final CommandLine.Builder builder = new CommandLine.Builder();
         builder.addArg("foo").addArg("bar");
         builder.addOption(Option.builder("T").build());

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

@@ -63,7 +63,7 @@ public void testAccessors() {
     }
 
     @Test
-    public void testAutomaticUsage() throws Exception {
+    public void testAutomaticUsage() {
         final HelpFormatter hf = new HelpFormatter();
         Options options;
         String expected = "usage: app [-a]";
@@ -101,7 +101,7 @@ public void testDefaultArgName() {
     }
 
     @Test
-    public void testFindWrapPos() throws Exception {
+    public void testFindWrapPos() {
         final HelpFormatter hf = new HelpFormatter();
 
         String text = "This is a test.";
@@ -148,7 +148,7 @@ public void testHeaderStartingWithLineSeparator() {
     }
 
     @Test
-    public void testHelpWithLongOptSeparator() throws Exception {
+    public void testHelpWithLongOptSeparator() {
         final Options options = new Options();
         options.addOption("f", true, "the file");
         options.addOption(Option.builder("s").longOpt("size").desc("the size").hasArg().argName("SIZE").build());
@@ -329,7 +329,7 @@ public void testPrintOptionGroupUsage() {
     }
 
     @Test
-    public void testPrintOptions() throws Exception {
+    public void testPrintOptions() {
         final StringBuffer sb = new StringBuffer();
         final HelpFormatter hf = new HelpFormatter();
         final int leftPad = 1;
@@ -458,9 +458,9 @@ public void testPrintUsage() {
         opts.addOption(optionC);
         final HelpFormatter helpFormatter = new HelpFormatter();
         final ByteArrayOutputStream bytesOut = new ByteArrayOutputStream();
-        final PrintWriter printWriter = new PrintWriter(bytesOut);
-        helpFormatter.printUsage(printWriter, 80, "app", opts);
-        printWriter.close();
+        try (final PrintWriter printWriter = new PrintWriter(bytesOut)) {
+            helpFormatter.printUsage(printWriter, 80, "app", opts);
+        }
         assertEquals("usage: app [-a] [-b] [-c]" + EOL, bytesOut.toString());
     }
 
@@ -565,7 +565,7 @@ public void testRtrim() {
     }
 
     @Test
-    public void testUsageWithLongOptSeparator() throws Exception {
+    public void testUsageWithLongOptSeparator() {
         final Options options = new Options();
         options.addOption("f", true, "the file");
         options.addOption(Option.builder("s").longOpt("size").desc("the size").hasArg().argName("SIZE").build());

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

@@ -49,7 +49,7 @@ public void testClassPattern() throws Exception {
     }
 
     @Test
-    public void testEmptyPattern() throws Exception {
+    public void testEmptyPattern() {
         final Options options = PatternOptionBuilder.parsePattern("");
         assertTrue(options.getOptions().isEmpty());
     }

src/test/java/org/apache/commons/cli/bug/BugCLI162Test.java

@@ -84,10 +84,6 @@ public class BugCLI162Test {
 
     private static final String OPT_SQL_L = "sql";
 
-    private static final String OPT_SQL_SPLIT_DEFAULT = "###";
-
-    private static final String OPT_SQL_SPLIT_L = "splitSql";
-
     private static final String OPT_STACK_TRACE = "t";
 
     private static final String OPT_TIMING = "g";
@@ -113,7 +109,7 @@ public class BugCLI162Test {
     private StringWriter sw;
 
     @Before
-    public void setUp() throws Exception {
+    public void setUp() {
         formatter = new HelpFormatter();
         sw = new StringWriter();
     }

src/test/java/org/apache/commons/cli/bug/BugCLI265Test.java

@@ -41,7 +41,7 @@ public class BugCLI265Test {
     private Options options;
 
     @Before
-    public void setUp() throws Exception {
+    public void setUp() {
         parser = new DefaultParser();
 
         final Option optionT1 = Option.builder("t1").hasArg().numberOfArgs(1).optionalArg(true).argName("t1_path").build();

src/test/java/org/apache/commons/cli/bug/BugCLI266Test.java

@@ -27,7 +27,6 @@
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.OptionGroup;
 import org.apache.commons.cli.Options;
-import org.apache.commons.cli.ParseException;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -105,7 +104,7 @@ private Options getOptions() {
     }
 
     @Test
-    public void testOptionComparatorDefaultOrder() throws ParseException {
+    public void testOptionComparatorDefaultOrder() {
         final HelpFormatter formatter = new HelpFormatter();
         final List<Option> options = new ArrayList<>(getOptions().getOptions());
         Collections.sort(options, formatter.getOptionComparator());
@@ -117,7 +116,7 @@ public void testOptionComparatorDefaultOrder() throws ParseException {
     }
 
     @Test
-    public void testOptionComparatorInsertedOrder() throws ParseException {
+    public void testOptionComparatorInsertedOrder() {
         final Collection<Option> options = getOptions().getOptions();
         int i = 0;
         for (final Option o : options) {