Remove redundant Parameter implementation

Found a redundant implementation of Parameter with a comment on the class stating that this class can be removed from the codebase after JDK8. Stumbled into it just now and so getting rid of it.
testng-team · Jan 7, 2022 · 03ca3d0 · 03ca3d0
1 parent 24cbb56
commit 03ca3d0
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 102 deletions.
diff --git a/testng-core/src/main/java/org/testng/internal/Parameters.java b/testng-core/src/main/java/org/testng/internal/Parameters.java
@@ -4,6 +4,7 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
+import java.lang.reflect.Parameter;
 import java.util.*;
 import javax.annotation.Nullable;
 import org.testng.DataProviderHolder;
@@ -36,7 +37,6 @@
 import org.testng.internal.reflect.InjectableParameter;
 import org.testng.internal.reflect.MethodMatcher;
 import org.testng.internal.reflect.MethodMatcherContext;
-import org.testng.internal.reflect.Parameter;
 import org.testng.internal.reflect.ReflectionRecipes;
 import org.testng.util.Strings;
 import org.testng.xml.XmlSuite;

diff --git a/testng-core/src/main/java/org/testng/internal/reflect/AbstractNodeMethodMatcher.java b/testng-core/src/main/java/org/testng/internal/reflect/AbstractNodeMethodMatcher.java
@@ -1,5 +1,6 @@
 package org.testng.internal.reflect;
 
+import java.lang.reflect.Parameter;
 import java.util.List;
 import java.util.Set;
 

diff --git a/testng-core/src/main/java/org/testng/internal/reflect/ArrayEndingMethodMatcher.java b/testng-core/src/main/java/org/testng/internal/reflect/ArrayEndingMethodMatcher.java
@@ -3,6 +3,7 @@
 import static org.testng.internal.reflect.InjectableParameter.Assistant.ALL_INJECTS;
 
 import java.lang.reflect.Array;
+import java.lang.reflect.Parameter;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;

diff --git a/testng-core/src/main/java/org/testng/internal/reflect/DirectMethodMatcher.java b/testng-core/src/main/java/org/testng/internal/reflect/DirectMethodMatcher.java
@@ -3,6 +3,7 @@
 import static org.testng.internal.reflect.InjectableParameter.Assistant.ALL_INJECTS;
 import static org.testng.internal.reflect.InjectableParameter.Assistant.NONE;
 
+import java.lang.reflect.Parameter;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;

diff --git a/testng-core/src/main/java/org/testng/internal/reflect/MethodMatcherContext.java b/testng-core/src/main/java/org/testng/internal/reflect/MethodMatcherContext.java
@@ -1,6 +1,7 @@
 package org.testng.internal.reflect;
 
 import java.lang.reflect.Method;
+import java.lang.reflect.Parameter;
 import org.testng.ITestContext;
 import org.testng.ITestResult;
 

diff --git a/testng-core/src/main/java/org/testng/internal/reflect/MethodMatcherException.java b/testng-core/src/main/java/org/testng/internal/reflect/MethodMatcherException.java
@@ -2,6 +2,7 @@
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
+import java.lang.reflect.Parameter;
 import java.util.Arrays;
 import org.testng.TestNGException;
 

diff --git a/testng-core/src/main/java/org/testng/internal/reflect/Parameter.java b/testng-core/src/main/java/org/testng/internal/reflect/Parameter.java
diff --git a/testng-core/src/main/java/org/testng/internal/reflect/ReflectionRecipes.java b/testng-core/src/main/java/org/testng/internal/reflect/ReflectionRecipes.java
@@ -1,8 +1,8 @@
 package org.testng.internal.reflect;
 
-import java.lang.annotation.Annotation;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
+import java.lang.reflect.Parameter;
 import java.util.*;
 import org.testng.ITestContext;
 import org.testng.ITestResult;
@@ -151,7 +151,7 @@ public static Parameter[] getMethodParameters(final Method method) {
     if (method == null) {
       return new Parameter[] {};
     }
-    return getParameters(method.getParameterTypes(), method.getParameterAnnotations());
+    return method.getParameters();
   }
 
   /**
@@ -164,16 +164,7 @@ public static Parameter[] getConstructorParameters(final Constructor<?> construc
     if (constructor == null) {
       return new Parameter[] {};
     }
-    return getParameters(constructor.getParameterTypes(), constructor.getParameterAnnotations());
-  }
-
-  private static Parameter[] getParameters(
-      Class<?>[] parametersTypes, final Annotation[][] parametersAnnotations) {
-    final Parameter[] parameters = new Parameter[parametersTypes.length];
-    for (int i = 0; i < parametersTypes.length; i++) {
-      parameters[i] = new Parameter(i, parametersTypes[i], parametersAnnotations[i]);
-    }
-    return parameters;
+    return constructor.getParameters();
   }
 
   /**

diff --git a/testng-core/src/test/java/test/reflect/ReflectionRecipesTest.java b/testng-core/src/test/java/test/reflect/ReflectionRecipesTest.java
@@ -7,6 +7,7 @@
 import java.lang.annotation.Target;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.lang.reflect.Parameter;
 import java.sql.Connection;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -19,7 +20,6 @@
 import org.testng.annotations.NoInjection;
 import org.testng.annotations.Test;
 import org.testng.internal.reflect.InjectableParameter;
-import org.testng.internal.reflect.Parameter;
 import org.testng.internal.reflect.ReflectionRecipes;
 import org.testng.log4testng.Logger;
 import org.testng.xml.XmlTest;