1 files changed, 0 insertions, 126 deletions
diff --git a/vespajlib/src/main/java/ai/vespa/util/http/hc4/retry/DelayedConnectionLevelRetryHandler.java b/vespajlib/src/main/java/ai/vespa/util/http/hc4/retry/DelayedConnectionLevelRetryHandler.java
deleted file mode 100644
index 3ba92c08e30..00000000000
--- a/vespajlib/src/main/java/ai/vespa/util/http/hc4/retry/DelayedConnectionLevelRetryHandler.java
+++ /dev/null
@@ -1,126 +0,0 @@
-// Copyright 2020 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package ai.vespa.util.http.hc4.retry;
-
-import org.apache.http.annotation.Contract;
-import org.apache.http.annotation.ThreadingBehavior;
-import org.apache.http.client.HttpRequestRetryHandler;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.protocol.HttpContext;
-
-import java.io.IOException;
-import java.time.Duration;
-import java.util.List;
-import java.util.function.Predicate;
-import java.util.logging.Logger;
-
-/**
- * A {@link HttpRequestRetryHandler} that supports delayed retries.
- *
- * @author bjorncs
- */
-@Contract(threading = ThreadingBehavior.IMMUTABLE)
-public class DelayedConnectionLevelRetryHandler implements HttpRequestRetryHandler {
-
-    private static final Logger log = Logger.getLogger(HttpRequestRetryHandler.class.getName());
-
-    private final DelaySupplier delaySupplier;
-    private final int maxRetries;
-    private final RetryPredicate<IOException> predicate;
-    private final RetryConsumer<IOException> retryConsumer;
-    private final RetryFailedConsumer<IOException> retryFailedConsumer;
-    private final Sleeper sleeper;
-
-    private DelayedConnectionLevelRetryHandler(
-            DelaySupplier delaySupplier,
-            int maxRetries,
-            RetryPredicate<IOException> predicate,
-            RetryConsumer<IOException> retryConsumer,
-            RetryFailedConsumer<IOException> retryFailedConsumer,
-            Sleeper sleeper) {
-        this.delaySupplier = delaySupplier;
-        this.maxRetries = maxRetries;
-        this.predicate = predicate;
-        this.retryConsumer = retryConsumer;
-        this.retryFailedConsumer = retryFailedConsumer;
-        this.sleeper = sleeper;
-    }
-
-    @Override
-    public boolean retryRequest(IOException exception, int executionCount, HttpContext ctx) {
-        log.fine(() -> String.format("retryRequest(exception='%s', executionCount='%d', ctx='%s'",
-                                     exception.getClass().getName(), executionCount, ctx));
-        HttpClientContext clientCtx = HttpClientContext.adapt(ctx);
-        if (!predicate.test(exception, clientCtx)) {
-            log.fine(() -> String.format("Not retrying for '%s'", ctx));
-            return false;
-        }
-        if (executionCount > maxRetries) {
-            log.fine(() -> String.format("Max retries exceeded for '%s'", ctx));
-            retryFailedConsumer.onRetryFailed(exception, executionCount, clientCtx);
-            return false;
-        }
-        Duration delay = delaySupplier.getDelay(executionCount);
-        log.fine(() -> String.format("Retrying after %s for '%s'", delay, ctx));
-        retryConsumer.onRetry(exception, delay, executionCount, clientCtx);
-        sleeper.sleep(delay);
-        return true;
-    }
-
-    public static class Builder {
-
-        private final DelaySupplier delaySupplier;
-        private final int maxRetries;
-        private RetryPredicate<IOException> predicate = (ioException, ctx) -> true;
-        private RetryConsumer<IOException> retryConsumer = (exception, delay, count, ctx) -> {};
-        private RetryFailedConsumer<IOException> retryFailedConsumer = (exception, count, ctx) -> {};
-        private Sleeper sleeper = new Sleeper.Default();
-
-        private Builder(DelaySupplier delaySupplier, int maxRetries) {
-            this.delaySupplier = delaySupplier;
-            this.maxRetries = maxRetries;
-        }
-
-        public static Builder withFixedDelay(Duration delay, int maxRetries) {
-            return new Builder(new DelaySupplier.Fixed(delay), maxRetries);
-        }
-
-        public static Builder withExponentialBackoff(Duration startDelay, Duration maxDelay, int maxRetries) {
-            return new Builder(new DelaySupplier.Exponential(startDelay, maxDelay), maxRetries);
-        }
-
-        public Builder retryForExceptions(List<Class<? extends IOException>> exceptionTypes) {
-            this.predicate = (ioException, ctx) -> exceptionTypes.stream().anyMatch(type -> type.isInstance(ioException));
-            return this;
-        }
-
-        public Builder retryForExceptions(Predicate<IOException> predicate) {
-            this.predicate = (ioException, ctx) -> predicate.test(ioException);
-            return this;
-        }
-
-        public Builder retryFor(RetryPredicate<IOException> predicate) {
-            this.predicate = predicate;
-            return this;
-        }
-
-        public Builder onRetry(RetryConsumer<IOException> consumer) {
-            this.retryConsumer = consumer;
-            return this;
-        }
-
-        public Builder onRetryFailed(RetryFailedConsumer<IOException> consumer) {
-            this.retryFailedConsumer = consumer;
-            return this;
-        }
-
-        // For unit testing
-        Builder withSleeper(Sleeper sleeper) {
-            this.sleeper = sleeper;
-            return this;
-        }
-
-        public DelayedConnectionLevelRetryHandler build() {
-            return new DelayedConnectionLevelRetryHandler(delaySupplier, maxRetries, predicate, retryConsumer, retryFailedConsumer, sleeper);
-        }
-    }
-}