From 749044426d441837fd1f16cfcc24ffd5ec0e4b10 Mon Sep 17 00:00:00 2001
From: Cedric Beust <cedric@beust.com>
Date: Sun, 5 Mar 2017 06:41:41 -0800
Subject: Compile JCommander with 1.7.

TestNG depends on it, so that's necessary.
---
 src/main/java/com/beust/jcommander/JCommander.java |  4 ++--
 .../beust/jcommander/ParametersNotEmptyTest.java   | 23 ++++++++++++++--------
 2 files changed, 17 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/main/java/com/beust/jcommander/JCommander.java b/src/main/java/com/beust/jcommander/JCommander.java
index e8b5045..1736ef5 100644
--- a/src/main/java/com/beust/jcommander/JCommander.java
+++ b/src/main/java/com/beust/jcommander/JCommander.java
@@ -1297,7 +1297,7 @@ public class JCommander {
      * Adds a factory to lookup string converters. The added factory is used prior to previously added factories.
      * @param converterFactory the factory determining string converters
      */
-    public void addConverterFactory(IStringConverterFactory converterFactory) {
+    public void addConverterFactory(final IStringConverterFactory converterFactory) {
         addConverterInstanceFactory(new IStringConverterInstanceFactory() {
             @SuppressWarnings("unchecked")
             @Override
@@ -1337,7 +1337,7 @@ public class JCommander {
      * @param optionName
      * @param value The value to convert
      */
-    public Object convertValue(Parameterized parameterized, Class type, String optionName, String value) {
+    public Object convertValue(final Parameterized parameterized, Class type, String optionName, String value) {
         final Parameter annotation = parameterized.getParameter();
 
         // Do nothing if it's a @DynamicParameter
diff --git a/src/test/java/com/beust/jcommander/ParametersNotEmptyTest.java b/src/test/java/com/beust/jcommander/ParametersNotEmptyTest.java
index 596c2f4..7ebfc24 100644
--- a/src/test/java/com/beust/jcommander/ParametersNotEmptyTest.java
+++ b/src/test/java/com/beust/jcommander/ParametersNotEmptyTest.java
@@ -3,8 +3,10 @@ package com.beust.jcommander;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
-import java.util.stream.Collectors;
+import java.util.List;
 
 @Test
 public class ParametersNotEmptyTest {
@@ -19,12 +21,17 @@ public class ParametersNotEmptyTest {
 
     @Test
     public void testParameters() throws Exception {
-        final JCommander jc = new JCommander(new Args1());
-        final String parameterNames = jc.getParameters().stream()
-                .map(ParameterDescription::getNames)
-                .sorted()
-                .collect(Collectors.joining(", "));
-        Assert.assertEquals(parameterNames,"-date, -debug",
-                "getParameters returns the @Parameters");
+        JCommander jc = new JCommander(new Args1());
+        List<String> parameters = new ArrayList<>();
+        for (ParameterDescription pd : jc.getParameters()) {
+            parameters.add(pd.getNames());
+        }
+        Collections.sort(parameters);
+
+        Assert.assertEquals(parameters, new ArrayList<String>() {{
+            add("-date");
+            add("-debug");
+        }}
+        );
     }
 }
-- 
cgit v1.2.3