diff options
author | Håkon Hallingstad <hakon@oath.com> | 2018-10-26 09:44:35 +0200 |
---|---|---|
committer | Håkon Hallingstad <hakon@oath.com> | 2018-10-26 09:44:35 +0200 |
commit | 67878e49f9442d43d42d35f0ebbb57735ad2edbf (patch) | |
tree | 5becab9bd4740bf63256d57bf9bb6370b6863140 /jaxrs_client_utils | |
parent | 0ccd403b2eed0476a17548a55107bb036567c3f0 (diff) |
Fixes after review round
Diffstat (limited to 'jaxrs_client_utils')
3 files changed, 8 insertions, 8 deletions
diff --git a/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/JaxRsTimeouts.java b/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/JaxRsTimeouts.java index e04226c278d..6758d6f94d6 100644 --- a/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/JaxRsTimeouts.java +++ b/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/JaxRsTimeouts.java @@ -7,16 +7,16 @@ import java.time.Duration; */ public interface JaxRsTimeouts { /** - * The connect timeout. + * The connect timeout, which must be at least 1ms. * * Throws com.google.common.util.concurrent.UncheckedTimeoutException on timeout. */ - Duration getConnectTimeout(); + Duration getConnectTimeoutOrThrow(); /** - * The read timeout. + * The read timeout, which must be at least 1ms. * * Throws com.google.common.util.concurrent.UncheckedTimeoutException on timeout. */ - Duration getReadTimeout(); + Duration getReadTimeoutOrThrow(); } diff --git a/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/LegacyJaxRsTimeouts.java b/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/LegacyJaxRsTimeouts.java index 7bc3a450f51..3f2139f6bf0 100644 --- a/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/LegacyJaxRsTimeouts.java +++ b/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/LegacyJaxRsTimeouts.java @@ -15,12 +15,12 @@ public class LegacyJaxRsTimeouts implements JaxRsTimeouts { private static final Duration READ_TIMEOUT = Duration.ofSeconds(30); @Override - public Duration getConnectTimeout() { + public Duration getConnectTimeoutOrThrow() { return CONNECT_TIMEOUT; } @Override - public Duration getReadTimeout() { + public Duration getReadTimeoutOrThrow() { return READ_TIMEOUT; } } diff --git a/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/RetryingJaxRsStrategy.java b/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/RetryingJaxRsStrategy.java index b66d9ff6f66..4c97147d61e 100644 --- a/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/RetryingJaxRsStrategy.java +++ b/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/RetryingJaxRsStrategy.java @@ -79,8 +79,8 @@ public class RetryingJaxRsStrategy<T> implements JaxRsStrategy<T> { for (final HostName hostName : hostNames) { URI uri = UriBuilder.fromPath(pathPrefix).port(port).scheme(scheme).host(hostName.s()).build(); JaxRsClientFactory.Params<T> params = new JaxRsClientFactory.Params<>(apiClass, uri); - params.setConnectTimeout(timeouts.getConnectTimeout()); - params.setReadTimeout(timeouts.getReadTimeout()); + params.setConnectTimeout(timeouts.getConnectTimeoutOrThrow()); + params.setReadTimeout(timeouts.getReadTimeoutOrThrow()); final T jaxRsClient = jaxRsClientFactory.createClient(params); try { return function.apply(jaxRsClient); |