delete with payload does not work

corrected wiremock stub after client delete change
changed the method used to create a delete with payload

Change-Id: I3cbda716af30e0d2954b42a4ac965e53b4897924
Issue-ID: SO-1712
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>

diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/adapter/network/NetworkAdapterClientIT.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/adapter/network/NetworkAdapterClientIT.java
index 1bcc464..d362996 100644 (file)
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/adapter/network/NetworkAdapterClientIT.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/adapter/network/NetworkAdapterClientIT.java
@@ -21,6 +21,7 @@
 package org.onap.so.client.adapter.network;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.delete;
 import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
 import static com.github.tomakehurst.wiremock.client.WireMock.get;
 import static com.github.tomakehurst.wiremock.client.WireMock.post;
@@ -104,7 +105,7 @@ public class NetworkAdapterClientIT extends BaseIntegrationTest{
                DeleteNetworkResponse mockResponse = new DeleteNetworkResponse();
                mockResponse.setNetworkDeleted(true);
 
-               stubFor(post(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_NETWORK_ID))
+               stubFor(delete(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_NETWORK_ID))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                                .withBody(mapper.writeValueAsString(mockResponse)).withStatus(200)));
 
@@ -119,7 +120,7 @@ public class NetworkAdapterClientIT extends BaseIntegrationTest{
 
                DeleteNetworkError mockResponse = new DeleteNetworkError();
                mockResponse.setMessage("Error in delete network");
-               stubFor(post(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_NETWORK_ID))
+               stubFor(delete(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_NETWORK_ID))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                                .withBody(mapper.writeValueAsString(mockResponse)).withStatus(500)));
 
@@ -136,7 +137,7 @@ public class NetworkAdapterClientIT extends BaseIntegrationTest{
                RollbackNetworkResponse mockResponse = new RollbackNetworkResponse();
                mockResponse.setNetworkRolledBack(true);
 
-               stubFor(post(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_NETWORK_ID))
+               stubFor(delete(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_NETWORK_ID))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                                .withBody(mapper.writeValueAsString(mockResponse)).withStatus(200)));
 
@@ -154,7 +155,7 @@ public class NetworkAdapterClientIT extends BaseIntegrationTest{
                RollbackNetworkError mockResponse = new RollbackNetworkError();
                mockResponse.setMessage("Error in rollback network");
 
-               stubFor(post(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_NETWORK_ID))
+               stubFor(delete(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_NETWORK_ID))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                                .withBody(mapper.writeValueAsString(mockResponse)).withStatus(500)));
 

diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/adapter/vnf/VnfAdapterClientIT.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/adapter/vnf/VnfAdapterClientIT.java
index 3387920..cb3d91b 100644 (file)
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/adapter/vnf/VnfAdapterClientIT.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/adapter/vnf/VnfAdapterClientIT.java
@@ -21,6 +21,7 @@
 package org.onap.so.client.adapter.vnf;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.delete;
 import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
 import static com.github.tomakehurst.wiremock.client.WireMock.get;
 import static com.github.tomakehurst.wiremock.client.WireMock.post;
@@ -102,7 +103,7 @@ public class VnfAdapterClientIT extends BaseIntegrationTest{
                RollbackVfModuleResponse mockResponse = new RollbackVfModuleResponse();
                mockResponse.setVfModuleRolledback(true);
                stubFor(
-                               post(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_VNF_ID + "/vf-modules/" + AAI_VF_MODULE_ID + "/rollback"))
+                               delete(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_VNF_ID + "/vf-modules/" + AAI_VF_MODULE_ID + "/rollback"))
                                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                                                .withBody(mapper.writeValueAsString(mockResponse)).withStatus(200)));
 
@@ -120,7 +121,7 @@ public class VnfAdapterClientIT extends BaseIntegrationTest{
                VfModuleExceptionResponse mockResponse = new VfModuleExceptionResponse();
                mockResponse.setMessage("Error in rollback Vf module");
                stubFor(
-                               post(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_VNF_ID + "/vf-modules/" + AAI_VF_MODULE_ID + "/rollback"))
+                               delete(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_VNF_ID + "/vf-modules/" + AAI_VF_MODULE_ID + "/rollback"))
                                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                                                .withBody(mapper.writeValueAsString(mockResponse)).withStatus(500)));
 
@@ -134,7 +135,7 @@ public class VnfAdapterClientIT extends BaseIntegrationTest{
 
                DeleteVfModuleResponse mockResponse = new DeleteVfModuleResponse();
                mockResponse.setVfModuleDeleted(true);
-               stubFor(post(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_VNF_ID + "/vf-modules/" + AAI_VF_MODULE_ID))
+               stubFor(delete(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_VNF_ID + "/vf-modules/" + AAI_VF_MODULE_ID))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                                .withBody(mapper.writeValueAsString(mockResponse)).withStatus(200)));
 
@@ -149,7 +150,7 @@ public class VnfAdapterClientIT extends BaseIntegrationTest{
 
                VfModuleExceptionResponse mockResponse = new VfModuleExceptionResponse();
                mockResponse.setMessage("Error in delete Vf module");
-               stubFor(post(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_VNF_ID + "/vf-modules/" + AAI_VF_MODULE_ID))
+               stubFor(delete(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_VNF_ID + "/vf-modules/" + AAI_VF_MODULE_ID))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                                .withBody(mapper.writeValueAsString(mockResponse)).withStatus(500)));
 

diff --git a/common/src/main/java/org/onap/so/client/RestRequest.java b/common/src/main/java/org/onap/so/client/RestRequest.java
index 6f0d71c..3864f2e 100644 (file)
--- a/common/src/main/java/org/onap/so/client/RestRequest.java
+++ b/common/src/main/java/org/onap/so/client/RestRequest.java
@@ -25,6 +25,7 @@ package org.onap.so.client;
 import java.util.Optional;
 import java.util.concurrent.Callable;
 
+import javax.ws.rs.HttpMethod;
 import javax.ws.rs.NotFoundException;
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.core.Response;
@@ -60,8 +61,8 @@ public class RestRequest implements Callable<Response> {
                                response = this.client.getBuilder().accept(this.client.getAccept()).delete();
 
                        } else {
-                               response = this.client.getBuilder().header("X-HTTP-Method-Override", "DELETE").accept(this.client.getAccept())
-                                               .post(Entity.entity(entity, this.client.getContentType()));
+                               response = this.client.getBuilder().accept(this.client.getAccept())
+                                               .build(HttpMethod.DELETE, Entity.entity(entity, this.client.getContentType())).invoke();
                        }
                } else if ("PUT".equals(method)) {
                        response = this.client.getBuilder().accept(this.client.getAccept()).put(Entity.entity(entity, this.client.getContentType()));

diff --git a/common/src/test/java/org/onap/so/client/aai/AAIResourcesClientTest.java b/common/src/test/java/org/onap/so/client/aai/AAIResourcesClientTest.java
index 174c76b..c63d602 100644 (file)
--- a/common/src/test/java/org/onap/so/client/aai/AAIResourcesClientTest.java
+++ b/common/src/test/java/org/onap/so/client/aai/AAIResourcesClientTest.java
@@ -150,7 +150,7 @@ public class AAIResourcesClientTest {
                AAIResourceUri path = AAIUriFactory.createResourceUri(AAIObjectType.GENERIC_VNF, "test2");
                AAIResourceUri path2 = AAIUriFactory.createResourceUri(AAIObjectType.GENERIC_VNF, "test3");
                
-               wireMockRule.stubFor(post(
+               wireMockRule.stubFor(delete(
                                urlPathEqualTo("/aai/" + AAIVersion.LATEST + path.build() + "/relationship-list/relationship"))
                                .willReturn(
                                        aResponse()