[messages] Use rapidjson::kObjectType constructor instead of Parse({}} to serialize messages/types to JSON

Author: c-jimenez

src/messages/GenericMessageSender.h

@@ -139,8 +139,7 @@ class GenericMessageSender
         if (req_converter && resp_converter)
         {
             // Convert request
-            rapidjson::Document payload;
-            payload.Parse("{}");
+            rapidjson::Document payload(rapidjson::kObjectType);
             req_converter->setAllocator(&payload.GetAllocator());
             if (req_converter->toJson(request, payload))
             {

src/ocpp16/centralsystem/chargepoint/ChargePointHandler.h

@@ -290,8 +290,7 @@ class ChargePointHandler
                     handleMessage(req, resp);
 
                     // Convert response to JSON
-                    rapidjson::Document response;
-                    response.Parse("{}");
+                    rapidjson::Document response(rapidjson::kObjectType);
                     resp_converter->setAllocator(&response.GetAllocator());
                     if (resp_converter->toJson(resp, response))
                     {

src/ocpp16/centralsystem/chargepoint/ChargePointProxy.h

@@ -370,10 +370,9 @@ class ChargePointProxy : public ICentralSystem::IChargePoint, public ocpp::rpc::
         req.messageId.value().assign(action);
 
         // Convert request to JSON
-        rapidjson::Document                        json_req;
+        rapidjson::Document                        json_req(rapidjson::kObjectType);
         rapidjson::StringBuffer                    buffer;
         rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
-        json_req.Parse("{}");
         req_converter->setAllocator(&json_req.GetAllocator());
         req_converter->toJson(request, json_req);
         json_req.Accept(writer);

src/ocpp16/chargepoint/iso15118/Iso15118Manager.h

@@ -188,10 +188,9 @@ class Iso15118Manager : public IDataTransferManager::IDataTransferHandler
         req.messageId.value().assign(action);
 
         // Convert request to JSON
-        rapidjson::Document                        json_req;
+        rapidjson::Document                        json_req(rapidjson::kObjectType);
         rapidjson::StringBuffer                    buffer;
         rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
-        json_req.Parse("{}");
         req_converter->setAllocator(&json_req.GetAllocator());
         req_converter->toJson(request, json_req);
         json_req.Accept(writer);
@@ -265,8 +264,7 @@ class Iso15118Manager : public IDataTransferManager::IDataTransferHandler
                     handle(req, resp);
 
                     // Convert response to JSON
-                    rapidjson::Document response;
-                    response.Parse("{}");
+                    rapidjson::Document response(rapidjson::kObjectType);
                     resp_converter->setAllocator(&response.GetAllocator());
                     if (resp_converter->toJson(resp, response))
                     {

src/ocpp16/chargepoint/metervalues/MeterValuesManager.cpp

@@ -644,8 +644,7 @@ std::string MeterValuesManager::serialize(const ocpp::types::ocpp16::MeterValue&
 {
     std::string meter_value_str;
 
-    rapidjson::Document meter_value_json;
-    meter_value_json.Parse("{}");
+    rapidjson::Document meter_value_json(rapidjson::kObjectType);
     MeterValueConverter meter_value_converter;
     meter_value_converter.setAllocator(&meter_value_json.GetAllocator());
     meter_value_converter.toJson(meter_value, meter_value_json);

src/ocpp16/chargepoint/security/SecurityManager.cpp

@@ -319,8 +319,7 @@ bool SecurityManager::logSecurityEvent(const std::string& type, const std::strin
             else
             {
                 // Stack is not started, queue the notification
-                rapidjson::Document payload;
-                payload.Parse("{}");
+                rapidjson::Document payload(rapidjson::kObjectType);
                 m_security_event_req_converter->setAllocator(&payload.GetAllocator());
                 if (m_security_event_req_converter->toJson(request, payload))
                 {

src/ocpp16/chargepoint/smartcharging/ProfileDatabase.cpp

@@ -356,8 +356,7 @@ std::string ProfileDatabase::serialize(const ocpp::types::ocpp16::ChargingProfil
 {
     std::string profile_str;
 
-    rapidjson::Document profile_json;
-    profile_json.Parse("{}");
+    rapidjson::Document      profile_json(rapidjson::kObjectType);
     ChargingProfileConverter charging_profile_converter;
     charging_profile_converter.setAllocator(&profile_json.GetAllocator());
     charging_profile_converter.toJson(profile, profile_json);

src/ocpp16/messages/Authorize.cpp

@@ -74,9 +74,8 @@ bool AuthorizeConfConverter::toJson(const AuthorizeConf& data, rapidjson::Docume
 {
     IdTagInfoConverter id_tag_info_converter;
     id_tag_info_converter.setAllocator(allocator);
-    rapidjson::Document id_tag_info;
-    id_tag_info.Parse("{}");
-    bool ret = id_tag_info_converter.toJson(data.idTagInfo, id_tag_info);
+    rapidjson::Document id_tag_info(rapidjson::kObjectType);
+    bool                ret = id_tag_info_converter.toJson(data.idTagInfo, id_tag_info);
     json.AddMember(rapidjson::StringRef("idTagInfo"), id_tag_info.Move(), *allocator);
     return ret;
 }

src/ocpp16/messages/DeleteCertificate.cpp

@@ -57,9 +57,8 @@ bool DeleteCertificateReqConverter::toJson(const DeleteCertificateReq& data, rap
 {
     CertificateHashDataTypeConverter certificate_hash_converter;
     certificate_hash_converter.setAllocator(allocator);
-    rapidjson::Document value;
-    value.Parse("{}");
-    bool ret = certificate_hash_converter.toJson(data.certificateHashData, value);
+    rapidjson::Document value(rapidjson::kObjectType);
+    bool                ret = certificate_hash_converter.toJson(data.certificateHashData, value);
     json.AddMember(rapidjson::StringRef("certificateHashData"), value.Move(), *allocator);
     return ret;
 }

src/ocpp16/messages/GetCertificateStatus.cpp

@@ -58,9 +58,8 @@ bool GetCertificateStatusReqConverter::toJson(const GetCertificateStatusReq& dat
     OcspRequestDataTypeConverter ocsp_request_converter;
     ocsp_request_converter.setAllocator(allocator);
 
-    rapidjson::Document value;
-    value.Parse("{}");
-    bool ret = ocsp_request_converter.toJson(data.ocspRequestData, value);
+    rapidjson::Document value(rapidjson::kObjectType);
+    bool                ret = ocsp_request_converter.toJson(data.ocspRequestData, value);
     if (ret)
     {
         json.AddMember(rapidjson::StringRef("ocspRequestData"), value.Move(), *allocator);