From 4f11c490da2bee48a40e80cfbbfda9914457043c Mon Sep 17 00:00:00 2001
From: Bjørn Christian Seime <bjorncs@verizonmedia.com>
Date: Wed, 8 Dec 2021 15:00:07 +0100
Subject: 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.
---
 vespajlib/src/main/java/com/yahoo/concurrent/CompletableFutures.java | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'vespajlib')

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);
-- 
cgit v1.2.3