Use Jetty deobfuscation method on password strings

Change-Id: Ifc36d8358c54f2602ecab2fb965461a6436bfcae
Issue-ID: AAI-2110
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>

3 files changed, 8 insertions, 5 deletions

diff --git a/src/main/java/org/onap/aai/validation/config/RestConfig.java b/src/main/java/org/onap/aai/validation/config/RestConfig.java
index 344c203..b192e73 100644
--- a/src/main/java/org/onap/aai/validation/config/RestConfig.java
+++ b/src/main/java/org/onap/aai/validation/config/RestConfig.java
@@ -19,6 +19,7 @@ package org.onap.aai.validation.config;
 
 import java.util.Objects;
 import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.eclipse.jetty.util.security.Password;
 import org.springframework.beans.factory.annotation.Value;
 
 /**
@@ -111,7 +112,7 @@ public class RestConfig {
      * @return the decrypted password
      */
     public String getTrustStorePassword() {
-        return trustStorePassword;
+        return Password.deobfuscate(trustStorePassword);
     }
 
     public void setTrustStorePassword(String trustStorePassword) {
@@ -132,7 +133,7 @@ public class RestConfig {
      * @return the decrypted password
      */
     public String getKeyStorePassword() {
-        return keyStorePassword;
+        return Password.deobfuscate(keyStorePassword);
     }
 
     public void setKeyStorePassword(String keyStorePassword) {
diff --git a/src/main/java/org/onap/aai/validation/config/RuleIndexingConfig.java b/src/main/java/org/onap/aai/validation/config/RuleIndexingConfig.java
index 67b0b8a..511df07 100644
--- a/src/main/java/org/onap/aai/validation/config/RuleIndexingConfig.java
+++ b/src/main/java/org/onap/aai/validation/config/RuleIndexingConfig.java
@@ -20,7 +20,7 @@ package org.onap.aai.validation.config;
 import java.util.List;
 
 /**
- * Loads the properties needed by the controller using spring.
+ * Loads the properties needed by the controller using Spring.
  */
 public class RuleIndexingConfig extends PropertiesConfig {
 
diff --git a/src/main/java/org/onap/aai/validation/config/TopicConfig.java b/src/main/java/org/onap/aai/validation/config/TopicConfig.java
index a167672..d769935 100644
--- a/src/main/java/org/onap/aai/validation/config/TopicConfig.java
+++ b/src/main/java/org/onap/aai/validation/config/TopicConfig.java
@@ -24,11 +24,12 @@ import java.util.Objects;
 import java.util.Properties;
 import javax.annotation.Resource;
 import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.eclipse.jetty.util.security.Password;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 
 /**
- * Gets the configuration of the topics. The topics are configured using Spring in topic-config-beans.xml.
+ * Gets the configuration of the topics using Spring.
  */
 
 public class TopicConfig {
@@ -132,6 +133,7 @@ public class TopicConfig {
         private String consumerGroup;
         private String consumerId;
         private String transportType;
+        private String protocol;
 
         public String getName() {
             return name;
@@ -158,7 +160,7 @@ public class TopicConfig {
         }
 
         public String getPassword() {
-            return password;
+            return Password.deobfuscate(password);
         }
 
         public void setPassword(String password) {