diff --git a/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoBeanOverrideMetadata.java b/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoBeanOverrideMetadata.java index a4e7e5a14c..5167d6b905 100644 --- a/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoBeanOverrideMetadata.java +++ b/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoBeanOverrideMetadata.java @@ -25,6 +25,7 @@ import java.util.Set; import org.mockito.Answers; import org.mockito.MockSettings; +import org.mockito.Mockito; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.core.ResolvableType; @@ -37,8 +38,6 @@ import org.springframework.util.ClassUtils; import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; -import static org.mockito.Mockito.mock; - /** * {@link OverrideMetadata} implementation for Mockito {@code mock} support. * @@ -97,7 +96,7 @@ class MockitoBeanOverrideMetadata extends MockitoOverrideMetadata { /** * Return if the mock is serializable. - * @return if the mock is serializable + * @return {@code true} if the mock is serializable */ boolean isSerializable() { return this.serializable; @@ -122,7 +121,7 @@ class MockitoBeanOverrideMetadata extends MockitoOverrideMetadata { settings.serializable(); } Class targetType = getBeanType().resolve(); - return (T) mock(targetType, settings); + return (T) Mockito.mock(targetType, settings); } @Override diff --git a/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanOverrideMetadata.java b/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanOverrideMetadata.java index 931b92c4b3..6cf5a77e08 100644 --- a/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanOverrideMetadata.java +++ b/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanOverrideMetadata.java @@ -35,8 +35,6 @@ import org.springframework.test.util.AopTestUtils; import org.springframework.util.Assert; import org.springframework.util.StringUtils; -import static org.mockito.Mockito.mock; - /** * {@link OverrideMetadata} implementation for Mockito {@code spy} support. * @@ -95,7 +93,7 @@ class MockitoSpyBeanOverrideMetadata extends MockitoOverrideMetadata { settings.spiedInstance(instance); toSpy = instance.getClass(); } - return (T) mock(toSpy, settings); + return (T) Mockito.mock(toSpy, settings); } @Override