X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fdatarouter%2FApplication.java;fp=src%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fdatarouter%2FApplication.java;h=1a2a5e766fc293f619c9230e75d1529374787278;hb=a11b8dda11186bf9c760fce77d080a4390702566;hp=42b459dd4084f26de60a01e19a509d3ad0bddaaa;hpb=ab1a2ed3d961919008bad949e62fcf3ba722c2ce;p=aai%2Fdata-router.git

diff --git a/src/main/java/org/onap/aai/datarouter/Application.java b/src/main/java/org/onap/aai/datarouter/Application.java
index 42b459d..1a2a5e7 100644
--- a/src/main/java/org/onap/aai/datarouter/Application.java
+++ b/src/main/java/org/onap/aai/datarouter/Application.java
@@ -56,8 +56,20 @@ public class Application extends SpringBootServletInitializer{
       if(keyStorePassword==null || keyStorePassword.isEmpty()){
         throw new RuntimeException("Env property KEY_STORE_PASSWORD not set");
       }
+      
       HashMap<String, Object> props = new HashMap<>();
-      props.put("server.ssl.key-store-password", Password.deobfuscate(keyStorePassword));
+      String deobfuscatedKeyStorePassword = keyStorePassword.startsWith(JETTY_OBFUSCATION_PATTERN)?Password.deobfuscate(keyStorePassword):keyStorePassword;
+      props.put("server.ssl.key-store-password", deobfuscatedKeyStorePassword);
+      
+      String trustStoreLocation = System.getenv("TRUST_STORE_LOCATION");
+      String trustStorePassword = System.getenv("TRUST_STORE_PASSWORD");
+      if(trustStoreLocation!=null && trustStorePassword !=null){
+          trustStorePassword = trustStorePassword.startsWith(JETTY_OBFUSCATION_PATTERN)?Password.deobfuscate(trustStorePassword):trustStorePassword;
+          props.put("server.ssl.trust-store", trustStoreLocation);
+          props.put("server.ssl.trust-store-password", trustStorePassword);
+      } 
+      
+
       new Application().configure(new SpringApplicationBuilder(Application.class).properties(props)).run(args);
     }