inlined ArrayUtils.isEmpty() in ArgumentsProcessor (mockito#540)

thassan1977 · Aug 9, 2016 · cf8c51e · cf8c51e
1 parent dc1fb1b
commit cf8c51e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 16 deletions.
diff --git a/src/main/java/org/mockito/internal/invocation/ArgumentsProcessor.java b/src/main/java/org/mockito/internal/invocation/ArgumentsProcessor.java
@@ -7,7 +7,6 @@
 import org.mockito.ArgumentMatcher;
 import org.mockito.internal.matchers.ArrayEquals;
 import org.mockito.internal.matchers.Equals;
-import org.mockito.internal.util.collections.ArrayUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -19,7 +18,7 @@ public class ArgumentsProcessor {
     // expands array varArgs that are given by runtime (1, [a, b]) into true
     // varArgs (1, a, b);
     public static Object[] expandVarArgs(final boolean isVarArgs, final Object[] args) {
-        if (!isVarArgs || new ArrayUtils().isEmpty(args) || args[args.length - 1] != null && !args[args.length - 1].getClass().isArray()) {
+        if (!isVarArgs || isNullOrEmpty(args) || args[args.length - 1] != null && !args[args.length - 1].getClass().isArray()) {
             return args == null ? new Object[0] : args;
         }
 
@@ -37,6 +36,10 @@ public static Object[] expandVarArgs(final boolean isVarArgs, final Object[] arg
         System.arraycopy(varArgs, 0, newArgs, nonVarArgsCount, varArgsCount);
         return newArgs;
     }
+
+    private static <T> boolean isNullOrEmpty(T[] array) {
+        return array == null || array.length == 0;
+    }
 
     public static List<ArgumentMatcher> argumentsToMatchers(Object[] arguments) {
         List<ArgumentMatcher> matchers = new ArrayList<ArgumentMatcher>(arguments.length);
@@ -49,4 +52,6 @@ public static List<ArgumentMatcher> argumentsToMatchers(Object[] arguments) {
         }
         return matchers;
     }
+
+
 }
diff --git a/src/main/java/org/mockito/internal/util/collections/ArrayUtils.java b/src/main/java/org/mockito/internal/util/collections/ArrayUtils.java