Merge "updated delete payloads for bulk deletes"

8 files changed, 60 insertions, 20 deletions

diff --git a/common/src/main/java/org/onap/so/client/aai/AAISingleTransactionClient.java b/common/src/main/java/org/onap/so/client/aai/AAISingleTransactionClient.java
index 1370bb3fa3..3f9715bdef 100644
--- a/common/src/main/java/org/onap/so/client/aai/AAISingleTransactionClient.java
+++ b/common/src/main/java/org/onap/so/client/aai/AAISingleTransactionClient.java
@@ -116,17 +116,23 @@ public class AAISingleTransactionClient
     }
 
     @Override
-    public void put(String uri, Object body) {
+    protected void put(String uri, Object body) {
         request.getOperations().add(new OperationBodyRequest().withAction("put").withUri(uri).withBody(body));
     }
 
     @Override
-    public void delete(String uri, Object body) {
-        request.getOperations().add(new OperationBodyRequest().withAction("delete").withUri(uri).withBody(body));
+    protected void delete(String uri) {
+        request.getOperations()
+                .add(new OperationBodyRequest().withAction("delete").withUri(uri).withBody(new Object()));
     }
 
     @Override
-    public void patch(String uri, Object body) {
+    protected void delete(String uri, Object obj) {
+        request.getOperations().add(new OperationBodyRequest().withAction("delete").withUri(uri).withBody(obj));
+    }
+
+    @Override
+    protected void patch(String uri, Object body) {
         request.getOperations().add(new OperationBodyRequest().withAction("patch").withUri(uri).withBody(body));
     }
 
diff --git a/common/src/main/java/org/onap/so/client/aai/AAITransactionalClient.java b/common/src/main/java/org/onap/so/client/aai/AAITransactionalClient.java
index 11e458a3da..e621566e5a 100644
--- a/common/src/main/java/org/onap/so/client/aai/AAITransactionalClient.java
+++ b/common/src/main/java/org/onap/so/client/aai/AAITransactionalClient.java
@@ -169,18 +169,22 @@ public class AAITransactionalClient
     }
 
     @Override
-    public void put(String uri, Object body) {
+    protected void put(String uri, Object body) {
         currentTransaction.getPut().add(new OperationBody().withUri(uri).withBody(body));
     }
 
     @Override
-    public void delete(String uri, Object body) {
-        currentTransaction.getDelete().add(new OperationBody().withUri(uri).withBody(body));
+    protected void delete(String uri) {
+        currentTransaction.getDelete().add(new OperationBody().withUri(uri).withBody(null));
+    }
 
+    @Override
+    protected void delete(String uri, Object obj) {
+        currentTransaction.getDelete().add(new OperationBody().withUri(uri).withBody(obj));
     }
 
     @Override
-    public void patch(String uri, Object body) {
+    protected void patch(String uri, Object body) {
         currentTransaction.getPatch().add(new OperationBody().withUri(uri).withBody(body));
     }
 
diff --git a/common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryCommonObjectMapperProvider.java b/common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryCommonObjectMapperProvider.java
index 72b01c268e..a4f9496d17 100644
--- a/common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryCommonObjectMapperProvider.java
+++ b/common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryCommonObjectMapperProvider.java
@@ -40,6 +40,7 @@ public class GraphInventoryCommonObjectMapperProvider extends CommonObjectMapper
         mapper.setSerializationInclusion(JsonInclude.Include.NON_EMPTY);
         mapper.enable(MapperFeature.USE_ANNOTATIONS);
         mapper.configure(SerializationFeature.WRAP_ROOT_VALUE, false);
+        mapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
         mapper.configure(DeserializationFeature.UNWRAP_ROOT_VALUE, false);
         mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
         AnnotationIntrospector aiJaxb = new JaxbAnnotationIntrospector(TypeFactory.defaultInstance());
diff --git a/common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryTransactionClient.java b/common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryTransactionClient.java
index 5fc8726427..45ac1f741d 100644
--- a/common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryTransactionClient.java
+++ b/common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryTransactionClient.java
@@ -33,8 +33,7 @@ import org.onap.so.client.graphinventory.exceptions.BulkProcessFailed;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public abstract class GraphInventoryTransactionClient<Self, Uri extends GraphInventoryResourceUri, EdgeLabel extends GraphInventoryEdgeLabel>
-        implements TransactionBuilder {
+public abstract class GraphInventoryTransactionClient<Self, Uri extends GraphInventoryResourceUri, EdgeLabel extends GraphInventoryEdgeLabel> {
 
     protected static Logger logger = LoggerFactory.getLogger(GraphInventoryTransactionClient.class);
 
@@ -181,7 +180,7 @@ public abstract class GraphInventoryTransactionClient<Self, Uri extends GraphInv
         Map<String, Object> result = this.get(new GenericType<Map<String, Object>>() {}, (Uri) uri.clone())
                 .orElseThrow(() -> new NotFoundException(uri.build() + " does not exist in " + this.getGraphDBName()));
         String resourceVersion = (String) result.get("resource-version");
-        this.delete(uri.resourceVersion(resourceVersion).build().toString(), "");
+        this.delete(uri.resourceVersion(resourceVersion).build().toString());
         incrementActionAmount();
         return (Self) this;
     }
@@ -192,6 +191,14 @@ public abstract class GraphInventoryTransactionClient<Self, Uri extends GraphInv
 
     protected abstract String getGraphDBName();
 
+    protected abstract void put(String uri, Object body);
+
+    protected abstract void delete(String uri);
+
+    protected abstract void delete(String uri, Object obj);
+
+    protected abstract void patch(String uri, Object body);
+
     /**
      * @param obj - can be any object which will marshal into a valid A&AI payload
      * @param uri
diff --git a/common/src/test/java/org/onap/so/client/aai/AAISingleTransactionClientTest.java b/common/src/test/java/org/onap/so/client/aai/AAISingleTransactionClientTest.java
index 1c49c11382..b07d893adb 100644
--- a/common/src/test/java/org/onap/so/client/aai/AAISingleTransactionClientTest.java
+++ b/common/src/test/java/org/onap/so/client/aai/AAISingleTransactionClientTest.java
@@ -24,6 +24,7 @@ import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.Matchers.greaterThan;
 import static org.junit.Assert.assertThat;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
@@ -32,12 +33,14 @@ import static org.mockito.Mockito.verify;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Optional;
+import javax.ws.rs.core.GenericType;
 import org.json.JSONException;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
 import org.mockito.Spy;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.onap.aai.domain.yang.Pserver;
@@ -46,7 +49,6 @@ import org.onap.so.client.aai.entities.singletransaction.SingleTransactionReques
 import org.onap.so.client.aai.entities.singletransaction.SingleTransactionResponse;
 import org.onap.so.client.aai.entities.uri.AAIResourceUri;
 import org.onap.so.client.aai.entities.uri.AAIUriFactory;
-import org.onap.so.client.defaultproperties.DefaultAAIPropertiesImpl;
 import org.onap.so.client.graphinventory.GraphInventoryPatchConverter;
 import org.skyscreamer.jsonassert.JSONAssert;
 import com.fasterxml.jackson.core.JsonParseException;
@@ -60,11 +62,13 @@ public class AAISingleTransactionClientTest {
     private final static String AAI_JSON_FILE_LOCATION = "src/test/resources/__files/aai/singletransaction/";
     AAIResourceUri uriA = AAIUriFactory.createResourceUri(AAIObjectType.PSERVER, "pserver-hostname");
     AAIResourceUri uriB = AAIUriFactory.createResourceUri(AAIObjectType.COMPLEX, "my-complex");
+    AAIResourceUri uriC = AAIUriFactory.createResourceUri(AAIObjectType.COMPLEX, "my-complex2");
 
     ObjectMapper mapper;
 
     public AAIClient client = new AAIClient();
 
+    @Spy
     public AAIResourcesClient aaiClient = new AAIResourcesClient();
 
     @Before
@@ -82,9 +86,11 @@ public class AAISingleTransactionClientTest {
         pserver2.setFqdn("patched-fqdn");
         Complex complex = new Complex();
         complex.setCity("my-city");
-        AAISingleTransactionClient singleTransaction =
-                aaiClient.beginSingleTransaction().create(uriA, pserver).update(uriA, pserver2).create(uriB, complex);
-
+        Map<String, Object> map = new HashMap<>();
+        map.put("resource-version", "1234");
+        doReturn(Optional.of(map)).when(aaiClient).get(any(GenericType.class), eq(uriC));
+        AAISingleTransactionClient singleTransaction = aaiClient.beginSingleTransaction().create(uriA, pserver)
+                .update(uriA, pserver2).create(uriB, complex).delete(uriC);
 
         SingleTransactionRequest actual = singleTransaction.getRequest();
 
diff --git a/common/src/test/java/org/onap/so/client/aai/AAITransactionalClientTest.java b/common/src/test/java/org/onap/so/client/aai/AAITransactionalClientTest.java
index adbdbb419f..305cdf59cc 100644
--- a/common/src/test/java/org/onap/so/client/aai/AAITransactionalClientTest.java
+++ b/common/src/test/java/org/onap/so/client/aai/AAITransactionalClientTest.java
@@ -22,6 +22,7 @@ package org.onap.so.client.aai;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
@@ -31,19 +32,19 @@ import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import javax.ws.rs.core.GenericType;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
 import org.mockito.Spy;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.onap.aai.domain.yang.Relationship;
 import org.onap.so.client.aai.entities.uri.AAIResourceUri;
 import org.onap.so.client.aai.entities.uri.AAIUriFactory;
-import org.onap.so.client.defaultproperties.DefaultAAIPropertiesImpl;
 import org.onap.so.client.graphinventory.GraphInventoryPatchConverter;
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -61,11 +62,13 @@ public class AAITransactionalClientTest {
     AAIResourceUri uriD = AAIUriFactory.createResourceUri(AAIObjectType.PSERVER, "test4");
     AAIResourceUri uriE = AAIUriFactory.createResourceUri(AAIObjectType.GENERIC_VNF, "test5");
     AAIResourceUri uriF = AAIUriFactory.createResourceUri(AAIObjectType.PSERVER, "test6");
+    AAIResourceUri uriG = AAIUriFactory.createResourceUri(AAIObjectType.GENERIC_VNF, "test7");
 
     ObjectMapper mapper;
 
     public AAIClient client = new AAIClient();
 
+    @Spy
     public AAIResourcesClient aaiClient = new AAIResourcesClient();
 
     @Before
@@ -95,9 +98,12 @@ public class AAITransactionalClientTest {
         List<AAIResourceUri> uris = new ArrayList<AAIResourceUri>();
         uris.add(uriB);
 
+        Map<String, Object> map = new HashMap<>();
+        map.put("resource-version", "1234");
+        doReturn(Optional.of(map)).when(aaiClient).get(any(GenericType.class), eq(uriG));
         AAIResourceUri uriAClone = uriA.clone();
         AAITransactionalClient transactions = aaiClient.beginTransaction().connect(uriA, uris).connect(uriC, uriD)
-                .beginNewTransaction().connect(uriE, uriF);
+                .beginNewTransaction().connect(uriE, uriF).beginNewTransaction().delete(uriG);
 
         String serializedTransactions = mapper.writeValueAsString(transactions.getTransactions());
         Map<String, Object> actual =
diff --git a/common/src/test/resources/__files/aai/bulkprocess/test-request.json b/common/src/test/resources/__files/aai/bulkprocess/test-request.json
index f5ffe38285..5a2953c632 100644
--- a/common/src/test/resources/__files/aai/bulkprocess/test-request.json
+++ b/common/src/test/resources/__files/aai/bulkprocess/test-request.json
@@ -18,5 +18,9 @@
         "related-link" : "/cloud-infrastructure/pservers/pserver/test6"
       }
     } ]
-  } ]
+  }, {
+    "delete" : [ {
+      "uri" : "/network/generic-vnfs/generic-vnf/test7?resource-version=1234"
+    } ]
+  }]
 }
\ No newline at end of file
diff --git a/common/src/test/resources/__files/aai/singletransaction/sample-request.json b/common/src/test/resources/__files/aai/singletransaction/sample-request.json
index f0761a07b6..69024dca83 100644
--- a/common/src/test/resources/__files/aai/singletransaction/sample-request.json
+++ b/common/src/test/resources/__files/aai/singletransaction/sample-request.json
@@ -21,6 +21,12 @@
       "body": {
         "city": "my-city"
       }
+    },
+    {
+      "action": "delete",
+      "uri": "/cloud-infrastructure/complexes/complex/my-complex2?resource-version=1234",
+      "body" : {
+      }
     }
   ]
 }
\ No newline at end of file