commit 034e1259223252624a4652bc0288058bdd4da9b8
author Ed Tanous <etanous@nvidia.com> Sat Nov 16 21:59:03 2024 -0800
committer Ed Tanous <ed@tanous.net> Fri Nov 22 21:15:32 2024 +0000
tree 2731c4e262f168fbf119a87b266537c6be3bf0e1
parent 42079ecb70cdd41a5459815d74092c148010f661

Don't pretty print inline arguments

For consistency, keep all json value printing in error messages non
pretty printed.  This allows us to generate this file easier.

Tested: On last patch in series.

Change-Id: I1a205e9594e2c917d2b758d537a3f58018cd83d9
Signed-off-by: Ed Tanous <etanous@nvidia.com>

redfish-core/src/error_messages.cpp

diff --git a/redfish-core/src/error_messages.cpp b/redfish-core/src/error_messages.cpp
index 45388d2..3c2d498 100644
--- a/redfish-core/src/error_messages.cpp
+++ b/redfish-core/src/error_messages.cpp
@@ -228,7 +228,7 @@
     const nlohmann::json& arg1, std::string_view arg2, std::string_view arg3)
 {
     std::string arg1Str =
-        arg1.dump(2, ' ', true, nlohmann::json::error_handler_t::replace);
+        arg1.dump(-1, ' ', true, nlohmann::json::error_handler_t::replace);
     return getLog(
         redfish::registries::base::Index::actionParameterValueFormatError,
         std::to_array<std::string_view>({arg1Str, arg2, arg3}));
@@ -483,7 +483,7 @@
                                         std::string_view arg2)
 {
     std::string arg1Str =
-        arg1.dump(2, ' ', true, nlohmann::json::error_handler_t::replace);
+        arg1.dump(-1, ' ', true, nlohmann::json::error_handler_t::replace);
     return getLog(redfish::registries::base::Index::propertyValueFormatError,
                   std::to_array<std::string_view>({arg1Str, arg2}));
 }
@@ -531,7 +531,7 @@
                                        std::string_view arg2)
 {
     std::string arg1Str =
-        arg1.dump(2, ' ', true, nlohmann::json::error_handler_t::replace);
+        arg1.dump(-1, ' ', true, nlohmann::json::error_handler_t::replace);
     return getLog(redfish::registries::base::Index::propertyValueOutOfRange,
                   std::to_array<std::string_view>({arg1Str, arg2}));
 }
@@ -812,7 +812,7 @@
     const boost::urls::url_view_base& arg3)
 {
     std::string arg2Str =
-        arg2.dump(2, ' ', true, nlohmann::json::error_handler_t::replace);
+        arg2.dump(-1, ' ', true, nlohmann::json::error_handler_t::replace);
 
     return getLog(
         redfish::registries::base::Index::propertyValueResourceConflict,
@@ -839,7 +839,7 @@
                                              const nlohmann::json& arg2)
 {
     std::string arg2Str =
-        arg2.dump(2, ' ', true, nlohmann::json::error_handler_t::replace);
+        arg2.dump(-1, ' ', true, nlohmann::json::error_handler_t::replace);
 
     return getLog(
         redfish::registries::base::Index::propertyValueExternalConflict,
@@ -865,7 +865,7 @@
                                       const nlohmann::json& arg2)
 {
     std::string arg2Str =
-        arg2.dump(2, ' ', true, nlohmann::json::error_handler_t::replace);
+        arg2.dump(-1, ' ', true, nlohmann::json::error_handler_t::replace);
     return getLog(redfish::registries::base::Index::propertyValueIncorrect,
                   std::to_array<std::string_view>({arg1, arg2Str}));
 }
@@ -999,7 +999,7 @@
                                       std::string_view arg2)
 {
     std::string arg1Str =
-        arg1.dump(2, ' ', true, nlohmann::json::error_handler_t::replace);
+        arg1.dump(-1, ' ', true, nlohmann::json::error_handler_t::replace);
     return getLog(redfish::registries::base::Index::propertyValueTypeError,
                   std::to_array<std::string_view>({arg1Str, arg2}));
 }
@@ -1103,7 +1103,7 @@
                                             std::string_view arg2)
 {
     std::string arg1Str =
-        arg1.dump(2, ' ', true, nlohmann::json::error_handler_t::replace);
+        arg1.dump(-1, ' ', true, nlohmann::json::error_handler_t::replace);
     return getLog(
         redfish::registries::base::Index::queryParameterValueTypeError,
         std::to_array<std::string_view>({arg1Str, arg2}));
@@ -1454,7 +1454,7 @@
     const nlohmann::json& arg1, std::string_view arg2, std::string_view arg3)
 {
     std::string arg1Str =
-        arg1.dump(2, ' ', true, nlohmann::json::error_handler_t::replace);
+        arg1.dump(-1, ' ', true, nlohmann::json::error_handler_t::replace);
     return getLog(
         redfish::registries::base::Index::actionParameterValueTypeError,
         std::to_array<std::string_view>({arg1Str, arg2, arg3}));
@@ -1480,7 +1480,7 @@
                                          std::string_view arg2)
 {
     std::string arg1Str =
-        arg1.dump(2, ' ', true, nlohmann::json::error_handler_t::replace);
+        arg1.dump(-1, ' ', true, nlohmann::json::error_handler_t::replace);
     return getLog(redfish::registries::base::Index::actionParameterValueError,
                   std::to_array<std::string_view>({arg1Str, arg2}));
 }
@@ -1671,7 +1671,7 @@
                                      const nlohmann::json& arg2)
 {
     std::string arg2Str =
-        arg2.dump(2, ' ', true, nlohmann::json::error_handler_t::replace);
+        arg2.dump(-1, ' ', true, nlohmann::json::error_handler_t::replace);
     return getLog(redfish::registries::base::Index::propertyValueModified,
                   std::to_array<std::string_view>({arg1, arg2Str}));
 }
@@ -1712,7 +1712,7 @@
                                               std::string_view arg2)
 {
     std::string arg1Str =
-        arg1.dump(2, ' ', true, nlohmann::json::error_handler_t::replace);
+        arg1.dump(-1, ' ', true, nlohmann::json::error_handler_t::replace);
     return getLog(
         redfish::registries::base::Index::queryParameterValueFormatError,
         std::to_array<std::string_view>({arg1Str, arg2}));