Support bulk api for patch/deletes

Issue-ID: AAI-533
Change-Id: I86ece3494985da48606f356dada267fac14a7aad
Signed-off-by: Maharajh, Robby (rx2202) <rx2202@us.att.com>

12 files changed, 769 insertions, 332 deletions

diff --git a/aai-resources/src/main/java/org/onap/aai/rest/BulkConsumer.java b/aai-resources/src/main/java/org/onap/aai/rest/BulkConsumer.java
index 780510d..5a90bc5 100644
--- a/aai-resources/src/main/java/org/onap/aai/rest/BulkConsumer.java
+++ b/aai-resources/src/main/java/org/onap/aai/rest/BulkConsumer.java
@@ -25,6 +25,8 @@ import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map.Entry;
+import java.util.stream.Collectors;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.Consumes;
@@ -40,8 +42,6 @@ import javax.ws.rs.core.UriBuilder;
 import javax.ws.rs.core.UriInfo;
 
 import org.javatuples.Pair;
-import org.javatuples.Triplet;
-
 import org.onap.aai.dbmap.DBConnectionType;
 import org.onap.aai.exceptions.AAIException;
 import org.onap.aai.introspection.Introspector;
@@ -51,6 +51,8 @@ import org.onap.aai.introspection.Version;
 import org.onap.aai.introspection.exceptions.AAIUnmarshallingException;
 import org.onap.aai.logging.ErrorObjectNotFoundException;
 import org.onap.aai.parsers.query.QueryParser;
+import org.onap.aai.rest.bulk.BulkOperation;
+import org.onap.aai.rest.bulk.BulkOperationResponse;
 import org.onap.aai.rest.db.DBRequest;
 import org.onap.aai.rest.db.HttpEntry;
 import org.onap.aai.rest.util.ValidateEncoding;
@@ -58,6 +60,9 @@ import org.onap.aai.restcore.HttpMethod;
 import org.onap.aai.restcore.RESTAPI;
 import org.onap.aai.serialization.engines.QueryStyle;
 import org.onap.aai.serialization.engines.TransactionalGraphEngine;
+import org.springframework.web.util.UriComponents;
+import org.springframework.web.util.UriComponentsBuilder;
+
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
@@ -81,6 +86,10 @@ import com.google.gson.JsonSyntaxException;
  */
 public abstract class BulkConsumer extends RESTAPI {
 
+	private static final String BULK_PATCH_METHOD = "patch";
+	private static final String BULK_DELETE_METHOD = "delete";
+	private static final String BULK_PUT_METHOD = "put";
+
 	/** The introspector factory type. */
 	private ModelType introspectorFactoryType = ModelType.MOXY;
 	
@@ -101,7 +110,7 @@ public abstract class BulkConsumer extends RESTAPI {
 	@PUT
 	@Consumes({ MediaType.APPLICATION_JSON})
 	@Produces({ MediaType.APPLICATION_JSON})
-	public Response bulkAdd(String content, @PathParam("version")String versionParam, @Context HttpHeaders headers, @Context UriInfo info, @Context HttpServletRequest req){
+	public Response bulkProcessor(String content, @PathParam("version")String versionParam, @Context HttpHeaders headers, @Context UriInfo info, @Context HttpServletRequest req){
 		
 		String transId = headers.getRequestHeaders().getFirst("X-TransactionId");
 		String sourceOfTruth = headers.getRequestHeaders().getFirst("X-FromAppId");
@@ -114,14 +123,12 @@ public abstract class BulkConsumer extends RESTAPI {
 		/* A Response will be generated for each object in each transaction.
 		 * To keep track of what came from where to give organized feedback to the client,
 		 * we keep responses from a given transaction together in one list (hence all being a list of lists)
-		 * and pair each response with its matching URI (which will be null if there wasn't one).
+		 * and BulkOperationResponse each response with its matching URI (which will be null if there wasn't one).
 		 */ 
- 		List<List<Pair<URI, Response>>> allResponses = new ArrayList<List<Pair<URI, Response>>>();
-		
+ 		List<List<BulkOperationResponse>> allResponses = new ArrayList<>();
 		try {
-			//TODO add auth check when this endpoint added to that auth properties files
 			DBConnectionType type = this.determineConnectionType(sourceOfTruth, realTime);
-			
+		
 			JsonArray transactions = getTransactions(content);
 			
 			for (int i = 0; i < transactions.size(); i++){
@@ -129,17 +136,17 @@ public abstract class BulkConsumer extends RESTAPI {
 				Loader loader = httpEntry.getLoader();
 				TransactionalGraphEngine dbEngine = httpEntry.getDbEngine();
 				URI thisUri = null;
-				List<Triplet<URI, Introspector,HttpMethod>> triplet = new ArrayList<Triplet<URI, Introspector,HttpMethod>>();
+				List<BulkOperation> bulkOperations = new ArrayList<>();
 				HttpMethod method = null;
+				JsonElement transObj = new JsonObject();
 				try {
-					JsonElement transObj = transactions.get(i);
-					if (!(transObj instanceof JsonObject)) {
-						throw new AAIException("AAI_6111", "input payload does not follow bulk add interface");
+					transObj = transactions.get(i);
+					if (!transObj.isJsonObject()) {
+						throw new AAIException("AAI_6111", "input payload does not follow bulk interface");
 					}
-					//JsonObject transaction = transObj.getAsJsonObject();
 					
-					fillObjectTuplesFromTransaction(triplet, transObj.getAsJsonObject(), loader, dbEngine, outputMediaType);
-					if (triplet.size() == 0) {
+					fillBulkOperationObjectFromTransaction(bulkOperations, transObj.getAsJsonObject(), loader, dbEngine, outputMediaType);
+					if (bulkOperations.isEmpty()) {
 						//case where user sends a validly formatted transactions object but
 						//which has no actual things in it for A&AI to do anything with
 						//assuming we should count this as a user error
@@ -147,16 +154,16 @@ public abstract class BulkConsumer extends RESTAPI {
 					}
 				
 					List<DBRequest> requests = new ArrayList<>();
-					for (Triplet<URI, Introspector, HttpMethod> tuple : triplet){
-						thisUri = tuple.getValue0(); 
-						method = tuple.getValue2();
+					for (BulkOperation bulkOperation : bulkOperations){
+						thisUri = bulkOperation.getUri(); 
+						method = bulkOperation.getHttpMethod();
 						QueryParser uriQuery = dbEngine.getQueryBuilder().createQueryFromURI(thisUri);
-						DBRequest request = new DBRequest.Builder(method, thisUri, uriQuery, tuple.getValue1(), headers, info, transId).build();
+						DBRequest request = new DBRequest.Builder(method, thisUri, uriQuery, bulkOperation.getIntrospector(), headers, bulkOperation.getUriInfo(), transId).rawRequestContent(bulkOperation.getRawReq()).build();
 						requests.add(request);
 					}
 					
 					Pair<Boolean, List<Pair<URI, Response>>> results = httpEntry.process(requests, sourceOfTruth, this.enableResourceVersion());
-					List<Pair<URI,    Response>> responses = results.getValue1();
+					List<BulkOperationResponse> responses = BulkOperationResponse.processPairList(method, results.getValue1());
 					allResponses.add(responses);
 					if (results.getValue0()) { //everything was processed without error
 						dbEngine.commit();
@@ -168,15 +175,29 @@ public abstract class BulkConsumer extends RESTAPI {
 					 * bubbles up to here. As we want to tie error messages to the URI of the object that caused
 					 * them, we catch here, generate a Response, bundle it with that URI, and move on.
 					 */
-					method = HttpMethod.PUT;
-					if (triplet.size() != 0) { //failed somewhere in the middle of tuple-filling
-						Triplet<URI, Introspector, HttpMethod> lastTuple = triplet.get(triplet.size()-1); //last one in there was the problem
-						if (lastTuple.getValue1() == null){
-							//failed out before thisUri could be set but after tuples started being filled
-							thisUri = lastTuple.getValue0();
-							method = lastTuple.getValue2();
+					if (!bulkOperations.isEmpty()) { //failed somewhere in the middle of bulkOperation-filling
+						BulkOperation lastBulkOperation = bulkOperations.get(bulkOperations.size()-1); //last one in there was the problem
+						if (lastBulkOperation.getIntrospector() == null){
+							//failed out before thisUri could be set but after bulkOperation started being filled
+							thisUri = lastBulkOperation.getUri();
+							method = lastBulkOperation.getHttpMethod();
 						}
-					} //else failed out on empty payload so tuples never filled (or failed out even earlier than tuple-filling)
+					} //else failed out on empty payload so bulkOperations never filled (or failed out even earlier than bulkOperations-filling)
+					
+					if (method == null) {
+						List<String> methods = transObj.getAsJsonObject().entrySet().stream().map(Entry::getKey).collect(Collectors.toCollection(ArrayList::new));
+						
+						if (methods.contains(BULK_PUT_METHOD)) {
+							method = HttpMethod.PUT; 
+						} else if (methods.contains(BULK_DELETE_METHOD)) {
+							method = HttpMethod.DELETE;
+						} else if (methods.contains(BULK_PATCH_METHOD)) {
+							method = HttpMethod.MERGE_PATCH;
+						} else {
+							method = HttpMethod.PUT;
+						}
+					}
+					
 					addExceptionCaseFailureResponse(allResponses, e, i, thisUri, headers, info, method);
 					dbEngine.rollback();
 					continue; /* if an exception gets thrown within a transaction we want to keep going to 
@@ -238,38 +259,41 @@ public abstract class BulkConsumer extends RESTAPI {
 	}
 	
 	/**
-	 * Fill object tuples from transaction.
+	 * Fill object bulkOperations from transaction.
 	 *
-	 * @param tuples the tuples
+	 * @param bulkOperations the bulk Operations
 	 * @param transaction - JSON body containing the objects to be added
 	 * 							each object must have a URI and an object body
 	 * @param loader the loader
 	 * @param dbEngine the db engine
 	 * @param inputMediaType the input media type
-	 * @return list of tuples containing each introspector-wrapped object and its given URI
+	 * @return list of bulkOperations containing each introspector-wrapped object and its given URI
 	 * @throws AAIException the AAI exception
 	 * @throws JsonSyntaxException the json syntax exception
 	 * @throws UnsupportedEncodingException Walks through the given transaction and unmarshals each object in it, then bundles each
 	 * with its URI.
 	 */
-	private void fillObjectTuplesFromTransaction(List<Triplet<URI, Introspector, HttpMethod>> triplet,
+	private void fillBulkOperationObjectFromTransaction(List<BulkOperation> bulkOperations,
 			JsonObject transaction, Loader loader, TransactionalGraphEngine dbEngine, String inputMediaType)
 			throws AAIException, JsonSyntaxException, UnsupportedEncodingException {
 
 	
-			if (transaction.has("put") && this.functionAllowed(HttpMethod.PUT)) {
-				pairUp(triplet, transaction, loader, dbEngine, inputMediaType, HttpMethod.PUT);
-			}
-			else if (transaction.has("delete") && this.functionAllowed(HttpMethod.DELETE)) {
-				pairUp(triplet, transaction, loader, dbEngine, inputMediaType, HttpMethod.DELETE);
-			}
-			else if (transaction.has("patch") && this.functionAllowed(HttpMethod.MERGE_PATCH)) {
-				pairUp(triplet, transaction, loader, dbEngine, inputMediaType, HttpMethod.MERGE_PATCH);
-			}
-							
-			else{
+			if (transaction.has(BULK_PUT_METHOD) && this.functionAllowed(HttpMethod.PUT)) {
+				populateBulkOperations(bulkOperations, transaction, loader, dbEngine, inputMediaType, HttpMethod.PUT);
+			} else if (transaction.has(BULK_DELETE_METHOD) && this.functionAllowed(HttpMethod.DELETE)) {
+				populateBulkOperations(bulkOperations, transaction, loader, dbEngine, inputMediaType, HttpMethod.DELETE);
+			} else if (transaction.has(BULK_PATCH_METHOD) && this.functionAllowed(HttpMethod.MERGE_PATCH)) {
+				populateBulkOperations(bulkOperations, transaction, loader, dbEngine, inputMediaType, HttpMethod.MERGE_PATCH);
+			} else {
+				String msg = "input payload does not follow bulk %s interface - missing %s";
+				String type = "process";
+				String operations = "put delete or patch";
 				
-				throw new AAIException("AAI_6118", "input payload does not follow bulk add interface - missing put delete or patch");                                                    
+				if (this instanceof BulkAddConsumer) {
+					type = "add";
+					operations = BULK_PUT_METHOD;
+				}
+				throw new AAIException("AAI_6118", String.format(msg, type, operations));                                                    
 			}
 
 			
@@ -278,74 +302,83 @@ public abstract class BulkConsumer extends RESTAPI {
 
 	
 	
-	private void pairUp(List<Triplet<URI, Introspector, HttpMethod>> triplet, JsonObject item, Loader loader, TransactionalGraphEngine dbEngine, String inputMediaType, HttpMethod method) throws AAIException, JsonSyntaxException, UnsupportedEncodingException{
+	private void populateBulkOperations(List<BulkOperation> bulkOperations, JsonObject item, Loader loader, TransactionalGraphEngine dbEngine, String inputMediaType, HttpMethod method) throws AAIException, JsonSyntaxException, UnsupportedEncodingException{
 	
-		
 		for (int i=0; i<item.size(); i++) {
-			Triplet<URI, Introspector, HttpMethod> tuple =  Triplet.with(null, null,null);
-			
-			tuple = tuple.setAt2(method);
+			BulkOperation bulkOperation = new BulkOperation();
 			try {
+				
 				if (!(item.isJsonObject())) {
 					throw new AAIException("AAI_6111", "input payload does not follow bulk add interface");
 				}
 				
-				
 				JsonElement actionElement = null;
 				
-				if(item.has("put")){
-					actionElement = item.get("put");
-				} else if(item.has("patch")){
-					actionElement = item.get("patch");
-				} else if(item.has("delete")){
-					actionElement = item.get("delete");
+				if(item.has(BULK_PUT_METHOD)){
+					actionElement = item.get(BULK_PUT_METHOD);
+				} else if(item.has(BULK_PATCH_METHOD)){
+					actionElement = item.get(BULK_PATCH_METHOD);
+				} else if(item.has(BULK_DELETE_METHOD)){
+					actionElement = item.get(BULK_DELETE_METHOD);
 				}
 				
 				if ((actionElement == null) || !actionElement.isJsonArray()) {
 					throw new AAIException("AAI_6111", "input payload does not follow bulk add interface");
 				}
+				
 				JsonArray httpArray = actionElement.getAsJsonArray();
-				for(int j = 0; j < httpArray.size(); ++j){
+				for (int j = 0; j < httpArray.size(); ++j) {
+					
+					bulkOperation = new BulkOperation();
+					bulkOperation.setHttpMethod(method);
+					
 					JsonObject it = httpArray.get(j).getAsJsonObject();
 					JsonElement itemURIfield = it.get("uri");
 					if (itemURIfield == null) {
 						throw new AAIException("AAI_6118", "must include object uri");
 					}
-					String uriStr = itemURIfield.getAsString();
-					if (uriStr.endsWith("/relationship-list/relationship")) {
+					
+					UriComponents uriComponents = UriComponentsBuilder.fromUriString(itemURIfield.getAsString()).build();
+					if (uriComponents.getPath().endsWith("/relationship-list/relationship")) {
 						if (method.equals(HttpMethod.PUT)) {
-							tuple = tuple.setAt2(HttpMethod.PUT_EDGE);
+							bulkOperation.setHttpMethod(HttpMethod.PUT_EDGE);
 						} else if (method.equals(HttpMethod.DELETE)) {
-							tuple = tuple.setAt2(HttpMethod.DELETE_EDGE);
+							bulkOperation.setHttpMethod(HttpMethod.DELETE_EDGE);
 						}
 					} else {
-						tuple = tuple.setAt2(method);
+						bulkOperation.setHttpMethod(method);
 					}
 									
-					URI uri = UriBuilder.fromPath(uriStr).build();
+					URI uri = UriBuilder.fromPath(uriComponents.getPath()).build();
 					
 					/* adding the uri as soon as we have one (valid or not) lets us
 					 * keep any errors with their corresponding uris for client feedback  
 					 */
-					tuple = tuple.setAt0(uri);
+					bulkOperation.setUri(uri);
+					
+					bulkOperation.addUriInfoQueryParams(uriComponents.getQueryParams());
 					
 					if (!ValidateEncoding.getInstance().validate(uri)) {
 						throw new AAIException("AAI_3008", "uri=" + uri.getPath());
 					}
 					
-					if (!(it.has("body"))){
-						throw new AAIException("AAI_6118", "input payload does not follow bulk add interface - missing \"body\"");
-					}
-					JsonElement bodyObj = it.get("body");
-					if (!(bodyObj.isJsonObject())) {
-						throw new AAIException("AAI_6111", "input payload does not follow bulk add interface");
+					JsonElement bodyObj = new JsonObject();
+					if (!bulkOperation.getHttpMethod().equals(HttpMethod.DELETE)) {
+						if (!(it.has("body"))){
+							throw new AAIException("AAI_6118", "input payload does not follow bulk interface - missing \"body\"");
+						}
+						bodyObj = it.get("body");
+						if (!(bodyObj.isJsonObject())) {
+							throw new AAIException("AAI_6111", "input payload does not follow bulk interface");
+						} 
 					}
 					
 					Gson gson = new Gson();
 					
 					String bodyStr = gson.toJson(bodyObj);
+					bulkOperation.setRawReq(bodyStr);
 					
-					if (tuple.getValue2().equals(HttpMethod.PUT_EDGE)) {
+					if (bulkOperation.getHttpMethod().equals(HttpMethod.PUT_EDGE)) {
 						Introspector obj;
 						try {
 							obj = loader.unmarshal("relationship", bodyStr, org.onap.aai.restcore.MediaType.getEnum(inputMediaType));
@@ -355,31 +388,36 @@ public abstract class BulkConsumer extends RESTAPI {
 						}
 						
 					
-						tuple = tuple.setAt1(obj);
+						bulkOperation.setIntrospector(obj);
 
 					} else {
 						QueryParser uriQuery = dbEngine.getQueryBuilder().createQueryFromURI(uri);
 						String objName = uriQuery.getResultType();
 						
 						Introspector obj;
-						try {
-							obj = loader.unmarshal(objName, bodyStr, org.onap.aai.restcore.MediaType.getEnum(inputMediaType));
-						} catch (AAIUnmarshallingException e) {
-							throw new AAIException("AAI_3000", "object could not be unmarshalled:" + bodyStr);
+						
+						if (bulkOperation.getHttpMethod().equals(HttpMethod.DELETE)) {
+							obj = loader.introspectorFromName(objName);
+						} else {
+							try {
+								obj = loader.unmarshal(objName, bodyStr, org.onap.aai.restcore.MediaType.getEnum(inputMediaType));
+							} catch (AAIUnmarshallingException e) {
+								throw new AAIException("AAI_3000", "object could not be unmarshalled:" + bodyStr);
+	
+							}
+							this.validateIntrospector(obj, loader, uri, bulkOperation.getHttpMethod());
 
 						}
 					
-						this.validateIntrospector(obj, loader, uri, tuple.getValue2());
-						tuple = tuple.setAt1(obj);
+						bulkOperation.setIntrospector(obj);
 					}
-					triplet.add(tuple);
+					bulkOperations.add(bulkOperation);
 				}
-//				JsonElement itemURIfield = item.get("uri");
 				
 			} catch (AAIException e) {
-				// even if tuple doesn't have a uri or body, this way we keep all information associated with this error together
+				// even if bulkOperations doesn't have a uri or body, this way we keep all information associated with this error together
 				// even if both are null, that indicates how the input was messed up, so still useful to carry around like this
-				triplet.add(tuple);
+				bulkOperations.add(bulkOperation);
 				throw e; //rethrow so the right response is generated on the level above
 			}
 		}
@@ -396,18 +434,21 @@ public abstract class BulkConsumer extends RESTAPI {
 	 * 
 	 * Creates the payload for a single unified response from all responses generated
 	 */
-	private String generateResponsePayload(List<List<Pair<URI,Response>>> allResponses){
+	private String generateResponsePayload(List<List<BulkOperationResponse>> allResponses){
 		JsonObject ret = new JsonObject();
 		JsonArray retArr = new JsonArray();
 		
-		for(List<Pair<URI,Response>> responses : allResponses){
+		for(List<BulkOperationResponse> responses : allResponses){
 			JsonObject tResp = new JsonObject();
 			JsonArray tArrResp = new JsonArray();
+			HttpMethod method = HttpMethod.PUT;
 			
-			for (Pair<URI,Response> r : responses) {
+			for (BulkOperationResponse r : responses) {
+				
 				JsonObject indPayload = new JsonObject();
+				method = r.getHttpMethod();
 				
-				URI origURI = r.getValue0();
+				URI origURI = r.getUri();
 				if (origURI != null) {
 					indPayload.addProperty("uri", origURI.getPath());
 				} else {
@@ -416,26 +457,38 @@ public abstract class BulkConsumer extends RESTAPI {
 				
 				JsonObject body = new JsonObject();
 				
-				int rStatus = r.getValue1().getStatus();
+				int rStatus = r.getResponse().getStatus();
 				String rContents = null;
 				
-				rContents = (String)r.getValue1().getEntity();
+				rContents = (String)r.getResponse().getEntity();
 				
-				body.addProperty(new Integer(rStatus).toString(), rContents);
+				body.addProperty(Integer.toString(rStatus), rContents);
 				indPayload.add("body", body);
 				
 				tArrResp.add(indPayload);
 			}
 			
-			tResp.add("put", tArrResp);
+			tResp.add(this.mapHttpMethodToBulkMethod(method), tArrResp);
 			retArr.add(tResp);
 		}
 		ret.add("transaction", retArr);
 		Gson gson = new GsonBuilder().serializeNulls().create();
-		String jsonStr = gson.toJson(ret);
-		return jsonStr;
+		return gson.toJson(ret);
 	}
 	
+	private String mapHttpMethodToBulkMethod(HttpMethod method) {
+		if (HttpMethod.PUT.equals(method) || HttpMethod.PUT_EDGE.equals(method)) {
+			return BULK_PUT_METHOD;
+		} else if (HttpMethod.DELETE.equals(method) || HttpMethod.DELETE_EDGE.equals(method)) {
+			return BULK_DELETE_METHOD;
+		} else if (HttpMethod.MERGE_PATCH.equals(method)) {
+			return BULK_PATCH_METHOD;
+		} else {
+			return "";
+		}
+	}
+
+
 	/**
 	 * Adds the exception case failure response.
 	 *
@@ -449,7 +502,7 @@ public abstract class BulkConsumer extends RESTAPI {
 	 * @param logline Generates a Response based on the given exception and adds it to the collection of responses for this request.
 	 * @throws ErrorObjectNotFoundException 
 	 */
-	private void addExceptionCaseFailureResponse(List<List<Pair<URI, Response>>> allResponses, Exception e, int index, URI thisUri, HttpHeaders headers, UriInfo info, HttpMethod templateAction) {
+	private void addExceptionCaseFailureResponse(List<List<BulkOperationResponse>> allResponses, Exception e, int index, URI thisUri, HttpHeaders headers, UriInfo info, HttpMethod templateAction) {
 		AAIException ex = null;
 		
 		if (!(e instanceof AAIException)){
@@ -464,15 +517,15 @@ public abstract class BulkConsumer extends RESTAPI {
 			
 			//this transaction doesn't have a response list yet, so create one
 			Response failResp = consumerExceptionResponseGenerator(headers, info, templateAction, ex);
-			Pair<URI, Response> uriResp = Pair.with(thisUri, failResp);
-			List<Pair<URI, Response>> transRespList = new ArrayList<Pair<URI,Response>>();
+			BulkOperationResponse uriResp =  new BulkOperationResponse(templateAction, thisUri, failResp);
+			List<BulkOperationResponse> transRespList = new ArrayList<>();
 			transRespList.add(uriResp);
 			allResponses.add(transRespList);
 		} else {
 			//this transaction already has a response list, so add this failure response to it
 			Response failResp = consumerExceptionResponseGenerator(headers, info, templateAction, ex);
-			Pair<URI, Response> uriResp = Pair.with(thisUri, failResp);
-			List<Pair<URI, Response>> tResps = allResponses.get(index);
+			BulkOperationResponse uriResp = new BulkOperationResponse(templateAction, thisUri, failResp);
+			List<BulkOperationResponse> tResps = allResponses.get(index);
 			tResps.add(uriResp);
 		}
 	}
diff --git a/aai-resources/src/main/java/org/onap/aai/rest/bulk/BulkOperation.java b/aai-resources/src/main/java/org/onap/aai/rest/bulk/BulkOperation.java
new file mode 100644
index 0000000..a4c8d98
--- /dev/null
+++ b/aai-resources/src/main/java/org/onap/aai/rest/bulk/BulkOperation.java
@@ -0,0 +1,68 @@
+package org.onap.aai.rest.bulk;

+

+import java.net.URI;

+import java.util.List;

+import java.util.Map.Entry;

+

+import javax.ws.rs.core.UriInfo;

+

+import org.onap.aai.introspection.Introspector;

+import org.onap.aai.restcore.HttpMethod;

+import org.springframework.util.MultiValueMap;

+

+public class BulkOperation {

+

+	private URI uri = null;

+	private Introspector introspector = null;

+	private HttpMethod httpMethod = null;

+	private String rawReq = "";

+	private UriInfo uriInfo = new BulkUriInfo();

+

+	public UriInfo getUriInfo() {

+		return uriInfo;

+	}

+

+	public String getRawReq() {

+		return rawReq;

+	}

+

+	public void setRawReq(String rawReq) {

+		this.rawReq = rawReq;

+	}

+

+	public URI getUri() {

+		return uri;

+	}

+

+	public void setUri(URI uri) {

+		this.uri = uri;

+	}

+

+	public Introspector getIntrospector() {

+		return introspector;

+	}

+

+	public void setIntrospector(Introspector introspector) {

+		this.introspector = introspector;

+	}

+

+	public HttpMethod getHttpMethod() {

+		return httpMethod;

+	}

+

+	public void setHttpMethod(HttpMethod httpMethod) {

+		this.httpMethod = httpMethod;

+	}

+

+	public void addUriInfoQueryParams(MultiValueMap<String, String> queryParams) {

+		

+		BulkUriInfo bui = new BulkUriInfo();

+		

+		for (Entry<String, List<String>> entry : queryParams.entrySet()) {

+			bui.addParams(entry.getKey(), entry.getValue());

+		}

+		

+		this.uriInfo = bui;

+	}

+

+}

diff --git a/aai-resources/src/main/java/org/onap/aai/rest/bulk/BulkOperationResponse.java b/aai-resources/src/main/java/org/onap/aai/rest/bulk/BulkOperationResponse.java
new file mode 100644
index 0000000..ac00b80
--- /dev/null
+++ b/aai-resources/src/main/java/org/onap/aai/rest/bulk/BulkOperationResponse.java
@@ -0,0 +1,70 @@
+package org.onap.aai.rest.bulk;

+

+import java.net.URI;

+import java.util.ArrayList;

+import java.util.List;

+

+import javax.ws.rs.core.Response;

+

+import org.javatuples.Pair;

+import org.onap.aai.restcore.HttpMethod;

+

+public class BulkOperationResponse {

+	

+	private URI uri = null;

+	private Response response = null;

+	private HttpMethod httpMethod = null;

+	

+	private BulkOperationResponse() {

+		

+	}

+	

+	private BulkOperationResponse(HttpMethod httpMethod, Pair<URI, Response> pair) {

+		this.httpMethod = httpMethod;

+		this.response = pair.getValue1();

+		this.uri = pair.getValue0();

+	}

+

+	public BulkOperationResponse(HttpMethod httpMethod, URI uri, Response response) {

+		this.httpMethod = httpMethod;

+		this.response = response;

+		this.uri = uri;

+	}

+

+	public URI getUri() {

+		return uri;

+	}

+

+	public void setUri(URI uri) {

+		this.uri = uri;

+	}

+

+	public Response getResponse() {

+		return response;

+	}

+

+	public void setResponse(Response response) {

+		this.response = response;

+	}

+

+	public HttpMethod getHttpMethod() {

+		return httpMethod;

+	}

+

+	public void setHttpMethod(HttpMethod httpMethod) {

+		this.httpMethod = httpMethod;

+	}

+	

+	public static List<BulkOperationResponse> processPairList(HttpMethod httpMethod, List<Pair<URI, Response>> pairList) {

+		

+		List<BulkOperationResponse> borList = new ArrayList<>();

+		BulkOperationResponse bor;

+		

+		for (Pair<URI, Response> pair: pairList) {

+			bor = new BulkOperationResponse(httpMethod, pair);

+			borList.add(bor);

+		}

+		

+		return borList;

+	}

+}

diff --git a/aai-resources/src/main/java/org/onap/aai/rest/bulk/BulkUriInfo.java b/aai-resources/src/main/java/org/onap/aai/rest/bulk/BulkUriInfo.java
new file mode 100644
index 0000000..2bff084
--- /dev/null
+++ b/aai-resources/src/main/java/org/onap/aai/rest/bulk/BulkUriInfo.java
@@ -0,0 +1,105 @@
+package org.onap.aai.rest.bulk;

+

+import java.net.URI;

+import java.util.List;

+

+import javax.ws.rs.core.MultivaluedMap;

+import javax.ws.rs.core.PathSegment;

+import javax.ws.rs.core.UriBuilder;

+import javax.ws.rs.core.UriInfo;

+

+import com.sun.jersey.core.util.MultivaluedMapImpl;

+

+public class BulkUriInfo implements UriInfo {

+	

+	private MultivaluedMap<String, String> queryParams= new MultivaluedMapImpl();

+		

+	@Override

+	public String getPath() {

+		return null;

+	}

+

+	@Override

+	public String getPath(boolean decode) {

+		return null;

+	}

+

+	@Override

+	public List<PathSegment> getPathSegments() {

+		return null;

+	}

+

+	@Override

+	public List<PathSegment> getPathSegments(boolean decode) {

+		return null;

+	}

+

+	@Override

+	public URI getRequestUri() {

+		return null;

+	}

+

+	@Override

+	public UriBuilder getRequestUriBuilder() {

+		return null;

+	}

+

+	@Override

+	public URI getAbsolutePath() {

+		return null;

+	}

+

+	@Override

+	public UriBuilder getAbsolutePathBuilder() {

+		return null;

+	}

+

+	@Override

+	public URI getBaseUri() {

+		return null;

+	}

+

+	@Override

+	public UriBuilder getBaseUriBuilder() {

+		return null;

+	}

+

+	@Override

+	public MultivaluedMap<String, String> getPathParameters() {

+		return null;

+	}

+

+	@Override

+	public MultivaluedMap<String, String> getPathParameters(boolean decode) {

+		return null;

+	}

+

+	@Override

+	public MultivaluedMap<String, String> getQueryParameters() {

+		return this.queryParams;

+	}

+

+	@Override

+	public MultivaluedMap<String, String> getQueryParameters(boolean decode) {

+		return this.queryParams;

+	}

+

+	@Override

+	public List<String> getMatchedURIs() {

+		return null;

+	}

+

+	@Override

+	public List<String> getMatchedURIs(boolean decode) {

+		return null;

+	}

+

+	@Override

+	public List<Object> getMatchedResources() {

+		return null;

+	}

+	

+	public void addParams(String key, List<String> list) {

+		this.queryParams.put(key, list);

+	}

+}

diff --git a/aai-resources/src/test/java/org/onap/aai/rest/BulkAddConsumerTest.java b/aai-resources/src/test/java/org/onap/aai/rest/BulkAddConsumerTest.java
index 28ded9d..66afeeb 100644
--- a/aai-resources/src/test/java/org/onap/aai/rest/BulkAddConsumerTest.java
+++ b/aai-resources/src/test/java/org/onap/aai/rest/BulkAddConsumerTest.java
@@ -21,169 +21,100 @@
  */
 package org.onap.aai.rest;
 
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
-import org.apache.commons.io.IOUtils;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.mockito.Mockito;
-import org.onap.aai.AAISetup;
-import org.onap.aai.dbmap.AAIGraph;
-import org.onap.aai.introspection.ModelInjestor;
-import org.onap.aai.introspection.Version;
-
-import javax.ws.rs.core.*;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.*;
-
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.mockito.Matchers.anyObject;
 import static org.mockito.Mockito.when;
 
-public class BulkAddConsumerTest extends AAISetup {
-
-    protected static final MediaType APPLICATION_JSON = MediaType.valueOf("application/json");
-
-    protected static final Set<Integer> VALID_HTTP_STATUS_CODES = new HashSet<>();
-
-    static {
-        VALID_HTTP_STATUS_CODES.add(200);
-        VALID_HTTP_STATUS_CODES.add(201);
-        VALID_HTTP_STATUS_CODES.add(204);
-    }
-
-    protected BulkConsumer bulkConsumer;
-
-    protected HttpHeaders httpHeaders;
+import java.io.IOException;
 
-    protected UriInfo uriInfo;
+import javax.ws.rs.core.Response;
 
-    protected MultivaluedMap<String, String> headersMultiMap;
-    protected MultivaluedMap<String, String> queryParameters;
+import org.apache.commons.lang3.StringUtils;
+import org.junit.Test;
+import org.onap.aai.introspection.Version;
 
-    protected List<String> aaiRequestContextList;
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
 
-    protected List<MediaType> outputMediaTypes;
+public class BulkAddConsumerTest extends BulkProcessorTestAbstraction {
 
     private static final EELFLogger logger = EELFManager.getInstance().getLogger(BulkAddConsumerTest.class.getName());
 
-    @BeforeClass
-    public static void setupRest(){
-        AAIGraph.getInstance();
-        ModelInjestor.getInstance();
-    }
-
-    @Before
-    public void setup(){
-        logger.info("Starting the setup for the integration tests of Rest Endpoints");
 
-        bulkConsumer     = getConsumer();
-        httpHeaders         = Mockito.mock(HttpHeaders.class);
-        uriInfo             = Mockito.mock(UriInfo.class);
+	@Test
+    public void validBulkAddTest() throws IOException {
 
-        headersMultiMap     = new MultivaluedHashMap<>();
-        queryParameters     = Mockito.spy(new MultivaluedHashMap<>());
-
-        headersMultiMap.add("X-FromAppId", "JUNIT");
-        headersMultiMap.add("X-TransactionId", UUID.randomUUID().toString());
-        headersMultiMap.add("Real-Time", "true");
-        headersMultiMap.add("Accept", "application/json");
-        headersMultiMap.add("aai-request-context", "");
-
-        outputMediaTypes = new ArrayList<>();
-        outputMediaTypes.add(APPLICATION_JSON);
-
-        aaiRequestContextList = new ArrayList<>();
-        aaiRequestContextList.add("");
-
-        when(httpHeaders.getAcceptableMediaTypes()).thenReturn(outputMediaTypes);
-        when(httpHeaders.getRequestHeaders()).thenReturn(headersMultiMap);
+        when(uriInfo.getPath()).thenReturn(uri);
+        when(uriInfo.getPath(false)).thenReturn(uri);
 
-        when(httpHeaders.getRequestHeader("aai-request-context")).thenReturn(aaiRequestContextList);
+        String payload = getBulkPayload("pserver-transactions");
+        Response response = executeRequest(payload);
 
+        assertEquals("Valid Response Code", Response.Status.CREATED.getStatusCode(), response.getStatus());
+        assertEquals("Contains 3 {\"201\":null}", 3, StringUtils.countMatches(response.getEntity().toString(), "{\"201\":null}"));
+    }
+	
+	@Test
+    public void bulkProcessPayloadInBulkAddTest() throws IOException {
 
-        when(uriInfo.getQueryParameters()).thenReturn(queryParameters);
-        when(uriInfo.getQueryParameters(false)).thenReturn(queryParameters);
+        when(uriInfo.getPath()).thenReturn(uri);
+        when(uriInfo.getPath(false)).thenReturn(uri);
 
-        // TODO - Check if this is valid since RemoveDME2QueryParameters seems to be very unreasonable
-        Mockito.doReturn(null).when(queryParameters).remove(anyObject());
+        String payload = getBulkPayload("pserver-bulk-process-transactions");
+        Response response = executeRequest(payload);
 
-        when(httpHeaders.getMediaType()).thenReturn(APPLICATION_JSON);
+        assertEquals("Valid Response Code", Response.Status.CREATED.getStatusCode(), response.getStatus());
+        assertEquals("Contains 1 {\"201\":null}", 1, StringUtils.countMatches(response.getEntity().toString(), "{\"201\":null}"));
+        assertEquals("Contains 1 {\"400\":\"{", 1, StringUtils.countMatches(response.getEntity().toString(), "{\"400\":\"{"));
+        assertEquals("Contains 1 ERR.5.4.6118", 1, StringUtils.countMatches(response.getEntity().toString(), "ERR.5.4.6118"));
     }
-
-    @Test
-    public void testBulkAdd() throws IOException {
-
-        String uri = "/aai/v11/bulkadd";
+	
+	@Test
+    public void bulkAddInvalidMethodTest() throws IOException {
 
         when(uriInfo.getPath()).thenReturn(uri);
         when(uriInfo.getPath(false)).thenReturn(uri);
 
-        String payload = getBulkPayload("pserver-transactions");
-        Response response = bulkConsumer.bulkAdd(
-                payload,
-                Version.getLatest().toString(),
-                httpHeaders,
-                uriInfo,
-                null
-        );
-
-        System.out.println("Code: " + response.getStatus() + "\tResponse: " + response.getEntity());
-        assertEquals(Response.Status.CREATED.getStatusCode(), response.getStatus());
+        String payload = getBulkPayload("pserver-transactions-invalid-method");
+        Response response = executeRequest(payload);
+
+        assertEquals("Valid Response Code", Response.Status.CREATED.getStatusCode(), response.getStatus());
+        assertEquals("Contains 1 {\"400\":\"{", 1, StringUtils.countMatches(response.getEntity().toString(), "{\"400\":\"{"));
+        assertEquals("Contains 1 ERR.5.4.6118", 1, StringUtils.countMatches(response.getEntity().toString(), "ERR.5.4.6118"));
     }
 
     @Test
-    public void testBulkAddThrowExceptionWhenPayloadContainsNoTransactions(){
-
-        String uri = "/aai/v11/bulkadd";
+    public void bulkAddThrowExceptionWhenPayloadContainsNoTransactionsTest(){
 
         when(uriInfo.getPath()).thenReturn(uri);
         when(uriInfo.getPath(false)).thenReturn(uri);
 
         String payload = "{\"transactions\":[]}";
-        Response response = bulkConsumer.bulkAdd(
-                payload,
-                Version.getLatest().toString(),
-                httpHeaders,
-                uriInfo,
-                null
-        );
-
-        System.out.println("Code: " + response.getStatus() + "\tResponse: " + response.getEntity());
-        assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), response.getStatus());
+        Response response = executeRequest(payload);
+
+        assertEquals("Bad Request", Response.Status.BAD_REQUEST.getStatusCode(), response.getStatus());
+        assertEquals("Contains error code", true, response.getEntity().toString().contains("ERR.5.4.6118"));
     }
 
     @Test
-    public void testBulkAddThrowExceptionWhenInvalidJson() throws IOException {
-
-        String uri = "/aai/v11/bulkadd";
+    public void bulkAddThrowExceptionWhenInvalidJsonTest() throws IOException {
 
         when(uriInfo.getPath()).thenReturn(uri);
         when(uriInfo.getPath(false)).thenReturn(uri);
 
         String payload = "{";
-        Response response = bulkConsumer.bulkAdd(
-                payload,
-                Version.getLatest().toString(),
-                httpHeaders,
-                uriInfo,
-                null
-        );
-
-        System.out.println("Code: " + response.getStatus() + "\tResponse: " + response.getEntity());
-        assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), response.getStatus());
-
-        // TODO - Verify the result output and check if it contains an 400 in the list
-    }
+        Response response = executeRequest(payload);
 
-    public String getBulkPayload(String bulkName) throws IOException {
-        return getPayload("payloads/bulk/" + bulkName + ".json");
+        assertEquals("Bad Request", Response.Status.BAD_REQUEST.getStatusCode(), response.getStatus());
+        assertEquals("Contains error code", true, response.getEntity().toString().contains("ERR.5.4.6111"));
     }
-
-    public BulkConsumer getConsumer(){
+    
+    @Override
+    protected BulkConsumer getConsumer(){
         return new BulkAddConsumer();
     }
+  
+    @Override
+    protected String getUri() {
+		return "/aai/" + Version.getLatest().toString() + "/bulkadd";
+	}
 }
diff --git a/aai-resources/src/test/java/org/onap/aai/rest/BulkProcessConsumerTest.java b/aai-resources/src/test/java/org/onap/aai/rest/BulkProcessConsumerTest.java
index 99bccc7..92d1637 100644
--- a/aai-resources/src/test/java/org/onap/aai/rest/BulkProcessConsumerTest.java
+++ b/aai-resources/src/test/java/org/onap/aai/rest/BulkProcessConsumerTest.java
@@ -21,55 +21,117 @@
  */
 package org.onap.aai.rest;
 
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
-import org.apache.commons.io.IOUtils;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.mockito.Mockito;
-import org.onap.aai.AAISetup;
-import org.onap.aai.dbmap.AAIGraph;
-import org.onap.aai.introspection.ModelInjestor;
-import org.onap.aai.introspection.Version;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.when;
 
-import javax.ws.rs.core.*;
 import java.io.IOException;
-import java.io.InputStream;
-import java.util.*;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Mockito.when;
+import javax.ws.rs.core.Response;
+
+import org.apache.commons.lang3.StringUtils;
+import org.junit.Test;
+import org.onap.aai.introspection.Version;
 
-public class BulkProcessConsumerTest extends BulkAddConsumerTest {
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+
+public class BulkProcessConsumerTest extends BulkProcessorTestAbstraction {
 
     private static final EELFLogger logger = EELFManager.getInstance().getLogger(BulkProcessConsumerTest.class.getName());
 
-    @Test
-    public void testBulkAddCreatedWhenOneTransactionInPayloadContainsNotAllowedVerb() throws IOException {
 
-        String uri = "/aai/v11/bulkadd";
+	@Test
+    public void bulkAddPayloadInBulkProcessTest() throws IOException {
+
+        when(uriInfo.getPath()).thenReturn(uri);
+        when(uriInfo.getPath(false)).thenReturn(uri);
+
+        String payload = getBulkPayload("pserver-transactions");
+        Response response = executeRequest(payload);
+
+        assertEquals("Valid Response Code", Response.Status.CREATED.getStatusCode(), response.getStatus());
+        assertEquals("Contains 3 {\"201\":null}", 3, StringUtils.countMatches(response.getEntity().toString(), "{\"201\":null}"));
+    }
+	
+	@Test
+    public void bulkProcessPayloadTest() throws IOException {
+
+        when(uriInfo.getPath()).thenReturn(uri);
+        when(uriInfo.getPath(false)).thenReturn(uri);
+
+        String payload = getBulkPayload("pserver-bulk-process-transactions");
+        Response response = executeRequest(payload);
+
+        assertEquals("Valid Response Code", Response.Status.CREATED.getStatusCode(), response.getStatus());
+        assertEquals("Contains 1 {\"201\":null}", 1, StringUtils.countMatches(response.getEntity().toString(), "{\"201\":null}"));
+        assertEquals("Contains 1 {\"404\":\"{", 1, StringUtils.countMatches(response.getEntity().toString(), "{\"404\":\"{"));
+        assertEquals("Contains 1 ERR.5.4.6114", 1, StringUtils.countMatches(response.getEntity().toString(), "ERR.5.4.6114"));
+    }
+	
+	@Test
+    public void bulkProcessComplexDeletePayloadTest() throws IOException {
 
         when(uriInfo.getPath()).thenReturn(uri);
         when(uriInfo.getPath(false)).thenReturn(uri);
 
-        String payload = getBulkPayload("pserver-transactions-invalid");
-        Response response = bulkConsumer.bulkAdd(
-                payload,
-                Version.getLatest().toString(),
-                httpHeaders,
-                uriInfo,
-                null
-        );
-
-        System.out.println("Code: " + response.getStatus() + "\tResponse: " + response.getEntity());
-        assertEquals(Response.Status.CREATED.getStatusCode(), response.getStatus());
+        String payload = getBulkPayload("complex-bulk-process-transactions");
+        Response response = executeRequest(payload);
+
+        System.out.println(response.getEntity().toString());
+        assertEquals("Valid Response Code", Response.Status.CREATED.getStatusCode(), response.getStatus());
+        assertEquals("Contains 0 {\"201\":null}", 0, StringUtils.countMatches(response.getEntity().toString(), "{\"201\":null}"));
+        assertEquals("Contains 1 {\"404\":\"{", 1, StringUtils.countMatches(response.getEntity().toString(), "{\"404\":\"{"));
+        assertEquals("Contains 1 ERR.5.4.6114", 1, StringUtils.countMatches(response.getEntity().toString(), "ERR.5.4.6114"));
     }
+	
+	
+	@Test
+    public void bulkAddInvalidMethodTest() throws IOException {
+
+        when(uriInfo.getPath()).thenReturn(uri);
+        when(uriInfo.getPath(false)).thenReturn(uri);
+
+        String payload = getBulkPayload("pserver-transactions-invalid-method");
+        Response response = executeRequest(payload);
 
+        assertEquals("Valid Response Code", Response.Status.CREATED.getStatusCode(), response.getStatus());
+        assertEquals("Contains 1 {\"400\":\"{", 1, StringUtils.countMatches(response.getEntity().toString(), "{\"400\":\"{"));
+        assertEquals("Contains 1 ERR.5.4.6118", 1, StringUtils.countMatches(response.getEntity().toString(), "ERR.5.4.6118"));
+    }
+
+    @Test
+    public void bulkAddThrowExceptionWhenPayloadContainsNoTransactionsTest(){
+
+        when(uriInfo.getPath()).thenReturn(uri);
+        when(uriInfo.getPath(false)).thenReturn(uri);
+
+        String payload = "{\"transactions\":[]}";
+        Response response = executeRequest(payload);
+
+        assertEquals("Bad Request", Response.Status.BAD_REQUEST.getStatusCode(), response.getStatus());
+        assertEquals("Contains error code", true, response.getEntity().toString().contains("ERR.5.4.6118"));
+    }
+
+    @Test
+    public void bulkAddThrowExceptionWhenInvalidJsonTest() throws IOException {
+
+        when(uriInfo.getPath()).thenReturn(uri);
+        when(uriInfo.getPath(false)).thenReturn(uri);
+
+        String payload = "{";
+        Response response = executeRequest(payload);
+
+        assertEquals("Bad Request", Response.Status.BAD_REQUEST.getStatusCode(), response.getStatus());
+        assertEquals("Contains error code", true, response.getEntity().toString().contains("ERR.5.4.6111"));
+    }
+    
     @Override
-    public BulkConsumer getConsumer(){
+    protected BulkConsumer getConsumer(){
         return new BulkProcessConsumer();
     }
+  
+    @Override
+    protected String getUri() {
+		return "/aai/" + Version.getLatest().toString() + "/bulkprocess";
+	}
 }
diff --git a/aai-resources/src/test/java/org/onap/aai/rest/BulkProcessorTestAbstraction.java b/aai-resources/src/test/java/org/onap/aai/rest/BulkProcessorTestAbstraction.java
new file mode 100644
index 0000000..f5d0670
--- /dev/null
+++ b/aai-resources/src/test/java/org/onap/aai/rest/BulkProcessorTestAbstraction.java
@@ -0,0 +1,143 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ */
+package org.onap.aai.rest;
+
+import static org.mockito.Matchers.anyObject;
+import static org.mockito.Mockito.when;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedHashMap;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriInfo;
+
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.mockito.Mockito;
+import org.onap.aai.AAISetup;
+import org.onap.aai.dbmap.AAIGraph;
+import org.onap.aai.introspection.ModelInjestor;
+import org.onap.aai.introspection.Version;
+
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+
+public abstract class BulkProcessorTestAbstraction extends AAISetup {
+
+    protected static final MediaType APPLICATION_JSON = MediaType.valueOf("application/json");
+
+    protected static final Set<Integer> VALID_HTTP_STATUS_CODES = new HashSet<>();
+
+    static {
+        VALID_HTTP_STATUS_CODES.add(200);
+        VALID_HTTP_STATUS_CODES.add(201);
+        VALID_HTTP_STATUS_CODES.add(204);
+    }
+
+    protected BulkConsumer bulkConsumer;
+
+    protected HttpHeaders httpHeaders;
+
+    protected UriInfo uriInfo;
+
+    protected MultivaluedMap<String, String> headersMultiMap;
+    protected MultivaluedMap<String, String> queryParameters;
+
+    protected List<String> aaiRequestContextList;
+
+    protected List<MediaType> outputMediaTypes;
+    
+    protected String uri;
+
+    private static final EELFLogger logger = EELFManager.getInstance().getLogger(BulkProcessorTestAbstraction.class.getName());
+
+    @BeforeClass
+    public static void setupRest(){
+        AAIGraph.getInstance();
+        ModelInjestor.getInstance();
+    }
+
+    @Before
+    public void setup(){
+        logger.info("Starting the setup for the integration tests of Rest Endpoints");
+
+        bulkConsumer     = getConsumer();
+        uri = getUri();
+        httpHeaders         = Mockito.mock(HttpHeaders.class);
+        uriInfo             = Mockito.mock(UriInfo.class);
+
+        headersMultiMap     = new MultivaluedHashMap<>();
+        queryParameters     = Mockito.spy(new MultivaluedHashMap<>());
+
+        headersMultiMap.add("X-FromAppId", "JUNIT");
+        headersMultiMap.add("X-TransactionId", UUID.randomUUID().toString());
+        headersMultiMap.add("Real-Time", "true");
+        headersMultiMap.add("Accept", "application/json");
+        headersMultiMap.add("aai-request-context", "");
+
+        outputMediaTypes = new ArrayList<>();
+        outputMediaTypes.add(APPLICATION_JSON);
+
+        aaiRequestContextList = new ArrayList<>();
+        aaiRequestContextList.add("");
+
+        when(httpHeaders.getAcceptableMediaTypes()).thenReturn(outputMediaTypes);
+        when(httpHeaders.getRequestHeaders()).thenReturn(headersMultiMap);
+
+        when(httpHeaders.getRequestHeader("aai-request-context")).thenReturn(aaiRequestContextList);
+
+
+        when(uriInfo.getQueryParameters()).thenReturn(queryParameters);
+        when(uriInfo.getQueryParameters(false)).thenReturn(queryParameters);
+
+        // TODO - Check if this is valid since RemoveDME2QueryParameters seems to be very unreasonable
+        Mockito.doReturn(null).when(queryParameters).remove(anyObject());
+
+        when(httpHeaders.getMediaType()).thenReturn(APPLICATION_JSON);
+    }
+    
+    protected Response executeRequest(String payload) {
+		return bulkConsumer.bulkProcessor(
+				payload.replaceAll("<UUID>", UUID.randomUUID().toString()),
+                Version.getLatest().toString(),
+                httpHeaders,
+                uriInfo,
+                null
+        );
+	}
+
+    protected String getBulkPayload(String bulkPayloadName) throws IOException {
+        return getPayload("payloads/bulk/" + bulkPayloadName + ".json");
+    }
+    
+    protected abstract BulkConsumer getConsumer();
+  
+    protected abstract String getUri();
+}
diff --git a/aai-resources/src/test/resources/payloads/bulk/complex-bulk-process-transactions.json b/aai-resources/src/test/resources/payloads/bulk/complex-bulk-process-transactions.json
new file mode 100644
index 0000000..62b2e97
--- /dev/null
+++ b/aai-resources/src/test/resources/payloads/bulk/complex-bulk-process-transactions.json
@@ -0,0 +1,11 @@
+{
+	"transactions": [
+		{
+			"delete": [
+				{
+					"uri": "/cloud-infrastructure/complexes/complex/complex-bulk-process-transactions-2-<UUID>"
+				}
+			]
+		}
+	]
+}
diff --git a/aai-resources/src/test/resources/payloads/bulk/pserver-bulk-process-transactions.json b/aai-resources/src/test/resources/payloads/bulk/pserver-bulk-process-transactions.json
new file mode 100644
index 0000000..116159a
--- /dev/null
+++ b/aai-resources/src/test/resources/payloads/bulk/pserver-bulk-process-transactions.json
@@ -0,0 +1,25 @@
+{
+	"transactions": [
+		{
+			"put": [
+				{
+					"uri": "/cloud-infrastructure/pservers/pserver/pserver-bulk-process-transactions-1-<UUID>",
+					"body": {
+						"hostname": "pserver-bulk-process-transactions-1-<UUID>",
+						"fqdn": "pserver-bulk-process-transactions-1-fqdn"
+					}
+				}
+			]
+		},
+		{
+			"delete": [
+				{
+					"uri": "/cloud-infrastructure/pservers/pserver/pserver-bulk-process-transactions-2-<UUID>",
+					"body": {
+						"hostname": "pserver-bulk-process-transactions-2-<UUID>"
+					}
+				}
+			]
+		}
+	]
+}
diff --git a/aai-resources/src/test/resources/payloads/bulk/pserver-transactions-invalid-method.json b/aai-resources/src/test/resources/payloads/bulk/pserver-transactions-invalid-method.json
new file mode 100644
index 0000000..f0f1d32
--- /dev/null
+++ b/aai-resources/src/test/resources/payloads/bulk/pserver-transactions-invalid-method.json
@@ -0,0 +1,15 @@
+{
+	"transactions": [
+		{
+			"foo": [
+				{
+					"uri": "/cloud-infrastructure/pservers/pserver/pserver-transactions-invalid-method-1-<UUID>",
+					"body": {
+						"hostname": "pserver-transactions-invalid-method-1-<UUID>",
+						"fqdn": "pserver-transactions-invalid-method-1-fqdn"
+					}
+				}
+			]
+		}
+	]
+}
diff --git a/aai-resources/src/test/resources/payloads/bulk/pserver-transactions-invalid.json b/aai-resources/src/test/resources/payloads/bulk/pserver-transactions-invalid.json
deleted file mode 100644
index baf8392..0000000
--- a/aai-resources/src/test/resources/payloads/bulk/pserver-transactions-invalid.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "transactions": [
-    {
-      "put": [
-        {
-          "uri": "/cloud-infrastructure/pservers/pserver/pserver-hostname-11",
-          "body": {
-            "hostname": "pserver-hostname-11",
-            "fqdn": "fake-fqdn-11"
-          }
-        }
-      ]
-    },
-    {
-      "patch": [
-        {
-          "uri": "/cloud-infrastructure/pservers/pserver/pserver-hostname-11",
-          "body": {
-            "fqdn": "fake-fqdn-12"
-          }
-        }
-      ]
-    },
-    {
-      "delete": [
-        {
-          "uri": "/cloud-infrastructure/pservers/pserver/pserver-hostname-11",
-          "body": {
-            "hostname": "pserver-hostname-11"
-          }
-        }
-      ]
-    },
-    {
-      "get": [
-        {
-          "uri": "/cloud-infrastructure/pservers/pserver/pserver-hostname-11",
-          "body": {
-          }
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/aai-resources/src/test/resources/payloads/bulk/pserver-transactions.json b/aai-resources/src/test/resources/payloads/bulk/pserver-transactions.json
index cf0698c..93ed663 100644
--- a/aai-resources/src/test/resources/payloads/bulk/pserver-transactions.json
+++ b/aai-resources/src/test/resources/payloads/bulk/pserver-transactions.json
@@ -1,35 +1,33 @@
 {
-  "transactions": [
-    {
-      "put": [
-        {
-          "uri": "/cloud-infrastructure/pservers/pserver/pserver-hostname-11",
-          "body": {
-            "hostname": "pserver-hostname-11",
-            "fqdn": "fake-fqdn-11"
-          }
-        }
-      ]
-    },
-    {
-      "patch": [
-        {
-          "uri": "/cloud-infrastructure/pservers/pserver/pserver-hostname-11",
-          "body": {
-            "fqdn": "fake-fqdn-12"
-          }
-        }
-      ]
-    },
-    {
-      "delete": [
-        {
-          "uri": "/cloud-infrastructure/pservers/pserver/pserver-hostname-11",
-          "body": {
-            "hostname": "pserver-hostname-11"
-          }
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
+	"transactions": [
+		{
+			"put": [
+				{
+					"uri": "/cloud-infrastructure/pservers/pserver/pserver-transactions-1-<UUID>",
+					"body": {
+						"hostname": "pserver-transactions-1-<UUID>",
+						"fqdn": "fake-fqdn-1"
+					}
+				},
+				{
+					"uri": "/cloud-infrastructure/pservers/pserver/pserver-transactions-2-<UUID>",
+					"body": {
+						"hostname": "pserver-transactions-2-<UUID>",
+						"fqdn": "fake-fqdn-2"
+					}
+				}
+			]
+		},
+		{
+			"put": [
+				{
+					"uri": "/cloud-infrastructure/pservers/pserver/pserver-transactions-3-<UUID>",
+					"body": {
+						"hostname": "pserver-transactions-3-<UUID>",
+						"fqdn": "fake-fqdn-3"
+					}
+				}
+			]
+		}
+	]
+}