1 files changed, 81 insertions, 36 deletions

diff --git a/src/main/java/org/onap/crud/service/CrudGraphDataService.java b/src/main/java/org/onap/crud/service/CrudGraphDataService.java
index 5a2710d..5b1c2dd 100644
--- a/src/main/java/org/onap/crud/service/CrudGraphDataService.java
+++ b/src/main/java/org/onap/crud/service/CrudGraphDataService.java
@@ -22,20 +22,22 @@ package org.onap.crud.service;
 
 
 import java.util.HashMap;
-
+import javax.ws.rs.core.EntityTag;
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.onap.aai.restclient.client.OperationResult;
 import org.onap.crud.dao.GraphDao;
 import org.onap.crud.entity.Edge;
-
 import org.onap.crud.entity.Vertex;
 import org.onap.crud.exception.CrudException;
 import org.onap.crud.parser.CrudResponseBuilder;
+import org.onap.crud.util.CrudServiceUtil;
 import org.onap.schema.OxmModelValidator;
 import org.onap.schema.RelationshipSchemaValidator;
 
 
 public class CrudGraphDataService extends AbstractGraphDataService {
- 
-  
+
+
   public CrudGraphDataService(GraphDao dao) throws CrudException {
     super();
     this.dao = dao;
@@ -48,103 +50,146 @@ public class CrudGraphDataService extends AbstractGraphDataService {
     this.daoForGet = daoForGet;
   }
 
-  public String addVertex(String version, String type, VertexPayload payload) throws CrudException {
+  @Override
+  public ImmutablePair<EntityTag, String> addVertex(String version, String type, VertexPayload payload)
+            throws CrudException {
     Vertex vertex = OxmModelValidator.validateIncomingUpsertPayload(null, version, type, payload.getProperties());
     return addVertex(version, vertex);
   }
 
-  private String addVertex(String version, Vertex vertex) throws CrudException {
-    Vertex addedVertex = dao.addVertex(vertex.getType(), vertex.getProperties(), version);
-    return CrudResponseBuilder
+  private ImmutablePair<EntityTag, String> addVertex(String version, Vertex vertex) throws CrudException {
+    OperationResult addedVertexResult = dao.addVertex(vertex.getType(), vertex.getProperties(), version);
+    EntityTag entityTag = CrudServiceUtil.getETagFromHeader(addedVertexResult.getHeaders());
+    Vertex addedVertex = Vertex.fromJson(addedVertexResult.getResult(), version);
+    String payload = CrudResponseBuilder
         .buildUpsertVertexResponse(OxmModelValidator.validateOutgoingPayload(version, addedVertex), version);
+
+    return new ImmutablePair<EntityTag, String>(entityTag, payload);
   }
 
-  public String addEdge(String version, String type, EdgePayload payload) throws CrudException {
+  @Override
+  public ImmutablePair<EntityTag, String> addEdge(String version, String type, EdgePayload payload)
+            throws CrudException {
     Edge edge = RelationshipSchemaValidator.validateIncomingAddPayload(version, type, payload);
     return addEdge(version, edge);
   }
 
-  private String addEdge(String version, Edge edge) throws CrudException {
-    Edge addedEdge = dao.addEdge(edge.getType(), edge.getSource(), edge.getTarget(), edge.getProperties(), version);
-    return CrudResponseBuilder
-        .buildUpsertEdgeResponse(RelationshipSchemaValidator.validateOutgoingPayload(version, addedEdge), version);
+  private ImmutablePair<EntityTag, String> addEdge(String version, Edge edge) throws CrudException {
+    OperationResult addedEdgeResult = dao.addEdge(edge.getType(), edge.getSource(), edge.getTarget(), edge.getProperties(), version);
+    EntityTag entityTag = CrudServiceUtil.getETagFromHeader(addedEdgeResult.getHeaders());
+    Edge addedEdge = Edge.fromJson(addedEdgeResult.getResult());
+    String payload = CrudResponseBuilder
+      .buildUpsertEdgeResponse(RelationshipSchemaValidator.validateOutgoingPayload(version, addedEdge), version);
+
+    return new ImmutablePair<EntityTag, String>(entityTag, payload);
   }
 
-  public String updateVertex(String version, String id, String type, VertexPayload payload) throws CrudException {
+  @Override
+  public ImmutablePair<EntityTag, String> updateVertex(String version, String id, String type, VertexPayload payload)
+            throws CrudException {
     Vertex vertex = OxmModelValidator.validateIncomingUpsertPayload(id, version, type, payload.getProperties());
     return updateVertex(version, vertex);
+  }
 
+  private ImmutablePair<EntityTag, String> updateVertex(String version, Vertex vertex) throws CrudException {
+    OperationResult updatedVertexResult = dao.updateVertex(vertex.getId().get(), vertex.getType(), vertex.getProperties(), version);
+    String payload = getUpdatedVertexPayload(version, updatedVertexResult);
+    EntityTag entityTag = CrudServiceUtil.getETagFromHeader(updatedVertexResult.getHeaders());
+
+    return new ImmutablePair<EntityTag, String>(entityTag, payload);
   }
 
-  private String updateVertex(String version, Vertex vertex) throws CrudException {
-    Vertex updatedVertex = dao.updateVertex(vertex.getId().get(), vertex.getType(), vertex.getProperties(), version);
+  private String getUpdatedVertexPayload(String version, OperationResult updatedVertexResult) throws CrudException {
+    Vertex updatedVertex = Vertex.fromJson(updatedVertexResult.getResult(), version);
+
     return CrudResponseBuilder
-        .buildUpsertVertexResponse(OxmModelValidator.validateOutgoingPayload(version, updatedVertex), version);
+      .buildUpsertVertexResponse(OxmModelValidator.validateOutgoingPayload(version, updatedVertex), version);
   }
 
-  public String patchVertex(String version, String id, String type, VertexPayload payload) throws CrudException {
-    Vertex existingVertex = dao.getVertex(id, OxmModelValidator.resolveCollectionType(version, type), version, new HashMap<String, String>());
+  @Override
+  public ImmutablePair<EntityTag, String> patchVertex(String version, String id, String type, VertexPayload payload)
+            throws CrudException {
+    OperationResult existingVertexOpResult = dao.getVertex(id, OxmModelValidator.resolveCollectionType(version, type), version, new HashMap<String, String>());
+    Vertex existingVertex = Vertex.fromJson(existingVertexOpResult.getResult(), version);
     Vertex vertex = OxmModelValidator.validateIncomingPatchPayload(id, version, type, payload.getProperties(),
-        existingVertex);
+          existingVertex);
     return updateVertex(version, vertex);
   }
 
+  @Override
   public String deleteVertex(String version, String id, String type) throws CrudException {
     type = OxmModelValidator.resolveCollectionType(version, type);
     dao.deleteVertex(id, type);
     return "";
   }
 
+  @Override
   public String deleteEdge(String version, String id, String type) throws CrudException {
     RelationshipSchemaValidator.validateType(version, type);
     dao.deleteEdge(id, type);
     return "";
   }
 
-  public String updateEdge(String version, String id, String type, EdgePayload payload) throws CrudException {
-    Edge edge = dao.getEdge(id, type, new HashMap<String, String>());
-    Edge validatedEdge = RelationshipSchemaValidator.validateIncomingUpdatePayload(edge, version, payload);
+  @Override
+  public ImmutablePair<EntityTag, String> updateEdge(String version, String id, String type, EdgePayload payload)
+            throws CrudException {
+    Edge validatedEdge = getValidatedEdge(version, id, type, payload);
     return updateEdge(version, validatedEdge);
   }
 
-  private String updateEdge(String version, Edge edge) throws CrudException {
-    Edge updatedEdge = dao.updateEdge(edge);
+  private ImmutablePair<EntityTag, String> updateEdge(String version, Edge edge) throws CrudException {
+    OperationResult updatedEdgeResult = dao.updateEdge(edge);
+    String payload = getUpdatedEdgePayload(version, updatedEdgeResult);
+    EntityTag entityTag = CrudServiceUtil.getETagFromHeader(updatedEdgeResult.getHeaders());
+
+    return new ImmutablePair<EntityTag, String>(entityTag, payload);
+  }
+
+  private String getUpdatedEdgePayload(String version, OperationResult updatedEdgeResult) throws CrudException {
+    Edge updatedEdge = Edge.fromJson(updatedEdgeResult.getResult());
+
     return CrudResponseBuilder
-        .buildUpsertEdgeResponse(RelationshipSchemaValidator.validateOutgoingPayload(version, updatedEdge), version);
+      .buildUpsertEdgeResponse(RelationshipSchemaValidator.validateOutgoingPayload(version, updatedEdge), version);
+  }
+
+  private Edge getValidatedEdge(String version, String id, String type, EdgePayload payload) throws CrudException {
+      OperationResult operationResult = dao.getEdge(id, type, new HashMap<String, String>());
+    return RelationshipSchemaValidator.validateIncomingUpdatePayload(Edge.fromJson(operationResult.getResult()), version, payload);
   }
-  
-  public String patchEdge(String version, String id, String type, EdgePayload payload) throws CrudException {
-    Edge edge = dao.getEdge(id, type, new HashMap<String, String>());
-    Edge patchedEdge = RelationshipSchemaValidator.validateIncomingPatchPayload(edge, version, payload);
-    return updateEdge(version, patchedEdge);
 
+  @Override
+  public ImmutablePair<EntityTag, String> patchEdge(String version, String id, String type, EdgePayload payload)
+            throws CrudException {
+    OperationResult operationResult = dao.getEdge(id, type, new HashMap<String, String>());
+    Edge patchedEdge = RelationshipSchemaValidator.validateIncomingPatchPayload(Edge.fromJson(operationResult.getResult()), version, payload);
+    return updateEdge(version, patchedEdge);
   }
 
   @Override
   protected Vertex addBulkVertex(Vertex vertex, String version, String dbTransId) throws CrudException {
     return dao.addVertex(vertex.getType(), vertex.getProperties(), version, dbTransId);
   }
-  
+
   @Override
   protected Vertex updateBulkVertex(Vertex vertex, String id, String version, String dbTransId) throws CrudException {
     return dao.updateVertex(id, vertex.getType(), vertex.getProperties(), version, dbTransId);
   }
-  
+
   @Override
   protected void deleteBulkVertex(String id, String version, String type, String dbTransId) throws CrudException {
     dao.deleteVertex(id, type, dbTransId);
   }
-  
+
   @Override
   protected Edge addBulkEdge(Edge edge, String version, String dbTransId) throws CrudException {
     return dao.addEdge(edge.getType(), edge.getSource(), edge.getTarget(), edge.getProperties(), version, dbTransId);
   }
-  
+
   @Override
   protected Edge updateBulkEdge(Edge edge, String version, String dbTransId) throws CrudException {
     return dao.updateEdge(edge, dbTransId);
   }
-  
+
   @Override
   protected void deleteBulkEdge(String id, String version, String type, String dbTransId) throws CrudException {
     dao.deleteEdge(id, type, dbTransId);