Gizmo to load multiple Db Edge Rules files

[aai/gizmo.git] / src / main / java / org / onap / crud / util / CrudServiceUtil.java

diff --git a/src/main/java/org/onap/crud/util/CrudServiceUtil.java b/src/main/java/org/onap/crud/util/CrudServiceUtil.java
index 7943218..6c251bc 100644 (file)
--- a/src/main/java/org/onap/crud/util/CrudServiceUtil.java
+++ b/src/main/java/org/onap/crud/util/CrudServiceUtil.java
@@ -21,9 +21,9 @@
 package org.onap.crud.util;
 
 import org.onap.aai.db.props.AAIProperties;
-import org.onap.aaiutils.oxm.OxmModelLoader;
 import org.onap.crud.exception.CrudException;
-import org.onap.schema.RelationshipSchemaLoader;
+import org.onap.schema.OxmModelLoader;
+import org.onap.schema.EdgeRulesLoader;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
@@ -41,6 +41,8 @@ import javax.ws.rs.core.Response.Status;
 public class CrudServiceUtil {
 
   private static Gson gson = new Gson();
+  
+  @SuppressWarnings({"unchecked", "rawtypes"})
   public static Object validateFieldType(String value, Class clazz) throws CrudException {
     try {
       if (clazz.isAssignableFrom(Integer.class)) {
@@ -75,10 +77,10 @@ public class CrudServiceUtil {
     // load the schemas
     try {
       OxmModelLoader.loadModels();
+      EdgeRulesLoader.loadModels ();
     } catch (Exception e) {
       throw new CrudException(e);
     }
-    RelationshipSchemaLoader.loadModels();
   }
   
   /**
@@ -88,7 +90,9 @@ public class CrudServiceUtil {
    * @param isAdd
    * @return
    */
-  public static JsonElement mergeHeaderInFoToPayload(JsonElement propertiesFromRequest,  HttpHeaders headers, boolean isAdd) {
+    @SuppressWarnings("unchecked")
+    public static JsonElement mergeHeaderInFoToPayload(JsonElement propertiesFromRequest, HttpHeaders headers,
+            boolean isAdd) {
     String sourceOfTruth = headers.getRequestHeaders().getFirst("X-FromAppId");  
     Set<Map.Entry<String, JsonElement>> properties = new HashSet<Map.Entry<String, JsonElement>>();
     properties.addAll(propertiesFromRequest.getAsJsonObject().entrySet());