Use renderResponse

5 files changed, 15 insertions, 18 deletions

diff --git a/container-core/src/test/java/com/yahoo/processing/rendering/AsynchronousSectionedRendererTest.java b/container-core/src/test/java/com/yahoo/processing/rendering/AsynchronousSectionedRendererTest.java
index 0ea8a157410..a6db21d5094 100644
--- a/container-core/src/test/java/com/yahoo/processing/rendering/AsynchronousSectionedRendererTest.java
+++ b/container-core/src/test/java/com/yahoo/processing/rendering/AsynchronousSectionedRendererTest.java
@@ -31,7 +31,7 @@ import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertSame;
 
 /**
- * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
+ * @author Einar M R Rosenvinge
  */
 public class AsynchronousSectionedRendererTest {
 
@@ -222,14 +222,14 @@ public class AsynchronousSectionedRendererTest {
         return render(renderer, data);
     }
 
-    @SuppressWarnings({"unchecked", "removal"})
+    @SuppressWarnings({"unchecked"})
     public String render(Renderer renderer, DataList data) throws InterruptedException, IOException {
         TestContentChannel contentChannel = new TestContentChannel();
 
         Execution execution = Execution.createRoot(new NoopProcessor(), 0, null);
 
         final ContentChannelOutputStream stream = new ContentChannelOutputStream(contentChannel);
-        ListenableFuture result = renderer.render(stream, new Response(data), execution, null);
+        CompletableFuture<Boolean> result = renderer.renderResponse(stream, new Response(data), execution, null);
 
         int waitCounter = 1000;
         while (!result.isDone()) {
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ExecutionAbstractTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ExecutionAbstractTestCase.java
index b39c170c6a3..5a8a4dfa9d2 100644
--- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ExecutionAbstractTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ExecutionAbstractTestCase.java
@@ -1,7 +1,6 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.pagetemplates.engine.test;
 
-import com.google.common.util.concurrent.ListenableFuture;
 import com.yahoo.io.IOUtils;
 import com.yahoo.search.Result;
 import com.yahoo.search.pagetemplates.PageTemplate;
@@ -11,8 +10,9 @@ import com.yahoo.search.result.Hit;
 import com.yahoo.search.result.HitGroup;
 import com.yahoo.text.Utf8;
 
-import java.io.*;
+import java.io.ByteArrayOutputStream;
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
 
 import static org.junit.Assert.*;
 
@@ -53,13 +53,12 @@ public class ExecutionAbstractTestCase {
         assertRendered(result,resultFileName,false);
     }
 
-    @SuppressWarnings({"deprecation", "removal"})
     protected void assertRendered(Result result, String resultFileName, boolean print) {
         try {
             PageTemplatesXmlRenderer renderer = new PageTemplatesXmlRenderer();
             renderer.init();
             ByteArrayOutputStream stream = new ByteArrayOutputStream();
-            ListenableFuture<Boolean> f = renderer.render(stream, result, null, null);
+            CompletableFuture<Boolean> f = renderer.renderResponse(stream, result, null, null);
             assertTrue(f.get());
             String renderedResult = Utf8.toString(stream.toByteArray());
             if (print)
diff --git a/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java b/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java
index 1d2e3c240b9..3236cbd5bbc 100644
--- a/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java
@@ -66,6 +66,7 @@ import java.math.BigInteger;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 
 import static org.junit.Assert.assertEquals;
@@ -82,7 +83,7 @@ public class JsonRendererTestCase {
 
     private static final ObjectMapper jsonMapper = new ObjectMapper();
 
-    private JsonRenderer originalRenderer;
+    private final JsonRenderer originalRenderer;
     private JsonRenderer renderer;
 
     public JsonRendererTestCase() {
@@ -381,7 +382,6 @@ public class JsonRendererTestCase {
     }
 
     @Test
-    @SuppressWarnings("removal")
     public void testEmptyTracing() throws IOException, InterruptedException, ExecutionException {
         String expected = "{"
                 + "    \"root\": {"
@@ -403,7 +403,7 @@ public class JsonRendererTestCase {
         subQuery.trace("yellow", 1);
         q.trace("marker", 1);
         ByteArrayOutputStream bs = new ByteArrayOutputStream();
-        ListenableFuture<Boolean> f = renderer.render(bs, r, execution, null);
+        CompletableFuture<Boolean> f = renderer.renderResponse(bs, r, execution, null);
         assertTrue(f.get());
         String summary = Utf8.toString(bs.toByteArray());
         assertEqualJson(expected, summary);
@@ -445,7 +445,7 @@ public class JsonRendererTestCase {
         execution.search(q);
         new Execution(new Chain<>(), execution.context());
         ByteArrayOutputStream bs = new ByteArrayOutputStream();
-        ListenableFuture<Boolean> f = renderer.render(bs, r, execution, null);
+        CompletableFuture<Boolean> f = renderer.renderResponse(bs, r, execution, null);
         assertTrue(f.get());
         String summary = Utf8.toString(bs.toByteArray());
         ObjectMapper m = new ObjectMapper();
@@ -1441,7 +1441,7 @@ public class JsonRendererTestCase {
     @SuppressWarnings("removal")
     private String render(Execution execution, Result r) throws InterruptedException, ExecutionException {
         ByteArrayOutputStream bs = new ByteArrayOutputStream();
-        ListenableFuture<Boolean> f = renderer.render(bs, r, execution, null);
+        CompletableFuture<Boolean> f = renderer.renderResponse(bs, r, execution, null);
         assertTrue(f.get());
         return Utf8.toString(bs.toByteArray());
     }
diff --git a/container-search/src/test/java/com/yahoo/search/rendering/SyncDefaultRendererTestCase.java b/container-search/src/test/java/com/yahoo/search/rendering/SyncDefaultRendererTestCase.java
index 99911276f50..2166000cf7a 100644
--- a/container-search/src/test/java/com/yahoo/search/rendering/SyncDefaultRendererTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/rendering/SyncDefaultRendererTestCase.java
@@ -1,7 +1,6 @@
 // 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.google.common.util.concurrent.ListenableFuture;
 import com.yahoo.component.chain.Chain;
 import com.yahoo.prelude.fastsearch.FastHit;
 import com.yahoo.search.Query;
@@ -20,6 +19,7 @@ import org.junit.Before;
 import org.junit.Test;
 
 import java.io.ByteArrayOutputStream;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 
 import static org.junit.Assert.assertEquals;
@@ -54,7 +54,6 @@ public class SyncDefaultRendererTestCase {
         assertEquals("text/xml", d.getMimeType());
     }
 
-    @SuppressWarnings({"deprecation", "removal"})
     @Test
     public void testRenderWriterResult() throws InterruptedException, ExecutionException {
         Query q = new Query("/?query=a&tracelevel=5");
@@ -90,7 +89,7 @@ public class SyncDefaultRendererTestCase {
         r.hits().add(gg);
         r.hits().addError(ErrorMessage.createInternalServerError("boom"));
         ByteArrayOutputStream bs = new ByteArrayOutputStream();
-        ListenableFuture<Boolean> f = d.render(bs, r, null, null);
+        CompletableFuture<Boolean> f = d.renderResponse(bs, r, null, null);
         assertTrue(f.get());
         String summary = Utf8.toString(bs.toByteArray());
         // TODO figure out a reasonably strict and reasonably flexible way to test
diff --git a/container-search/src/test/java/com/yahoo/search/rendering/XMLRendererTestCase.java b/container-search/src/test/java/com/yahoo/search/rendering/XMLRendererTestCase.java
index b3534d580d8..a8b38130333 100644
--- a/container-search/src/test/java/com/yahoo/search/rendering/XMLRendererTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/rendering/XMLRendererTestCase.java
@@ -1,7 +1,6 @@
 // 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.google.common.util.concurrent.ListenableFuture;
 import com.yahoo.component.ComponentId;
 import com.yahoo.component.chain.Chain;
 import com.yahoo.container.QrSearchersConfig;
@@ -28,6 +27,7 @@ import com.yahoo.text.Utf8;
 import org.junit.Test;
 
 import java.io.ByteArrayOutputStream;
+import java.util.concurrent.CompletableFuture;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -155,12 +155,11 @@ public class XMLRendererTestCase {
         assertTrue(summary.contains("<meta type=\"context\">"));
     }
 
-    @SuppressWarnings("removal")
     private String render(Result result) throws Exception {
         XmlRenderer renderer = new XmlRenderer();
         renderer.init();
         ByteArrayOutputStream bs = new ByteArrayOutputStream();
-        ListenableFuture<Boolean> f = renderer.render(bs, result, null, null);
+        CompletableFuture<Boolean> f = renderer.renderResponse(bs, result, null, null);
         assertTrue(f.get());
         return Utf8.toString(bs.toByteArray());
     }