Remove trailing whitespace

- Use final
- Reduce nesting
- Use method references

Author: garydgregory

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

@@ -309,7 +309,7 @@ public String getOptionValue(final Option option, final Supplier<String> default
         final String answer = getOptionValue(option);
         return answer != null ? answer : defaultValue.get();
     }
-    
+
     /**
      * Gets the first argument, if any, of this option.
      *
@@ -343,7 +343,7 @@ public String getOptionValue(final String opt, final Supplier<String> defaultVal
         return getOptionValue(resolveOption(opt), defaultValue);
     }
 
-    
+
     /**
      * Gets the array of values, if any, of an option.
      *
@@ -425,7 +425,7 @@ public <T> T getParsedOptionValue(final char opt, final T defaultValue) throws P
     public <T> T getParsedOptionValue(final Option option) throws ParseException {
         return  getParsedOptionValue(option, null);
     }
-    
+
     /**
      * Gets a version of this {@code Option} converted to a particular type.
      *
@@ -446,7 +446,7 @@ public <T> T getParsedOptionValue(final Option option, final T defaultValue) thr
 
         try {
             return res == null ? defaultValue : (T) option.getConverter().apply(res);
-        } catch (Exception e) {
+        } catch (final Exception e) {
             throw ParseException.wrap(e);
         }
     }

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

@@ -36,10 +36,10 @@ public interface Converter<T> {
     Converter<?> DEFAULT = s -> s;
 
     /** Class name converter. Calls {@code Class.forName}. */
-    Converter<Class<?>> CLASS = s -> Class.forName(s);
+    Converter<Class<?>> CLASS = Class::forName;
 
     /** File name converter. Calls @{code new File(s)} */
-    Converter<File> FILE = s -> new File(s);
+    Converter<File> FILE = File::new;
 
     /** Path converter. Calls @{code new Path(s)} */
     Converter<Path> PATH = s -> new File(s).toPath();
@@ -63,7 +63,7 @@ public interface Converter<T> {
     Converter<Object> OBJECT = s -> CLASS.apply(s).getConstructor().newInstance();
 
     /** Creates a URL. Calls {@code new URL(s)}. */
-    Converter<URL> URL = s -> new URL(s);
+    Converter<URL> URL = java.net.URL::new;
 
     /** Converts to a date using the format string Form "EEE MMM dd HH:mm:ss zzz yyyy". */
     Converter<Date> DATE = s -> new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy").parse(s);

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

@@ -82,7 +82,7 @@ public static final class Builder {
 
         /** The character that is the value separator */
         private char valueSeparator;
-        
+
         /** The converter to convert to type **/
         private Converter<?> converter;
 
@@ -285,7 +285,7 @@ public Builder valueSeparator(final char valueSeparator) {
             this.valueSeparator = valueSeparator;
             return this;
         }
-        
+
     }
 
     /** Specifies the number of argument values has not been specified */
@@ -351,7 +351,7 @@ public static Builder builder(final String option) {
 
     /** The character that is the value separator. */
     private char valuesep;
-    
+
     /** The explicit converter for this option.  May be null */
     private transient Converter<?> converter;
 
@@ -724,7 +724,7 @@ private boolean hasNoValues() {
 
     /**
      * Returns whether this Option can have an optional argument.
-     * 
+     *
      * @return whether this Option can have an optional argument
      */
     public boolean hasOptionalArg() {
@@ -880,7 +880,7 @@ public void setRequired(final boolean required) {
     public void setType(final Class<?> type) {
         this.type = type;
     }
-    
+
     /**
      * Sets the type of this Option.
      * <p>

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

@@ -29,11 +29,11 @@ public class ParseException extends Exception {
 
     /**
      * Converts any exception except {@code UnsupportedOperationException} to a {@code ParseException}.
-     * if {@code e} is an instance of {@code ParseException} it is returned, otherwise a {@code ParseException} is 
+     * if {@code e} is an instance of {@code ParseException} it is returned, otherwise a {@code ParseException} is
      * created that wraps it.
      * <p>
-     * Note: {@code UnsupportedOperationException} are not wrapped.  This is to solve a legacy expected exception problem and will be 
-     * removed in the future.</p> 
+     * Note: {@code UnsupportedOperationException} are not wrapped.  This is to solve a legacy expected exception problem and will be
+     * removed in the future.</p>
      * @param e the exception to convert.
      * @return the ParseException.
      * @throws UnsupportedOperationException due to legacy expectations.  Will be removed in the future.
@@ -50,13 +50,13 @@ public static ParseException wrap(final Exception e) throws UnsupportedOperation
         return new ParseException(e);
     }
     /**
-     * Constructs a new {@code ParseException} wrapping the specified exception. 
+     * Constructs a new {@code ParseException} wrapping the specified exception.
      * @param e the Exception to wrap.
      */
     public ParseException(final Exception e) {
         super(e);
     }
-    
+
     /**
      * Constructs a new {@code ParseException} with the specified detail message.
      *

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

@@ -102,12 +102,12 @@ public class PatternOptionBuilder {
 
     /** URL class */
     public static final Class<URL> URL_VALUE = URL.class;
-    
+
     /** The converter to use for Unimplemented data types */
-    static final Converter<?> NOT_IMPLEMENTED = s -> { 
+    static final Converter<?> NOT_IMPLEMENTED = s -> {
         throw new UnsupportedOperationException("Not yet implemented");
     };
-    
+
     static {
         registerTypes();
     }
@@ -155,7 +155,7 @@ public static Class<?> getValueType(final char ch) {
 
         return null;
     }
-    
+
     /**
      * Returns whether {@code ch} is a value code, i.e. whether it represents a class in a pattern.
      *
@@ -217,7 +217,7 @@ public static Options parsePattern(final String pattern) {
     }
 
     /**
-     * Registers custom {@code Converter}s with the {@code TypeHandler}. 
+     * Registers custom {@code Converter}s with the {@code TypeHandler}.
      * @since 1.7.0
      */
     public static void registerTypes() {

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

@@ -28,19 +28,19 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import java.util.Map;
 
 /**
- * TypeHandler will handle the pluggable conversion and verification of 
+ * TypeHandler will handle the pluggable conversion and verification of
  * Option types.  It handles the mapping of classes to bot converters and verifiers.
  * It provides the default conversion and verification methods when converters and verifiers
  * are not explicitly set.
  * <p>
- * If Options are serialized and deserialized their converters and verifiers will revert to the 
+ * If Options are serialized and deserialized their converters and verifiers will revert to the
  * defaults defined in this class.  To correctly de-serialize Options with custom converters and/or
  * verifiers, using the default serialization methods, this class should be properly configured with the custom
  * converters and verifiers for the specific class.
  * </p>
  */
 public class TypeHandler {
-    
+
     /** Value of hex conversion of strings */
     private static final int HEX_RADIX = 16;
 
@@ -50,7 +50,7 @@ public class TypeHandler {
     static {
         resetConverters();
     }
-    
+
     /**
      * Returns the class whose name is {@code className}.
      *
@@ -63,7 +63,7 @@ public class TypeHandler {
     public static Class<?> createClass(final String className) throws ParseException {
         return createValue(className, Class.class);
     }
-    
+
     /**
      * Returns the date represented by {@code str}.
      * <p>
@@ -77,7 +77,7 @@ public static Class<?> createClass(final String className) throws ParseException
     public static Date createDate(final String str) {
         try {
             return createValue(str, Date.class);
-        } catch (ParseException e) {
+        } catch (final ParseException e) {
             throw new RuntimeException(e);
         }
     }
@@ -93,7 +93,7 @@ public static Date createDate(final String str) {
     public static File createFile(final String str) {
         try {
             return createValue(str, File.class);
-        } catch (ParseException e) {
+        } catch (final ParseException e) {
             throw new RuntimeException(e);
         }
     }
@@ -166,7 +166,7 @@ public static URL createURL(final String str) throws ParseException {
     public static <T> T createValue(final String str, final Class<T> clazz) throws ParseException {
         try {
             return (T) getConverter(clazz).apply(str);
-        } catch (Exception e) {
+        } catch (final Exception e) {
             throw ParseException.wrap(e);
         }
     }
@@ -192,7 +192,7 @@ public static Object createValue(final String str, final Object obj) throws Pars
      * @since 1.7.0
      */
     public static Converter<?> getConverter(final Class<?> clazz) {
-        Converter<?> converter = converterMap.get(clazz);
+        final Converter<?> converter = converterMap.get(clazz);
         return converter == null ? Converter.DEFAULT : converter;
     }
 
@@ -218,9 +218,9 @@ public static FileInputStream openFile(final String str) throws ParseException {
     }
 
     /**
-     * Registers a Converter for a Class. If @code converter} is null registration is cleared for {@code clazz}, and 
+     * Registers a Converter for a Class. If @code converter} is null registration is cleared for {@code clazz}, and
      * no converter will be used in processing.
-     * 
+     *
      * @param clazz the Class to register the Converter and Verifier to.
      * @param converter The Converter to associate with Class.  May be null.
      * @since 1.7.0
@@ -246,20 +246,19 @@ public static void resetConverters() {
         converterMap.put(Path.class, Converter.PATH);
         converterMap.put(Number.class, Converter.NUMBER);
         converterMap.put(URL.class, Converter.URL);
-        converterMap.put(FileInputStream.class, s -> new FileInputStream(s));
+        converterMap.put(FileInputStream.class, FileInputStream::new);
         converterMap.put(Long.class, Long::parseLong);
         converterMap.put(Integer.class, Integer::parseInt);
         converterMap.put(Short.class, Short::parseShort);
         converterMap.put(Byte.class, Byte::parseByte);
         converterMap.put(Character.class, s -> {
             if (s.startsWith("\\u")) {
                 return Character.toChars(Integer.parseInt(s.substring(2), HEX_RADIX))[0];
-            } else {
-                return s.charAt(0);
-            } });
+            }
+            return s.charAt(0); });
         converterMap.put(Double.class, Double::parseDouble);
         converterMap.put(Float.class, Float::parseFloat);
-        converterMap.put(BigInteger.class, s -> new BigInteger(s));
-        converterMap.put(BigDecimal.class, s -> new BigDecimal(s));
+        converterMap.put(BigInteger.class, BigInteger::new);
+        converterMap.put(BigDecimal.class, BigDecimal::new);
     }
 }

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

@@ -43,7 +43,7 @@ public AClassWithoutADefaultConstructor(final int i) {
     }
 
     private static Stream<Arguments> numberTestParameters() {
-        List<Arguments> lst = new ArrayList<>();
+        final List<Arguments> lst = new ArrayList<>();
 
         lst.add(Arguments.of("123", Long.valueOf("123")));
         lst.add(Arguments.of("12.3", Double.valueOf("12.3")));
@@ -75,16 +75,16 @@ public void classTests() throws Exception {
     public void dateTests() throws Exception {
         assertThrows(java.text.ParseException.class, () -> Converter.DATE.apply("whatever"));
 
-        Date d = new Date(1023400137000L);
+        final Date d = new Date(1023400137000L);
         assertEquals(d, Converter.DATE.apply("Thu Jun 06 17:48:57 EDT 2002"));
 
         assertThrows(java.text.ParseException.class, () -> Converter.DATE.apply("Jun 06 17:48:57 EDT 2002"));
     }
 
     @Test
     public void fileTests() throws Exception {
-        URL url = this.getClass().getClassLoader().getResource("./org/apache/commons/cli/existing-readable.file");
-        String fileName = url.toString().substring("file:".length());
+        final URL url = this.getClass().getClassLoader().getResource("./org/apache/commons/cli/existing-readable.file");
+        final String fileName = url.toString().substring("file:".length());
         assertNotNull(Converter.FILE.apply(fileName));
     }
 

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

@@ -80,11 +80,11 @@ private static void checkOption(final Option option, final String opt, final Str
     }
 
     private Option roundTrip(final Option o) throws IOException, ClassNotFoundException {
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        ObjectOutputStream oos = new ObjectOutputStream(baos);
+        final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        final ObjectOutputStream oos = new ObjectOutputStream(baos);
         oos.writeObject(o);
-        ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-        ObjectInputStream ois = new ObjectInputStream(bais);
+        final ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
+        final ObjectInputStream ois = new ObjectInputStream(bais);
         return (Option) ois.readObject();
     }
 
@@ -243,7 +243,7 @@ public void testHashCode() {
     @Test
     public void testSerialization() throws IOException, ClassNotFoundException {
 
-        Option o = Option.builder("o").type(TypeHandlerTest.Instantiable.class).build();
+        final Option o = Option.builder("o").type(TypeHandlerTest.Instantiable.class).build();
         assertEquals(Converter.DEFAULT, o.getConverter());
         Option o2 = roundTrip(o);
         assertEquals(Converter.DEFAULT, o2.getConverter());

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

@@ -88,7 +88,7 @@ public void testNumberPattern() throws Exception {
         // 3,5 fails validation.
         //assertThrows(ParseException.class, () -> parser.parse(options, new String[] {"-n", "1", "-d", "2.1", "-x", "3,5"}));
 
-        CommandLine line = parser.parse(options, new String[] {"-n", "1", "-d", "2.1", "-x", "3,5"});
+        final CommandLine line = parser.parse(options, new String[] {"-n", "1", "-d", "2.1", "-x", "3,5"});
         assertEquals("n object class", Long.class, line.getOptionObject("n").getClass());
         assertEquals("n value", Long.valueOf(1), line.getOptionObject("n"));