diff options
author | Lusheng Ji <lji@research.att.com> | 2018-05-16 04:23:34 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2018-05-16 04:23:34 +0000 |
commit | 66a071133ae4a56e5add6c6408a74e1d2b301a5e (patch) | |
tree | c9b0c8d7ecb0462edef43c16fae283d902b483ae /prh-aai-client/src/main/java/org/onap/dcaegen2/services/service/AAIClientImpl.java | |
parent | 1a754849c09d4dd3d4a7dab04f9bdd87fd638912 (diff) | |
parent | d65298c77307675e3d133753cad2f14cd8b5fbbd (diff) |
Merge "Correction of AAI Client configuration loading"
Diffstat (limited to 'prh-aai-client/src/main/java/org/onap/dcaegen2/services/service/AAIClientImpl.java')
-rw-r--r-- | prh-aai-client/src/main/java/org/onap/dcaegen2/services/service/AAIClientImpl.java | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/prh-aai-client/src/main/java/org/onap/dcaegen2/services/service/AAIClientImpl.java b/prh-aai-client/src/main/java/org/onap/dcaegen2/services/service/AAIClientImpl.java index f58919e5..785ff972 100644 --- a/prh-aai-client/src/main/java/org/onap/dcaegen2/services/service/AAIClientImpl.java +++ b/prh-aai-client/src/main/java/org/onap/dcaegen2/services/service/AAIClientImpl.java @@ -41,20 +41,20 @@ import java.security.NoSuchAlgorithmException; public class AAIClientImpl implements AAIClient { - Logger logger = LoggerFactory.getLogger(AAIClientImpl.class); + private Logger logger = LoggerFactory.getLogger(AAIClientImpl.class); - private AAIClientConfiguration aaiHttpClientConfig; + private AAIClientConfiguration aaiClientConfig; - public AAIClientImpl(AAIClientConfiguration aaiHttpClientConfiguration) { - this.aaiHttpClientConfig = aaiHttpClientConfiguration; + public AAIClientImpl(AAIClientConfiguration aaiClientConfiguration) { + this.aaiClientConfig = aaiClientConfiguration; } @Override public CloseableHttpClient getAAIHttpClient() { final HttpClientBuilder httpClientBuilder = HttpClients.custom().useSystemProperties(); - final boolean aaiIgnoreSSLCertificateErrors = aaiHttpClientConfig.aaiIgnoreSSLCertificateErrors(); + final boolean aaiIgnoreSSLCertificateErrors = aaiClientConfig.aaiIgnoreSSLCertificateErrors(); TrustStrategy acceptingTrustStrategy = (cert, authType) -> true; @@ -72,14 +72,14 @@ public class AAIClientImpl implements AAIClient { httpClientBuilder.setSSLHostnameVerifier(NoopHostnameVerifier.INSTANCE); } - final String aaiUserName = aaiHttpClientConfig.aaiUserName(); + final String aaiUserName = aaiClientConfig.aaiUserName(); final CredentialsProvider credentialsProvider = new BasicCredentialsProvider(); if (aaiUserName != null) { - final String aaiHost = aaiHttpClientConfig.aaiHost(); - final Integer aaiHostPortNumber = aaiHttpClientConfig.aaiHostPortNumber(); - final String aaiUserPassword = aaiHttpClientConfig.aaiUserPassword(); + final String aaiHost = aaiClientConfig.aaiHost(); + final Integer aaiHostPortNumber = aaiClientConfig.aaiHostPortNumber(); + final String aaiUserPassword = aaiClientConfig.aaiUserPassword(); final AuthScope aaiHostPortAuthScope = new AuthScope(aaiHost, aaiHostPortNumber); final Credentials aaiCredentials = new UsernamePasswordCredentials(aaiUserName, aaiUserPassword); credentialsProvider.setCredentials(aaiHostPortAuthScope, aaiCredentials); |