Fix echo service path in gizmo

[aai/gizmo.git] / src / main / java / org / onap / crud / CrudApplication.java

diff --git a/src/main/java/org/onap/crud/CrudApplication.java b/src/main/java/org/onap/crud/CrudApplication.java
index b91794d..05160d8 100644 (file)
--- a/src/main/java/org/onap/crud/CrudApplication.java
+++ b/src/main/java/org/onap/crud/CrudApplication.java
@@ -54,10 +54,22 @@ public class CrudApplication extends SpringBootServletInitializer{// NOSONAR
           throw new RuntimeException("Env property KEY_STORE_PASSWORD not set");
         }
         HashMap<String, Object> props = new HashMap<>();
-        String deobfuscatedKeyStorePassword = Password.deobfuscate(keyStorePassword);
+        String deobfuscatedKeyStorePassword = keyStorePassword.startsWith("OBF:")?Password.deobfuscate(keyStorePassword):keyStorePassword;
         props.put("server.ssl.key-store-password", deobfuscatedKeyStorePassword);
+        
+        String trustStoreLocation = System.getProperty("TRUST_STORE_LOCATION");
+        String trustStorePassword = System.getProperty("TRUST_STORE_PASSWORD");
+        if(trustStoreLocation!=null && trustStorePassword !=null){
+            trustStorePassword = trustStorePassword.startsWith("OBF:")?Password.deobfuscate(trustStorePassword):trustStorePassword;
+            props.put("server.ssl.trust-store", trustStoreLocation);
+            props.put("server.ssl.trust-store-password", trustStorePassword);
+        } 
+        
         props.put("schema.service.ssl.key-store-password", deobfuscatedKeyStorePassword);
         props.put("schema.service.ssl.trust-store-password", deobfuscatedKeyStorePassword);
+        
+       
+        
         new CrudApplication()
             .configure(new SpringApplicationBuilder(CrudApplication.class).properties(props))
             .run(args);
@@ -82,11 +94,13 @@ public class CrudApplication extends SpringBootServletInitializer{// NOSONAR
     }
     public static final Contact DEFAULT_CONTACT = new Contact("Amdocs", "http://www.amdocs.com", "noreply@amdocs.com");
 
-    public static final ApiInfo DEFAULT_API_INFO = new ApiInfo("AAI NCSO Adapter Service", "AAI NCSO Adapter Service.",
+    public static final ApiInfo DEFAULT_API_INFO = new ApiInfo("AAI Gizmo Service", "AAI Gizmo Service.",
         "1.0", "urn:tos", DEFAULT_CONTACT, "Apache 2.0", "API license URL", Collections.emptyList());
 
     public Docket api() {
       return new Docket(DocumentationType.SWAGGER_2).apiInfo(DEFAULT_API_INFO).select().paths(PathSelectors.any())
           .apis(RequestHandlerSelectors.basePackage("org.onap.crud")).build();
     }
+    
+   
 }