diff options
Diffstat (limited to 'container-core/src/main/java')
8 files changed, 4 insertions, 79 deletions
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 cf54d043c5f..59533900a0c 100644 --- a/container-core/src/main/java/com/yahoo/processing/Response.java +++ b/container-core/src/main/java/com/yahoo/processing/Response.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.processing; -import com.google.common.util.concurrent.ListenableFuture; import com.yahoo.component.provider.ListenableFreezableClass; -import com.yahoo.concurrent.CompletableFutures; import com.yahoo.concurrent.SystemTimer; import com.yahoo.processing.execution.ResponseReceiver; import com.yahoo.processing.impl.ProcessingFuture; @@ -102,13 +100,6 @@ public class Response extends ListenableFreezableClass { return new CompleteAllOnGetFuture<D>(futures); } - /** @deprecated Use {@link #recursiveFuture(DataList)} instead */ - @Deprecated(forRemoval = true, since = "7") - @SuppressWarnings("removal") - public static <D extends Data> ListenableFuture<DataList<D>> recursiveComplete(DataList<D> rootDataList) { - return CompletableFutures.toGuavaListenableFuture(recursiveFuture(rootDataList)); - } - @SuppressWarnings("unchecked") private static <D extends Data> void collectCompletionFutures(DataList<D> dataList, List<CompletableFuture<DataList<D>>> futures) { futures.add(dataList.completeFuture()); diff --git a/container-core/src/main/java/com/yahoo/processing/impl/ProcessingFuture.java b/container-core/src/main/java/com/yahoo/processing/impl/ProcessingFuture.java index ab597fffaff..07923de6e09 100644 --- a/container-core/src/main/java/com/yahoo/processing/impl/ProcessingFuture.java +++ b/container-core/src/main/java/com/yahoo/processing/impl/ProcessingFuture.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.processing.impl; -import com.google.common.util.concurrent.ListenableFuture; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; @@ -14,8 +13,7 @@ import java.util.concurrent.TimeoutException; * * @author bjorncs */ -// TODO Vespa 8 remove ListenableFuture implementation -public abstract class ProcessingFuture<V> extends CompletableFuture<V> implements ListenableFuture<V> { +public abstract class ProcessingFuture<V> extends CompletableFuture<V> { @Override public boolean cancel(boolean mayInterruptIfRunning) { return false; } @Override public boolean isCancelled() { return false; } @@ -23,7 +21,6 @@ public abstract class ProcessingFuture<V> extends CompletableFuture<V> implement @Override public abstract V get() throws InterruptedException, ExecutionException; @Override public abstract V get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException; - @Override public void addListener(Runnable listener, Executor executor) { whenCompleteAsync((__, ___) -> listener.run(), executor); } 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 bb5fe7a1f76..aa753beb6a7 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 @@ -1,8 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.processing.rendering; -import com.google.common.util.concurrent.ListenableFuture; -import com.yahoo.concurrent.CompletableFutures; import com.yahoo.concurrent.ThreadFactoryFactory; import com.yahoo.jdisc.handler.CompletionHandler; import com.yahoo.jdisc.handler.ContentChannel; @@ -223,15 +221,6 @@ public abstract class AsynchronousSectionedRenderer<RESPONSE extends Response> e return startRender(stream, response, execution, request); } - - /** @deprecated Use {@link #renderResponseBeforeHandover(OutputStream, Response, Execution, Request)} */ - @Deprecated(forRemoval = true, since = "7") - @SuppressWarnings("removal") - public final ListenableFuture<Boolean> renderBeforeHandover(OutputStream stream, RESPONSE response, - Execution execution, Request request) { - return CompletableFutures.toGuavaListenableFuture(renderResponseBeforeHandover(stream, response, execution, request)); - } - private CompletableFuture<Boolean> startRender(OutputStream stream, RESPONSE response, Execution execution, Request request) { this.response = response; diff --git a/container-core/src/main/java/com/yahoo/processing/rendering/Renderer.java b/container-core/src/main/java/com/yahoo/processing/rendering/Renderer.java index 8db4ed4f624..df53ac846f2 100644 --- a/container-core/src/main/java/com/yahoo/processing/rendering/Renderer.java +++ b/container-core/src/main/java/com/yahoo/processing/rendering/Renderer.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.processing.rendering; -import com.google.common.util.concurrent.ListenableFuture; import com.yahoo.component.AbstractComponent; -import com.yahoo.concurrent.CompletableFutures; import com.yahoo.processing.Request; import com.yahoo.processing.Response; import com.yahoo.processing.execution.Execution; @@ -43,17 +41,6 @@ public abstract class Renderer<RESPONSE extends Response> extends AbstractCompon } /** - * @deprecated Use/implement {@link #renderResponse(OutputStream, Response, Execution, Request)} instead. - * Return type changed from {@link ListenableFuture} to {@link CompletableFuture}. - */ - @Deprecated(forRemoval = true, since = "7") - @SuppressWarnings("removal") - public ListenableFuture<Boolean> render(OutputStream stream, RESPONSE response, Execution execution, - Request request) { - return CompletableFutures.toGuavaListenableFuture(renderResponse(stream, response, execution, request)); - } - - /** * Render a response to a stream. The stream also exposes a ByteBuffer API * for efficient transactions to JDisc. The returned future will throw the * exception causing failure wrapped in an ExecutionException if rendering @@ -65,11 +52,8 @@ public abstract class Renderer<RESPONSE extends Response> extends AbstractCompon * @param request the request matching the response * @return a {@link CompletableFuture} containing a boolean where true indicates a successful rendering */ - @SuppressWarnings("removal") - public CompletableFuture<Boolean> renderResponse(OutputStream stream, RESPONSE response, - Execution execution, Request request) { - return CompletableFutures.toCompletableFuture(render(stream, response, execution, request)); - } + public abstract CompletableFuture<Boolean> renderResponse(OutputStream stream, RESPONSE response, + Execution execution, Request request); /** * Name of the output encoding, if applicable. 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 b1ce0643487..15b1abc10cd 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 @@ -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.processing.response; -import com.google.common.util.concurrent.ListenableFuture; import com.yahoo.component.provider.ListenableFreezableClass; -import com.yahoo.concurrent.CompletableFutures; import com.yahoo.processing.Request; import com.yahoo.processing.impl.ProcessingFuture; @@ -92,13 +90,6 @@ public abstract class AbstractDataList<DATATYPE extends Data> extends Listenable return incomingData; } - @Override - @SuppressWarnings("removal") - @Deprecated(forRemoval = true, since = "7") - public ListenableFuture<DataList<DATATYPE>> complete() { - return CompletableFutures.toGuavaListenableFuture(completedFuture); - } - @Override public CompletableFuture<DataList<DATATYPE>> completeFuture() { return completedFuture; } @Override @@ -108,7 +99,7 @@ public abstract class AbstractDataList<DATATYPE extends Data> extends Listenable public boolean isStreamed() { return streamed; } public String toString() { - return super.toString() + (complete().isDone() ? " [completed]" : " [incomplete, " + incoming() + "]"); + return super.toString() + (completeFuture().isDone() ? " [completed]" : " [incomplete, " + incoming() + "]"); } public static final class DrainOnGetFuture<DATATYPE extends Data> extends ProcessingFuture<DataList<DATATYPE>> { 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 dbda8983f12..8c63dd2f7fe 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 @@ -1,8 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.processing.response; -import com.google.common.util.concurrent.ListenableFuture; - import java.util.List; import java.util.concurrent.CompletableFuture; @@ -74,10 +72,6 @@ public interface DataList<DATATYPE extends Data> extends Data { */ CompletableFuture<DataList<DATATYPE>> completeFuture(); - /** @deprecated Use {@link #completeFuture()} instead */ - @Deprecated(forRemoval = true, since = "7") - ListenableFuture<DataList<DATATYPE>> complete(); - /** * Adds a listener which is invoked every time data is added to this list. * The listener is always invoked on the same thread which is adding the data, 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 813d6ac54d8..eab033f8bc9 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 @@ -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.processing.response; -import com.google.common.util.concurrent.ListenableFuture; import com.yahoo.collections.Tuple2; import com.yahoo.concurrent.CompletableFutures; @@ -50,13 +49,6 @@ public class DefaultIncomingData<DATATYPE extends Data> implements IncomingData< return owner; } - @Override - @Deprecated(forRemoval = true, since = "7") - @SuppressWarnings("removal") - public ListenableFuture<DataList<DATATYPE>> completed() { - return CompletableFutures.toGuavaListenableFuture(completionFuture); - } - @Override public CompletableFuture<DataList<DATATYPE>> completedFuture() { return completionFuture; } /** Returns whether the data in this is complete */ 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 54ba0fa8031..fc0e6d21e13 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 @@ -1,8 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.processing.response; -import com.google.common.util.concurrent.ListenableFuture; -import com.yahoo.concurrent.CompletableFutures; import com.yahoo.processing.impl.ProcessingFuture; import java.util.Collections; @@ -39,10 +37,6 @@ public interface IncomingData<DATATYPE extends Data> { */ CompletableFuture<DataList<DATATYPE>> completedFuture(); - /** @deprecated Use {@link #completedFuture()} instead */ - @Deprecated(forRemoval = true, since = "7") - ListenableFuture<DataList<DATATYPE>> completed(); - /** * Returns whether this is complete */ @@ -114,13 +108,6 @@ public interface IncomingData<DATATYPE extends Data> { completionFuture = new ImmediateFuture<>(owner); } - @Override - @SuppressWarnings("removal") - @Deprecated(forRemoval = true, since = "7") - public ListenableFuture<DataList<DATATYPE>> completed() { - return CompletableFutures.toGuavaListenableFuture(completionFuture); - } - @Override public CompletableFuture<DataList<DATATYPE>> completedFuture() { return completionFuture; } @Override |