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

Polish "Use proper return type in AsyncExecutionInterceptor"

Browse Source 
See gh-33957
This commit is contained in:
Stéphane Nicoll
2025-02-04 15:59:09 +01:00
parent 8eb24458f8
commit 3923150dad
2 changed files with 21 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionInterceptor.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2024 the original author or authors. * Copyright 2002-2025 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
package org.springframework.aop.interceptor; package org.springframework.aop.interceptor;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.concurrent.Callable; import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
@@ -61,7 +60,6 @@ import org.springframework.lang.Nullable;
* @author Juergen Hoeller * @author Juergen Hoeller
* @author Chris Beams * @author Chris Beams
* @author Stephane Nicoll * @author Stephane Nicoll
* @author Bao Ngo
* @since 3.0 * @since 3.0
* @see org.springframework.scheduling.annotation.Async * @see org.springframework.scheduling.annotation.Async
* @see org.springframework.scheduling.annotation.AsyncAnnotationAdvisor * @see org.springframework.scheduling.annotation.AsyncAnnotationAdvisor
@@ -127,16 +125,7 @@ public class AsyncExecutionInterceptor extends AsyncExecutionAspectSupport imple
return null; return null;
}; };
return doSubmit( task, executor, determineReturnType( invocation, userMethod ) ); return doSubmit(task, executor, userMethod.getReturnType());
}
private static Class<?> determineReturnType(MethodInvocation invocation, Method userMethod) {
Method originalMethod = invocation.getMethod();
if( Modifier.isAbstract( originalMethod.getModifiers() ) ) {
return userMethod.getReturnType();
}
return originalMethod.getReturnType();
} }
/** /**

39
spring-aop/src/test/java/org/springframework/aop/interceptor/AsyncExecutionInterceptorTests.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2024 the original author or authors. * Copyright 2002-2025 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -43,32 +43,31 @@ import static org.mockito.Mockito.verify;
class AsyncExecutionInterceptorTests { class AsyncExecutionInterceptorTests {
@Test @Test
public void testInvokeOnInterface() throws Throwable { @SuppressWarnings("unchecked")
AsyncExecutionInterceptor interceptor = spy( new AsyncExecutionInterceptor( null ) ); void invokeOnInterfaceWithGeneric() throws Throwable {
Impl impl = new Impl(); AsyncExecutionInterceptor interceptor = spy(new AsyncExecutionInterceptor(null));
ArgumentCaptor<Class<?>> classArgumentCaptor = ArgumentCaptor.forClass( Class.class ); FutureRunner impl = new FutureRunner();
MethodInvocation mi = mock(); MethodInvocation mi = mock();
given( mi.getThis() ).willReturn( impl ); given(mi.getThis()).willReturn(impl);
given( mi.getMethod() ).willReturn( I.class.getMethod( "doSomeThing" ) ); given(mi.getMethod()).willReturn(GenericRunner.class.getMethod("run"));
interceptor.invoke( mi );
verify( interceptor ).doSubmit( interceptor.invoke(mi);
any( Callable.class ), ArgumentCaptor<Class<?>> classArgumentCaptor = ArgumentCaptor.forClass(Class.class);
any( AsyncTaskExecutor.class ), verify(interceptor).doSubmit(any(Callable.class), any(AsyncTaskExecutor.class), classArgumentCaptor.capture());
classArgumentCaptor.capture() assertThat(classArgumentCaptor.getValue()).isEqualTo(Future.class);
);
assertThat( classArgumentCaptor.getValue() ).isEqualTo( Future.class );
} }
private interface I<O> { interface GenericRunner<O> {
O doSomeThing();
O run();
} }
private static final class Impl implements I<Future<Void>> { static class FutureRunner implements GenericRunner<Future<Void>> {
@Override @Override
public Future<Void> doSomeThing() { public Future<Void> run() {
return CompletableFuture.runAsync( () -> { return CompletableFuture.runAsync(() -> {
} ); });
} }
} }
} }