Merge branch '6.0.x'

# Conflicts:
#	spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJPointcutAdvisor.java
#	spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionInterceptorTests.java

Author: sbrannen

spring-aop/src/main/java/org/springframework/aop/ClassFilter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,18 +17,23 @@
 package org.springframework.aop;
 
 /**
- * Filter that restricts matching of a pointcut or introduction to
- * a given set of target classes.
+ * Filter that restricts matching of a pointcut or introduction to a given set
+ * of target classes.
  *
- * <p>Can be used as part of a {@link Pointcut} or for the entire
- * targeting of an {@link IntroductionAdvisor}.
+ * <p>Can be used as part of a {@link Pointcut} or for the entire targeting of
+ * an {@link IntroductionAdvisor}.
  *
- * <p>Concrete implementations of this interface typically should provide proper
- * implementations of {@link Object#equals(Object)} and {@link Object#hashCode()}
- * in order to allow the filter to be used in caching scenarios &mdash; for
- * example, in proxies generated by CGLIB.
+ * <p><strong>WARNING</strong>: Concrete implementations of this interface must
+ * provide proper implementations of {@link Object#equals(Object)},
+ * {@link Object#hashCode()}, and {@link Object#toString()} in order to allow the
+ * filter to be used in caching scenarios &mdash; for example, in proxies generated
+ * by CGLIB. As of Spring Framework 6.0.13, the {@code toString()} implementation
+ * must generate a unique string representation that aligns with the logic used
+ * to implement {@code equals()}. See concrete implementations of this interface
+ * within the framework for examples.
  *
  * @author Rod Johnson
+ * @author Sam Brannen
  * @see Pointcut
  * @see MethodMatcher
  */
@@ -44,7 +49,7 @@ public interface ClassFilter {
 
 
 	/**
-	 * Canonical instance of a ClassFilter that matches all classes.
+	 * Canonical instance of a {@code ClassFilter} that matches all classes.
 	 */
 	ClassFilter TRUE = TrueClassFilter.INSTANCE;
 

spring-aop/src/main/java/org/springframework/aop/MethodMatcher.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,80 +21,84 @@
 /**
  * Part of a {@link Pointcut}: Checks whether the target method is eligible for advice.
  *
- * <p>A MethodMatcher may be evaluated <b>statically</b> or at <b>runtime</b> (dynamically).
- * Static matching involves method and (possibly) method attributes. Dynamic matching
- * also makes arguments for a particular call available, and any effects of running
- * previous advice applying to the joinpoint.
+ * <p>A {@code MethodMatcher} may be evaluated <b>statically</b> or at <b>runtime</b>
+ * (dynamically). Static matching involves a method and (possibly) method attributes.
+ * Dynamic matching also makes arguments for a particular call available, and any
+ * effects of running previous advice applying to the joinpoint.
  *
  * <p>If an implementation returns {@code false} from its {@link #isRuntime()}
  * method, evaluation can be performed statically, and the result will be the same
  * for all invocations of this method, whatever their arguments. This means that
  * if the {@link #isRuntime()} method returns {@code false}, the 3-arg
- * {@link #matches(java.lang.reflect.Method, Class, Object[])} method will never be invoked.
+ * {@link #matches(Method, Class, Object[])} method will never be invoked.
  *
  * <p>If an implementation returns {@code true} from its 2-arg
- * {@link #matches(java.lang.reflect.Method, Class)} method and its {@link #isRuntime()} method
- * returns {@code true}, the 3-arg {@link #matches(java.lang.reflect.Method, Class, Object[])}
- * method will be invoked <i>immediately before each potential execution of the related advice</i>,
- * to decide whether the advice should run. All previous advice, such as earlier interceptors
- * in an interceptor chain, will have run, so any state changes they have produced in
- * parameters or ThreadLocal state will be available at the time of evaluation.
+ * {@link #matches(Method, Class)} method and its {@link #isRuntime()} method
+ * returns {@code true}, the 3-arg {@link #matches(Method, Class, Object[])}
+ * method will be invoked <i>immediately before each potential execution of the
+ * related advice</i> to decide whether the advice should run. All previous advice,
+ * such as earlier interceptors in an interceptor chain, will have run, so any
+ * state changes they have produced in parameters or {@code ThreadLocal} state will
+ * be available at the time of evaluation.
  *
- * <p>Concrete implementations of this interface typically should provide proper
- * implementations of {@link Object#equals(Object)} and {@link Object#hashCode()}
- * in order to allow the matcher to be used in caching scenarios &mdash; for
- * example, in proxies generated by CGLIB.
+ * <p><strong>WARNING</strong>: Concrete implementations of this interface must
+ * provide proper implementations of {@link Object#equals(Object)},
+ * {@link Object#hashCode()}, and {@link Object#toString()} in order to allow the
+ * matcher to be used in caching scenarios &mdash; for example, in proxies generated
+ * by CGLIB. As of Spring Framework 6.0.13, the {@code toString()} implementation
+ * must generate a unique string representation that aligns with the logic used
+ * to implement {@code equals()}. See concrete implementations of this interface
+ * within the framework for examples.
  *
  * @author Rod Johnson
+ * @author Sam Brannen
  * @since 11.11.2003
  * @see Pointcut
  * @see ClassFilter
  */
 public interface MethodMatcher {
 
 	/**
-	 * Perform static checking whether the given method matches.
-	 * <p>If this returns {@code false} or if the {@link #isRuntime()}
-	 * method returns {@code false}, no runtime check (i.e. no
-	 * {@link #matches(java.lang.reflect.Method, Class, Object[])} call)
-	 * will be made.
+	 * Perform static checking to determine whether the given method matches.
+	 * <p>If this method returns {@code false} or if {@link #isRuntime()}
+	 * returns {@code false}, no runtime check (i.e. no
+	 * {@link #matches(Method, Class, Object[])} call) will be made.
 	 * @param method the candidate method
 	 * @param targetClass the target class
 	 * @return whether this method matches statically
 	 */
 	boolean matches(Method method, Class<?> targetClass);
 
 	/**
-	 * Is this MethodMatcher dynamic, that is, must a final call be made on the
-	 * {@link #matches(java.lang.reflect.Method, Class, Object[])} method at
-	 * runtime even if the 2-arg matches method returns {@code true}?
+	 * Is this {@code MethodMatcher} dynamic, that is, must a final check be made
+	 * via the {@link #matches(Method, Class, Object[])} method at runtime even
+	 * if {@link #matches(Method, Class)} returns {@code true}?
 	 * <p>Can be invoked when an AOP proxy is created, and need not be invoked
-	 * again before each method invocation,
-	 * @return whether a runtime match via the 3-arg
-	 * {@link #matches(java.lang.reflect.Method, Class, Object[])} method
+	 * again before each method invocation.
+	 * @return whether a runtime match via {@link #matches(Method, Class, Object[])}
 	 * is required if static matching passed
 	 */
 	boolean isRuntime();
 
 	/**
-	 * Check whether there a runtime (dynamic) match for this method,
-	 * which must have matched statically.
-	 * <p>This method is invoked only if the 2-arg matches method returns
-	 * {@code true} for the given method and target class, and if the
-	 * {@link #isRuntime()} method returns {@code true}. Invoked
-	 * immediately before potential running of the advice, after any
+	 * Check whether there is a runtime (dynamic) match for this method, which
+	 * must have matched statically.
+	 * <p>This method is invoked only if {@link #matches(Method, Class)} returns
+	 * {@code true} for the given method and target class, and if
+	 * {@link #isRuntime()} returns {@code true}.
+	 * <p>Invoked immediately before potential running of the advice, after any
 	 * advice earlier in the advice chain has run.
 	 * @param method the candidate method
 	 * @param targetClass the target class
 	 * @param args arguments to the method
 	 * @return whether there's a runtime match
-	 * @see MethodMatcher#matches(Method, Class)
+	 * @see #matches(Method, Class)
 	 */
 	boolean matches(Method method, Class<?> targetClass, Object... args);
 
 
 	/**
-	 * Canonical instance that matches all methods.
+	 * Canonical instance of a {@code MethodMatcher} that matches all methods.
 	 */
 	MethodMatcher TRUE = TrueMethodMatcher.INSTANCE;
 

spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java

@@ -32,6 +32,7 @@
 import org.springframework.aop.support.DynamicMethodMatcherPointcut;
 import org.springframework.aop.support.Pointcuts;
 import org.springframework.lang.Nullable;
+import org.springframework.util.ObjectUtils;
 
 /**
  * Internal implementation of AspectJPointcutAdvisor.
@@ -40,6 +41,7 @@
  *
  * @author Rod Johnson
  * @author Juergen Hoeller
+ * @author Sam Brannen
  * @since 2.0
  */
 @SuppressWarnings("serial")
@@ -297,6 +299,23 @@ public boolean matches(Method method, Class<?> targetClass, Object... args) {
 		private boolean isAspectMaterialized() {
 			return (this.aspectInstanceFactory == null || this.aspectInstanceFactory.isMaterialized());
 		}
+
+		@Override
+		public boolean equals(@Nullable Object other) {
+			return (this == other || (other instanceof PerTargetInstantiationModelPointcut that &&
+					ObjectUtils.nullSafeEquals(this.declaredPointcut.getExpression(), that.declaredPointcut.getExpression())));
+		}
+
+		@Override
+		public int hashCode() {
+			return ObjectUtils.nullSafeHashCode(this.declaredPointcut.getExpression());
+		}
+
+		@Override
+		public String toString() {
+			return PerTargetInstantiationModelPointcut.class.getName() + ": " + this.declaredPointcut.getExpression();
+		}
+
 	}
 
 }

spring-aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java

@@ -48,18 +48,21 @@
 
 /**
  * Base class for AOP proxy configuration managers.
- * These are not themselves AOP proxies, but subclasses of this class are
+ *
+ * <p>These are not themselves AOP proxies, but subclasses of this class are
  * normally factories from which AOP proxy instances are obtained directly.
  *
  * <p>This class frees subclasses of the housekeeping of Advices
  * and Advisors, but doesn't actually implement proxy creation
  * methods, which are provided by subclasses.
  *
  * <p>This class is serializable; subclasses need not be.
- * This class is used to hold snapshots of proxies.
+ *
+ * <p>This class is used to hold snapshots of proxies.
  *
  * @author Rod Johnson
  * @author Juergen Hoeller
+ * @author Sam Brannen
  * @see org.springframework.aop.framework.AopProxy
  */
 public class AdvisedSupport extends ProxyConfig implements Advised {
@@ -111,7 +114,7 @@ public AdvisedSupport() {
 	}
 
 	/**
-	 * Create a AdvisedSupport instance with the given parameters.
+	 * Create an {@code AdvisedSupport} instance with the given parameters.
 	 * @param interfaces the proxied interfaces
 	 */
 	public AdvisedSupport(Class<?>... interfaces) {
@@ -131,7 +134,7 @@ private AdvisedSupport(AdvisorChainFactory advisorChainFactory, Map<MethodCacheK
 
 	/**
 	 * Set the given object as target.
-	 * Will create a SingletonTargetSource for the object.
+	 * <p>Will create a SingletonTargetSource for the object.
 	 * @see #setTargetSource
 	 * @see org.springframework.aop.target.SingletonTargetSource
 	 */
@@ -500,9 +503,9 @@ protected void copyConfigurationFrom(AdvisedSupport other) {
 	}
 
 	/**
-	 * Copy the AOP configuration from the given AdvisedSupport object,
-	 * but allow substitution of a fresh TargetSource and a given interceptor chain.
-	 * @param other the AdvisedSupport object to take proxy configuration from
+	 * Copy the AOP configuration from the given {@link AdvisedSupport} object,
+	 * but allow substitution of a fresh {@link TargetSource} and a given interceptor chain.
+	 * @param other the {@code AdvisedSupport} object to take proxy configuration from
 	 * @param targetSource the new TargetSource
 	 * @param advisors the Advisors for the chain
 	 */
@@ -522,8 +525,8 @@ protected void copyConfigurationFrom(AdvisedSupport other, TargetSource targetSo
 	}
 
 	/**
-	 * Build a configuration-only copy of this AdvisedSupport,
-	 * replacing the TargetSource.
+	 * Build a configuration-only copy of this {@link AdvisedSupport},
+	 * replacing the {@link TargetSource}.
 	 */
 	AdvisedSupport getConfigurationOnlyCopy() {
 		AdvisedSupport copy = new AdvisedSupport(this.advisorChainFactory, this.methodCache);
@@ -598,8 +601,7 @@ public MethodCacheKey(Method method) {
 
 		@Override
 		public boolean equals(@Nullable Object other) {
-			return (this == other || (other instanceof MethodCacheKey methodCacheKey &&
-					this.method == methodCacheKey.method));
+			return (this == other || (other instanceof MethodCacheKey that && this.method == that.method));
 		}
 
 		@Override
@@ -624,7 +626,7 @@ public int compareTo(MethodCacheKey other) {
 
 
 	/**
-	 * Stub for an Advisor instance that is just needed for key purposes,
+	 * Stub for an {@link Advisor} instance that is just needed for key purposes,
 	 * allowing for efficient equals and hashCode comparisons against the
 	 * advice class and the pointcut.
 	 * @since 6.0.10
@@ -636,17 +638,22 @@ private static class AdvisorKeyEntry implements Advisor {
 		private final Class<?> adviceType;
 
 		@Nullable
-		private String classFilterKey;
+		private final String classFilterKey;
 
 		@Nullable
-		private String methodMatcherKey;
+		private final String methodMatcherKey;
+
 
 		public AdvisorKeyEntry(Advisor advisor) {
 			this.adviceType = advisor.getAdvice().getClass();
 			if (advisor instanceof PointcutAdvisor pointcutAdvisor) {
 				Pointcut pointcut = pointcutAdvisor.getPointcut();
-				this.classFilterKey = ObjectUtils.identityToString(pointcut.getClassFilter());
-				this.methodMatcherKey = ObjectUtils.identityToString(pointcut.getMethodMatcher());
+				this.classFilterKey = pointcut.getClassFilter().toString();
+				this.methodMatcherKey = pointcut.getMethodMatcher().toString();
+			}
+			else {
+				this.classFilterKey = null;
+				this.methodMatcherKey = null;
 			}
 		}
 
@@ -657,10 +664,10 @@ public Advice getAdvice() {
 
 		@Override
 		public boolean equals(Object other) {
-			return (this == other || (other instanceof AdvisorKeyEntry otherEntry &&
-					this.adviceType == otherEntry.adviceType &&
-					ObjectUtils.nullSafeEquals(this.classFilterKey, otherEntry.classFilterKey) &&
-					ObjectUtils.nullSafeEquals(this.methodMatcherKey, otherEntry.methodMatcherKey)));
+			return (this == other || (other instanceof AdvisorKeyEntry that &&
+					this.adviceType == that.adviceType &&
+					ObjectUtils.nullSafeEquals(this.classFilterKey, that.classFilterKey) &&
+					ObjectUtils.nullSafeEquals(this.methodMatcherKey, that.methodMatcherKey)));
 		}
 
 		@Override

spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java

@@ -40,17 +40,17 @@
 import org.aspectj.lang.reflect.MethodSignature;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import test.aop.DefaultLockable;
-import test.aop.Lockable;
-import test.aop.PerTargetAspect;
-import test.aop.TwoAdviceAspect;
 
 import org.springframework.aop.Advisor;
 import org.springframework.aop.framework.Advised;
 import org.springframework.aop.framework.AopConfigException;
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.aop.interceptor.ExposeInvocationInterceptor;
 import org.springframework.aop.support.AopUtils;
+import org.springframework.aop.testfixture.aspectj.PerTargetAspect;
+import org.springframework.aop.testfixture.aspectj.TwoAdviceAspect;
+import org.springframework.aop.testfixture.mixin.DefaultLockable;
+import org.springframework.aop.testfixture.mixin.Lockable;
 import org.springframework.beans.testfixture.beans.ITestBean;
 import org.springframework.beans.testfixture.beans.TestBean;
 import org.springframework.core.OrderComparator;
@@ -459,10 +459,10 @@ void twoAdvicesOnOneAspect() {
 		assertThat(advisors).as("Two advice methods found").hasSize(2);
 		ITestBean itb = createProxy(target, ITestBean.class, advisors);
 		itb.setName("");
-		assertThat(itb.getAge()).isEqualTo(0);
+		assertThat(itb.age()).isEqualTo(0);
 		int newAge = 32;
 		itb.setAge(newAge);
-		assertThat(itb.getAge()).isEqualTo(1);
+		assertThat(itb.age()).isEqualTo(1);
 	}
 
 	@Test

spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,13 +17,13 @@
 package org.springframework.aop.aspectj.annotation;
 
 import org.junit.jupiter.api.Test;
-import test.aop.PerTargetAspect;
 
 import org.springframework.aop.Pointcut;
 import org.springframework.aop.aspectj.AspectJExpressionPointcut;
 import org.springframework.aop.aspectj.AspectJExpressionPointcutTests;
 import org.springframework.aop.aspectj.annotation.AbstractAspectJAdvisorFactoryTests.ExceptionThrowingAspect;
 import org.springframework.aop.framework.AopConfigException;
+import org.springframework.aop.testfixture.aspectj.PerTargetAspect;
 import org.springframework.beans.testfixture.beans.TestBean;
 
 import static org.assertj.core.api.Assertions.assertThat;