Remove Multiplicity feature

[aai/gizmo.git] / src / main / java / org / onap / crud / entity / Vertex.java

diff --git a/src/main/java/org/onap/crud/entity/Vertex.java b/src/main/java/org/onap/crud/entity/Vertex.java
index efe2d5a..a5bda17 100644 (file)
--- a/src/main/java/org/onap/crud/entity/Vertex.java
+++ b/src/main/java/org/onap/crud/entity/Vertex.java
@@ -20,31 +20,28 @@
  */
 package org.onap.crud.entity;
 
-import net.dongliu.gson.GsonJava8TypeAdapterFactory;
-
-import com.google.common.base.CaseFormat;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.annotations.SerializedName;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.Set;
-
 import org.eclipse.persistence.dynamic.DynamicType;
 import org.eclipse.persistence.internal.helper.DatabaseField;
 import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext;
 import org.eclipse.persistence.mappings.DatabaseMapping;
 import org.json.JSONArray;
 import org.json.JSONObject;
-import org.onap.aaiutils.oxm.OxmModelLoader;
 import org.onap.crud.exception.CrudException;
 import org.onap.crud.util.CrudServiceUtil;
+import org.onap.schema.OxmModelLoader;
 import org.onap.schema.OxmModelValidator;
 
+import com.google.common.base.CaseFormat;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.annotations.SerializedName;
+import net.dongliu.gson.GsonJava8TypeAdapterFactory;
+
 public class Vertex {
   private static final Gson gson = new GsonBuilder().registerTypeAdapterFactory(new GsonJava8TypeAdapterFactory())
       .create();
@@ -114,30 +111,29 @@ public class Vertex {
     try {
       String type = jsonObject.getString("type");
       builder = new Builder(type).id(jsonObject.getString("key"));
-      
+
       type = OxmModelValidator.resolveCollectionType(version, type);
       DynamicJAXBContext jaxbContext = OxmModelLoader.getContextForVersion(version);
-      String modelObjectClass = CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_CAMEL, CaseFormat.LOWER_HYPHEN.to(CaseFormat.UPPER_CAMEL, type));
-
-      final DynamicType modelObjectType = jaxbContext.getDynamicType(modelObjectClass);
-      final DynamicType reservedType = jaxbContext.getDynamicType("ReservedPropNames");
-      
       
+      final DynamicType modelObjectType = OxmModelLoader.getDynamicTypeForVersion(version, type);
+      final DynamicType reservedType = jaxbContext.getDynamicType("ReservedPropNames");
+
+
       if (modelObjectType == null) {
         throw new CrudException("Unable to load oxm version", javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR);
       }
 
       if (jsonObject.has("properties")) {
         JSONObject jsonProps = jsonObject.getJSONObject("properties");
-        for (String key : (Set<String>)jsonProps.keySet()) {
+        for (String key : jsonProps.keySet()) {
           String keyJavaName = CaseFormat.LOWER_HYPHEN.to(CaseFormat.LOWER_CAMEL, key);
           DatabaseMapping mapping = modelObjectType.getDescriptor().getMappingForAttributeName(keyJavaName);
-          
+
           if (mapping == null) {
             // This might be one of the reserved properties
             mapping = reservedType.getDescriptor().getMappingForAttributeName(keyJavaName);
           }
-          
+
           if (mapping != null) {
             DatabaseField field = mapping.getField();
             Object value = CrudServiceUtil.validateFieldType(jsonProps.get(key).toString(), field.getType());
@@ -149,8 +145,8 @@ public class Vertex {
     catch (Exception ex) {
       throw new CrudException("Unable to transform response: " + jsonObject.toString(), javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR);
     }
-    
-    return builder.build(); 
+
+    return builder.build();
   }
 
   public static List<Vertex> collectionFromJson(String jsonString, String version) throws CrudException {