Browse Source

Add support for `@Async` Kotlin function returning `Unit?`

Closes gh-31891
pull/32145/head
Sébastien Deleuze 2 years ago
parent
commit
c9163b77df
  1. 3
      spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionAspectSupport.java
  2. 43
      spring-context/src/test/kotlin/org/springframework/scheduling/annotation/AnnotationAsyncExecutionInterceptorKotlinTests.kt

3
spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionAspectSupport.java

@ -58,6 +58,7 @@ import org.springframework.util.function.SingletonSupplier; @@ -58,6 +58,7 @@ import org.springframework.util.function.SingletonSupplier;
* @author Juergen Hoeller
* @author Stephane Nicoll
* @author He Bo
* @author Sebastien Deleuze
* @since 3.1.2
*/
public abstract class AsyncExecutionAspectSupport implements BeanFactoryAware {
@ -290,7 +291,7 @@ public abstract class AsyncExecutionAspectSupport implements BeanFactoryAware { @@ -290,7 +291,7 @@ public abstract class AsyncExecutionAspectSupport implements BeanFactoryAware {
else if (Future.class.isAssignableFrom(returnType)) {
return executor.submit(task);
}
else if (void.class == returnType) {
else if (void.class == returnType || "kotlin.Unit".equals(returnType.getName())) {
executor.submit(task);
return null;
}

43
spring-context/src/test/kotlin/org/springframework/scheduling/annotation/AnnotationAsyncExecutionInterceptorKotlinTests.kt

@ -0,0 +1,43 @@ @@ -0,0 +1,43 @@
/*
* 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.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.scheduling.annotation
import org.aopalliance.intercept.MethodInvocation
import org.assertj.core.api.Assertions
import org.junit.jupiter.api.Test
import org.mockito.BDDMockito.given
import org.mockito.Mockito
/**
* Kotlin tests for [AnnotationAsyncExecutionInterceptor].
*
* @author Sebastien Deleuze
*/
class AnnotationAsyncExecutionInterceptorKotlinTests {
@Test
fun nullableUnitReturnValue() {
val interceptor = AnnotationAsyncExecutionInterceptor(null)
class C { @Async fun nullableUnit(): Unit? = null }
val invocation = Mockito.mock<MethodInvocation>()
given(invocation.method).willReturn(C::class.java.getDeclaredMethod("nullableUnit"))
Assertions.assertThat(interceptor.invoke(invocation)).isNull()
}
}
Loading…
Cancel
Save