From 2c8d19b82de5ec4b47a5eb4ab566bbcb1725d118 Mon Sep 17 00:00:00 2001
From: Bjørn Christian Seime <bjorncs@verizonmedia.com>
Date: Mon, 6 Dec 2021 14:35:27 +0100
Subject: 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()
---
 .../src/main/java/com/yahoo/search/rendering/Renderer.java  | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'container-search/src/main/java/com/yahoo/search/rendering/Renderer.java')

diff --git a/container-search/src/main/java/com/yahoo/search/rendering/Renderer.java b/container-search/src/main/java/com/yahoo/search/rendering/Renderer.java
index b8a7f0d1978..6ff8f003f7e 100644
--- a/container-search/src/main/java/com/yahoo/search/rendering/Renderer.java
+++ b/container-search/src/main/java/com/yahoo/search/rendering/Renderer.java
@@ -1,19 +1,18 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.rendering;
 
-import com.yahoo.search.Query;
-import com.yahoo.search.Result;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.SettableFuture;
 import com.yahoo.io.ByteWriter;
 import com.yahoo.processing.Request;
 import com.yahoo.processing.execution.Execution;
+import com.yahoo.search.Query;
+import com.yahoo.search.Result;
 
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.Writer;
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetEncoder;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * Renders a search result to a writer synchronously
@@ -37,7 +36,7 @@ abstract public class Renderer extends com.yahoo.processing.rendering.Renderer<R
      * @return a future which is always completed to true
      */
     @Override
-    public final ListenableFuture<Boolean> render(OutputStream stream, Result response, Execution execution, Request request) {
+    public final CompletableFuture<Boolean> renderResponse(OutputStream stream, Result response, Execution execution, Request request) {
         Writer writer = null;
         try {
             writer = createWriter(stream, response);
@@ -50,8 +49,8 @@ abstract public class Renderer extends com.yahoo.processing.rendering.Renderer<R
             if (writer != null)
                 try { writer.close(); } catch (IOException e2) {};
         }
-        SettableFuture<Boolean> completed = SettableFuture.create();
-        completed.set(true);
+        CompletableFuture<Boolean> completed = new CompletableFuture<>();
+        completed.complete(true);
         return completed;
     }
 
-- 
cgit v1.2.3