support clear text/jetty obfuscated password

[aai/search-data-service.git] / src / main / java / org / onap / aai / sa / searchdbabstraction / elasticsearch / config / ElasticSearchConfig.java

diff --git a/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/config/ElasticSearchConfig.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/config/ElasticSearchConfig.java
index f5cb9da..0d116f8 100644 (file)
--- a/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/config/ElasticSearchConfig.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/config/ElasticSearchConfig.java
@@ -189,7 +189,11 @@ public class ElasticSearchConfig {
 
         Optional<String> passwordValue = Optional.ofNullable(props.getProperty(ES_TRUST_STORE_ENC));
         if (passwordValue.isPresent()) {
+          if(passwordValue.get().startsWith("OBF:")){
             setTrustStorePassword(Password.deobfuscate(passwordValue.get()));
+          }else{
+            setTrustStorePassword(passwordValue.get());
+          }
         }
 
         Optional<String> keyStoreFile = Optional.ofNullable(props.getProperty(ES_KEY_STORE));
@@ -199,7 +203,11 @@ public class ElasticSearchConfig {
 
         passwordValue = Optional.ofNullable(props.getProperty(ES_KEY_STORE_ENC));
         if (passwordValue.isPresent()) {
+          if(passwordValue.get().startsWith("OBF:")){
             setKeyStorePassword(Password.deobfuscate(passwordValue.get()));
+          }else{
+            setKeyStorePassword(passwordValue.get());
+          }
         }
     }