Use better JRE API

Author: garydgregory

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

@@ -148,12 +148,12 @@ public int compare(final Option opt1, final Option opt2) {
     public String defaultSyntaxPrefix = DEFAULT_SYNTAX_PREFIX;
 
     /**
-     * the new line string
-     *
-     * @deprecated Scope will be made private for next major version - use get/setNewLine methods instead.
-     */
+    * the new line string
+    *
+    * @deprecated Scope will be made private for next major version - use get/setNewLine methods instead.
+    */
     @Deprecated
-    public String defaultNewLine = System.getProperty("line.separator");
+    public String defaultNewLine = System.lineSeparator();
 
     /**
      * the shortOpt prefix

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

@@ -486,7 +486,7 @@ public void testOptionAndRequiredOption() throws Exception {
         assertEquals("Confirm arg of -b", "file", cl.getOptionValue("b"));
         assertTrue("Confirm NO of extra args", cl.getArgList().isEmpty());
     }
-    
+
     @Test
     public void testOptionGroup() throws Exception {
         final OptionGroup group = new OptionGroup();
@@ -1021,12 +1021,12 @@ public void testWithRequiredOption() throws Exception {
         assertEquals("Confirm arg of -b", "file", cl.getOptionValue("b"));
         assertTrue("Confirm NO of extra args", cl.getArgList().isEmpty());
     }
-    
+
     @Test(expected = UnrecognizedOptionException.class)
     public void testAmbiguousArgParsing() throws Exception {
         final String[] args = {"-=-"};
         final Options options = new Options();
-        
+
         final CommandLine cl = parser.parse(options, args);
     }
 }

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

@@ -227,7 +227,7 @@ public void testMan() {
         //@formatter:on
 
         final HelpFormatter hf = new HelpFormatter();
-        final String eol = System.getProperty("line.separator");
+        final String eol = System.lineSeparator();
         final StringWriter out = new StringWriter();
         hf.printHelp(new PrintWriter(out), 60, cmdLine, null, options, HelpFormatter.DEFAULT_LEFT_PAD, HelpFormatter.DEFAULT_DESC_PAD, null, false);
         //@formatter:off

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

@@ -24,15 +24,14 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import java.io.ByteArrayOutputStream;
 import java.io.PrintWriter;
 import java.io.StringWriter;
-import java.util.Comparator;
 
 import org.junit.Test;
 
 /**
  * Test case for the HelpFormatter class.
  */
 public class HelpFormatterTest {
-    private static final String EOL = System.getProperty("line.separator");
+    private static final String EOL = System.lineSeparator();
 
     @Test
     public void testAccessors() {
@@ -271,7 +270,7 @@ public void testOptionWithoutShortFormat2() {
         mOptions.addOption(configFile);
 
         final HelpFormatter formatter = new HelpFormatter();
-        final String eol = System.getProperty("line.separator");
+        final String eol = System.lineSeparator();
         final StringWriter out = new StringWriter();
         formatter.printHelp(new PrintWriter(out), 80, "commandline", "header", mOptions, 2, 2, "footer", true);
         //@formatter:off
@@ -470,13 +469,7 @@ public void testPrintSortedUsage() {
         opts.addOption(new Option("c", "third"));
 
         final HelpFormatter helpFormatter = new HelpFormatter();
-        helpFormatter.setOptionComparator(new Comparator<Option>() {
-            @Override
-            public int compare(final Option opt1, final Option opt2) {
-                // reverses the functionality of the default comparator
-                return opt2.getKey().compareToIgnoreCase(opt1.getKey());
-            }
-        });
+        helpFormatter.setOptionComparator((opt1, opt2) -> opt2.getKey().compareToIgnoreCase(opt1.getKey()));
 
         final StringWriter out = new StringWriter();
         helpFormatter.printUsage(new PrintWriter(out), 80, "app", opts);

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

@@ -33,7 +33,7 @@
 
 public class BugCLI162Test {
     /** Constant for the line separator. */
-    private static final String CR = System.getProperty("line.separator");
+    private static final String CR = System.lineSeparator();
 
     // Constants used for options
     private static final String OPT = "-";