From f60a17c6abb6deef1c24f917488745cbc6e6a566 Mon Sep 17 00:00:00 2001
From: "Popescu, Serban" <serban.popescu@amdocs.com>
Date: Wed, 13 Feb 2019 10:29:59 -0500
Subject: Performance Improvements for Gizmo bulk API

Use bulk operations with Gizmo/Champ to improve performance.
Also allows for HA by allowing Champ to operate in stateless mode

Change-Id: I63bbbf8d6071cecb4b22110c477d7dc592026200
Issue-ID: AAI-2147
Signed-off-by: Serban Popescu <serban.popescu@amdocs.com>
---
 .../onap/crud/service/CrudGraphDataService.java    | 51 ++++++++++------------
 1 file changed, 22 insertions(+), 29 deletions(-)

(limited to '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 034b0bf..3916bc6 100644
--- a/src/main/java/org/onap/crud/service/CrudGraphDataService.java
+++ b/src/main/java/org/onap/crud/service/CrudGraphDataService.java
@@ -23,21 +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.util.CrudServiceUtil;
 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();
@@ -168,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 dbTransId) throws CrudException {
-    dao.deleteEdge(id, 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);
   }
 }
-- 
cgit 1.2.3-korg