Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid use of static import in production code

Browse Source
This commit is contained in:
Sam Brannen
2024-09-16 15:50:05 +02:00
parent b60bb44256
commit 13e175ab46
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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

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

@@ -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