Propagate arguments for dynamic prototype-scoped advice

Closes gh-28407
spring-projects · Jan 6, 2024 · 43107e7 · 43107e7
1 parent 81bd6be
commit 43107e7
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 16 deletions.
diff --git a/...rg/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java b/...rg/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2024 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.
@@ -293,7 +293,7 @@ public boolean matches(Method method, Class<?> targetClass) {
 		@Override
 		public boolean matches(Method method, Class<?> targetClass, Object... args) {
 			// This can match only on declared pointcut.
-			return (isAspectMaterialized() && this.declaredPointcut.matches(method, targetClass));
+			return (isAspectMaterialized() && this.declaredPointcut.matches(method, targetClass, args));
 		}
 
 		private boolean isAspectMaterialized() {

diff --git a/...ng-aop/src/test/java/org/springframework/aop/aspectj/annotation/ArgumentBindingTests.java b/...ng-aop/src/test/java/org/springframework/aop/aspectj/annotation/ArgumentBindingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2024 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.
@@ -42,26 +42,38 @@
  */
 class ArgumentBindingTests {
 
+	@Test
+	void annotationArgumentNameBinding() {
+		AspectJProxyFactory proxyFactory = new AspectJProxyFactory(new TransactionalBean());
+		proxyFactory.addAspect(PointcutWithAnnotationArgument.class);
+		ITransactionalBean proxiedTestBean = proxyFactory.getProxy();
+
+		assertThatIllegalStateException()
+				.isThrownBy(proxiedTestBean::doInTransaction)
+				.withMessage("Invoked with @Transactional");
+	}
+
 	@Test
 	void bindingInPointcutUsedByAdvice() {
 		AspectJProxyFactory proxyFactory = new AspectJProxyFactory(new TestBean());
 		proxyFactory.addAspect(NamedPointcutWithArgs.class);
-
 		ITestBean proxiedTestBean = proxyFactory.getProxy();
+
 		assertThatIllegalArgumentException()
-			.isThrownBy(() -> proxiedTestBean.setName("enigma"))
-			.withMessage("enigma");
+				.isThrownBy(() -> proxiedTestBean.setName("enigma"))
+				.withMessage("enigma");
 	}
 
 	@Test
-	void annotationArgumentNameBinding() {
-		AspectJProxyFactory proxyFactory = new AspectJProxyFactory(new TransactionalBean());
-		proxyFactory.addAspect(PointcutWithAnnotationArgument.class);
+	void bindingWithDynamicAdvice() {
+		AspectJProxyFactory proxyFactory = new AspectJProxyFactory(new TestBean());
+		proxyFactory.addAspect(DynamicPointcutWithArgs.class);
+		ITestBean proxiedTestBean = proxyFactory.getProxy();
 
-		ITransactionalBean proxiedTestBean = proxyFactory.getProxy();
-		assertThatIllegalStateException()
-			.isThrownBy(proxiedTestBean::doInTransaction)
-			.withMessage("Invoked with @Transactional");
+		proxiedTestBean.applyName(1);
+		assertThatIllegalArgumentException()
+				.isThrownBy(() -> proxiedTestBean.applyName("enigma"))
+				.withMessage("enigma");
 	}
 
 	@Test
@@ -94,23 +106,25 @@ public void doInTransaction() {
 		}
 	}
 
+
 	/**
 	 * Mimics Spring's @Transactional annotation without actually introducing the dependency.
 	 */
 	@Retention(RetentionPolicy.RUNTIME)
 	@interface Transactional {
 	}
 
+
 	@Aspect
 	static class PointcutWithAnnotationArgument {
 
-		@Around(value = "execution(* org.springframework..*.*(..)) && @annotation(transactional)")
+		@Around("execution(* org.springframework..*.*(..)) && @annotation(transactional)")
 		public Object around(ProceedingJoinPoint pjp, Transactional transactional) throws Throwable {
 			throw new IllegalStateException("Invoked with @Transactional");
 		}
-
 	}
 
+
 	@Aspect
 	static class NamedPointcutWithArgs {
 
@@ -121,7 +135,16 @@ public void pointcutWithArgs(String s) {}
 		public Object doAround(ProceedingJoinPoint pjp, String aString) throws Throwable {
 			throw new IllegalArgumentException(aString);
 		}
+	}
 
+
+	@Aspect("pertarget(execution(* *(..)))")
+	static class DynamicPointcutWithArgs {
+
+		@Around("execution(* *(..)) && args(java.lang.String)")
+		public Object doAround(ProceedingJoinPoint pjp) throws Throwable {
+			throw new IllegalArgumentException(String.valueOf(pjp.getArgs()[0]));
+		}
 	}
 
 }

diff --git a/...ng-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/ITestBean.java b/...ng-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/ITestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2024 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.
@@ -33,6 +33,10 @@ public interface ITestBean extends AgeHolder {
 
 	void setName(String name);
 
+	default void applyName(Object name) {
+		setName(String.valueOf(name));
+	}
+
 	ITestBean getSpouse();
 
 	void setSpouse(ITestBean spouse);