Deprecate public APIs using Guava's ListenableFuture

Public methods:
- com.yahoo.processing.rendering.Renderer.render()
- com.yahoo.search.handler.HttpSearchResponse.waitableRender()
- com.yahoo.processing.rendering.AsynchronousSectionedRenderer.renderBeforeHandover()

1 files changed, 22 insertions, 4 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/handler/HttpSearchResponse.java b/container-search/src/main/java/com/yahoo/search/handler/HttpSearchResponse.java
index 5c897245e64..64e7403fa1a 100644
--- a/container-search/src/main/java/com/yahoo/search/handler/HttpSearchResponse.java
+++ b/container-search/src/main/java/com/yahoo/search/handler/HttpSearchResponse.java
@@ -3,6 +3,7 @@ package com.yahoo.search.handler;
 
 import com.google.common.util.concurrent.ListenableFuture;
 import com.yahoo.collections.ListMap;
+import com.yahoo.concurrent.CompletableFutures;
 import com.yahoo.container.handler.Coverage;
 import com.yahoo.container.handler.Timing;
 import com.yahoo.container.jdisc.ExtendedResponse;
@@ -25,6 +26,7 @@ import java.io.OutputStream;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * Wrap the result of a query as an HTTP response.
@@ -75,20 +77,36 @@ public class HttpSearchResponse extends ExtendedResponse {
         }
     }
 
+    /** @deprecated Use {@link #asyncRender(OutputStream)} instead */
+    @Deprecated(forRemoval = true, since = "7")
     public ListenableFuture<Boolean> waitableRender(OutputStream stream) throws IOException {
         return waitableRender(result, query, rendererCopy, stream);
     }
 
+    /** @deprecated Use {@link #asyncRender(Result, Query, Renderer, OutputStream)} instead */
+    @Deprecated(forRemoval = true, since = "7")
+    @SuppressWarnings("removal")
     public static ListenableFuture<Boolean> waitableRender(Result result,
                                                            Query query,
                                                            Renderer<Result> renderer,
                                                            OutputStream stream) throws IOException {
+        return CompletableFutures.toGuavaListenableFuture(asyncRender(result, query, renderer, stream));
+    }
+
+    public CompletableFuture<Boolean> asyncRender(OutputStream stream) {
+        return asyncRender(result, query, rendererCopy, stream);
+    }
+
+    public static CompletableFuture<Boolean> asyncRender(Result result,
+                                                         Query query,
+                                                         Renderer<Result> renderer,
+                                                         OutputStream stream) {
         SearchResponse.trimHits(result);
         SearchResponse.removeEmptySummaryFeatureFields(result);
-        return renderer.render(stream, result, query.getModel().getExecution(), query);
-
+        return renderer.renderResponse(stream, result, query.getModel().getExecution(), query);
     }
 
+
     @Override
     public void render(OutputStream output, ContentChannel networkChannel, CompletionHandler handler) throws IOException {
         if (rendererCopy instanceof AsynchronousSectionedRenderer) {
@@ -98,9 +116,9 @@ public class HttpSearchResponse extends ExtendedResponse {
         try {
             try {
                 long nanoStart = System.nanoTime();
-                ListenableFuture<Boolean> promise = waitableRender(output);
+                CompletableFuture<Boolean> promise = asyncRender(output);
                 if (metric != null) {
-                    promise.addListener(new RendererLatencyReporter(nanoStart), Runnable::run);
+                    promise.whenComplete((__, ___) -> new RendererLatencyReporter(nanoStart).run());
                 }
             } finally {
                 if (!(rendererCopy instanceof AsynchronousSectionedRenderer)) {