diff options
6 files changed, 13 insertions, 13 deletions
diff --git a/container-core/abi-spec.json b/container-core/abi-spec.json index 1112fe79613..ed53543fcbc 100644 --- a/container-core/abi-spec.json +++ b/container-core/abi-spec.json @@ -3506,7 +3506,7 @@ "public final void assignOwner(com.yahoo.processing.response.DataList)", "public com.yahoo.processing.response.DataList getOwner()", "public com.google.common.util.concurrent.ListenableFuture completed()", - "public java.util.concurrent.CompletableFuture future()", + "public java.util.concurrent.CompletableFuture completedFuture()", "public synchronized boolean isComplete()", "public synchronized void addLast(com.yahoo.processing.response.Data)", "public synchronized void add(com.yahoo.processing.response.Data)", @@ -3571,7 +3571,7 @@ "methods": [ "public void <init>(com.yahoo.processing.response.DataList)", "public com.google.common.util.concurrent.ListenableFuture completed()", - "public java.util.concurrent.CompletableFuture future()", + "public java.util.concurrent.CompletableFuture completedFuture()", "public com.yahoo.processing.response.DataList getOwner()", "public boolean isComplete()", "public void addLast(com.yahoo.processing.response.Data)", @@ -3595,7 +3595,7 @@ ], "methods": [ "public abstract com.yahoo.processing.response.DataList getOwner()", - "public abstract java.util.concurrent.CompletableFuture future()", + "public abstract java.util.concurrent.CompletableFuture completedFuture()", "public abstract com.google.common.util.concurrent.ListenableFuture completed()", "public abstract boolean isComplete()", "public abstract void addLast(com.yahoo.processing.response.Data)", 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 a973aef88ed..bb5fe7a1f76 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 @@ -445,7 +445,7 @@ public abstract class AsynchronousSectionedRenderer<RESPONSE extends Response> e subList.addFreezeListener(listListener, getExecutor()); subList.completeFuture().whenCompleteAsync((__, ___) -> listListener.run(), getExecutor()); - subList.incoming().future().whenCompleteAsync((__, ___) -> listListener.run(), getExecutor()); + subList.incoming().completedFuture().whenCompleteAsync((__, ___) -> listListener.run(), getExecutor()); } private boolean isOrdered(DataList dataList) { 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 d4dd59cdd59..b1ce0643487 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 @@ -140,7 +140,7 @@ public abstract class AbstractDataList<DATATYPE extends Data> extends Listenable */ @Override public DataList<DATATYPE> get() throws InterruptedException, ExecutionException { - return drain(owner.incoming().future().get()); + return drain(owner.incoming().completedFuture().get()); } /** @@ -149,7 +149,7 @@ public abstract class AbstractDataList<DATATYPE extends Data> extends Listenable */ @Override public DataList<DATATYPE> get(long timeout, TimeUnit timeUnit) throws InterruptedException, ExecutionException, TimeoutException { - return drain(owner.incoming().future().get(timeout, timeUnit)); + return drain(owner.incoming().completedFuture().get(timeout, timeUnit)); } private DataList<DATATYPE> drain(DataList<DATATYPE> dataList) { diff --git a/container-core/src/main/java/com/yahoo/processing/response/DefaultIncomingData.java b/container-core/src/main/java/com/yahoo/processing/response/DefaultIncomingData.java index 0a2bcdc90b0..813d6ac54d8 100644 --- a/container-core/src/main/java/com/yahoo/processing/response/DefaultIncomingData.java +++ b/container-core/src/main/java/com/yahoo/processing/response/DefaultIncomingData.java @@ -57,7 +57,7 @@ public class DefaultIncomingData<DATATYPE extends Data> implements IncomingData< return CompletableFutures.toGuavaListenableFuture(completionFuture); } - @Override public CompletableFuture<DataList<DATATYPE>> future() { return completionFuture; } + @Override public CompletableFuture<DataList<DATATYPE>> completedFuture() { return completionFuture; } /** Returns whether the data in this is complete */ @Override diff --git a/container-core/src/main/java/com/yahoo/processing/response/IncomingData.java b/container-core/src/main/java/com/yahoo/processing/response/IncomingData.java index c8a013fbda9..54ba0fa8031 100644 --- a/container-core/src/main/java/com/yahoo/processing/response/IncomingData.java +++ b/container-core/src/main/java/com/yahoo/processing/response/IncomingData.java @@ -37,9 +37,9 @@ public interface IncomingData<DATATYPE extends Data> { * <p> * This return the list owning this for convenience. */ - CompletableFuture<DataList<DATATYPE>> future(); + CompletableFuture<DataList<DATATYPE>> completedFuture(); - /** @deprecated Use {@link #future()} instead */ + /** @deprecated Use {@link #completedFuture()} instead */ @Deprecated(forRemoval = true, since = "7") ListenableFuture<DataList<DATATYPE>> completed(); @@ -121,7 +121,7 @@ public interface IncomingData<DATATYPE extends Data> { return CompletableFutures.toGuavaListenableFuture(completionFuture); } - @Override public CompletableFuture<DataList<DATATYPE>> future() { return completionFuture; } + @Override public CompletableFuture<DataList<DATATYPE>> completedFuture() { return completionFuture; } @Override public DataList<DATATYPE> getOwner() { diff --git a/container-search/src/test/java/com/yahoo/search/rendering/AsyncGroupPopulationTestCase.java b/container-search/src/test/java/com/yahoo/search/rendering/AsyncGroupPopulationTestCase.java index b5e6e243a9f..7db29568d5b 100644 --- a/container-search/src/test/java/com/yahoo/search/rendering/AsyncGroupPopulationTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/rendering/AsyncGroupPopulationTestCase.java @@ -77,10 +77,10 @@ public class AsyncGroupPopulationTestCase { private final Object lock = new Object(); @Override - public CompletableFuture<DataList<DATATYPE>> future() { + public CompletableFuture<DataList<DATATYPE>> completedFuture() { synchronized (lock) { if (waitForIt == null) { - waitForIt = new WrappedFuture<>(super.future()); + waitForIt = new WrappedFuture<>(super.completedFuture()); } } return waitForIt; @@ -128,7 +128,7 @@ public class AsyncGroupPopulationTestCase { CompletableFuture<Boolean> f = renderer.renderResponse(out, result, new Execution(Execution.Context.createContextStub()), result.getQuery()); - WrappedFuture<DataList<Hit>> x = (WrappedFuture<DataList<Hit>>) h.incoming().future(); + WrappedFuture<DataList<Hit>> x = (WrappedFuture<DataList<Hit>>) h.incoming().completedFuture(); x.isListening.get(86_400_000); h.incoming().add(new Hit("yahoo2")); h.incoming().markComplete(); |