Notification handling for instantiate

[so.git] / common / src / main / java / org / onap / so / client / RestRequest.java

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 4788acf..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
@@ -4,6 +4,8 @@
  * ================================================================================
  * Copyright (C) 2017 - 2018 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Modifications Copyright (c) 2019 Samsung
+ * ================================================================================
  * 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
@@ -23,16 +25,17 @@ 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;
-import javax.ws.rs.core.Response.Status;
 
-import org.onap.so.logger.MsoLogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class RestRequest implements Callable<Response> {
 
-       private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.GENERAL, RestRequest.class);
+       private static final Logger logger = LoggerFactory.getLogger(RestRequest.class);
 
        private final RestClient client;
        private final String method;
@@ -58,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()));
@@ -73,7 +76,7 @@ public class RestRequest implements Callable<Response> {
                                mapper.get().map(response);
                        } catch (NotFoundException e) {
                                if (this.client.props.mapNotFoundToEmpty() && "GET".equals(method)) {
-                                       msoLogger.debug("RestClient recieved not found on URL: " + this.client.getWebTarget().getUri());
+                                       logger.debug("RestClient recieved not found on URL: {}", this.client.getWebTarget().getUri());
                                        return response;
                                } else {
                                        throw e;