Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish contribution

Browse Source 
See gh-28549
This commit is contained in:
Sam Brannen
2022-10-07 16:35:55 +02:00
parent 2434470457
commit 72307bbb20
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionAspectSupport.java
View File

@@ -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);

6
spring-context/src/test/java/org/springframework/scheduling/annotation/EnableAsyncTests.java
View File

@@ -147,7 +147,7 @@ public class EnableAsyncTests {
Future<Thread> workerThread2 = asyncBean.myWork2();
assertThat(workerThread2.get().getName()).startsWith("myExecutor2-");
Future<Thread> workerThread3 = asyncBean.defaultExecutor();
Future<Thread> 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<Thread> defaultExecutor() {
@Async("${my.app.myExecutor.UNDEFINED:}")
public Future<Thread> fallBackToDefaultExecutor() {
return new AsyncResult<>(Thread.currentThread());
}
}