diff options
author | Michael Arrastia <MArrasti@amdocs.com> | 2018-12-17 17:34:37 +0000 |
---|---|---|
committer | Michael Arrastia <MArrasti@amdocs.com> | 2018-12-17 18:27:04 +0000 |
commit | 69d4c0a747053473355ee82aa426589324e50d82 (patch) | |
tree | 735d591809d861326ee7e3ec93ad8a49bd0d101e /src/main/java/org/onap/aai/spike/schema/EdgeRulesLoader.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/schema/EdgeRulesLoader.java')
-rw-r--r-- | src/main/java/org/onap/aai/spike/schema/EdgeRulesLoader.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/main/java/org/onap/aai/spike/schema/EdgeRulesLoader.java b/src/main/java/org/onap/aai/spike/schema/EdgeRulesLoader.java index be303f5..93e4a6c 100644 --- a/src/main/java/org/onap/aai/spike/schema/EdgeRulesLoader.java +++ b/src/main/java/org/onap/aai/spike/schema/EdgeRulesLoader.java @@ -37,8 +37,8 @@ import org.onap.aai.cl.eelf.LoggerFactory; import org.onap.aai.edges.EdgeIngestor; import org.onap.aai.edges.EdgeRule; import org.onap.aai.edges.exceptions.EdgeRuleNotFoundException; -import org.onap.aai.setup.ConfigTranslator; import org.onap.aai.setup.SchemaVersion; +import org.onap.aai.setup.Translator; import org.onap.aai.spike.exception.SpikeException; import org.onap.aai.spike.logging.SpikeMsgs; import org.springframework.beans.factory.annotation.Autowired; @@ -47,7 +47,7 @@ import org.springframework.stereotype.Component; @Component public class EdgeRulesLoader { - private static ConfigTranslator configTranslator; + private static Translator translator; private static EdgeIngestor edgeIngestor; private static EdgePropsConfiguration edgePropsConfiguration; @@ -69,14 +69,14 @@ public class EdgeRulesLoader { * This constructor presents an awkward marrying of Spring bean creation and static method use. This * is technical debt that will need fixing. * - * @param configTranslator contains schema versions configuration + * @param translator contains schema versions configuration * @param edgeIngestor provides edge rules * @param edgePropsConfiguration edge property validation configuration */ @Autowired - public EdgeRulesLoader(ConfigTranslator configTranslator, EdgeIngestor edgeIngestor, + public EdgeRulesLoader(Translator translator, EdgeIngestor edgeIngestor, EdgePropsConfiguration edgePropsConfiguration) { - EdgeRulesLoader.configTranslator = configTranslator; + EdgeRulesLoader.translator = translator; EdgeRulesLoader.edgeIngestor = edgeIngestor; EdgeRulesLoader.edgePropsConfiguration = edgePropsConfiguration; } @@ -95,7 +95,7 @@ public class EdgeRulesLoader { for (String version : OXMModelLoader.getLoadedOXMVersions()) { try { - SchemaVersion schemaVersion = configTranslator.getSchemaVersions().getVersions().stream() + SchemaVersion schemaVersion = translator.getSchemaVersions().getVersions().stream() .filter(s -> s.toString().equalsIgnoreCase(version)).findAny().orElse(null); loadModel(schemaVersion, edgeIngestor, propFiles); } catch (IOException | EdgeRuleNotFoundException e) { @@ -118,7 +118,7 @@ public class EdgeRulesLoader { } try { - SchemaVersion schemaVersion = configTranslator.getSchemaVersions().getVersions().stream() + SchemaVersion schemaVersion = translator.getSchemaVersions().getVersions().stream() .filter(s -> s.toString().equalsIgnoreCase(v)).findAny().orElse(null); loadModel(schemaVersion, edgeIngestor, propFiles); |