Update to use Schema Service

[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 b2b2611..b91794d 100644 (file)
--- a/src/main/java/org/onap/crud/CrudApplication.java
+++ b/src/main/java/org/onap/crud/CrudApplication.java
@@ -22,18 +22,14 @@ package org.onap.crud;
 
 import java.util.Collections;
 import java.util.HashMap;
-
 import javax.annotation.PostConstruct;
-
 import org.eclipse.jetty.util.security.Password;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.support.SpringBootServletInitializer;
-import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.ImportResource;
 import org.springframework.core.env.Environment;
-
 import springfox.documentation.builders.PathSelectors;
 import springfox.documentation.builders.RequestHandlerSelectors;
 import springfox.documentation.service.ApiInfo;
@@ -47,7 +43,6 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
  */
 @SpringBootApplication
 @EnableSwagger2
-@Import({SchemaIngestConfiguration.class, SchemaLoaderConfiguration.class})
 @ImportResource({"file:${SERVICE_BEANS}/*.xml"})
 public class CrudApplication extends SpringBootServletInitializer{// NOSONAR
     @Autowired
@@ -59,8 +54,13 @@ public class CrudApplication extends SpringBootServletInitializer{// NOSONAR
           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 CrudApplication().configure(new SpringApplicationBuilder(SchemaIngestConfiguration.class, SchemaLoaderConfiguration.class).child(CrudApplication.class).properties(props)).run(args);
+        String deobfuscatedKeyStorePassword = Password.deobfuscate(keyStorePassword);
+        props.put("server.ssl.key-store-password", deobfuscatedKeyStorePassword);
+        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);
     }
 
     /**
@@ -85,8 +85,6 @@ public class CrudApplication extends SpringBootServletInitializer{// NOSONAR
     public static final ApiInfo DEFAULT_API_INFO = new ApiInfo("AAI NCSO Adapter Service", "AAI NCSO Adapter 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();