Remove Multiplicity feature

[aai/gizmo.git] / src / main / java / org / onap / crud / service / CrudGraphDataService.java

diff --git a/src/main/java/org/onap/crud/service/CrudGraphDataService.java b/src/main/java/org/onap/crud/service/CrudGraphDataService.java
index 5b1c2dd..034b0bf 100644 (file)
--- a/src/main/java/org/onap/crud/service/CrudGraphDataService.java
+++ b/src/main/java/org/onap/crud/service/CrudGraphDataService.java
@@ -22,6 +22,7 @@ package org.onap.crud.service;
 
 
 import java.util.HashMap;
+import java.util.List;
 import javax.ws.rs.core.EntityTag;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.onap.aai.restclient.client.OperationResult;
@@ -64,13 +65,15 @@ public class CrudGraphDataService extends AbstractGraphDataService {
     String payload = CrudResponseBuilder
         .buildUpsertVertexResponse(OxmModelValidator.validateOutgoingPayload(version, addedVertex), version);
 
-    return new ImmutablePair<EntityTag, String>(entityTag, payload);
+    return new ImmutablePair<>(entityTag, payload);
   }
 
   @Override
   public ImmutablePair<EntityTag, String> addEdge(String version, String type, EdgePayload payload)
             throws CrudException {
-    Edge edge = RelationshipSchemaValidator.validateIncomingAddPayload(version, type, payload);
+         
+       Edge edge = RelationshipSchemaValidator.validateIncomingAddPayload(version, type, payload);
+
     return addEdge(version, edge);
   }
 
@@ -81,7 +84,7 @@ public class CrudGraphDataService extends AbstractGraphDataService {
     String payload = CrudResponseBuilder
       .buildUpsertEdgeResponse(RelationshipSchemaValidator.validateOutgoingPayload(version, addedEdge), version);
 
-    return new ImmutablePair<EntityTag, String>(entityTag, payload);
+    return new ImmutablePair<>(entityTag, payload);
   }
 
   @Override
@@ -96,7 +99,7 @@ public class CrudGraphDataService extends AbstractGraphDataService {
     String payload = getUpdatedVertexPayload(version, updatedVertexResult);
     EntityTag entityTag = CrudServiceUtil.getETagFromHeader(updatedVertexResult.getHeaders());
 
-    return new ImmutablePair<EntityTag, String>(entityTag, payload);
+    return new ImmutablePair<>(entityTag, payload);
   }
 
   private String getUpdatedVertexPayload(String version, OperationResult updatedVertexResult) throws CrudException {
@@ -126,14 +129,15 @@ public class CrudGraphDataService extends AbstractGraphDataService {
   @Override
   public String deleteEdge(String version, String id, String type) throws CrudException {
     RelationshipSchemaValidator.validateType(version, type);
-    dao.deleteEdge(id, type);
+    dao.deleteEdge(id);
     return "";
   }
 
   @Override
   public ImmutablePair<EntityTag, String> updateEdge(String version, String id, String type, EdgePayload payload)
             throws CrudException {
-    Edge validatedEdge = getValidatedEdge(version, id, type, payload);
+       Edge validatedEdge = getValidatedEdge(version, id, type, payload);
+
     return updateEdge(version, validatedEdge);
   }
 
@@ -142,7 +146,7 @@ public class CrudGraphDataService extends AbstractGraphDataService {
     String payload = getUpdatedEdgePayload(version, updatedEdgeResult);
     EntityTag entityTag = CrudServiceUtil.getETagFromHeader(updatedEdgeResult.getHeaders());
 
-    return new ImmutablePair<EntityTag, String>(entityTag, payload);
+    return new ImmutablePair<>(entityTag, payload);
   }
 
   private String getUpdatedEdgePayload(String version, OperationResult updatedEdgeResult) throws CrudException {
@@ -153,10 +157,10 @@ public class CrudGraphDataService extends AbstractGraphDataService {
   }
 
   private Edge getValidatedEdge(String version, String id, String type, EdgePayload payload) throws CrudException {
-      OperationResult operationResult = dao.getEdge(id, type, new HashMap<String, String>());
+    OperationResult operationResult = dao.getEdge(id, type, new HashMap<String, String>());
     return RelationshipSchemaValidator.validateIncomingUpdatePayload(Edge.fromJson(operationResult.getResult()), version, payload);
   }
-
+  
   @Override
   public ImmutablePair<EntityTag, String> patchEdge(String version, String id, String type, EdgePayload payload)
             throws CrudException {
@@ -191,7 +195,7 @@ public class CrudGraphDataService extends AbstractGraphDataService {
   }
 
   @Override
-  protected void deleteBulkEdge(String id, String version, String type, String dbTransId) throws CrudException {
-    dao.deleteEdge(id, type, dbTransId);
+  protected void deleteBulkEdge(String id, String version, String dbTransId) throws CrudException {
+    dao.deleteEdge(id, dbTransId);
   }
 }