X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fsa%2FApplication.java;h=4fe2202fcddde889ce1dbd480185f6b5d790fcc3;hb=15af66b115f3e8046b2d0f2634fb77b3d835f730;hp=2ccebd1fb2400f34b92f06aa0a4d51a2580b5c9a;hpb=ce701746049abfd94a87b46e43f296faf32d6213;p=aai%2Fsearch-data-service.git

diff --git a/src/main/java/org/onap/aai/sa/Application.java b/src/main/java/org/onap/aai/sa/Application.java
index 2ccebd1..4fe2202 100644
--- a/src/main/java/org/onap/aai/sa/Application.java
+++ b/src/main/java/org/onap/aai/sa/Application.java
@@ -20,34 +20,24 @@
  */
 package org.onap.aai.sa;
 
-// import org.eclipse.jetty.util.security.Password;
-
-import org.springframework.boot.SpringApplication;
+import java.util.HashMap;
+import org.eclipse.jetty.util.security.Password;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.support.SpringBootServletInitializer;
 
 @SpringBootApplication
-public class Application {
+public class Application extends SpringBootServletInitializer {
+
 
-//	public static String[] deobfuscateArgs(String[] args, String ... attrnames) {
-//
-//		String[] deobfuscatedArgs = args.clone();
-//
-//		Password.deobfuscate("HI");
-//
-//		//System.setProperty(arg0, arg1)
-//
-//		return deobfuscatedArgs;
-//	}
-//
     public static void main(String[] args) {
-    	
-    	//server.ssl.key-store-password=onapSecret
-    	//server.ssl.key-password=onapSecret
-//    	args = new String[]{"-Dserver.ssl.key-store-password", "onapSecret",
-//    			"-Dserver.ssl.key-password", "onapSecret"};
-    	
-    	SpringApplication.run(Application.class, args);
 
-    	//deobfuscateArgs(args, "server.ssl.key-store-password", "server.ssl.key-password"));
+        String keyStorePassword = System.getProperty("KEY_STORE_PASSWORD");
+        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));
+        new Application().configure(new SpringApplicationBuilder(Application.class).properties(props)).run(args);
     }
 }