AsyncExecutionInterceptor uses submitListenable if method signature indicates ListenableFuture

Issue: SPR-11909

spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncResult.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 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.
@@ -16,18 +16,24 @@
 
 package org.springframework.scheduling.annotation;
 
-import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
+import org.springframework.util.concurrent.ListenableFuture;
+import org.springframework.util.concurrent.ListenableFutureCallback;
+
 /**
  * A pass-through {@code Future} handle that can be used for method signatures
- * which are declared with a Future return type for asynchronous execution.
+ * which are declared with a {@code Future} return type for asynchronous execution.
+ *
+ * <p>As of Spring 4.1, this class implements {@link ListenableFuture}, not just
+ * plain {@link java.util.concurrent.Future}, along with the corresponding support
+ * in {@code @Async} processing.
  *
  * @author Juergen Hoeller
  * @since 3.0
  * @see Async
  */
-public class AsyncResult<V> implements Future<V> {
+public class AsyncResult<V> implements ListenableFuture<V> {
 
 	private final V value;
 
@@ -40,6 +46,7 @@ public class AsyncResult<V> implements Future<V> {
 		this.value = value;
 	}
 
+
 	@Override
 	public boolean cancel(boolean mayInterruptIfRunning) {
 		return false;
@@ -65,4 +72,9 @@ public class AsyncResult<V> implements Future<V> {
 		return this.value;
 	}
 
+	@Override
+	public void addCallback(ListenableFutureCallback<? super V> callback) {
+		callback.onSuccess(this.value);
+	}
+
 }

spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncExecutionTests.java

@@ -36,6 +36,7 @@ import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+import org.springframework.util.concurrent.ListenableFuture;
 
 import static org.junit.Assert.*;
 
@@ -65,6 +66,8 @@ public class AsyncExecutionTests {
 		asyncTest.doSomething(10);
 		Future<String> future = asyncTest.returnSomething(20);
 		assertEquals("20", future.get());
+		ListenableFuture<String> listenableFuture = asyncTest.returnSomethingListenable(20);
+		assertEquals("20", listenableFuture.get());
 	}
 
 	@Test
@@ -134,6 +137,8 @@ public class AsyncExecutionTests {
 		asyncTest.doSomething(10);
 		Future<String> future = asyncTest.returnSomething(20);
 		assertEquals("20", future.get());
+		ListenableFuture<String> listenableFuture = asyncTest.returnSomethingListenable(20);
+		assertEquals("20", listenableFuture.get());
 	}
 
 	@Test
@@ -348,6 +353,12 @@ public class AsyncExecutionTests {
 			assertTrue(!Thread.currentThread().getName().equals(originalThreadName));
 			return new AsyncResult<String>(Integer.toString(i));
 		}
+
+		@Async
+		public ListenableFuture<String> returnSomethingListenable(int i) {
+			assertTrue(!Thread.currentThread().getName().equals(originalThreadName));
+			return new AsyncResult<String>(Integer.toString(i));
+		}
 	}
 
 
@@ -410,6 +421,11 @@ public class AsyncExecutionTests {
 			return new AsyncResult<String>(Integer.toString(i));
 		}
 
+		public ListenableFuture<String> returnSomethingListenable(int i) {
+			assertTrue(!Thread.currentThread().getName().equals(originalThreadName));
+			return new AsyncResult<String>(Integer.toString(i));
+		}
+
 		@Override
 		public void destroy() {
 		}