aboutsummaryrefslogtreecommitdiffstats
path: root/prh-aai-client
diff options
context:
space:
mode:
authorMaciej Wejs <maciej.wejs@nokia.com>2018-11-06 16:38:46 +0100
committerMaciej Wejs <maciej.wejs@nokia.com>2018-11-06 16:38:46 +0100
commitf4f1318b19c90016c70a0af457020361733b69f3 (patch)
tree679399be0e90df7f2e24fd054a6a6d2918f62d75 /prh-aai-client
parent8a762124d24555d50ce7455398ca3ac02fde1076 (diff)
Names change of SSL config params
Change-Id: I719b38b76fec976c459bfca6ffdc6dd9c1d7b00c Issue-ID: DCAEGEN2-953 Signed-off-by: Maciej Wejs <maciej.wejs@nokia.com>
Diffstat (limited to 'prh-aai-client')
-rw-r--r--prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/config/AaiClientConfiguration.java11
-rw-r--r--prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AaiReactiveWebClient.java24
2 files changed, 16 insertions, 19 deletions
diff --git a/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/config/AaiClientConfiguration.java b/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/config/AaiClientConfiguration.java
index 706c328a..23e621fe 100644
--- a/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/config/AaiClientConfiguration.java
+++ b/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/config/AaiClientConfiguration.java
@@ -63,19 +63,16 @@ public abstract class AaiClientConfiguration implements Serializable {
public abstract Map<String, String> aaiHeaders();
@Value.Parameter
- public abstract String keyFile();
+ public abstract String trustStorePath();
@Value.Parameter
- public abstract String trustStore();
+ public abstract String trustStorePasswordPath();
@Value.Parameter
- public abstract String trustStorePassword();
+ public abstract String keyStorePath();
@Value.Parameter
- public abstract String keyStore();
-
- @Value.Parameter
- public abstract String keyStorePassword();
+ public abstract String keyStorePasswordPath();
@Value.Parameter
public abstract Boolean enableAaiCertAuth();
diff --git a/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AaiReactiveWebClient.java b/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AaiReactiveWebClient.java
index ad57ba47..2d1a7ac4 100644
--- a/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AaiReactiveWebClient.java
+++ b/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AaiReactiveWebClient.java
@@ -48,10 +48,10 @@ public class AaiReactiveWebClient {
private final String aaiUserPassword;
private final Map<String, String> aaiHeaders;
private final Boolean enableAaiCertAuth;
- private final String trustStore;
- private final String trustStorePassword;
- private final String keyStore;
- private final String keyStorePassword;
+ private final String trustStorePath;
+ private final String trustStorePasswordPath;
+ private final String keyStorePath;
+ private final String keyStorePasswordPath;
private final SslFactory sslFactory;
/**
@@ -64,10 +64,10 @@ public class AaiReactiveWebClient {
this.aaiUserName = configuration.aaiUserName();
this.aaiUserPassword = configuration.aaiUserPassword();
this.aaiHeaders = configuration.aaiHeaders();
- this.trustStore = configuration.trustStore();
- this.trustStorePassword = configuration.trustStorePassword();
- this.keyStore = configuration.keyStore();
- this.keyStorePassword = configuration.keyStorePassword();
+ this.trustStorePath = configuration.trustStorePath();
+ this.trustStorePasswordPath = configuration.trustStorePasswordPath();
+ this.keyStorePath = configuration.keyStorePath();
+ this.keyStorePasswordPath = configuration.keyStorePasswordPath();
this.enableAaiCertAuth = configuration.enableAaiCertAuth();
this.sslFactory = sslFactory;
}
@@ -97,10 +97,10 @@ public class AaiReactiveWebClient {
private SslContext createSslContext() throws SSLException {
if (enableAaiCertAuth) {
return sslFactory.createSecureContext(
- keyStore,
- keyStorePassword,
- trustStore,
- trustStorePassword
+ keyStorePath,
+ keyStorePasswordPath,
+ trustStorePath,
+ trustStorePasswordPath
);
}
return sslFactory.createInsecureContext();