From: Andy Mayer <am803u@att.com>
Date: Fri, 20 Mar 2020 13:47:43 +0000 (+0000)
Subject: Merge "Initial draft of Frankfurt Release notes for RC0"
X-Git-Tag: 6.0.1~6
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=c4b865137354f422efb46f0f6efa846d1353239d;hp=cee9d89b17313d12441b9f5e3664c6d8b23c5c50;p=externalapi%2Fnbi.git

Merge "Initial draft of Frankfurt Release notes for RC0"
---

diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/MultiClient.java b/src/main/java/org/onap/nbi/apis/serviceorder/MultiClient.java
index 9729202..ef1a734 100644
--- a/src/main/java/org/onap/nbi/apis/serviceorder/MultiClient.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/MultiClient.java
@@ -87,6 +87,7 @@ public class MultiClient {
     private static final String HEADER_AUTHORIZATION = "Authorization";
     private static final String X_FROM_APP_ID = "X-FromAppId";
     private static final String X_TRANSACTION_ID = "X-TransactionId";
+    private static final String EXCEPTION_STRING = "error on calling";
 
     private static final Logger LOGGER = LoggerFactory.getLogger(MultiClient.class);
 
@@ -244,17 +245,17 @@ public class MultiClient {
         try {
             ResponseEntity<Object> response =
                     restTemplate.exchange(callUrl, HttpMethod.PUT, new HttpEntity<>(param, httpHeaders), Object.class);
-            LOGGER.info("response status : " + response.getStatusCodeValue());
+            LOGGER.info("response status :{} " , response.getStatusCodeValue());
             if (LOGGER.isWarnEnabled() && !response.getStatusCode().equals(HttpStatus.CREATED)) {
                 LOGGER.warn("HTTP call on {} returns {} , {}", callUrl, response.getStatusCodeValue(),
-                        response.getBody().toString());
+                        response.getBody());
             }
             return response;
         } catch (BackendFunctionalException e) {
-            LOGGER.error("error on calling " + callUrl + " ," + e);
+            LOGGER.error(EXCEPTION_STRING , callUrl , e);
             return new ResponseEntity<>("problem calling onap services", e.getHttpStatus());
         } catch (ResourceAccessException e) {
-            LOGGER.error("error on calling " + callUrl + " ," + e);
+            LOGGER.error(EXCEPTION_STRING , callUrl , e);
             return new ResponseEntity<>("unable to reach onap services", HttpStatus.INTERNAL_SERVER_ERROR);
         }
     }
@@ -272,21 +273,21 @@ public class MultiClient {
             ResponseEntity<Object> response =
                     restTemplate.exchange(uri, HttpMethod.GET, new HttpEntity<>(httpHeaders), Object.class);
             if (LOGGER.isDebugEnabled()) {
-                LOGGER.debug("response body : {}", response.getBody().toString());
+                LOGGER.debug("response body : {}", response.getBody());
             }
             LOGGER.info("response status : {}", response.getStatusCodeValue());
             if (LOGGER.isWarnEnabled() && !response.getStatusCode().equals(HttpStatus.OK)) {
                 LOGGER.warn("HTTP call on {} returns {} , {}", callURL, response.getStatusCodeValue(),
-                        response.getBody().toString());
+                        response.getBody());
 
             }
             return response;
 
         } catch (BackendFunctionalException e) {
-            LOGGER.error("error on calling " + callURL + " ," + e);
+            LOGGER.error(EXCEPTION_STRING,callURL , e);
             return new ResponseEntity<>("problem calling onap services", e.getHttpStatus());
         } catch (ResourceAccessException e) {
-            LOGGER.error("error on calling " + callURL + " ," + e);
+            LOGGER.error(EXCEPTION_STRING , callURL, e);
             return new ResponseEntity<>("unable to reach onap services", HttpStatus.INTERNAL_SERVER_ERROR);
         }