diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/src/main/java/org/onap/so/client/RestClientSSL.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/common/src/main/java/org/onap/so/client/RestClientSSL.java b/common/src/main/java/org/onap/so/client/RestClientSSL.java index abef417325..f5737b862c 100644 --- a/common/src/main/java/org/onap/so/client/RestClientSSL.java +++ b/common/src/main/java/org/onap/so/client/RestClientSSL.java @@ -33,9 +33,8 @@ import javax.ws.rs.client.ClientBuilder; public abstract class RestClientSSL extends RestClient { private static final String TRUE = "true"; - public static final String SSL_KEY_STORE_KEY = "javax.net.ssl.keyStore"; - public static final String SSL_KEY_STORE_PASSWORD_KEY = "javax.net.ssl.keyStorePassword"; - public static final String MSO_LOAD_SSL_CLIENT_KEYSTORE_KEY = "mso.load.ssl.client.keystore"; + private static final String SSL_KEY_STORE_KEY = "javax.net.ssl.keyStore"; + private static final String MSO_LOAD_SSL_CLIENT_KEYSTORE_KEY = "mso.load.ssl.client.keystore"; protected RestClientSSL(RestProperties props, Optional<URI> path) { @@ -55,8 +54,7 @@ public abstract class RestClientSSL extends RestClient { if (loadSSLKeyStore != null && loadSSLKeyStore.equalsIgnoreCase(TRUE)) { KeyStore ks = getKeyStore(); if (ks != null) { - client = ClientBuilder.newBuilder() - .keyStore(ks, System.getProperty(RestClientSSL.SSL_KEY_STORE_PASSWORD_KEY)).build(); + client = ClientBuilder.newBuilder().keyStore(ks, getSSlKeyStorePassword()).build(); logger.info("RestClientSSL not using default SSL context - setting keystore here."); return client; } @@ -72,7 +70,7 @@ public abstract class RestClientSSL extends RestClient { private KeyStore getKeyStore() { KeyStore ks = null; - char[] password = System.getProperty(RestClientSSL.SSL_KEY_STORE_PASSWORD_KEY).toCharArray(); + char[] password = getSSlKeyStorePassword().toCharArray(); try (FileInputStream fis = new FileInputStream( Paths.get(System.getProperty(RestClientSSL.SSL_KEY_STORE_KEY)).normalize().toString())) { ks = KeyStore.getInstance(KeyStore.getDefaultType()); @@ -84,4 +82,8 @@ public abstract class RestClientSSL extends RestClient { return ks; } + + private String getSSlKeyStorePassword() { + return System.getProperty("javax.net.ssl.keyStorePassword"); + } } |