Remove Arrays.asList from critical stubbing path in GenericMetadataSupport (#3610)

adrianroos · web-flow · commit 0215884a5e68 · 2025-03-14T16:49:43.000+01:00
On Android, the implementation of `java.util.Arrays.ArrayList.toArray` has a non-trivial implementation that ends up calling into `android.os.Process.myUid()`. Consequently, attempting to stub static methods in `android.os.Process` with `doReturn` will end up calling into `myUid()` before the stubbing completes, triggering an infinite recursion. To work around that, replace the `addAll(asList(...))` call with `Collections.addAll`. As an added benefit this avoids an array copy. This upstreams https://r.android.com/3500336.
diff --git a/mockito-core/src/main/java/org/mockito/internal/util/reflection/GenericMetadataSupport.java b/mockito-core/src/main/java/org/mockito/internal/util/reflection/GenericMetadataSupport.java
@@ -91,7 +91,7 @@ protected void registerAllTypeVariables(Type classType) {
 
             Class<?> rawType = extractRawTypeOf(typeToRegister);
             typesToRegister.add(rawType.getGenericSuperclass());
-            typesToRegister.addAll(Arrays.asList(rawType.getGenericInterfaces()));
+            Collections.addAll(typesToRegister, rawType.getGenericInterfaces());
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ protected void registerAllTypeVariables(Type classType) {`
`91`	`91`
`92`	`92`	`Class<?> rawType = extractRawTypeOf(typeToRegister);`
`93`	`93`	`typesToRegister.add(rawType.getGenericSuperclass());`
`94`		`- typesToRegister.addAll(Arrays.asList(rawType.getGenericInterfaces()));`
	`94`	`+ Collections.addAll(typesToRegister, rawType.getGenericInterfaces());`
`95`	`95`	`}`
`96`	`96`	`}`
`97`	`97`