Merge "Reorder modifiers"

[so.git] / bpmn / MSOCommonBPMN / src / main / java / org / openecomp / mso / bpmn / common / util / CryptoHandler.java

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/util/CryptoHandler.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/util/CryptoHandler.java
index 787453e..13cff65 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/util/CryptoHandler.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/util/CryptoHandler.java
@@ -20,21 +20,25 @@
  */\r
 \r
 package org.openecomp.mso.bpmn.common.util;\r
-\r
+import java.io.IOException;\r
 import java.security.GeneralSecurityException;\r
 import org.openecomp.mso.logger.MsoLogger;\r
+import java.util.Properties;\r
 \r
 public class CryptoHandler implements ICryptoHandler {\r
        private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);\r
 \r
        private static String msoKey = "aa3871669d893c7fb8abbcda31b88b4f";\r
-       private static String msoAaiEncryptedPwd = "C1FC4A39E16419DD41DFC1212843F440";\r
+       private static String msoAaiEncryptedPwd;\r
 \r
         @Override\r
        public String getMsoAaiPassword() {\r
+       Properties keyProp = new Properties ();\r
                try {\r
+               keyProp.load (Thread.currentThread ().getContextClassLoader ().getResourceAsStream ("urn.properties"));\r
+                       msoAaiEncryptedPwd =(String) keyProp.get ("mso.AaiEncrypted.Pwd");\r
                        return CryptoUtils.decrypt(msoAaiEncryptedPwd, msoKey);\r
-               } catch (GeneralSecurityException e) {\r
+               } catch (GeneralSecurityException | IOException e) {\r
                        LOGGER.debug("GeneralSecurityException :",e);\r
                        return null;\r
                }\r