X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fgizmo.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fcrud%2Fservice%2FCrudGraphDataService.java;h=3916bc6b2437ee11328d7d3236cbfb0723f87af1;hp=2888aced53dee7ed6ffbe8acaf49ed2a32511529;hb=f60a17c6abb6deef1c24f917488745cbc6e6a566;hpb=d10a218c76633374f083f7a2802c198e93a6abae diff --git a/src/main/java/org/onap/crud/service/CrudGraphDataService.java b/src/main/java/org/onap/crud/service/CrudGraphDataService.java index 2888ace..3916bc6 100644 --- a/src/main/java/org/onap/crud/service/CrudGraphDataService.java +++ b/src/main/java/org/onap/crud/service/CrudGraphDataService.java @@ -23,24 +23,32 @@ package org.onap.crud.service; import java.util.HashMap; import java.util.List; + import javax.ws.rs.core.EntityTag; +import javax.ws.rs.core.HttpHeaders; + import org.apache.commons.lang3.tuple.ImmutablePair; +import org.onap.aai.cl.api.Logger; +import org.onap.aai.cl.eelf.LoggerFactory; import org.onap.aai.restclient.client.OperationResult; import org.onap.crud.dao.GraphDao; +import org.onap.crud.dao.champ.ChampBulkPayload; +import org.onap.crud.dao.champ.ChampBulkPayloadResponse; import org.onap.crud.entity.Edge; import org.onap.crud.entity.Vertex; import org.onap.crud.exception.CrudException; +import org.onap.crud.logging.CrudServiceMsgs; +import org.onap.crud.service.BulkPayload; import org.onap.crud.parser.CrudResponseBuilder; -import org.onap.crud.parser.EdgePayload; -import org.onap.crud.parser.VertexPayload; -import org.onap.crud.parser.util.EdgePayloadUtil; import org.onap.crud.util.CrudServiceUtil; -import org.onap.schema.validation.OxmModelValidator; -import org.onap.schema.validation.RelationshipSchemaValidator; +import org.onap.schema.OxmModelValidator; +import org.onap.schema.RelationshipSchemaValidator; +import com.google.gson.GsonBuilder; -public class CrudGraphDataService extends AbstractGraphDataService { +public class CrudGraphDataService extends AbstractGraphDataService { + Logger logger = LoggerFactory.getInstance().getLogger(CrudGraphDataService.class.getName()); public CrudGraphDataService(GraphDao dao) throws CrudException { super(); @@ -68,22 +76,14 @@ public class CrudGraphDataService extends AbstractGraphDataService { String payload = CrudResponseBuilder .buildUpsertVertexResponse(OxmModelValidator.validateOutgoingPayload(version, addedVertex), version); - return new ImmutablePair(entityTag, payload); + return new ImmutablePair<>(entityTag, payload); } @Override public ImmutablePair addEdge(String version, String type, EdgePayload payload) throws CrudException { - // load source and target vertex relationships for validation - List sourceVertexEdges = - EdgePayloadUtil.filterEdgesByRelatedVertexAndType(EdgePayloadUtil.getVertexNodeType(payload.getSource()), type, - daoForGet.getVertexEdges(EdgePayloadUtil.getVertexNodeId(payload.getSource()), null)); - - List targetVertexEdges = - EdgePayloadUtil.filterEdgesByRelatedVertexAndType(EdgePayloadUtil.getVertexNodeType(payload.getTarget()), type, - daoForGet.getVertexEdges(EdgePayloadUtil.getVertexNodeId(payload.getTarget()), null)); - - Edge edge = RelationshipSchemaValidator.validateIncomingAddPayload(version, type, payload, sourceVertexEdges, targetVertexEdges); + + Edge edge = RelationshipSchemaValidator.validateIncomingAddPayload(version, type, payload); return addEdge(version, edge); } @@ -95,7 +95,7 @@ public class CrudGraphDataService extends AbstractGraphDataService { String payload = CrudResponseBuilder .buildUpsertEdgeResponse(RelationshipSchemaValidator.validateOutgoingPayload(version, addedEdge), version); - return new ImmutablePair(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, payload); + return new ImmutablePair<>(entityTag, payload); } private String getUpdatedVertexPayload(String version, OperationResult updatedVertexResult) throws CrudException { @@ -140,26 +140,14 @@ 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 updateEdge(String version, String id, String type, EdgePayload payload) throws CrudException { - OperationResult edgeResult = dao.getEdge(id, type, new HashMap()); - Edge edge = Edge.fromJson(edgeResult.getResult()); - - // load source and target vertex relationships for validation - List sourceVertexEdges = - EdgePayloadUtil.filterEdgesByRelatedVertexAndType(EdgePayloadUtil.getVertexNodeType(payload.getSource()), type, - daoForGet.getVertexEdges(EdgePayloadUtil.getVertexNodeId(payload.getSource()), null)); - - List targetVertexEdges = - EdgePayloadUtil.filterEdgesByRelatedVertexAndType(EdgePayloadUtil.getVertexNodeType(payload.getTarget()), type, - daoForGet.getVertexEdges(EdgePayloadUtil.getVertexNodeId(payload.getTarget()), null)); - - Edge validatedEdge = RelationshipSchemaValidator.validateIncomingUpdatePayload(edge, version, payload, type, sourceVertexEdges, targetVertexEdges); + Edge validatedEdge = getValidatedEdge(version, id, type, payload); return updateEdge(version, validatedEdge); } @@ -169,7 +157,7 @@ public class CrudGraphDataService extends AbstractGraphDataService { String payload = getUpdatedEdgePayload(version, updatedEdgeResult); EntityTag entityTag = CrudServiceUtil.getETagFromHeader(updatedEdgeResult.getHeaders()); - return new ImmutablePair(entityTag, payload); + return new ImmutablePair<>(entityTag, payload); } private String getUpdatedEdgePayload(String version, OperationResult updatedEdgeResult) throws CrudException { @@ -179,6 +167,11 @@ public class CrudGraphDataService extends AbstractGraphDataService { .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()); + return RelationshipSchemaValidator.validateIncomingUpdatePayload(Edge.fromJson(operationResult.getResult()), version, payload); + } + @Override public ImmutablePair patchEdge(String version, String id, String type, EdgePayload payload) throws CrudException { @@ -186,34 +179,16 @@ public class CrudGraphDataService extends AbstractGraphDataService { 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); + public String addBulk(String version, BulkPayload payload, HttpHeaders headers) throws CrudException { + ChampBulkPayload champPayload = new ChampBulkPayload(); + champPayload.fromGizmoPayload(payload, version, headers, dao); + logger.info(CrudServiceMsgs.CHAMP_BULK_OP_INFO, "ChampBulkPayload-> "+new GsonBuilder().disableHtmlEscaping().setPrettyPrinting().create().toJson(champPayload)); + OperationResult bulkResult = dao.bulkOperation(champPayload); + + ChampBulkPayloadResponse response = ChampBulkPayloadResponse.fromJson(bulkResult.getResult()); + response.populateChampData(version); + return CrudResponseBuilder.buildUpsertBulkResponse(response.getVertices(), response.getEdges(), version, payload); } }