X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=datarouter-prov%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdatarouter%2Fprovisioning%2Futils%2FPasswordProcessor.java;h=a6a3e2b5354aabf2a4297fefdc71d5f9f7b69ff2;hb=a884c481af24e2405f9389b01842c4671a03a75e;hp=44142031f464a86a83981eb170e13413ea739d93;hpb=5775de7b0fc84a29511dc4a1a480c3ab32da2ade;p=dmaap%2Fdatarouter.git

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/PasswordProcessor.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/PasswordProcessor.java
index 44142031..a6a3e2b5 100644
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/PasswordProcessor.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/PasswordProcessor.java
@@ -6,29 +6,31 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
+ *
+ * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * <p>* Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * <p>
- * SPDX-License-Identifier: Apache-2.0
+ *
+ * <p>* SPDX-License-Identifier: Apache-2.0
  * ============LICENSE_END=========================================================
  */
 
 package org.onap.dmaap.datarouter.provisioning.utils;
 
+import java.nio.charset.StandardCharsets;
+import java.security.GeneralSecurityException;
+import java.util.Base64;
+
 import javax.crypto.Cipher;
 import javax.crypto.SecretKey;
 import javax.crypto.SecretKeyFactory;
 import javax.crypto.spec.PBEKeySpec;
 import javax.crypto.spec.PBEParameterSpec;
-import java.nio.charset.StandardCharsets;
-import java.security.GeneralSecurityException;
-import java.util.Base64;
+import org.onap.dmaap.datarouter.provisioning.ProvRunner;
 
 /**
  * The Processing of a Password.  Password can be encrypted and decrypted.
@@ -37,12 +39,15 @@ import java.util.Base64;
  */
 public class PasswordProcessor {
 
-    private PasswordProcessor(){}
-
     private static final String SECRET_KEY_FACTORY_TYPE = "PBEWithMD5AndDES";
-    private static final String PASSWORD_ENCRYPTION_STRING = (new DB()).getProperties().getProperty("org.onap.dmaap.datarouter.provserver.passwordencryption");
+    private static final String PASSWORD_ENCRYPTION_STRING =
+            ProvRunner.getProvProperties().getProperty("org.onap.dmaap.datarouter.provserver.passwordencryption");
     private static final char[] PASSWORD = PASSWORD_ENCRYPTION_STRING.toCharArray();
-    private static final byte[] SALT = {(byte) 0xde, (byte) 0x33, (byte) 0x10, (byte) 0x12, (byte) 0xde, (byte) 0x33, (byte) 0x10, (byte) 0x12,};
+    private static final byte[] SALT = {(byte) 0xde, (byte) 0x33, (byte) 0x10,
+        (byte) 0x12, (byte) 0xde, (byte) 0x33, (byte) 0x10, (byte) 0x12,};
+
+    private PasswordProcessor(){
+    }
 
     /**
      * Encrypt password.