From f4f1318b19c90016c70a0af457020361733b69f3 Mon Sep 17 00:00:00 2001
From: Maciej Wejs <maciej.wejs@nokia.com>
Date: Tue, 6 Nov 2018 16:38:46 +0100
Subject: Names change of SSL config params

Change-Id: I719b38b76fec976c459bfca6ffdc6dd9c1d7b00c
Issue-ID: DCAEGEN2-953
Signed-off-by: Maciej Wejs <maciej.wejs@nokia.com>
---
 .../services/prh/config/DmaapCustomConfig.java      | 21 ++++++++-------------
 .../consumer/DMaaPReactiveWebClientFactory.java     |  4 ++--
 2 files changed, 10 insertions(+), 15 deletions(-)

(limited to 'prh-dmaap-client/src/main/java/org')

diff --git a/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/prh/config/DmaapCustomConfig.java b/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/prh/config/DmaapCustomConfig.java
index 8691111d..7084d9c1 100644
--- a/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/prh/config/DmaapCustomConfig.java
+++ b/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/prh/config/DmaapCustomConfig.java
@@ -50,19 +50,16 @@ public interface DmaapCustomConfig extends Serializable {
     String dmaapContentType();
 
     @Value.Parameter
-    String keyFile();
+    String trustStorePath();
 
     @Value.Parameter
-    String trustStore();
+    String trustStorePasswordPath();
 
     @Value.Parameter
-    String trustStorePassword();
+    String keyStorePath();
 
     @Value.Parameter
-    String keyStore();
-
-    @Value.Parameter
-    String keyStorePassword();
+    String keyStorePasswordPath();
 
     @Value.Parameter
     Boolean enableDmaapCertAuth();
@@ -83,15 +80,13 @@ public interface DmaapCustomConfig extends Serializable {
 
         B dmaapContentType(String dmaapContentType);
 
-        B keyFile(String keyFile);
-
-        B trustStore(String trustStore);
+        B trustStorePath(String trustStorePath);
 
-        B trustStorePassword(String trustStorePass);
+        B trustStorePasswordPath(String trustStorePasswordPath);
 
-        B keyStore(String keyStore);
+        B keyStorePath(String keyStore);
 
-        B keyStorePassword(String keyStorePass);
+        B keyStorePasswordPath(String keyStorePass);
 
         B enableDmaapCertAuth(Boolean enableDmaapCertAuth);
 
diff --git a/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/prh/service/consumer/DMaaPReactiveWebClientFactory.java b/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/prh/service/consumer/DMaaPReactiveWebClientFactory.java
index 68dda512..ed88efb5 100644
--- a/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/prh/service/consumer/DMaaPReactiveWebClientFactory.java
+++ b/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/prh/service/consumer/DMaaPReactiveWebClientFactory.java
@@ -74,8 +74,8 @@ public class DMaaPReactiveWebClientFactory {
     private SslContext createSslContext(DmaapConsumerConfiguration consumerConfiguration) throws SSLException {
         if (consumerConfiguration.enableDmaapCertAuth()) {
             return sslFactory.createSecureContext(
-                    consumerConfiguration.keyStore(), consumerConfiguration.keyStorePassword(),
-                    consumerConfiguration.trustStore(), consumerConfiguration.trustStorePassword()
+                    consumerConfiguration.keyStorePath(), consumerConfiguration.keyStorePasswordPath(),
+                    consumerConfiguration.trustStorePath(), consumerConfiguration.trustStorePasswordPath()
             );
         }
         return sslFactory.createInsecureContext();
-- 
cgit 1.2.3-korg