diff options
| author |   Benjamin, Max (mb388a) <mb388a@att.com> | 2021-01-23 16:07:59 -0500 |
|---|---|---|
| committer | Benjamin, Max (mb388a) <mb388a@att.com> | 2021-02-01 17:43:52 -0500 |
| commit | b8b0464aa8a05a345115264084b08229f35c8413 (patch) | |
| tree | c65cbaaa063c0809f629a4c3f7c3edf23dc95f2f /common/src | |
| parent | f1235657951f714a394f1cfc7aef08af05620be4 (diff) | |
set connection timeout as well as read timeout
set connection timeout as well as read timeout
correct dependency version in openstack pom
limit timeout test to a single retry
add connection timeout property for A&AI client
Issue-ID: SO-3491
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: I576c143822ba45fc79648fd0a1edb6ccd3aff8b2
Diffstat (limited to 'common/src')
3 files changed, 17 insertions, 1 deletions
diff --git a/common/src/main/java/org/onap/so/client/RestClient.java b/common/src/main/java/org/onap/so/client/RestClient.java index be0a0f3f9e..f201c7c906 100644 --- a/common/src/main/java/org/onap/so/client/RestClient.java +++ b/common/src/main/java/org/onap/so/client/RestClient.java @@ -193,7 +193,8 @@ public abstract class RestClient { if (props.isCachingEnabled()) { enableCaching(builder); } - return builder.readTimeout(props.getReadTimeout(), TimeUnit.MILLISECONDS); + return builder.connectTimeout(props.getConnectionTimeout(), TimeUnit.MILLISECONDS) + .readTimeout(props.getReadTimeout(), TimeUnit.MILLISECONDS); } protected ClientBuilder enableCaching(ClientBuilder builder) { diff --git a/common/src/main/java/org/onap/so/client/RestProperties.java b/common/src/main/java/org/onap/so/client/RestProperties.java index a7a0ef614c..79e006bf9a 100644 --- a/common/src/main/java/org/onap/so/client/RestProperties.java +++ b/common/src/main/java/org/onap/so/client/RestProperties.java @@ -50,6 +50,15 @@ public interface RestProperties { return Long.valueOf(60000); } + /** + * Time in milliseconds + * + * @return + */ + public default Long getConnectionTimeout() { + return Long.valueOf(60000); + } + public default boolean isCachingEnabled() { return false; } diff --git a/common/src/test/java/org/onap/so/client/RestClientTest.java b/common/src/test/java/org/onap/so/client/RestClientTest.java index d40576b69f..57abf8784f 100644 --- a/common/src/test/java/org/onap/so/client/RestClientTest.java +++ b/common/src/test/java/org/onap/so/client/RestClientTest.java @@ -101,6 +101,12 @@ public class RestClientTest { RestProperties props = new RestProperties() { + + @Override + public Integer getRetries() { + return Integer.valueOf(0); + } + @Override public URL getEndpoint() throws MalformedURLException { return new URL(String.format("http://localhost:%s", wireMockRule.port())); |