commit f610caaeaebc3b6aeaef3cd293ae6e43339af315
author Ed Tanous <edtanous@google.com> Thu Mar 17 08:53:00 2022 -0700
committer Ed Tanous <ed@tanous.net> Wed Aug 03 20:37:29 2022 +0000
tree 637d445fd6b7045064b8a771cf24e2e0a09ae1af
parent 1d8d9a3f8d6f7be032cae9f2d89c1048d7dfbadb

Remove jsonMode method

The jsonMode method is a single line, that basically only sets the
content type, and is only called from one place.  In all other cases we
set the content-type directly from a header, so we should do the same
here.

Tested:
curl --insecure -vvv --user root:0penBmc https://192.168.7.2/redfish/v1

returns < Content-Type: application/json

Signed-off-by: Ed Tanous <edtanous@google.com>
Change-Id: I82f6fcf1b574192620ac7b29f97cdd01334c18c4

http/http_connection.hpp

diff --git a/http/http_connection.hpp b/http/http_connection.hpp
index feea815..d061973 100644
--- a/http/http_connection.hpp
+++ b/http/http_connection.hpp
@@ -459,7 +459,8 @@
             }
             else
             {
-                res.jsonMode();
+                res.addHeader(boost::beast::http::field::content_type,
+                              "application/json");
                 res.body() = res.jsonValue.dump(
                     2, ' ', true, nlohmann::json::error_handler_t::replace);
             }

http/http_response.hpp

diff --git a/http/http_response.hpp b/http/http_response.hpp
index d06c65d..71d3377 100644
--- a/http/http_response.hpp
+++ b/http/http_response.hpp
@@ -187,11 +187,5 @@
     bool completed = false;
     std::function<void(Response&)> completeRequestHandler;
     std::function<bool()> isAliveHelper;
-
-    // In case of a JSON object, set the Content-Type header
-    void jsonMode()
-    {
-        addHeader("Content-Type", "application/json");
-    }
 };
 } // namespace crow