Fixes #3215 : Remove type parameter from Mockito#clearInvocations

src/main/java/org/mockito/MockedStatic.java

@@ -48,7 +48,7 @@ default void verify(Verification verification) {
  void reset();
 
  /**
- * See {@link Mockito#clearInvocations(Object[])}.
+ * See {@link Mockito#clearInvocations(Object, Object...)}.
  */
  void clearInvocations();
 

src/main/java/org/mockito/Mockito.java

@@ -4,6 +4,7 @@
  */
 package org.mockito;
 
+import java.util.Objects;
 import org.mockito.exceptions.misusing.PotentialStubbingProblem;
 import org.mockito.exceptions.misusing.UnnecessaryStubbingException;
 import org.mockito.internal.MockitoCore;
@@ -2629,11 +2630,16 @@ public static void clearAllCaches() {
  * </ul>
  *
  * <b>Try to avoid this method at all costs. Only clear invocations if you are unable to efficiently test your program.</b>
- * @param <T> The type of the mocks
- * @param mocks The mocks to clear the invocations for
+ * @param mock a mock to clear the invocations for
+ * @param otherMocks other mocks to clear the invocation for
  */
- public static <T> void clearInvocations(T... mocks) {
- MOCKITO_CORE.clearInvocations(mocks);
+ public static void clearInvocations(final Object mock, final Object... otherMocks) {
+ Objects.requireNonNull(mock, "mock is null");
+ Objects.requireNonNull(otherMocks, "otherMocks is null");
+ MOCKITO_CORE.clearInvocations(mock);
+ for (final var otherMock: otherMocks) {
+ MOCKITO_CORE.clearInvocations(otherMock);
+ }
  }
 
  /**

src/main/java/org/mockito/internal/MockitoCore.java

@@ -215,13 +215,13 @@ public <T> void reset(T... mocks) {
  }
  }
 
- public <T> void clearInvocations(T... mocks) {
+ public void clearInvocations(final Object... mocks) {
  MockingProgress mockingProgress = mockingProgress();
  mockingProgress.validateState();
  mockingProgress.reset();
  mockingProgress.resetOngoingStubbing();
 
- for (T m : mocks) {
+ for (final Object m : mocks) {
  getInvocationContainer(m).clearInvocations();
  }
  }