diff options
author | 2018-12-17 11:34:46 +0000 | |
---|---|---|
committer | 2018-12-17 12:24:27 +0000 | |
commit | f6a319cdda918e33c1bf5cffbb356dd0b9feb069 (patch) | |
tree | 7f5b25ab3cfe075c281c00e8896d157902aa338e /src/main/java/org/onap/crud/SchemaIngestConfiguration.java | |
parent | fb4c5707d0f116cfd7438fa06e5273ce552345a7 (diff) |
Update to use Schema Service
The code supports both Schema Service and local schema files.
The property schema.translator.list drives which one to use.
Change-Id: Idc9c5832d7286e7904ddf0b2637c83b0a3cfa15c
Issue-ID: AAI-2008
Signed-off-by: Ravi Geda <gravik@amdocs.com>
Diffstat (limited to 'src/main/java/org/onap/crud/SchemaIngestConfiguration.java')
-rw-r--r-- | src/main/java/org/onap/crud/SchemaIngestConfiguration.java | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/src/main/java/org/onap/crud/SchemaIngestConfiguration.java b/src/main/java/org/onap/crud/SchemaIngestConfiguration.java index ee050dd..ca76dbd 100644 --- a/src/main/java/org/onap/crud/SchemaIngestConfiguration.java +++ b/src/main/java/org/onap/crud/SchemaIngestConfiguration.java @@ -26,37 +26,44 @@ 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.onap.aai.setup.Translator; +import org.onap.schema.EdgePropsConfiguration; +import org.onap.schema.EdgeRulesLoader; +import org.onap.schema.OxmModelLoader; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; @Configuration +@ComponentScan(basePackages = {"org.onap.aai.config", "org.onap.aai.setup"}) @PropertySource(value = "file:${schema.ingest.file}", ignoreResourceNotFound = true) +@PropertySource(value = "file:${edgeprops.ingest.file}", ignoreResourceNotFound = true) public class SchemaIngestConfiguration { - @Bean - public SchemaVersions schemaVersions() { - return new SchemaVersions(); - } + @Autowired + private Translator translator; @Bean - public SchemaLocationsBean schemaLocationsBean() { - return new SchemaLocationsBean(); + public OxmModelLoader oxmModelLoader(NodeIngestor nodeIngestor) { + return new OxmModelLoader(translator, nodeIngestor ); } @Bean - public ConfigTranslator configTranslator() { - return new AAIConfigTranslator(schemaLocationsBean(), schemaVersions()); + public EdgeRulesLoader edgeRulesLoader(EdgeIngestor edgeIngestor) { + return new EdgeRulesLoader(translator, edgeIngestor, edgePropsConfiguration() ); } @Bean - public NodeIngestor nodeIngestor() { - return new NodeIngestor(configTranslator()); + public EdgePropsConfiguration edgePropsConfiguration() { + return new EdgePropsConfiguration(); } @Bean - public EdgeIngestor edgeIngestor() { - return new EdgeIngestor(configTranslator(), schemaVersions()); + @ConditionalOnExpression("'${schema.translator.list}'.contains('config')") + public ConfigTranslator configTranslator(SchemaLocationsBean schemaLocationsBean, SchemaVersions schemaVersions) { + return new AAIConfigTranslator(schemaLocationsBean, schemaVersions); } - }
\ No newline at end of file |