Remove deprecated APIs exposing Guava types

5 files changed, 2 insertions, 35 deletions

diff --git a/container-search/abi-spec.json b/container-search/abi-spec.json
index ff89cf432c2..1e205322169 100644
--- a/container-search/abi-spec.json
+++ b/container-search/abi-spec.json
@@ -4369,8 +4369,6 @@
     ],
     "methods": [
       "public void <init>(int, com.yahoo.search.Result, com.yahoo.search.Query, com.yahoo.processing.rendering.Renderer)",
-      "public com.google.common.util.concurrent.ListenableFuture waitableRender(java.io.OutputStream)",
-      "public static com.google.common.util.concurrent.ListenableFuture waitableRender(com.yahoo.search.Result, com.yahoo.search.Query, com.yahoo.processing.rendering.Renderer, java.io.OutputStream)",
       "public java.util.concurrent.CompletableFuture asyncRender(java.io.OutputStream)",
       "public static java.util.concurrent.CompletableFuture asyncRender(com.yahoo.search.Result, com.yahoo.search.Query, com.yahoo.processing.rendering.Renderer, java.io.OutputStream)",
       "public void render(java.io.OutputStream, com.yahoo.jdisc.handler.ContentChannel, com.yahoo.jdisc.handler.CompletionHandler)",
@@ -7810,7 +7808,6 @@
       "public boolean isFillable()",
       "public java.util.Set getFilled()",
       "public com.yahoo.processing.response.IncomingData incoming()",
-      "public com.google.common.util.concurrent.ListenableFuture complete()",
       "public java.util.concurrent.CompletableFuture completeFuture()",
       "public void addDataListener(java.lang.Runnable)",
       "public void close()",
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 64e7403fa1a..c6906ea7566 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
@@ -1,9 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 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;
@@ -77,22 +75,6 @@ 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);
     }
diff --git a/container-search/src/main/java/com/yahoo/search/result/HitGroup.java b/container-search/src/main/java/com/yahoo/search/result/HitGroup.java
index 7096d937959..9699e9a7448 100644
--- a/container-search/src/main/java/com/yahoo/search/result/HitGroup.java
+++ b/container-search/src/main/java/com/yahoo/search/result/HitGroup.java
@@ -3,9 +3,7 @@ package com.yahoo.search.result;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
-import com.google.common.util.concurrent.ListenableFuture;
 import com.yahoo.collections.ListenableArrayList;
-import com.yahoo.concurrent.CompletableFutures;
 import com.yahoo.net.URI;
 import com.yahoo.prelude.fastsearch.SortDataHitSorter;
 import com.yahoo.processing.response.ArrayDataList;
@@ -964,13 +962,6 @@ public class HitGroup extends Hit implements DataList<Hit>, Cloneable, Iterable<
     @Override
     public IncomingData<Hit> incoming() { return incomingHits; }
 
-    @Override
-    @SuppressWarnings("removal")
-    @Deprecated(forRemoval = true, since = "7")
-    public ListenableFuture<DataList<Hit>> complete() {
-        return CompletableFutures.toGuavaListenableFuture(completedFuture);
-    }
-
     @Override public CompletableFuture<DataList<Hit>> completeFuture() { return completedFuture; }
 
     @Override
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 3236cbd5bbc..bad3cc7284d 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
@@ -3,7 +3,6 @@ package com.yahoo.search.rendering;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.common.util.concurrent.ListenableFuture;
 import com.yahoo.component.ComponentId;
 import com.yahoo.component.chain.Chain;
 import com.yahoo.container.QrSearchersConfig;
diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/test/FutureDataTestCase.java b/container-search/src/test/java/com/yahoo/search/searchchain/test/FutureDataTestCase.java
index 2426b18f018..15517270cb9 100644
--- a/container-search/src/test/java/com/yahoo/search/searchchain/test/FutureDataTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/searchchain/test/FutureDataTestCase.java
@@ -32,7 +32,6 @@ import static org.junit.Assert.assertTrue;
  */
 public class FutureDataTestCase {
 
-    @SuppressWarnings("removal")
     @Test
     public void testAsyncFederation() throws InterruptedException, ExecutionException {
         // Setup environment
@@ -73,13 +72,12 @@ public class FutureDataTestCase {
         asyncProviderSearcher.simulateOneHitIOComplete(new Hit("async:1"));
         asyncProviderSearcher.simulateAllHitsIOComplete();
         assertEquals("Got no async data yet, as we haven't pulled it", 0, asyncGroup.size());
-        asyncGroup.complete().get();
+        asyncGroup.completeFuture().get();
         assertEquals("Completed, so we have the data", 2, asyncGroup.size());
         assertEquals("async:0", asyncGroup.get(0).getId().toString());
         assertEquals("async:1", asyncGroup.get(1).getId().toString());
     }
 
-    @SuppressWarnings("removal")
     @Test
     public void testFutureData() throws InterruptedException, ExecutionException, TimeoutException {
         // Set up
@@ -104,7 +102,7 @@ public class FutureDataTestCase {
 
         // Results with future hit groups will be passed to rendering directly and start rendering immediately.
         // For this test we block and wait for the data instead:
-        result.hits().complete().get(1000, TimeUnit.MILLISECONDS);
+        result.hits().completeFuture().get(1000, TimeUnit.MILLISECONDS);
         assertEquals(2, result.hits().getConcreteSize());
     }