Avoid use of static import in production code

Author: sbrannen

spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoBeanOverrideMetadata.java

@@ -25,6 +25,7 @@
 
 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.ObjectUtils;
 import org.springframework.util.StringUtils;
 
-import static org.mockito.Mockito.mock;
-
 /**
  * {@link OverrideMetadata} implementation for Mockito {@code mock} support.
  *
@@ -97,7 +96,7 @@ Answers getAnswer() {
 
 	/**
 	 * 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 @@ <T> T createMock(String name) {
 			settings.serializable();
 		}
 		Class<?> targetType = getBeanType().resolve();
-		return (T) mock(targetType, settings);
+		return (T) Mockito.mock(targetType, settings);
 	}
 
 	@Override

spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanOverrideMetadata.java

@@ -35,8 +35,6 @@
 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 @@ <T> T createSpy(String name, Object instance) {
 			settings.spiedInstance(instance);
 			toSpy = instance.getClass();
 		}
-		return (T) mock(toSpy, settings);
+		return (T) Mockito.mock(toSpy, settings);
 	}
 
 	@Override