diff options
author | 2018-12-17 17:34:37 +0000 | |
---|---|---|
committer | 2018-12-17 18:27:04 +0000 | |
commit | 69d4c0a747053473355ee82aa426589324e50d82 (patch) | |
tree | 735d591809d861326ee7e3ec93ad8a49bd0d101e /src/main/java/org/onap/aai/spike/SpikeApplication.java | |
parent | 9a6079fe14815e6f247268ce32b3157cf95d734b (diff) |
Use Schema Service for model ingestion
Change-Id: Id2531c52491c135ae000223caf7ce79f95a9cb43
Issue-ID: AAI-2010
Signed-off-by: Michael Arrastia <MArrasti@amdocs.com>
Diffstat (limited to 'src/main/java/org/onap/aai/spike/SpikeApplication.java')
-rw-r--r-- | src/main/java/org/onap/aai/spike/SpikeApplication.java | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/src/main/java/org/onap/aai/spike/SpikeApplication.java b/src/main/java/org/onap/aai/spike/SpikeApplication.java index 2768c24..fed74af 100644 --- a/src/main/java/org/onap/aai/spike/SpikeApplication.java +++ b/src/main/java/org/onap/aai/spike/SpikeApplication.java @@ -23,19 +23,28 @@ package org.onap.aai.spike; import java.util.HashMap; import javax.annotation.PostConstruct; import org.eclipse.jetty.util.security.Password; +import org.onap.aai.setup.AAIConfigTranslator; +import org.onap.aai.setup.ConfigTranslator; +import org.onap.aai.setup.SchemaLocationsBean; +import org.onap.aai.setup.SchemaVersions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; -import org.springframework.context.annotation.Import; +import org.springframework.boot.web.support.SpringBootServletInitializer; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.ImportResource; +import org.springframework.context.annotation.PropertySource; import org.springframework.core.env.Environment; /** * Spike service Spring Boot Application */ @SpringBootApplication -@Import({SchemaIngestConfiguration.class}) +@ComponentScan(basePackages = {"org.onap.aai.config", "org.onap.aai.setup", "org.onap.aai.spike"}) +@PropertySource(value = "file:${schema.ingest.file}", ignoreResourceNotFound = true) +@PropertySource(value = "file:${edgeprops.ingest.file}", ignoreResourceNotFound = true) @ImportResource({"file:${SERVICE_BEANS}/*.xml"}) public class SpikeApplication extends SpringBootServletInitializer { @Autowired @@ -49,9 +58,11 @@ public class SpikeApplication extends SpringBootServletInitializer { HashMap<String, Object> props = new HashMap<>(); props.put("server.ssl.key-store-password", Password.deobfuscate(keyStorePassword)); + props.put("schema.service.ssl.key-store-password", Password.deobfuscate(keyStorePassword)); + props.put("schema.service.ssl.trust-store-password", Password.deobfuscate(keyStorePassword)); - new SpikeApplication().configure(new SpringApplicationBuilder(SchemaIngestConfiguration.class) - .child(SpikeApplication.class).properties(props)).run(args); + new SpikeApplication().configure(new SpringApplicationBuilder(SpikeApplication.class).properties(props)) + .run(args); } /** @@ -72,4 +83,10 @@ public class SpikeApplication extends SpringBootServletInitializer { } } + @Bean + @ConditionalOnExpression("'${schema.translator.list}'.contains('config')") + public ConfigTranslator configTranslator(SchemaLocationsBean schemaLocationsBean, SchemaVersions schemaVersions) { + return new AAIConfigTranslator(schemaLocationsBean, schemaVersions); + } + } |