From 1abe55ef9844afcddcab9d862ae06118f3a2390c Mon Sep 17 00:00:00 2001 From: Ed Tanous Date: Wed, 5 Sep 2018 08:30:59 -0700 Subject: Move to clang-format-6.0 This commit moves the codebase to the lastest clang-format file from upstream, as well as clang-format-6.0. Change-Id: Ice8313468097c0c42317fbb9e10ddf036e8cff4c Signed-off-by: Ed Tanous --- redfish-core/src/utils/json_utils.cpp | 670 +++++++++++++++++++--------------- 1 file changed, 371 insertions(+), 299 deletions(-) (limited to 'redfish-core/src/utils') diff --git a/redfish-core/src/utils/json_utils.cpp b/redfish-core/src/utils/json_utils.cpp index 5d81c21fa9..868601f72d 100644 --- a/redfish-core/src/utils/json_utils.cpp +++ b/redfish-core/src/utils/json_utils.cpp @@ -14,440 +14,512 @@ // limitations under the License. */ #include "utils/json_utils.hpp" + #include -namespace redfish { +namespace redfish +{ -namespace json_util { +namespace json_util +{ Result getString(const char* fieldName, const nlohmann::json& json, - const std::string*& output) { - // Find field - auto fieldIt = json.find(fieldName); - - // Verify existence - if (fieldIt == json.end()) { - return Result::NOT_EXIST; - } + const std::string*& output) +{ + // Find field + auto fieldIt = json.find(fieldName); + + // Verify existence + if (fieldIt == json.end()) + { + return Result::NOT_EXIST; + } - output = fieldIt->get_ptr(); + output = fieldIt->get_ptr(); - // Verify type - we know that it exists, so nullptr means wrong type - if (output == nullptr) { - return Result::WRONG_TYPE; - } + // Verify type - we know that it exists, so nullptr means wrong type + if (output == nullptr) + { + return Result::WRONG_TYPE; + } - return Result::SUCCESS; + return Result::SUCCESS; } Result getObject(const char* fieldName, const nlohmann::json& json, - nlohmann::json* output) { - // Verify input pointer - if (output == nullptr) { - return Result::NULL_POINTER; - } + nlohmann::json* output) +{ + // Verify input pointer + if (output == nullptr) + { + return Result::NULL_POINTER; + } - // Find field - auto fieldIt = json.find(fieldName); + // Find field + auto fieldIt = json.find(fieldName); - // Verify existence - if (fieldIt == json.end()) { - return Result::NOT_EXIST; - } + // Verify existence + if (fieldIt == json.end()) + { + return Result::NOT_EXIST; + } - // Verify type - if (!fieldIt->is_object()) { - return Result::WRONG_TYPE; - } + // Verify type + if (!fieldIt->is_object()) + { + return Result::WRONG_TYPE; + } - // Extract value - *output = *fieldIt; + // Extract value + *output = *fieldIt; - return Result::SUCCESS; + return Result::SUCCESS; } Result getArray(const char* fieldName, const nlohmann::json& json, - nlohmann::json* output) { - // Verify input pointer - if (output == nullptr) { - return Result::NULL_POINTER; - } + nlohmann::json* output) +{ + // Verify input pointer + if (output == nullptr) + { + return Result::NULL_POINTER; + } - // Find field - auto fieldIt = json.find(fieldName); + // Find field + auto fieldIt = json.find(fieldName); - // Verify existence - if (fieldIt == json.end()) { - return Result::NOT_EXIST; - } + // Verify existence + if (fieldIt == json.end()) + { + return Result::NOT_EXIST; + } - // Verify type - if (!fieldIt->is_array()) { - return Result::WRONG_TYPE; - } + // Verify type + if (!fieldIt->is_array()) + { + return Result::WRONG_TYPE; + } - // Extract value - *output = *fieldIt; + // Extract value + *output = *fieldIt; - return Result::SUCCESS; + return Result::SUCCESS; } Result getInt(const char* fieldName, const nlohmann::json& json, - int64_t& output) { - // Find field - auto fieldIt = json.find(fieldName); - - // Verify existence - if (fieldIt == json.end()) { - return Result::NOT_EXIST; - } + int64_t& output) +{ + // Find field + auto fieldIt = json.find(fieldName); + + // Verify existence + if (fieldIt == json.end()) + { + return Result::NOT_EXIST; + } - const int64_t* retVal = fieldIt->get_ptr(); + const int64_t* retVal = fieldIt->get_ptr(); - // Verify type - we know that it exists, so nullptr means wrong type - if (retVal == nullptr) { - return Result::WRONG_TYPE; - } + // Verify type - we know that it exists, so nullptr means wrong type + if (retVal == nullptr) + { + return Result::WRONG_TYPE; + } - // Extract value - output = *retVal; + // Extract value + output = *retVal; - return Result::SUCCESS; + return Result::SUCCESS; } Result getUnsigned(const char* fieldName, const nlohmann::json& json, - uint64_t& output) { - // Find field - auto fieldIt = json.find(fieldName); - - // Verify existence - if (fieldIt == json.end()) { - return Result::NOT_EXIST; - } + uint64_t& output) +{ + // Find field + auto fieldIt = json.find(fieldName); + + // Verify existence + if (fieldIt == json.end()) + { + return Result::NOT_EXIST; + } - const uint64_t* retVal = fieldIt->get_ptr(); + const uint64_t* retVal = fieldIt->get_ptr(); - // Verify type - we know that it exists, so nullptr means wrong type - if (retVal == nullptr) { - return Result::WRONG_TYPE; - } + // Verify type - we know that it exists, so nullptr means wrong type + if (retVal == nullptr) + { + return Result::WRONG_TYPE; + } - // Extract value - output = *retVal; + // Extract value + output = *retVal; - return Result::SUCCESS; + return Result::SUCCESS; } -Result getBool(const char* fieldName, const nlohmann::json& json, - bool& output) { - // Find field - auto fieldIt = json.find(fieldName); +Result getBool(const char* fieldName, const nlohmann::json& json, bool& output) +{ + // Find field + auto fieldIt = json.find(fieldName); - // Verify existence - if (fieldIt == json.end()) { - return Result::NOT_EXIST; - } + // Verify existence + if (fieldIt == json.end()) + { + return Result::NOT_EXIST; + } - const bool* retVal = fieldIt->get_ptr(); + const bool* retVal = fieldIt->get_ptr(); - // Verify type - we know that it exists, so nullptr means wrong type - if (retVal == nullptr) { - return Result::WRONG_TYPE; - } + // Verify type - we know that it exists, so nullptr means wrong type + if (retVal == nullptr) + { + return Result::WRONG_TYPE; + } - // Extract value - output = *retVal; + // Extract value + output = *retVal; - return Result::SUCCESS; + return Result::SUCCESS; } Result getDouble(const char* fieldName, const nlohmann::json& json, - double& output) { - // Find field - auto fieldIt = json.find(fieldName); - - // Verify existence - if (fieldIt == json.end()) { - return Result::NOT_EXIST; - } + double& output) +{ + // Find field + auto fieldIt = json.find(fieldName); + + // Verify existence + if (fieldIt == json.end()) + { + return Result::NOT_EXIST; + } - const double* retVal = fieldIt->get_ptr(); + const double* retVal = fieldIt->get_ptr(); - // Verify type - we know that it exists, so nullptr means wrong type - if (retVal == nullptr) { - return Result::WRONG_TYPE; - } + // Verify type - we know that it exists, so nullptr means wrong type + if (retVal == nullptr) + { + return Result::WRONG_TYPE; + } - // Extract value - output = *retVal; + // Extract value + output = *retVal; - return Result::SUCCESS; + return Result::SUCCESS; } Result getString(const char* fieldName, const nlohmann::json& json, const std::string*& output, uint8_t msgCfgMap, - nlohmann::json& msgJson, const std::string&& fieldPath) { - // Find field - auto fieldIt = json.find(fieldName); - - // Verify existence - if (fieldIt == json.end()) { - if (msgCfgMap & static_cast(MessageSetting::MISSING)) { - messages::addMessageToJson(msgJson, messages::propertyMissing(fieldName), - fieldPath); + nlohmann::json& msgJson, const std::string&& fieldPath) +{ + // Find field + auto fieldIt = json.find(fieldName); + + // Verify existence + if (fieldIt == json.end()) + { + if (msgCfgMap & static_cast(MessageSetting::MISSING)) + { + messages::addMessageToJson( + msgJson, messages::propertyMissing(fieldName), fieldPath); + } + + return Result::NOT_EXIST; } - return Result::NOT_EXIST; - } + output = fieldIt->get_ptr(); - output = fieldIt->get_ptr(); + // Verify type - we know that it exists, so nullptr means wrong type + if (output == nullptr) + { + if (msgCfgMap & static_cast(MessageSetting::TYPE_ERROR)) + { + messages::addMessageToJson( + msgJson, + messages::propertyValueTypeError(fieldIt->dump(), fieldName), + fieldPath); + } - // Verify type - we know that it exists, so nullptr means wrong type - if (output == nullptr) { - if (msgCfgMap & static_cast(MessageSetting::TYPE_ERROR)) { - messages::addMessageToJson( - msgJson, messages::propertyValueTypeError(fieldIt->dump(), fieldName), - fieldPath); + return Result::WRONG_TYPE; } - return Result::WRONG_TYPE; - } - - return Result::SUCCESS; + return Result::SUCCESS; } Result getObject(const char* fieldName, const nlohmann::json& json, nlohmann::json* output, uint8_t msgCfgMap, - nlohmann::json& msgJson, const std::string&& fieldPath) { - // Verify input pointer - if (output == nullptr) { - return Result::NULL_POINTER; - } - - // Find field - auto fieldIt = json.find(fieldName); - - // Verify existence - if (fieldIt == json.end()) { - if (msgCfgMap & static_cast(MessageSetting::MISSING)) { - messages::addMessageToJson(msgJson, messages::propertyMissing(fieldName), - fieldPath); + nlohmann::json& msgJson, const std::string&& fieldPath) +{ + // Verify input pointer + if (output == nullptr) + { + return Result::NULL_POINTER; } - return Result::NOT_EXIST; - } + // Find field + auto fieldIt = json.find(fieldName); - // Verify type - if (!fieldIt->is_object()) { - if (msgCfgMap & static_cast(MessageSetting::TYPE_ERROR)) { - messages::addMessageToJson( - msgJson, messages::propertyValueTypeError(fieldIt->dump(), fieldName), - fieldPath); + // Verify existence + if (fieldIt == json.end()) + { + if (msgCfgMap & static_cast(MessageSetting::MISSING)) + { + messages::addMessageToJson( + msgJson, messages::propertyMissing(fieldName), fieldPath); + } + + return Result::NOT_EXIST; } - return Result::WRONG_TYPE; - } + // Verify type + if (!fieldIt->is_object()) + { + if (msgCfgMap & static_cast(MessageSetting::TYPE_ERROR)) + { + messages::addMessageToJson( + msgJson, + messages::propertyValueTypeError(fieldIt->dump(), fieldName), + fieldPath); + } + + return Result::WRONG_TYPE; + } - // Extract value - *output = *fieldIt; + // Extract value + *output = *fieldIt; - return Result::SUCCESS; + return Result::SUCCESS; } Result getArray(const char* fieldName, const nlohmann::json& json, nlohmann::json* output, uint8_t msgCfgMap, - nlohmann::json& msgJson, const std::string&& fieldPath) { - // Verify input pointer - if (output == nullptr) { - return Result::NULL_POINTER; - } - - // Find field - auto fieldIt = json.find(fieldName); - - // Verify existence - if (fieldIt == json.end()) { - if (msgCfgMap & static_cast(MessageSetting::MISSING)) { - messages::addMessageToJson(msgJson, messages::propertyMissing(fieldName), - fieldPath); + nlohmann::json& msgJson, const std::string&& fieldPath) +{ + // Verify input pointer + if (output == nullptr) + { + return Result::NULL_POINTER; } - return Result::NOT_EXIST; - } + // Find field + auto fieldIt = json.find(fieldName); + + // Verify existence + if (fieldIt == json.end()) + { + if (msgCfgMap & static_cast(MessageSetting::MISSING)) + { + messages::addMessageToJson( + msgJson, messages::propertyMissing(fieldName), fieldPath); + } - // Verify type - if (!fieldIt->is_array()) { - if (msgCfgMap & static_cast(MessageSetting::TYPE_ERROR)) { - messages::addMessageToJson( - msgJson, messages::propertyValueTypeError(fieldIt->dump(), fieldName), - fieldPath); + return Result::NOT_EXIST; } - return Result::WRONG_TYPE; - } + // Verify type + if (!fieldIt->is_array()) + { + if (msgCfgMap & static_cast(MessageSetting::TYPE_ERROR)) + { + messages::addMessageToJson( + msgJson, + messages::propertyValueTypeError(fieldIt->dump(), fieldName), + fieldPath); + } + + return Result::WRONG_TYPE; + } - // Extract value - *output = *fieldIt; + // Extract value + *output = *fieldIt; - return Result::SUCCESS; + return Result::SUCCESS; } Result getInt(const char* fieldName, const nlohmann::json& json, int64_t& output, uint8_t msgCfgMap, nlohmann::json& msgJson, - const std::string&& fieldPath) { - // Find field - auto fieldIt = json.find(fieldName); - - // Verify existence - if (fieldIt == json.end()) { - if (msgCfgMap & static_cast(MessageSetting::MISSING)) { - messages::addMessageToJson(msgJson, messages::propertyMissing(fieldName), - fieldPath); + const std::string&& fieldPath) +{ + // Find field + auto fieldIt = json.find(fieldName); + + // Verify existence + if (fieldIt == json.end()) + { + if (msgCfgMap & static_cast(MessageSetting::MISSING)) + { + messages::addMessageToJson( + msgJson, messages::propertyMissing(fieldName), fieldPath); + } + + return Result::NOT_EXIST; } - return Result::NOT_EXIST; - } + const int64_t* retVal = fieldIt->get_ptr(); - const int64_t* retVal = fieldIt->get_ptr(); + // Verify type - we know that it exists, so nullptr means wrong type + if (retVal == nullptr) + { + if (msgCfgMap & static_cast(MessageSetting::TYPE_ERROR)) + { + messages::addMessageToJson( + msgJson, + messages::propertyValueTypeError(fieldIt->dump(), fieldName), + fieldPath); + } - // Verify type - we know that it exists, so nullptr means wrong type - if (retVal == nullptr) { - if (msgCfgMap & static_cast(MessageSetting::TYPE_ERROR)) { - messages::addMessageToJson( - msgJson, messages::propertyValueTypeError(fieldIt->dump(), fieldName), - fieldPath); + return Result::WRONG_TYPE; } - return Result::WRONG_TYPE; - } - - // Extract value - output = *retVal; + // Extract value + output = *retVal; - return Result::SUCCESS; + return Result::SUCCESS; } Result getUnsigned(const char* fieldName, const nlohmann::json& json, uint64_t& output, uint8_t msgCfgMap, nlohmann::json& msgJson, - const std::string&& fieldPath) { - // Find field - auto fieldIt = json.find(fieldName); - - // Verify existence - if (fieldIt == json.end()) { - if (msgCfgMap & static_cast(MessageSetting::MISSING)) { - messages::addMessageToJson(msgJson, messages::propertyMissing(fieldName), - fieldPath); + const std::string&& fieldPath) +{ + // Find field + auto fieldIt = json.find(fieldName); + + // Verify existence + if (fieldIt == json.end()) + { + if (msgCfgMap & static_cast(MessageSetting::MISSING)) + { + messages::addMessageToJson( + msgJson, messages::propertyMissing(fieldName), fieldPath); + } + + return Result::NOT_EXIST; } - return Result::NOT_EXIST; - } + const uint64_t* retVal = fieldIt->get_ptr(); - const uint64_t* retVal = fieldIt->get_ptr(); + // Verify type - we know that it exists, so nullptr means wrong type + if (retVal == nullptr) + { + if (msgCfgMap & static_cast(MessageSetting::TYPE_ERROR)) + { + messages::addMessageToJson( + msgJson, + messages::propertyValueTypeError(fieldIt->dump(), fieldName), + fieldPath); + } - // Verify type - we know that it exists, so nullptr means wrong type - if (retVal == nullptr) { - if (msgCfgMap & static_cast(MessageSetting::TYPE_ERROR)) { - messages::addMessageToJson( - msgJson, messages::propertyValueTypeError(fieldIt->dump(), fieldName), - fieldPath); + return Result::WRONG_TYPE; } - return Result::WRONG_TYPE; - } - - // Extract value - output = *retVal; + // Extract value + output = *retVal; - return Result::SUCCESS; + return Result::SUCCESS; } Result getBool(const char* fieldName, const nlohmann::json& json, bool& output, uint8_t msgCfgMap, nlohmann::json& msgJson, - const std::string&& fieldPath) { - // Find field - auto fieldIt = json.find(fieldName); - - // Verify existence - if (fieldIt == json.end()) { - if (msgCfgMap & static_cast(MessageSetting::MISSING)) { - messages::addMessageToJson(msgJson, messages::propertyMissing(fieldName), - fieldPath); + const std::string&& fieldPath) +{ + // Find field + auto fieldIt = json.find(fieldName); + + // Verify existence + if (fieldIt == json.end()) + { + if (msgCfgMap & static_cast(MessageSetting::MISSING)) + { + messages::addMessageToJson( + msgJson, messages::propertyMissing(fieldName), fieldPath); + } + + return Result::NOT_EXIST; } - return Result::NOT_EXIST; - } + const bool* retVal = fieldIt->get_ptr(); - const bool* retVal = fieldIt->get_ptr(); + // Verify type - we know that it exists, so nullptr means wrong type + if (retVal == nullptr) + { + if (msgCfgMap & static_cast(MessageSetting::TYPE_ERROR)) + { + messages::addMessageToJson( + msgJson, + messages::propertyValueTypeError(fieldIt->dump(), fieldName), + fieldPath); + } - // Verify type - we know that it exists, so nullptr means wrong type - if (retVal == nullptr) { - if (msgCfgMap & static_cast(MessageSetting::TYPE_ERROR)) { - messages::addMessageToJson( - msgJson, messages::propertyValueTypeError(fieldIt->dump(), fieldName), - fieldPath); + return Result::WRONG_TYPE; } - return Result::WRONG_TYPE; - } - - // Extract value - output = *retVal; + // Extract value + output = *retVal; - return Result::SUCCESS; + return Result::SUCCESS; } Result getDouble(const char* fieldName, const nlohmann::json& json, double& output, uint8_t msgCfgMap, nlohmann::json& msgJson, - const std::string&& fieldPath) { - // Find field - auto fieldIt = json.find(fieldName); - - // Verify existence - if (fieldIt == json.end()) { - if (msgCfgMap & static_cast(MessageSetting::MISSING)) { - messages::addMessageToJson(msgJson, messages::propertyMissing(fieldName), - fieldPath); + const std::string&& fieldPath) +{ + // Find field + auto fieldIt = json.find(fieldName); + + // Verify existence + if (fieldIt == json.end()) + { + if (msgCfgMap & static_cast(MessageSetting::MISSING)) + { + messages::addMessageToJson( + msgJson, messages::propertyMissing(fieldName), fieldPath); + } + + return Result::NOT_EXIST; } - return Result::NOT_EXIST; - } + const double* retVal = fieldIt->get_ptr(); - const double* retVal = fieldIt->get_ptr(); + // Verify type - we know that it exists, so nullptr means wrong type + if (retVal == nullptr) + { + if (msgCfgMap & static_cast(MessageSetting::TYPE_ERROR)) + { + messages::addMessageToJson( + msgJson, + messages::propertyValueTypeError(fieldIt->dump(), fieldName), + fieldPath); + } - // Verify type - we know that it exists, so nullptr means wrong type - if (retVal == nullptr) { - if (msgCfgMap & static_cast(MessageSetting::TYPE_ERROR)) { - messages::addMessageToJson( - msgJson, messages::propertyValueTypeError(fieldIt->dump(), fieldName), - fieldPath); + return Result::WRONG_TYPE; } - return Result::WRONG_TYPE; - } + // Extract value + output = *retVal; - // Extract value - output = *retVal; - - return Result::SUCCESS; + return Result::SUCCESS; } bool processJsonFromRequest(crow::Response& res, const crow::Request& req, - nlohmann::json& reqJson) { - reqJson = nlohmann::json::parse(req.body, nullptr, false); + nlohmann::json& reqJson) +{ + reqJson = nlohmann::json::parse(req.body, nullptr, false); - if (reqJson.is_discarded()) { - messages::addMessageToErrorJson(res.jsonValue, messages::malformedJSON()); + if (reqJson.is_discarded()) + { + messages::addMessageToErrorJson(res.jsonValue, + messages::malformedJSON()); - res.result(boost::beast::http::status::bad_request); - res.end(); + res.result(boost::beast::http::status::bad_request); + res.end(); - return false; - } + return false; + } - return true; + return true; } -} // namespace json_util +} // namespace json_util -} // namespace redfish +} // namespace redfish -- cgit v1.2.3