From 00b561864b1ec694d13f8787d87a5bea48c64a9d Mon Sep 17 00:00:00 2001
From: David Phillips <david@acz.org>
Date: Sun, 12 Jan 2020 16:08:34 -0800
Subject: [PATCH] Remove usage of internal jcommander helpers

---
 .../tempto/internal/configuration/MapConfiguration.java   | 4 ++--
 .../initialization/TestInitializationListener.java        | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tempto-core/src/main/java/io/prestosql/tempto/internal/configuration/MapConfiguration.java b/tempto-core/src/main/java/io/prestosql/tempto/internal/configuration/MapConfiguration.java
index 81c9b53a..71d4e0ff 100644
--- a/tempto-core/src/main/java/io/prestosql/tempto/internal/configuration/MapConfiguration.java
+++ b/tempto-core/src/main/java/io/prestosql/tempto/internal/configuration/MapConfiguration.java
@@ -14,10 +14,10 @@
 
 package io.prestosql.tempto.internal.configuration;
 
-import com.beust.jcommander.internal.Sets;
 import io.prestosql.tempto.configuration.Configuration;
 import io.prestosql.tempto.configuration.KeyUtils;
 
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -101,7 +101,7 @@ private Optional<Object> getObject(String key)
     @Override
     public Set<String> listKeys()
     {
-        Set<String> acc = Sets.newHashSet();
+        Set<String> acc = new HashSet<>();
         listKeys(map, null, acc);
         return acc;
     }
diff --git a/tempto-core/src/main/java/io/prestosql/tempto/internal/initialization/TestInitializationListener.java b/tempto-core/src/main/java/io/prestosql/tempto/internal/initialization/TestInitializationListener.java
index d89c8e39..e0d3f334 100644
--- a/tempto-core/src/main/java/io/prestosql/tempto/internal/initialization/TestInitializationListener.java
+++ b/tempto-core/src/main/java/io/prestosql/tempto/internal/initialization/TestInitializationListener.java
@@ -14,7 +14,6 @@
 
 package io.prestosql.tempto.internal.initialization;
 
-import com.beust.jcommander.internal.Sets;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Ordering;
 import com.google.inject.Binder;
@@ -48,6 +47,8 @@
 import java.lang.annotation.Annotation;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
 import java.util.ServiceLoader;
@@ -55,7 +56,6 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Function;
 
-import static com.beust.jcommander.internal.Lists.newArrayList;
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.Lists.reverse;
@@ -272,7 +272,7 @@ private void doFulfillment(TestContextStack<TestContext> testContextStack,
             List<Class<? extends RequirementFulfiller>> fulfillerClasses,
             Set<Requirement> requirements)
     {
-        List<Class<? extends RequirementFulfiller>> successfulFulfillerClasses = newArrayList();
+        List<Class<? extends RequirementFulfiller>> successfulFulfillerClasses = new ArrayList<>();
 
         try {
             for (Class<? extends RequirementFulfiller> fulfillerClass : fulfillerClasses) {
@@ -349,7 +349,7 @@ private Set<Requirement> resolveAllTestsRequirements(ITestContext context)
     {
         // we cannot assume that context contains RequirementsAwareTestNGMethod instances here
         // as interceptor is for some reason called after onStart() which uses this method.
-        Set<Requirement> allTestsRequirements = Sets.newHashSet();
+        Set<Requirement> allTestsRequirements = new HashSet<>();
         for (ITestNGMethod iTestNGMethod : context.getAllTestMethods()) {
             Set<Set<Requirement>> requirementsSets = new TestSpecificRequirementsResolver(configuration).resolve(iTestNGMethod);
             for (Set<Requirement> requirementsSet : requirementsSets) {