Replace OxmModelLoader with aaiutils

Issue ID: AAI-245
Change-Id: I38312e114a221686834303a81e6e21a49ee27b2a
Signed-off-by: Daniel Silverthorn <daniel.silverthorn@amdocs.com>

1 files changed, 6 insertions, 2 deletions

diff --git a/src/main/java/org/openecomp/crud/service/CrudGraphDataService.java b/src/main/java/org/openecomp/crud/service/CrudGraphDataService.java
index a8c0248..f38fe0f 100644
--- a/src/main/java/org/openecomp/crud/service/CrudGraphDataService.java
+++ b/src/main/java/org/openecomp/crud/service/CrudGraphDataService.java
@@ -23,6 +23,7 @@
  */
 package org.openecomp.crud.service;
 
+import org.onap.aaiutils.oxm.OxmModelLoader;
 import org.openecomp.aai.champcore.ChampGraph;
 import org.openecomp.crud.dao.GraphDao;
 import org.openecomp.crud.dao.champ.ChampDao;
@@ -30,7 +31,6 @@ import org.openecomp.crud.entity.Edge;
 import org.openecomp.crud.entity.Vertex;
 import org.openecomp.crud.exception.CrudException;
 import org.openecomp.crud.parser.CrudResponseBuilder;
-import org.openecomp.schema.OxmModelLoader;
 import org.openecomp.schema.OxmModelValidator;
 import org.openecomp.schema.RelationshipSchemaLoader;
 import org.openecomp.schema.RelationshipSchemaValidator;
@@ -47,7 +47,11 @@ public class CrudGraphDataService {
 	this.dao = new ChampDao(graphImpl);
 
     //load the schemas
-    OxmModelLoader.loadModels();
+    try {
+      OxmModelLoader.loadModels();
+    } catch (Exception e) {
+      throw new CrudException(e);
+    }
     RelationshipSchemaLoader.loadModels();
   }