From c9163b77df52c5e1def643d9628965f4295dfc29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Deleuze?= <sebastien.deleuze@broadcom.com>
Date: Fri, 22 Dec 2023 15:19:01 +0100
Subject: [PATCH] Add support for `@Async` Kotlin function returning `Unit?`

Closes gh-31891
---
 .../AsyncExecutionAspectSupport.java          |  3 +-
 ...ionAsyncExecutionInterceptorKotlinTests.kt | 43 +++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 spring-context/src/test/kotlin/org/springframework/scheduling/annotation/AnnotationAsyncExecutionInterceptorKotlinTests.kt

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 5d35e87994b5..ff72b90056b6 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
@@ -58,6 +58,7 @@
  * @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 @@ else if (org.springframework.util.concurrent.ListenableFuture.class.isAssignable
 		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;
 		}
diff --git a/spring-context/src/test/kotlin/org/springframework/scheduling/annotation/AnnotationAsyncExecutionInterceptorKotlinTests.kt b/spring-context/src/test/kotlin/org/springframework/scheduling/annotation/AnnotationAsyncExecutionInterceptorKotlinTests.kt
new file mode 100644
index 000000000000..86548ef0d994
--- /dev/null
+++ b/spring-context/src/test/kotlin/org/springframework/scheduling/annotation/AnnotationAsyncExecutionInterceptorKotlinTests.kt
@@ -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()
+	}
+
+}