aai-schema and ingest fixes

[aai/sparky-be.git] / sparkybe-onap-service / src / main / java / org / onap / aai / sparky / config / oxm / OxmModelLoader.java

diff --git a/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/config/oxm/OxmModelLoader.java b/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/config/oxm/OxmModelLoader.java
index 0c89dcb..7ad01c7 100644 (file)
--- a/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/config/oxm/OxmModelLoader.java
+++ b/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/config/oxm/OxmModelLoader.java
@@ -26,7 +26,8 @@ import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext;
 import org.onap.aai.cl.api.Logger;
 import org.onap.aai.cl.eelf.LoggerFactory;
 import org.onap.aai.nodes.NodeIngestor;
-import org.onap.aai.setup.Version;
+import org.onap.aai.setup.SchemaVersion;
+import org.onap.aai.setup.SchemaVersions;
 import org.onap.aai.sparky.logging.AaiUiMsgs;
 
 public class OxmModelLoader {
@@ -42,25 +43,24 @@ public class OxmModelLoader {
    * specified version, and that stream will be returned if available.
    */
 
-  protected Version oxmApiVersion;
+  protected SchemaVersion oxmApiVersion;
   protected Set<OxmModelProcessor> processors;
 
   private NodeIngestor nodeIngestor;
 
-  public OxmModelLoader(Version apiVersionOverride, Set<OxmModelProcessor> oxmModelProcessors,
-      NodeIngestor nodeIngestor) {
-    this.oxmApiVersion = apiVersionOverride;
+  public OxmModelLoader(String apiVersionOverride, Set<OxmModelProcessor> oxmModelProcessors, NodeIngestor nodeIngestor) {
+    this.oxmApiVersion = new SchemaVersion(apiVersionOverride);
     this.processors = oxmModelProcessors;
     this.nodeIngestor = nodeIngestor;
   }
 
-  public OxmModelLoader(Set<OxmModelProcessor> oxmModelProcessors, NodeIngestor nodeIngestor) {
-    this.oxmApiVersion = Version.getLatest();
+  public OxmModelLoader(Set<OxmModelProcessor> oxmModelProcessors, NodeIngestor nodeIngestor, SchemaVersions schemaVersions) {
+    this.oxmApiVersion = schemaVersions.getDefaultVersion();
     this.processors = oxmModelProcessors;
     this.nodeIngestor = nodeIngestor;
   }
 
-  public Version getLatestVersionNum() {
+  public SchemaVersion getOxmApiVersion() {
     return oxmApiVersion;
   }
 
@@ -93,7 +93,7 @@ public class OxmModelLoader {
     if (processors != null && processors.size() > 0) {
 
       for (OxmModelProcessor processor : processors) {
-
+        
         try {
 
           processor.processOxmModel(oxmContext);