diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-12-08 16:33:54 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-12-08 16:34:03 +0100 |
commit | ef0b4d55f482fe8b4dc6dadbd41b21264ea1b956 (patch) | |
tree | a1545e49fa018b93c37ea9953955420df97d123b /container-core/src/main/java/com/yahoo/processing | |
parent | bf9d4b9ab1151de895f7e3375717d6e0ef1918e7 (diff) |
Rename method 'future' => 'completedFuture'
Diffstat (limited to 'container-core/src/main/java/com/yahoo/processing')
4 files changed, 7 insertions, 7 deletions
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() { |