Rename method 'future' => 'completeFuture'

7 files changed, 12 insertions, 12 deletions

diff --git a/container-core/abi-spec.json b/container-core/abi-spec.json
index 27fa885ada4..1112fe79613 100644
--- a/container-core/abi-spec.json
+++ b/container-core/abi-spec.json
@@ -3426,7 +3426,7 @@
       "public com.yahoo.processing.Request request()",
       "public com.yahoo.processing.response.IncomingData incoming()",
       "public com.google.common.util.concurrent.ListenableFuture complete()",
-      "public java.util.concurrent.CompletableFuture future()",
+      "public java.util.concurrent.CompletableFuture completeFuture()",
       "public boolean isOrdered()",
       "public boolean isStreamed()",
       "public java.lang.String toString()"
@@ -3485,7 +3485,7 @@
       "public abstract com.yahoo.processing.response.Data get(int)",
       "public abstract java.util.List asList()",
       "public abstract com.yahoo.processing.response.IncomingData incoming()",
-      "public abstract java.util.concurrent.CompletableFuture future()",
+      "public abstract java.util.concurrent.CompletableFuture completeFuture()",
       "public abstract com.google.common.util.concurrent.ListenableFuture complete()",
       "public abstract void addDataListener(java.lang.Runnable)",
       "public void close()"
diff --git a/container-core/src/main/java/com/yahoo/processing/Response.java b/container-core/src/main/java/com/yahoo/processing/Response.java
index 9ab95901320..cf54d043c5f 100644
--- a/container-core/src/main/java/com/yahoo/processing/Response.java
+++ b/container-core/src/main/java/com/yahoo/processing/Response.java
@@ -111,7 +111,7 @@ public class Response extends ListenableFreezableClass {
 
     @SuppressWarnings("unchecked")
     private static <D extends Data> void collectCompletionFutures(DataList<D> dataList, List<CompletableFuture<DataList<D>>> futures) {
-        futures.add(dataList.future());
+        futures.add(dataList.completeFuture());
         for (D data : dataList.asList()) {
             if (data instanceof DataList)
                 collectCompletionFutures((DataList<D>) data, futures);
diff --git a/container-core/src/main/java/com/yahoo/processing/rendering/AsynchronousSectionedRenderer.java b/container-core/src/main/java/com/yahoo/processing/rendering/AsynchronousSectionedRenderer.java
index 92df00711f3..a973aef88ed 100644
--- a/container-core/src/main/java/com/yahoo/processing/rendering/AsynchronousSectionedRenderer.java
+++ b/container-core/src/main/java/com/yahoo/processing/rendering/AsynchronousSectionedRenderer.java
@@ -359,10 +359,10 @@ public abstract class AsynchronousSectionedRenderer<RESPONSE extends Response> e
                 return; // Called on completion of a list which is not frozen yet - hold off until frozen
 
             if ( ! beforeHandoverMode)
-                list.future().get(); // trigger completion if not done already to invoke any listeners on that event
+                list.completeFuture().get(); // trigger completion if not done already to invoke any listeners on that event
             boolean startedRendering = renderData();
             if ( ! startedRendering || uncompletedChildren > 0) return; // children must render to completion first
-            if (list.future().isDone()) // might not be when in before handover mode
+            if (list.completeFuture().isDone()) // might not be when in before handover mode
                 endListLevel();
             else
                 stream.flush();
@@ -444,7 +444,7 @@ public abstract class AsynchronousSectionedRenderer<RESPONSE extends Response> e
             flushIfLikelyToSuspend(subList);
 
             subList.addFreezeListener(listListener, getExecutor());
-            subList.future().whenCompleteAsync((__, ___) -> listListener.run(), getExecutor());
+            subList.completeFuture().whenCompleteAsync((__, ___) -> listListener.run(), getExecutor());
             subList.incoming().future().whenCompleteAsync((__, ___) -> listListener.run(), getExecutor());
         }
 
diff --git a/container-core/src/main/java/com/yahoo/processing/response/AbstractDataList.java b/container-core/src/main/java/com/yahoo/processing/response/AbstractDataList.java
index ef7aea4716f..d4dd59cdd59 100644
--- a/container-core/src/main/java/com/yahoo/processing/response/AbstractDataList.java
+++ b/container-core/src/main/java/com/yahoo/processing/response/AbstractDataList.java
@@ -99,7 +99,7 @@ public abstract class AbstractDataList<DATATYPE extends Data> extends Listenable
         return CompletableFutures.toGuavaListenableFuture(completedFuture);
     }
 
-    @Override public CompletableFuture<DataList<DATATYPE>> future() { return completedFuture; }
+    @Override public CompletableFuture<DataList<DATATYPE>> completeFuture() { return completedFuture; }
 
     @Override
     public boolean isOrdered() { return ordered; }
diff --git a/container-core/src/main/java/com/yahoo/processing/response/DataList.java b/container-core/src/main/java/com/yahoo/processing/response/DataList.java
index d30fe4f1a0e..dbda8983f12 100644
--- a/container-core/src/main/java/com/yahoo/processing/response/DataList.java
+++ b/container-core/src/main/java/com/yahoo/processing/response/DataList.java
@@ -72,9 +72,9 @@ public interface DataList<DATATYPE extends Data> extends Data {
      * Making this call on a list which does not support future data always returns immediately and
      * causes no memory synchronization cost.
      */
-    CompletableFuture<DataList<DATATYPE>> future();
+    CompletableFuture<DataList<DATATYPE>> completeFuture();
 
-    /** @deprecated Use {@link #future()} instead */
+    /** @deprecated Use {@link #completeFuture()} instead */
     @Deprecated(forRemoval = true, since = "7")
     ListenableFuture<DataList<DATATYPE>> complete();
 
diff --git a/container-core/src/main/java/com/yahoo/processing/test/ProcessorLibrary.java b/container-core/src/main/java/com/yahoo/processing/test/ProcessorLibrary.java
index 5a672b77762..ee8dbd8dccb 100644
--- a/container-core/src/main/java/com/yahoo/processing/test/ProcessorLibrary.java
+++ b/container-core/src/main/java/com/yahoo/processing/test/ProcessorLibrary.java
@@ -353,7 +353,7 @@ public class ProcessorLibrary {
 
                 // wait for other executions and merge the responses
                 for (Response additionalResponse : AsyncExecution.waitForAll(futures, 1000)) {
-                    additionalResponse.data().future().get(); // block until we have all the data elements
+                    additionalResponse.data().completeFuture().get(); // block until we have all the data elements
                     for (Object item : additionalResponse.data().asList())
                         response.data().add((Data) item);
                     response.mergeWith(additionalResponse);
@@ -381,7 +381,7 @@ public class ProcessorLibrary {
         public Response process(Request request, Execution execution) {
             Response response = execution.process(request);
             // TODO: Consider for to best provide helpers for this
-            response.data().future().whenComplete(
+            response.data().completeFuture().whenComplete(
                     (__, ___) ->
                             new RunnableExecution(request, new ExecutionWithResponse(asyncChain, response, execution))
                                     .run());
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 52f0c457ce2..627081e0d3b 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
@@ -444,7 +444,7 @@ public class AsynchronousSectionedRendererTest {
         }
 
         @Override
-        public CompletableFuture<DataList<StringData>> future() {
+        public CompletableFuture<DataList<StringData>> completeFuture() {
             return CompletableFuture.completedFuture(this);
         }