Springboot 2.0 upgrade

[so.git] / adapters / mso-openstack-adapters / src / main / java / org / onap / so / adapters / vnf / BpelRestClient.java

diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/BpelRestClient.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/BpelRestClient.java
index 6383f57..5fa21c6 100644 (file)
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/BpelRestClient.java
+++ b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/BpelRestClient.java
@@ -68,7 +68,7 @@ public class BpelRestClient {
        private static final String RETRY_COUNT_PROPERTY     = PROPERTY_DOMAIN+".retrycount";
        private static final String RETRY_INTERVAL_PROPERTY  = PROPERTY_DOMAIN+".retryinterval";
        private static final String RETRY_LIST_PROPERTY      = PROPERTY_DOMAIN+".retrylist";
-       private static final String ENCRYPTION_KEY           = "aa3871669d893c7fb8abbcda31b88b4f";
+       private static final String ENCRYPTION_KEY_PROP      = "org.onap.so.adapters.network.encryptionKey";
        private static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA, BpelRestClient.class);
 
        /** Default socket timeout (in seconds) */
@@ -122,7 +122,7 @@ public class BpelRestClient {
                retryCount     = env.getProperty(RETRY_COUNT_PROPERTY, Integer.class, DEFAULT_RETRY_COUNT);
                retryInterval  = env.getProperty(RETRY_INTERVAL_PROPERTY, Integer.class, DEFAULT_RETRY_INTERVAL);
                setRetryList(env.getProperty(RETRY_LIST_PROPERTY, DEFAULT_RETRY_LIST));
-               credentials    = getEncryptedProperty(BPEL_AUTH_PROPERTY, DEFAULT_CREDENTIALS, ENCRYPTION_KEY);
+               credentials    = getEncryptedProperty(BPEL_AUTH_PROPERTY, DEFAULT_CREDENTIALS, ENCRYPTION_KEY_PROP);
        }
 
        public int getSocketTimeout() {
@@ -285,7 +285,7 @@ public class BpelRestClient {
        private String getEncryptedProperty(String key, String defaultValue, String encryptionKey) {
                if (env.getProperty(key) != null) {
                        try {
-                               return CryptoUtils.decrypt(env.getProperty(key), encryptionKey);
+                               return CryptoUtils.decrypt(env.getProperty(key), env.getProperty(encryptionKey));
                        } catch (GeneralSecurityException e) {
                                LOGGER.debug("Exception while decrypting property: " + env.getProperty(key), e);
                        }