X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fcrud%2Fservice%2FCrudGraphDataService.java;h=ae2d294c3f8cd47e09ce210177c80c68562ae2d0;hb=3bc6a702f2d3d8710c7aaa94cdc8c0ccf3deb759;hp=2888aced53dee7ed6ffbe8acaf49ed2a32511529;hpb=c68bb59a80df56a8426afad811d8e1833a5748a6;p=aai%2Fgizmo.git

diff --git a/src/main/java/org/onap/crud/service/CrudGraphDataService.java b/src/main/java/org/onap/crud/service/CrudGraphDataService.java
index 2888ace..ae2d294 100644
--- a/src/main/java/org/onap/crud/service/CrudGraphDataService.java
+++ b/src/main/java/org/onap/crud/service/CrudGraphDataService.java
@@ -68,7 +68,7 @@ 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
@@ -77,11 +77,11 @@ public class CrudGraphDataService extends AbstractGraphDataService {
     // load source and target vertex relationships for validation
     List<Edge> sourceVertexEdges =
              EdgePayloadUtil.filterEdgesByRelatedVertexAndType(EdgePayloadUtil.getVertexNodeType(payload.getSource()), type,
-                          daoForGet.getVertexEdges(EdgePayloadUtil.getVertexNodeId(payload.getSource()), null));
+                          daoForGet.getVertexEdges(EdgePayloadUtil.getVertexNodeId(payload.getSource()), null, null));
 
     List<Edge> targetVertexEdges =
               EdgePayloadUtil.filterEdgesByRelatedVertexAndType(EdgePayloadUtil.getVertexNodeType(payload.getTarget()), type,
-                          daoForGet.getVertexEdges(EdgePayloadUtil.getVertexNodeId(payload.getTarget()), null));
+                          daoForGet.getVertexEdges(EdgePayloadUtil.getVertexNodeId(payload.getTarget()), null, null));
 
     Edge edge = RelationshipSchemaValidator.validateIncomingAddPayload(version, type, payload, sourceVertexEdges, targetVertexEdges);
 
@@ -95,7 +95,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
@@ -110,7 +110,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 {
@@ -140,7 +140,7 @@ 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 "";
   }
 
@@ -153,11 +153,11 @@ public class CrudGraphDataService extends AbstractGraphDataService {
     // load source and target vertex relationships for validation
     List<Edge> sourceVertexEdges =
              EdgePayloadUtil.filterEdgesByRelatedVertexAndType(EdgePayloadUtil.getVertexNodeType(payload.getSource()), type,
-                          daoForGet.getVertexEdges(EdgePayloadUtil.getVertexNodeId(payload.getSource()), null));
+                          daoForGet.getVertexEdges(EdgePayloadUtil.getVertexNodeId(payload.getSource()), null, null));
 
     List<Edge> targetVertexEdges =
               EdgePayloadUtil.filterEdgesByRelatedVertexAndType(EdgePayloadUtil.getVertexNodeType(payload.getTarget()), type,
-                          daoForGet.getVertexEdges(EdgePayloadUtil.getVertexNodeId(payload.getTarget()), null));
+                          daoForGet.getVertexEdges(EdgePayloadUtil.getVertexNodeId(payload.getTarget()), null, null));
 
     Edge validatedEdge = RelationshipSchemaValidator.validateIncomingUpdatePayload(edge, version, payload, type, sourceVertexEdges, targetVertexEdges);
 
@@ -169,7 +169,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 {
@@ -213,7 +213,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);
   }
 }