Fix loading of ssl keys from external files for dmaap and AAI client4.0.0-ONAP1.1.6dublin

Change-Id: I18a68656ddfc8290e17fb483900c26baf3e25ba6
Issue-ID: DCAEGEN2-1503
Signed-off-by: grabinsk <maciej.grabinski@nokia.com>

1 files changed, 14 insertions, 4 deletions

diff --git a/rest-services/aai-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/AaiClientConfigurations.java b/rest-services/aai-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/AaiClientConfigurations.java
index f93bfd67..82356034 100644
--- a/rest-services/aai-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/AaiClientConfigurations.java
+++ b/rest-services/aai-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/AaiClientConfigurations.java
@@ -19,6 +19,8 @@
  */
 package org.onap.dcaegen2.services.sdk.rest.services.aai.client;
 
+import java.net.URISyntaxException;
+import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.Map;
 import org.onap.dcaegen2.services.sdk.rest.services.aai.client.config.AaiClientConfiguration;
@@ -48,10 +50,10 @@ public final class AaiClientConfigurations {
                 .aaiUserName("sample-username")
                 .aaiUserPassword("sample-password")
                 .aaiIgnoreSslCertificateErrors(false)
-                .trustStorePath("/trust.pkcs12")
-                .trustStorePasswordPath("/trust.pass")
-                .keyStorePath("/server.pkcs12")
-                .keyStorePasswordPath("/server.pass")
+                .trustStorePath(testResourceToPath("/trust.pkcs12"))
+                .trustStorePasswordPath(testResourceToPath("/trust.pass"))
+                .keyStorePath(testResourceToPath("/server.pkcs12"))
+                .keyStorePasswordPath(testResourceToPath("/server.pass"))
                 .enableAaiCertAuth(secure)
                 .aaiHeaders(headers)
                 .aaiProtocol("sample-protocol")
@@ -61,4 +63,12 @@ public final class AaiClientConfigurations {
                 .aaiServiceInstancePath("sample-instance-path")
                 .build();
     }
+
+    private static String testResourceToPath(String resource) {
+        try {
+            return Paths.get(AaiClientConfigurations.class.getResource(resource).toURI()).toString();
+        } catch (URISyntaxException e) {
+            throw new RuntimeException("Failed resolving test resource path", e);
+        }
+    }
 }