1 files changed, 4 insertions, 8 deletions
diff --git a/rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/AaiHttpClientFactory.java b/rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/AaiHttpClientFactory.java
index 9c097ef1..21d56c49 100644
--- a/rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/AaiHttpClientFactory.java
+++ b/rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/AaiHttpClientFactory.java
@@ -61,20 +61,16 @@ public class AaiHttpClientFactory {
     private SslContext createSslContext() {
         if (configuration.enableAaiCertAuth()) {
             final SecurityKeys collectorSecurityKeys = ImmutableSecurityKeys.builder()
-                    .keyStore(ImmutableSecurityKeysStore.of(resource(configuration.keyStorePath()).get()))
-                    .keyStorePassword(Passwords.fromResource(configuration.keyStorePasswordPath()))
-                    .trustStore(ImmutableSecurityKeysStore.of(resource(configuration.trustStorePath()).get()))
-                    .trustStorePassword(Passwords.fromResource(configuration.trustStorePasswordPath()))
+                    .keyStore(ImmutableSecurityKeysStore.of(Paths.get(configuration.keyStorePath())))
+                    .keyStorePassword(Passwords.fromPath(Paths.get(configuration.keyStorePasswordPath())))
+                    .trustStore(ImmutableSecurityKeysStore.of(Paths.get(configuration.trustStorePath())))
+                    .trustStorePassword(Passwords.fromPath(Paths.get(configuration.trustStorePasswordPath())))
                     .build();
             return sslFactory.createSecureClientContext(collectorSecurityKeys);
         }
         return sslFactory.createInsecureClientContext();
     }
 
-    private Try<Path> resource(String resource) {
-        return Try.of(() -> Paths.get(Passwords.class.getResource(resource).toURI()));
-    }
-
     public static RequestDiagnosticContext createRequestDiagnosticContext() {
         return ImmutableRequestDiagnosticContext.builder()
                 .invocationId(UUID.randomUUID()).requestId(UUID.randomUUID()).build();