summaryrefslogtreecommitdiffstats
path: root/asdc-controller
diff options
context:
space:
mode:
authorSteve Smokowski <ss835w@att.com>2021-02-02 10:20:48 +0000
committerGerrit Code Review <gerrit@onap.org>2021-02-02 10:20:48 +0000
commitbe3f1c8d747ab7dad3d6c76dc4c9034e83b84635 (patch)
tree1b59f4d6d34ac7edc2c00ca28d6e8c00a9c298ad /asdc-controller
parentd6194580f506ace2bf289eab17133c10ef912eed (diff)
parentb8b0464aa8a05a345115264084b08229f35c8413 (diff)
Merge "set connection timeout as well as read timeout"
Diffstat (limited to 'asdc-controller')
-rw-r--r--asdc-controller/src/main/java/org/onap/so/asdc/tenantIsolation/AaiClientPropertiesImpl.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/tenantIsolation/AaiClientPropertiesImpl.java b/asdc-controller/src/main/java/org/onap/so/asdc/tenantIsolation/AaiClientPropertiesImpl.java
index ace0ff1f57..46bdfe0b93 100644
--- a/asdc-controller/src/main/java/org/onap/so/asdc/tenantIsolation/AaiClientPropertiesImpl.java
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/tenantIsolation/AaiClientPropertiesImpl.java
@@ -34,6 +34,7 @@ public class AaiClientPropertiesImpl implements AAIProperties {
private String auth;
private String key;
private Long readTimeout;
+ private Long connectionTimeout;
private boolean enableCaching;
private Long cacheMaxAge;
private static final String SYSTEM_NAME = "MSO";
@@ -43,7 +44,8 @@ public class AaiClientPropertiesImpl implements AAIProperties {
aaiEndpoint = context.getEnvironment().getProperty("mso.aai.endpoint");
this.auth = context.getEnvironment().getProperty("aai.auth");
this.key = context.getEnvironment().getProperty("mso.msoKey");
- this.readTimeout = context.getEnvironment().getProperty("aai.readTimeout", Long.class, new Long(60000));
+ this.readTimeout = context.getEnvironment().getProperty("aai.readTimeout", Long.class, 60000L);
+ this.connectionTimeout = context.getEnvironment().getProperty("aai.connectionTimeout", Long.class, 60000L);
this.enableCaching = context.getEnvironment().getProperty("aai.caching.enabled", Boolean.class, false);
this.cacheMaxAge = context.getEnvironment().getProperty("aai.caching.maxAge", Long.class, 60000L);
}
@@ -81,6 +83,11 @@ public class AaiClientPropertiesImpl implements AAIProperties {
}
@Override
+ public Long getConnectionTimeout() {
+ return this.connectionTimeout;
+ }
+
+ @Override
public boolean isCachingEnabled() {
return this.enableCaching;
}