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();
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 {
- // 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));
-
- List<Edge> 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);
}
String payload = CrudResponseBuilder
.buildUpsertEdgeResponse(RelationshipSchemaValidator.validateOutgoingPayload(version, addedEdge), version);
- return new ImmutablePair<EntityTag, String>(entityTag, payload);
+ return new ImmutablePair<>(entityTag, payload);
}
@Override
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 {
@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 {
- OperationResult edgeResult = dao.getEdge(id, type, new HashMap<String, String>());
- Edge edge = Edge.fromJson(edgeResult.getResult());
-
- // 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));
-
- List<Edge> 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);
}
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 {
.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);
+ }
+
@Override
public ImmutablePair<EntityTag, String> patchEdge(String version, String id, String type, EdgePayload payload)
throws CrudException {
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);
}
}