Merge branch '2.7.x'

Closes gh-33792

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/SpringBootMockResolver.java

@@ -18,12 +18,14 @@ package org.springframework.boot.test.mock.mockito;
 
 import org.mockito.plugins.MockResolver;
 
-import org.springframework.test.util.AopTestUtils;
+import org.springframework.aop.TargetSource;
+import org.springframework.aop.framework.Advised;
+import org.springframework.aop.support.AopUtils;
+import org.springframework.util.Assert;
 
 /**
- * A {@link MockResolver} for testing Spring Boot applications with Mockito. Resolves
- * mocks by returning the {@link AopTestUtils#getUltimateTargetObject(Object) ultimate
- * target object} of the instance.
+ * A {@link MockResolver} for testing Spring Boot applications with Mockito. It resolves
+ * mocks by walking the proxy chain until the target or a non-static proxy is found.
  *
  * @author Andy Wilkinson
  * @since 2.4.0
@@ -32,7 +34,28 @@ public class SpringBootMockResolver implements MockResolver {
 
 	@Override
 	public Object resolve(Object instance) {
-		return AopTestUtils.getUltimateTargetObject(instance);
+		return getUltimateTargetObject(instance);
+	}
+
+	@SuppressWarnings("unchecked")
+	private static <T> T getUltimateTargetObject(Object candidate) {
+		Assert.notNull(candidate, "Candidate must not be null");
+		try {
+			if (AopUtils.isAopProxy(candidate) && candidate instanceof Advised) {
+				Advised advised = (Advised) candidate;
+				TargetSource targetSource = advised.getTargetSource();
+				if (targetSource.isStatic()) {
+					Object target = targetSource.getTarget();
+					if (target != null) {
+						return getUltimateTargetObject(target);
+					}
+				}
+			}
+		}
+		catch (Throwable ex) {
+			throw new IllegalStateException("Failed to unwrap proxied object", ex);
+		}
+		return (T) candidate;
 	}
 
 }