From: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
Date: Tue, 19 Dec 2017 13:01:06 +0000 (+0530)
Subject: Fix http profile to override the headers
X-Git-Tag: v2.0.0~24
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=c1a3a1bc706190ac8a03c78c9d992c06e34b3333;p=cli.git

Fix http profile to override the headers

Issue-ID: CLI-66

Change-Id: I0aa2413db977449f163bc4a75bcd7900c95076b8
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
---

diff --git a/framework/src/main/java/org/onap/cli/fw/output/OnapCommandResultAttribute.java b/framework/src/main/java/org/onap/cli/fw/output/OnapCommandResultAttribute.java
index d54fbff0..1208a3cd 100644
--- a/framework/src/main/java/org/onap/cli/fw/output/OnapCommandResultAttribute.java
+++ b/framework/src/main/java/org/onap/cli/fw/output/OnapCommandResultAttribute.java
@@ -58,7 +58,9 @@ public class OnapCommandResultAttribute {
     private boolean isSecured = false;
 
     public void setValues(List<String> values) {
-        this.values = (values == null) ? new ArrayList<>() : values;
+        if (values != null) {
+            this.values = values;
+        }
     }
 
     public String getName() {
diff --git a/profiles/http/src/main/java/org/onap/cli/fw/http/connect/OnapHttpConnection.java b/profiles/http/src/main/java/org/onap/cli/fw/http/connect/OnapHttpConnection.java
index a5a75e11..1ce0433c 100644
--- a/profiles/http/src/main/java/org/onap/cli/fw/http/connect/OnapHttpConnection.java
+++ b/profiles/http/src/main/java/org/onap/cli/fw/http/connect/OnapHttpConnection.java
@@ -227,9 +227,13 @@ public class OnapHttpConnection {
 
     private void addCommonHeaders(HttpInput input) {
         if (!input.isBinaryData()) {
-            input.getReqHeaders().put("Content-Type", OnapCommandHttpConstants.APPLICATION_JSON);
+            if (!input.getReqHeaders().containsKey("Content-Type")) {
+                input.getReqHeaders().put("Content-Type", OnapCommandHttpConstants.APPLICATION_JSON);
+            }
+        }
+        if (!input.getReqHeaders().containsKey("Accept")) {
+            input.getReqHeaders().put("Accept", OnapCommandHttpConstants.APPLICATION_JSON);
         }
-        input.getReqHeaders().put("Accept", OnapCommandHttpConstants.APPLICATION_JSON);
 
         for (String headerName : this.mapCommonHeaders.keySet()) {
             input.getReqHeaders().put(headerName, this.mapCommonHeaders.get(headerName));
@@ -328,7 +332,7 @@ public class OnapHttpConnection {
             throw new OnapCommandHttpFailure(e);
         } finally {
             if (this.debug) {
-                this.debugDetails = input + "" + result;
+                this.debugDetails = input + " " + result;
             }
         }