diff options
| author |   Geora Barsky <georab@amdocs.com> | 2018-12-19 15:05:20 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-12-19 15:05:20 +0000 |
| commit | 01e6267770e76f17fbb7f7b6d8cc2817a5e7604e (patch) | |
| tree | f7dd8f81d34c43f8b560823112676982f2acae31 | |
| parent | 27fe6e0fb1ad25ae50413ac29f2b0f1da227d30c (diff) | |
| parent | 9c99e066e1d0021758270de2b9d99f08525d988c (diff) | |
Merge "Bugfix: HTTP for SDNC context builder"
| -rw-r--r-- | config/application.properties | 2 | ||||
| -rw-r--r-- | src/main/java/org/onap/pomba/contextbuilder/sdnc/SdncConfiguration.java | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/config/application.properties b/config/application.properties index b37456a..c454c01 100644 --- a/config/application.properties +++ b/config/application.properties @@ -43,7 +43,7 @@ aai.trustStorePath=n/a aai.keyStorePath=n/a aai.keyStorePassword=n/a aai.connectionTimeout=5000 -aai.readTimeout=1000 +aai.readTimeout=5000 # HTTP Basic Authorization credentials for AAI Rest Service API aai.http.userId=admin diff --git a/src/main/java/org/onap/pomba/contextbuilder/sdnc/SdncConfiguration.java b/src/main/java/org/onap/pomba/contextbuilder/sdnc/SdncConfiguration.java index 7317143..35fe248 100644 --- a/src/main/java/org/onap/pomba/contextbuilder/sdnc/SdncConfiguration.java +++ b/src/main/java/org/onap/pomba/contextbuilder/sdnc/SdncConfiguration.java @@ -22,7 +22,6 @@ import java.util.Base64; import javax.ws.rs.ApplicationPath; import org.eclipse.jetty.util.security.Password; import org.onap.aai.restclient.client.RestClient; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Conditional; @@ -159,8 +158,7 @@ public class SdncConfiguration { @Bean(name="aaiClient") public RestClient restClientWithClientCert() { RestClient restClient = new RestClient(); - System.out.println("in client cert"); - if (httpProtocol.equals("https")) + if ("https".equals(aaiHttpProtocol)) restClient.validateServerHostname(false).validateServerCertChain(false).trustStore(trustStorePath).clientCertFile(keyStorePath).clientCertPassword(keyStorePassword).connectTimeoutMs(connectionTimeout).readTimeoutMs(readTimeout); else restClient.validateServerHostname(false).validateServerCertChain(false).connectTimeoutMs(connectionTimeout).readTimeoutMs(readTimeout); @@ -169,7 +167,7 @@ public class SdncConfiguration { @Bean(name="aaiBaseUrl") public String getAaiURL() { - return httpProtocol + "://" + aaiHost + ":" + aaiPort; + return aaiHttpProtocol + "://" + aaiHost + ":" + aaiPort; } @Bean(name="aaiPathToSearchNodeQuery") |