Align with naming in ReflectionTestUtils

spring-projects · Oct 24, 2024 · 2d028c3 · 2d028c3
1 parent fe6d914
commit 2d028c3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...org/springframework/test/context/bean/override/mockito/MockitoSpyBeanOverrideHandler.java b/...org/springframework/test/context/bean/override/mockito/MockitoSpyBeanOverrideHandler.java
@@ -82,7 +82,7 @@ private Object createSpy(String name, Object instance) {
 		if (StringUtils.hasLength(name)) {
 			settings.name(name);
 		}
-		if (SpringMockResolver.aopAvailable) {
+		if (SpringMockResolver.springAopPresent) {
 			settings.verificationStartedListeners(verificationStartedListener);
 		}
 

diff --git a/.../main/java/org/springframework/test/context/bean/override/mockito/SpringMockResolver.java b/.../main/java/org/springframework/test/context/bean/override/mockito/SpringMockResolver.java
@@ -37,13 +37,13 @@
  */
 public class SpringMockResolver implements MockResolver {
 
-	static final boolean aopAvailable = ClassUtils.isPresent(
+	static final boolean springAopPresent = ClassUtils.isPresent(
 			"org.springframework.aop.framework.Advised", SpringMockResolver.class.getClassLoader());
 
 
 	@Override
 	public Object resolve(Object instance) {
-		if (aopAvailable) {
+		if (springAopPresent) {
 			return getUltimateTargetObject(instance);
 		}
 		return instance;