aboutsummaryrefslogtreecommitdiffstats
path: root/http-utils
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2020-01-24 16:53:50 +0100
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2020-01-27 16:51:26 +0100
commitb0eb3902031985e6750b518f38473cd3578dee17 (patch)
tree80cc661796f54ecd1d1d76b7e1f19763629fa757 /http-utils
parent2016d352e512d446d16b6f837288f69025afc661 (diff)
Rename 'DelayedHttpRequestRetryHandler' => 'DelayedConnectionLevelRetryHandler'
Diffstat (limited to 'http-utils')
-rw-r--r--http-utils/src/main/java/ai/vespa/util/http/retry/DelayedConnectionLevelRetryHandler.java (renamed from http-utils/src/main/java/ai/vespa/util/http/retry/DelayedHttpRequestRetryHandler.java)8
-rw-r--r--http-utils/src/test/java/ai/vespa/util/http/retry/DelayedConnectionLevelRetryHandlerTest.java (renamed from http-utils/src/test/java/ai/vespa/util/http/retry/DelayedHttpRequestRetryHandlerTest.java)16
2 files changed, 12 insertions, 12 deletions
diff --git a/http-utils/src/main/java/ai/vespa/util/http/retry/DelayedHttpRequestRetryHandler.java b/http-utils/src/main/java/ai/vespa/util/http/retry/DelayedConnectionLevelRetryHandler.java
index 2627ace3c53..f26c2c18a27 100644
--- a/http-utils/src/main/java/ai/vespa/util/http/retry/DelayedHttpRequestRetryHandler.java
+++ b/http-utils/src/main/java/ai/vespa/util/http/retry/DelayedConnectionLevelRetryHandler.java
@@ -20,7 +20,7 @@ import java.util.logging.Logger;
* @author bjorncs
*/
@Contract(threading = ThreadingBehavior.IMMUTABLE)
-public class DelayedHttpRequestRetryHandler implements HttpRequestRetryHandler {
+public class DelayedConnectionLevelRetryHandler implements HttpRequestRetryHandler {
private static final Logger log = Logger.getLogger(HttpRequestRetryHandler.class.getName());
@@ -44,7 +44,7 @@ public class DelayedHttpRequestRetryHandler implements HttpRequestRetryHandler {
private final RetryFailedConsumer retryFailedConsumer;
private final Sleeper sleeper;
- private DelayedHttpRequestRetryHandler(
+ private DelayedConnectionLevelRetryHandler(
DelaySupplier delaySupplier,
int maxRetries,
RetryPredicate predicate,
@@ -133,8 +133,8 @@ public class DelayedHttpRequestRetryHandler implements HttpRequestRetryHandler {
return this;
}
- public DelayedHttpRequestRetryHandler build() {
- return new DelayedHttpRequestRetryHandler(delaySupplier, maxRetries, predicate, retryConsumer, retryFailedConsumer, sleeper);
+ public DelayedConnectionLevelRetryHandler build() {
+ return new DelayedConnectionLevelRetryHandler(delaySupplier, maxRetries, predicate, retryConsumer, retryFailedConsumer, sleeper);
}
}
}
diff --git a/http-utils/src/test/java/ai/vespa/util/http/retry/DelayedHttpRequestRetryHandlerTest.java b/http-utils/src/test/java/ai/vespa/util/http/retry/DelayedConnectionLevelRetryHandlerTest.java
index 487a16b0657..57a4d862b2e 100644
--- a/http-utils/src/test/java/ai/vespa/util/http/retry/DelayedHttpRequestRetryHandlerTest.java
+++ b/http-utils/src/test/java/ai/vespa/util/http/retry/DelayedConnectionLevelRetryHandlerTest.java
@@ -1,8 +1,8 @@
// 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.retry;
-import ai.vespa.util.http.retry.DelayedHttpRequestRetryHandler.RetryConsumer;
-import ai.vespa.util.http.retry.DelayedHttpRequestRetryHandler.RetryFailedConsumer;
+import ai.vespa.util.http.retry.DelayedConnectionLevelRetryHandler.RetryConsumer;
+import ai.vespa.util.http.retry.DelayedConnectionLevelRetryHandler.RetryFailedConsumer;
import com.yahoo.vespa.jdk8compat.List;
import org.apache.http.client.protocol.HttpClientContext;
import org.junit.Test;
@@ -21,7 +21,7 @@ import static org.mockito.Mockito.verify;
/**
* @author bjorncs
*/
-public class DelayedHttpRequestRetryHandlerTest {
+public class DelayedConnectionLevelRetryHandlerTest {
@Test
public void retry_consumers_are_invoked() {
@@ -31,7 +31,7 @@ public class DelayedHttpRequestRetryHandlerTest {
Duration delay = Duration.ofSeconds(10);
int maxRetries = 5;
- DelayedHttpRequestRetryHandler handler = DelayedHttpRequestRetryHandler.Builder
+ DelayedConnectionLevelRetryHandler handler = DelayedConnectionLevelRetryHandler.Builder
.withFixedDelay(delay, maxRetries)
.withSleeper(mock(Sleeper.class))
.onRetry(retryConsumer)
@@ -58,7 +58,7 @@ public class DelayedHttpRequestRetryHandlerTest {
Duration delay = Duration.ofSeconds(2);
int maxRetries = 2;
- DelayedHttpRequestRetryHandler handler = DelayedHttpRequestRetryHandler.Builder
+ DelayedConnectionLevelRetryHandler handler = DelayedConnectionLevelRetryHandler.Builder
.withFixedDelay(delay, maxRetries)
.withSleeper(sleeper)
.build();
@@ -81,7 +81,7 @@ public class DelayedHttpRequestRetryHandlerTest {
Duration maxDelay = Duration.ofSeconds(5);
int maxRetries = 10;
- DelayedHttpRequestRetryHandler handler = DelayedHttpRequestRetryHandler.Builder
+ DelayedConnectionLevelRetryHandler handler = DelayedConnectionLevelRetryHandler.Builder
.withExponentialBackoff(startDelay, maxDelay, maxRetries)
.withSleeper(sleeper)
.build();
@@ -104,7 +104,7 @@ public class DelayedHttpRequestRetryHandlerTest {
public void retries_for_listed_exceptions_until_max_retries_exceeded() {
int maxRetries = 2;
- DelayedHttpRequestRetryHandler handler = DelayedHttpRequestRetryHandler.Builder
+ DelayedConnectionLevelRetryHandler handler = DelayedConnectionLevelRetryHandler.Builder
.withFixedDelay(Duration.ofSeconds(2), maxRetries)
.retryForExceptions(List.of(SSLException.class, ConnectException.class))
.withSleeper(mock(Sleeper.class))
@@ -121,7 +121,7 @@ public class DelayedHttpRequestRetryHandlerTest {
@Test
public void does_not_retry_for_non_listed_exception() {
- DelayedHttpRequestRetryHandler handler = DelayedHttpRequestRetryHandler.Builder
+ DelayedConnectionLevelRetryHandler handler = DelayedConnectionLevelRetryHandler.Builder
.withFixedDelay(Duration.ofSeconds(2), 2)
.retryForExceptions(List.of(SSLException.class, ConnectException.class))
.withSleeper(mock(Sleeper.class))