aboutsummaryrefslogtreecommitdiffstats
path: root/vespajlib
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2021-12-08 15:00:07 +0100
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2021-12-08 15:00:07 +0100
commit4f11c490da2bee48a40e80cfbbfda9914457043c (patch)
treef2f784afe2c80bc04b2b32b5b588ac65f5643226 /vespajlib
parent92fb7c5a6b124a9f384ed54cb5be166c14a5e910 (diff)
Deprecate methods using Guava ListenableFuture
- com.yahoo.processing.Response.recursiveComplete() - com.yahoo.processing.response.DataList.complete() - com.yahoo.processing.response.IncomingData.completed() Also fixes bug in FutureResponse where `get()` does not return value produced by async task.
Diffstat (limited to 'vespajlib')
-rw-r--r--vespajlib/src/main/java/com/yahoo/concurrent/CompletableFutures.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/vespajlib/src/main/java/com/yahoo/concurrent/CompletableFutures.java b/vespajlib/src/main/java/com/yahoo/concurrent/CompletableFutures.java
index 125f909f0c2..711ce403d50 100644
--- a/vespajlib/src/main/java/com/yahoo/concurrent/CompletableFutures.java
+++ b/vespajlib/src/main/java/com/yahoo/concurrent/CompletableFutures.java
@@ -74,8 +74,12 @@ public class CompletableFutures {
* Helper for migrating from {@link ListenableFuture} to {@link CompletableFuture} in Vespa public apis
* @deprecated to be removed in Vespa 8
*/
+ @SuppressWarnings("unchecked")
@Deprecated(forRemoval = true, since = "7")
public static <V> ListenableFuture<V> toGuavaListenableFuture(CompletableFuture<V> future) {
+ if (future instanceof ListenableFuture) {
+ return ((ListenableFuture<V>) future);
+ }
SettableFuture<V> guavaFuture = SettableFuture.create();
future.whenComplete((result, error) -> {
if (result != null) guavaFuture.set(result);