diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionAspectSupport.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionAspectSupport.java index 26b66a2b8a..5cef18836f 100644 --- a/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionAspectSupport.java +++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionAspectSupport.java @@ -83,7 +83,7 @@ public abstract class AsyncExecutionAspectSupport implements BeanFactoryAware { private BeanFactory beanFactory; @Nullable - private StringValueResolver stringValueResolver; + private StringValueResolver embeddedValueResolver; /** * Create a new instance with a default {@link AsyncUncaughtExceptionHandler}. @@ -155,7 +155,7 @@ public abstract class AsyncExecutionAspectSupport implements BeanFactoryAware { public void setBeanFactory(BeanFactory beanFactory) { this.beanFactory = beanFactory; if (beanFactory instanceof ConfigurableBeanFactory configurableBeanFactory) { - this.stringValueResolver = new EmbeddedValueResolver(configurableBeanFactory); + this.embeddedValueResolver = new EmbeddedValueResolver(configurableBeanFactory); } } @@ -170,8 +170,8 @@ public abstract class AsyncExecutionAspectSupport implements BeanFactoryAware { if (executor == null) { Executor targetExecutor; String qualifier = getExecutorQualifier(method); - if (this.stringValueResolver != null && StringUtils.hasLength(qualifier)) { - qualifier = this.stringValueResolver.resolveStringValue(qualifier); + if (this.embeddedValueResolver != null && StringUtils.hasLength(qualifier)) { + qualifier = this.embeddedValueResolver.resolveStringValue(qualifier); } if (StringUtils.hasLength(qualifier)) { targetExecutor = findQualifiedExecutor(this.beanFactory, qualifier); diff --git a/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableAsyncTests.java b/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableAsyncTests.java index b2a1e1140e..eaaed1c9c3 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableAsyncTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableAsyncTests.java @@ -147,7 +147,7 @@ public class EnableAsyncTests { Future workerThread2 = asyncBean.myWork2(); assertThat(workerThread2.get().getName()).startsWith("myExecutor2-"); - Future workerThread3 = asyncBean.defaultExecutor(); + Future workerThread3 = asyncBean.fallBackToDefaultExecutor(); assertThat(workerThread3.get().getName()).startsWith("SimpleAsyncTaskExecutor"); } finally { @@ -386,8 +386,8 @@ public class EnableAsyncTests { return new AsyncResult<>(Thread.currentThread()); } - @Async("${my.app.targetExecutor:}") - public Future defaultExecutor() { + @Async("${my.app.myExecutor.UNDEFINED:}") + public Future fallBackToDefaultExecutor() { return new AsyncResult<>(Thread.currentThread()); } }