diff options
author | wejs <maciej.wejs@nokia.com> | 2018-05-15 16:48:03 +0200 |
---|---|---|
committer | wejs <maciej.wejs@nokia.com> | 2018-05-15 16:48:03 +0200 |
commit | d65298c77307675e3d133753cad2f14cd8b5fbbd (patch) | |
tree | 28b82868e7aa4d6eb7d6b7fc3c535af56f861a4a /prh-aai-client/src/main/java/org/onap/dcaegen2/services/service/AAIClientImpl.java | |
parent | 0a42016657086debbf41eba82d9f8cc0da6b7d80 (diff) |
Correction of AAI Client configuration loading
Change-Id: I42d5dcd2d2e65db9e4eb3cf324ed127ddd882f41
Issue-ID: DCAEGEN2-509
Signed-off-by: wejs <maciej.wejs@nokia.com>
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); |