fix: errorprone JdkObsolete warnings

testng-team · Feb 19, 2024 · ac5ead9 · ac5ead9
1 parent 23371c7
commit ac5ead9
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 16 deletions.
diff --git a/testng-core/src/main/java/org/testng/internal/Graph.java b/testng-core/src/main/java/org/testng/internal/Graph.java
@@ -1,9 +1,11 @@
 package org.testng.internal;
 
+import java.util.ArrayDeque;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Comparator;
+import java.util.Deque;
 import java.util.HashSet;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -190,9 +192,9 @@ public List<T> findPredecessors(T o) {
     // already encountered.  "queue" is the queue of items whose
     // predecessors we haven't yet explored.
 
-    LinkedList<T> result = new LinkedList<>();
+    Deque<T> result = new ArrayDeque<>();
     Set<T> visited = new HashSet<>();
-    LinkedList<T> queue = new LinkedList<>();
+    Deque<T> queue = new ArrayDeque<>();
     visited.add(o);
     queue.addLast(o);
 
@@ -206,7 +208,7 @@ public List<T> findPredecessors(T o) {
       }
     }
 
-    return result;
+    return new ArrayList<>(result);
   }
 
   @Override

diff --git a/testng-core/src/main/java/org/testng/internal/Tarjan.java b/testng-core/src/main/java/org/testng/internal/Tarjan.java
@@ -1,9 +1,9 @@
 package org.testng.internal;
 
+import java.util.ArrayDeque;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Stack;
 import org.testng.collections.Lists;
 import org.testng.collections.Maps;
 
@@ -14,13 +14,13 @@
  */
 public class Tarjan<T> {
   int m_index = 0;
-  private final Stack<T> stack;
+  private final ArrayDeque<T> stack;
   Map<T, Integer> visitedNodes = Maps.newHashMap();
   Map<T, Integer> m_lowlinks = Maps.newHashMap();
   private List<T> m_cycle;
 
   public Tarjan(Graph<T> graph, T start) {
-    stack = new Stack<>();
+    stack = new ArrayDeque<>();
     run(graph, start);
   }
 

diff --git a/testng-core/src/test/java/test/dataprovider/issue2327/TestClassSample.java b/testng-core/src/test/java/test/dataprovider/issue2327/TestClassSample.java
@@ -1,8 +1,9 @@
 package test.dataprovider.issue2327;
 
 import java.lang.reflect.Method;
+import java.util.ArrayList;
 import java.util.Iterator;
-import java.util.LinkedList;
+import java.util.List;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
@@ -16,7 +17,7 @@ public void setup(Method method, Object[] params) {
 
   @DataProvider(name = "dp", parallel = true)
   public Iterator<Object> dp() {
-    LinkedList<Object> objects = new LinkedList<>();
+    List<Object> objects = new ArrayList<>();
     objects.add("Dataset1");
     objects.add("Dataset2");
     return objects.iterator();

diff --git a/testng-core/src/test/java/test/junitreports/TestSuiteHandler.java b/testng-core/src/test/java/test/junitreports/TestSuiteHandler.java
@@ -1,16 +1,17 @@
 package test.junitreports;
 
+import java.util.ArrayDeque;
 import java.util.Arrays;
+import java.util.Deque;
 import java.util.List;
-import java.util.Stack;
 import org.xml.sax.Attributes;
 import org.xml.sax.helpers.DefaultHandler;
 
 public class TestSuiteHandler extends DefaultHandler {
   private static final List<String> tags = Arrays.asList("error", "skipped", "ignored", "failure");
   private final Testsuite testsuite = new Testsuite();
-  private final Stack<String> elementStack = new Stack<>();
-  private final Stack<Testcase> testcaseStack = new Stack<>();
+  private final Deque<String> elementStack = new ArrayDeque<>();
+  private final Deque<Testcase> testcaseStack = new ArrayDeque<>();
 
   @Override
   public void startElement(String uri, String localName, String qName, Attributes attributes) {

diff --git a/testng-core/src/test/java/test/junitreports/Testsuite.java b/testng-core/src/test/java/test/junitreports/Testsuite.java
@@ -1,6 +1,6 @@
 package test.junitreports;
 
-import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
 import org.xml.sax.Attributes;
 
@@ -92,5 +92,5 @@ public String toString() {
   private int failures;
   private int skipped;
   private int errors;
-  private List<Testcase> testcase = new LinkedList<>();
+  private List<Testcase> testcase = new ArrayList<>();
 }
diff --git a/testng-runner-api/src/main/java/org/testng/internal/LiteWeightTestNGMethod.java b/testng-runner-api/src/main/java/org/testng/internal/LiteWeightTestNGMethod.java
@@ -1,8 +1,8 @@
 package org.testng.internal;
 
 import java.lang.reflect.Method;
+import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Callable;
@@ -27,7 +27,7 @@ public class LiteWeightTestNGMethod implements ITestNGMethod {
   private String missingGroup;
   private final String[] beforeGroups;
   private final String[] afterGroups;
-  private final List<String> methodsDependedUpon = new LinkedList<>();
+  private final List<String> methodsDependedUpon = new ArrayList<>();
   private int priority;
   private int interceptedPriority;
   private final XmlTest xmlTest;