[messages] Renammed SignedFirmwareUpdate message to SignedUpdateFirmware to match the specification

c-jimenez · c-jimenez · commit ea50edb90db7 · 2022-02-08T23:16:26.000+01:00
diff --git a/src/centralsystem/chargepoint/ChargePointProxy.cpp b/src/centralsystem/chargepoint/ChargePointProxy.cpp
@@ -41,7 +41,7 @@ along with OpenOCPP. If not, see <http://www.gnu.org/licenses/>.
 #include "Reset.h"
 #include "SendLocalList.h"
 #include "SetChargingProfile.h"
-#include "SignedFirmwareUpdate.h"
+#include "SignedUpdateFirmware.h"
 #include "TriggerMessage.h"
 #include "UnlockConnector.h"
 #include "UpdateFirmware.h"
@@ -1003,7 +1003,7 @@ ocpp::types::UpdateFirmwareStatusEnumType ChargePointProxy::signedUpdateFirmware
              << " - signingCertificate subject = " << signing_certificate.subjectString() << " - signature = " << signature;
 
     // Prepare request
-    SignedFirmwareUpdateReq req;
+    SignedUpdateFirmwareReq req;
     req.requestId = request_id;
     req.retries   = retries;
     if (retry_interval.isSet())
@@ -1017,8 +1017,8 @@ ocpp::types::UpdateFirmwareStatusEnumType ChargePointProxy::signedUpdateFirmware
     req.firmware.signature.assign(signature);
 
     // Send request
-    SignedFirmwareUpdateConf resp;
-    CallResult               res = m_msg_sender.call(SIGNED_FIRMWARE_UPDATE_ACTION, req, resp);
+    SignedUpdateFirmwareConf resp;
+    CallResult               res = m_msg_sender.call(SIGNED_UPDATE_FIRMWARE_ACTION, req, resp);
     if (res == CallResult::Ok)
     {
         ret = resp.status;
diff --git a/src/chargepoint/ChargePoint.cpp b/src/chargepoint/ChargePoint.cpp
@@ -720,16 +720,16 @@ bool ChargePoint::signCertificate()
     return ret;
 }
 
-/** @copydoc bool IChargePoint::notifySignedFirmwareUpdateStatus(ocpp::types::FirmwareStatusEnumType) */
-bool ChargePoint::notifySignedFirmwareUpdateStatus(ocpp::types::FirmwareStatusEnumType status)
+/** @copydoc bool IChargePoint::notifySignedUpdateFirmwareStatus(ocpp::types::FirmwareStatusEnumType) */
+bool ChargePoint::notifySignedUpdateFirmwareStatus(ocpp::types::FirmwareStatusEnumType status)
 {
     bool ret = false;
 
     if (m_status_manager)
     {
         if (m_status_manager->getRegistrationStatus() != RegistrationStatus::Rejected)
         {
-            ret = m_maintenance_manager->notifySignedFirmwareUpdateStatus(status);
+            ret = m_maintenance_manager->notifySignedUpdateFirmwareStatus(status);
         }
         else
         {
diff --git a/src/chargepoint/ChargePoint.h b/src/chargepoint/ChargePoint.h
@@ -171,8 +171,8 @@ class ChargePoint : public IChargePoint,
     /** @copydoc bool IChargePoint::signCertificate() */
     bool signCertificate() override;
 
-    /** @copydoc bool IChargePoint::notifySignedFirmwareUpdateStatus(ocpp::types::FirmwareStatusEnumType) */
-    bool notifySignedFirmwareUpdateStatus(ocpp::types::FirmwareStatusEnumType status) override;
+    /** @copydoc bool IChargePoint::notifySignedUpdateFirmwareStatus(ocpp::types::FirmwareStatusEnumType) */
+    bool notifySignedUpdateFirmwareStatus(ocpp::types::FirmwareStatusEnumType status) override;
 
     // RpcClient::IListener interface
 
diff --git a/src/chargepoint/interface/IChargePoint.h b/src/chargepoint/interface/IChargePoint.h
@@ -252,7 +252,7 @@ class IChargePoint
      * @param status Installation status (see FirmwareStatusEnumType documentation)
      * @return true if the notification has been sent, false otherwise
      */
-    virtual bool notifySignedFirmwareUpdateStatus(ocpp::types::FirmwareStatusEnumType status) = 0;
+    virtual bool notifySignedUpdateFirmwareStatus(ocpp::types::FirmwareStatusEnumType status) = 0;
 };
 
 } // namespace chargepoint
diff --git a/src/chargepoint/maintenance/MaintenanceManager.cpp b/src/chargepoint/maintenance/MaintenanceManager.cpp
@@ -61,7 +61,7 @@ MaintenanceManager::MaintenanceManager(const ocpp::config::IChargePointConfig&
       GenericMessageHandler<GetDiagnosticsReq, GetDiagnosticsConf>(GET_DIAGNOSTICS_ACTION, messages_converter),
       GenericMessageHandler<UpdateFirmwareReq, UpdateFirmwareConf>(UPDATE_FIRMWARE_ACTION, messages_converter),
       GenericMessageHandler<GetLogReq, GetLogConf>(GET_LOG_ACTION, messages_converter),
-      GenericMessageHandler<SignedFirmwareUpdateReq, SignedFirmwareUpdateConf>(SIGNED_FIRMWARE_UPDATE_ACTION, messages_converter),
+      GenericMessageHandler<SignedUpdateFirmwareReq, SignedUpdateFirmwareConf>(SIGNED_UPDATE_FIRMWARE_ACTION, messages_converter),
       m_stack_config(stack_config),
       m_internal_config(internal_config),
       m_events_handler(events_handler),
@@ -86,8 +86,8 @@ MaintenanceManager::MaintenanceManager(const ocpp::config::IChargePointConfig&
     msg_dispatcher.registerHandler(UPDATE_FIRMWARE_ACTION,
                                    *dynamic_cast<GenericMessageHandler<UpdateFirmwareReq, UpdateFirmwareConf>*>(this));
     msg_dispatcher.registerHandler(GET_LOG_ACTION, *dynamic_cast<GenericMessageHandler<GetLogReq, GetLogConf>*>(this));
-    msg_dispatcher.registerHandler(SIGNED_FIRMWARE_UPDATE_ACTION,
-                                   *dynamic_cast<GenericMessageHandler<SignedFirmwareUpdateReq, SignedFirmwareUpdateConf>*>(this));
+    msg_dispatcher.registerHandler(SIGNED_UPDATE_FIRMWARE_ACTION,
+                                   *dynamic_cast<GenericMessageHandler<SignedUpdateFirmwareReq, SignedUpdateFirmwareConf>*>(this));
     trigger_manager.registerHandler(MessageTrigger::DiagnosticsStatusNotification, *this);
     trigger_manager.registerHandler(MessageTrigger::FirmwareStatusNotification, *this);
     trigger_manager.registerHandler(MessageTriggerEnumType::LogStatusNotification, *this);
@@ -146,7 +146,7 @@ bool MaintenanceManager::notifyFirmwareUpdateStatus(bool success)
 }
 
 /** @brief Notify the end of a signed firmware update operation */
-bool MaintenanceManager::notifySignedFirmwareUpdateStatus(ocpp::types::FirmwareStatusEnumType status)
+bool MaintenanceManager::notifySignedUpdateFirmwareStatus(ocpp::types::FirmwareStatusEnumType status)
 {
     // Update status
     m_signed_firmware_status = status;
@@ -465,8 +465,8 @@ bool MaintenanceManager::handleMessage(const ocpp::messages::GetLogReq& request,
  *                                                                                const char*& error_code,
  *                                                                                std::string& error_message)
  */
-bool MaintenanceManager::handleMessage(const ocpp::messages::SignedFirmwareUpdateReq& request,
-                                       ocpp::messages::SignedFirmwareUpdateConf&      response,
+bool MaintenanceManager::handleMessage(const ocpp::messages::SignedUpdateFirmwareReq& request,
+                                       ocpp::messages::SignedUpdateFirmwareConf&      response,
                                        const char*&                                   error_code,
                                        std::string&                                   error_message)
 {
@@ -517,7 +517,7 @@ bool MaintenanceManager::handleMessage(const ocpp::messages::SignedFirmwareUpdat
                 // Create a separate thread since the operation can be time consuming
                 m_firmware_request_id = request.requestId;
                 m_internal_config.setKey(SIGNED_FW_UPDATE_ID_KEY, std::to_string(request.requestId));
-                m_firmware_thread = new std::thread(std::bind(&MaintenanceManager::processSignedFirmwareUpdate,
+                m_firmware_thread = new std::thread(std::bind(&MaintenanceManager::processSignedUpdateFirmware,
                                                               this,
                                                               request.firmware.location,
                                                               request.retries,
@@ -812,7 +812,7 @@ void MaintenanceManager::sendLogStatusNotification()
 }
 
 /** @brief Process the signed firmware update */
-void MaintenanceManager::processSignedFirmwareUpdate(std::string                                  location,
+void MaintenanceManager::processSignedUpdateFirmware(std::string                                  location,
                                                      ocpp::types::Optional<unsigned int>          retries,
                                                      ocpp::types::Optional<unsigned int>          retry_interval,
                                                      ocpp::types::DateTime                        retrieve_date,
@@ -857,7 +857,7 @@ void MaintenanceManager::processSignedFirmwareUpdate(std::string
             nb_retries--;
             if (nb_retries != 0)
             {
-                LOG_WARNING << "SignedFirmwareUpdate : download failed (" << nb_retries << " retrie(s) left - next retry in "
+                LOG_WARNING << "SignedUpdateFirmware : download failed (" << nb_retries << " retrie(s) left - next retry in "
                             << retry_interval_s.count() << "s)";
                 std::this_thread::sleep_for(retry_interval_s);
             }
@@ -869,12 +869,12 @@ void MaintenanceManager::processSignedFirmwareUpdate(std::string
     if (success)
     {
         m_signed_firmware_status = FirmwareStatusEnumType::Downloaded;
-        LOG_INFO << "SignedFirmwareUpdate download : success";
+        LOG_INFO << "SignedUpdateFirmware download : success";
     }
     else
     {
         m_signed_firmware_status = FirmwareStatusEnumType::DownloadFailed;
-        LOG_ERROR << "SignedFirmwareUpdate download : failed";
+        LOG_ERROR << "SignedUpdateFirmware download : failed";
     }
     sendSignedFirmwareStatusNotification();
 
@@ -888,12 +888,12 @@ void MaintenanceManager::processSignedFirmwareUpdate(std::string
         if (success)
         {
             m_signed_firmware_status = FirmwareStatusEnumType::SignatureVerified;
-            LOG_INFO << "SignedFirmwareUpdate verify : success";
+            LOG_INFO << "SignedUpdateFirmware verify : success";
         }
         else
         {
             m_signed_firmware_status = FirmwareStatusEnumType::InvalidSignature;
-            LOG_ERROR << "SignedFirmwareUpdate verify : failed";
+            LOG_ERROR << "SignedUpdateFirmware verify : failed";
         }
         sendSignedFirmwareStatusNotification();
 
@@ -930,7 +930,7 @@ void MaintenanceManager::processSignedFirmwareUpdate(std::string
 /** @brief Send a signed firmware status notification */
 bool MaintenanceManager::sendSignedFirmwareStatusNotification()
 {
-    LOG_INFO << "SignedFirmwareUpdate status : " << FirmwareStatusEnumTypeHelper.toString(m_signed_firmware_status);
+    LOG_INFO << "SignedUpdateFirmware status : " << FirmwareStatusEnumTypeHelper.toString(m_signed_firmware_status);
 
     SignedFirmwareStatusNotificationReq  status_req;
     SignedFirmwareStatusNotificationConf status_conf;
diff --git a/src/chargepoint/maintenance/MaintenanceManager.h b/src/chargepoint/maintenance/MaintenanceManager.h
@@ -25,7 +25,7 @@ along with OpenOCPP. If not, see <http://www.gnu.org/licenses/>.
 #include "GetLog.h"
 #include "ITriggerMessageManager.h"
 #include "Reset.h"
-#include "SignedFirmwareUpdate.h"
+#include "SignedUpdateFirmware.h"
 #include "UnlockConnector.h"
 #include "UpdateFirmware.h"
 
@@ -72,7 +72,7 @@ class MaintenanceManager
       public ocpp::messages::GenericMessageHandler<ocpp::messages::UpdateFirmwareReq, ocpp::messages::UpdateFirmwareConf>,
       // Security extensions
       public ocpp::messages::GenericMessageHandler<ocpp::messages::GetLogReq, ocpp::messages::GetLogConf>,
-      public ocpp::messages::GenericMessageHandler<ocpp::messages::SignedFirmwareUpdateReq, ocpp::messages::SignedFirmwareUpdateConf>
+      public ocpp::messages::GenericMessageHandler<ocpp::messages::SignedUpdateFirmwareReq, ocpp::messages::SignedUpdateFirmwareConf>
 {
   public:
     /** @brief Constructor */
@@ -103,7 +103,7 @@ class MaintenanceManager
      * @param status Installation status (see FirmwareStatusEnumType documentation)
      * @return true if the notification has been sent, false otherwise
      */
-    bool notifySignedFirmwareUpdateStatus(ocpp::types::FirmwareStatusEnumType status);
+    bool notifySignedUpdateFirmwareStatus(ocpp::types::FirmwareStatusEnumType status);
 
     // ITriggerMessageManager::ITriggerMessageHandler interface
 
@@ -172,8 +172,8 @@ class MaintenanceManager
      *                                                                                const char*& error_code,
      *                                                                                std::string& error_message)
      */
-    bool handleMessage(const ocpp::messages::SignedFirmwareUpdateReq& request,
-                       ocpp::messages::SignedFirmwareUpdateConf&      response,
+    bool handleMessage(const ocpp::messages::SignedUpdateFirmwareReq& request,
+                       ocpp::messages::SignedUpdateFirmwareConf&      response,
                        const char*&                                   error_code,
                        std::string&                                   error_message) override;
 
@@ -242,7 +242,7 @@ class MaintenanceManager
     void sendLogStatusNotification();
 
     /** @brief Process the signed firmware update */
-    void processSignedFirmwareUpdate(std::string                                  location,
+    void processSignedUpdateFirmware(std::string                                  location,
                                      ocpp::types::Optional<unsigned int>          retries,
                                      ocpp::types::Optional<unsigned int>          retry_interval,
                                      ocpp::types::DateTime                        retrieve_date,
diff --git a/src/messages/CMakeLists.txt b/src/messages/CMakeLists.txt
@@ -40,7 +40,7 @@ add_library(messages STATIC
     SetChargingProfile.cpp
     SignCertificate.cpp
     SignedFirmwareStatusNotification.cpp
-    SignedFirmwareUpdate.cpp
+    SignedUpdateFirmware.cpp
     StartTransaction.cpp
     StatusNotification.cpp
     StopTransaction.cpp
diff --git a/src/messages/MessagesConverter.cpp b/src/messages/MessagesConverter.cpp
@@ -50,7 +50,7 @@ along with OpenOCPP. If not, see <http://www.gnu.org/licenses/>.
 #include "SetChargingProfile.h"
 #include "SignCertificate.h"
 #include "SignedFirmwareStatusNotification.h"
-#include "SignedFirmwareUpdate.h"
+#include "SignedUpdateFirmware.h"
 #include "StartTransaction.h"
 #include "StatusNotification.h"
 #include "StopTransaction.h"
@@ -108,7 +108,7 @@ MessagesConverter::MessagesConverter()
     REGISTER_CONVERTER(SetChargingProfile);
     REGISTER_CONVERTER(SignCertificate);
     REGISTER_CONVERTER(SignedFirmwareStatusNotification);
-    REGISTER_CONVERTER(SignedFirmwareUpdate);
+    REGISTER_CONVERTER(SignedUpdateFirmware);
     REGISTER_CONVERTER(StartTransaction);
     REGISTER_CONVERTER(StatusNotification);
     REGISTER_CONVERTER(StopTransaction);
@@ -152,7 +152,7 @@ MessagesConverter::~MessagesConverter()
     DELETE_CONVERTER(SetChargingProfile);
     DELETE_CONVERTER(SignCertificate);
     DELETE_CONVERTER(SignedFirmwareStatusNotification);
-    DELETE_CONVERTER(SignedFirmwareUpdate);
+    DELETE_CONVERTER(SignedUpdateFirmware);
     DELETE_CONVERTER(StartTransaction);
     DELETE_CONVERTER(StatusNotification);
     DELETE_CONVERTER(StopTransaction);
diff --git a/src/messages/SignedUpdateFirmware.cpp b/src/messages/SignedUpdateFirmware.cpp
@@ -16,7 +16,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with OpenOCPP. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "SignedFirmwareUpdate.h"
+#include "SignedUpdateFirmware.h"
 #include "IRpc.h"
 #include "Url.h"
 
@@ -40,8 +40,8 @@ namespace messages
 {
 
 /** @copydoc bool IMessageConverter<DataType>::fromJson(const rapidjson::Value&, DataType&, const char*&, std::string&) */
-bool SignedFirmwareUpdateReqConverter::fromJson(const rapidjson::Value&  json,
-                                                SignedFirmwareUpdateReq& data,
+bool SignedUpdateFirmwareReqConverter::fromJson(const rapidjson::Value&  json,
+                                                SignedUpdateFirmwareReq& data,
                                                 const char*&             error_code,
                                                 std::string&             error_message)
 {
@@ -66,7 +66,7 @@ bool SignedFirmwareUpdateReqConverter::fromJson(const rapidjson::Value&  json,
 }
 
 /** @copydoc bool IMessageConverter<DataType>::toJson(DataType&, rapidjson::Document&, const char*&, std::string&) */
-bool SignedFirmwareUpdateReqConverter::toJson(const SignedFirmwareUpdateReq& data, rapidjson::Document& json)
+bool SignedUpdateFirmwareReqConverter::toJson(const SignedUpdateFirmwareReq& data, rapidjson::Document& json)
 {
     fill(json, "requestId", data.requestId);
     fill(json, "retries", data.retries);
@@ -84,8 +84,8 @@ bool SignedFirmwareUpdateReqConverter::toJson(const SignedFirmwareUpdateReq& dat
 }
 
 /** @copydoc bool IMessageConverter<DataType>::fromJson(const rapidjson::Value&, DataType&, const char*&, std::string&) */
-bool SignedFirmwareUpdateConfConverter::fromJson(const rapidjson::Value&   json,
-                                                 SignedFirmwareUpdateConf& data,
+bool SignedUpdateFirmwareConfConverter::fromJson(const rapidjson::Value&   json,
+                                                 SignedUpdateFirmwareConf& data,
                                                  const char*&              error_code,
                                                  std::string&              error_message)
 {
@@ -96,7 +96,7 @@ bool SignedFirmwareUpdateConfConverter::fromJson(const rapidjson::Value&   json,
 }
 
 /** @copydoc bool IMessageConverter<DataType>::toJson(DataType&, rapidjson::Document&, const char*&, std::string&) */
-bool SignedFirmwareUpdateConfConverter::toJson(const SignedFirmwareUpdateConf& data, rapidjson::Document& json)
+bool SignedUpdateFirmwareConfConverter::toJson(const SignedUpdateFirmwareConf& data, rapidjson::Document& json)
 {
     fill(json, "status", UpdateFirmwareStatusEnumTypeHelper.toString(data.status));
     return true;
diff --git a/src/messages/SignedUpdateFirmware.h b/src/messages/SignedUpdateFirmware.h
@@ -16,8 +16,8 @@ You should have received a copy of the GNU Lesser General Public License
 along with OpenOCPP. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef SIGNEDFIRMWAREUPDATE_H
-#define SIGNEDFIRMWAREUPDATE_H
+#ifndef SIGNEDUPDATEFIRMWARE_H
+#define SIGNEDUPDATEFIRMWARE_H
 
 #include "Enums.h"
 #include "FirmwareType.h"
@@ -29,11 +29,11 @@ namespace ocpp
 namespace messages
 {
 
-/** @brief Action corresponding to the SignedFirmwareUpdate messages */
-static const std::string SIGNED_FIRMWARE_UPDATE_ACTION = "SignedFirmwareUpdate";
+/** @brief Action corresponding to the SignedUpdateFirmware messages */
+static const std::string SIGNED_UPDATE_FIRMWARE_ACTION = "SignedUpdateFirmware";
 
-/** @brief SignedFirmwareUpdate.req message */
-struct SignedFirmwareUpdateReq
+/** @brief SignedUpdateFirmware.req message */
+struct SignedUpdateFirmwareReq
 {
     /** @brief Optional. This specifies how many times Charge Point must try to download the
                firmware before giving up. If this field is not present, it is left to Charge Point to
@@ -50,17 +50,17 @@ struct SignedFirmwareUpdateReq
     ocpp::types::FirmwareType firmware;
 };
 
-/** @brief SignedFirmwareUpdate.conf message */
-struct SignedFirmwareUpdateConf
+/** @brief SignedUpdateFirmware.conf message */
+struct SignedUpdateFirmwareConf
 {
     /** @brief Required. This field indicates whether the Charge Point was able to accept the request */
     ocpp::types::UpdateFirmwareStatusEnumType status;
 };
 
 // Message converters
-MESSAGE_CONVERTERS(SignedFirmwareUpdate)
+MESSAGE_CONVERTERS(SignedUpdateFirmware)
 
 } // namespace messages
 } // namespace ocpp
 
-#endif // SIGNEDFIRMWAREUPDATE_H
+#endif // SIGNEDUPDATEFIRMWARE_H

Original file line number	Diff line number	Diff line change
`@@ -720,16 +720,16 @@ bool ChargePoint::signCertificate()`
`720`	`720`	`return ret;`
`721`	`721`	`}`
`722`	`722`
`723`		`-/** @copydoc bool IChargePoint::notifySignedFirmwareUpdateStatus(ocpp::types::FirmwareStatusEnumType) */`
`724`		`-bool ChargePoint::notifySignedFirmwareUpdateStatus(ocpp::types::FirmwareStatusEnumType status)`
	`723`	`+/** @copydoc bool IChargePoint::notifySignedUpdateFirmwareStatus(ocpp::types::FirmwareStatusEnumType) */`
	`724`	`+bool ChargePoint::notifySignedUpdateFirmwareStatus(ocpp::types::FirmwareStatusEnumType status)`
`725`	`725`	`{`
`726`	`726`	`bool ret = false;`
`727`	`727`
`728`	`728`	`if (m_status_manager)`
`729`	`729`	`{`
`730`	`730`	`if (m_status_manager->getRegistrationStatus() != RegistrationStatus::Rejected)`
`731`	`731`	`{`
`732`		`- ret = m_maintenance_manager->notifySignedFirmwareUpdateStatus(status);`
	`732`	`+ ret = m_maintenance_manager->notifySignedUpdateFirmwareStatus(status);`
`733`	`733`	`}`
`734`	`734`	`else`
`735`	`735`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ You should have received a copy of the GNU Lesser General Public License`
`16`	`16`	`along with OpenOCPP. If not, see <http://www.gnu.org/licenses/>.`
`17`	`17`	`*/`
`18`	`18`
`19`		`-#include "SignedFirmwareUpdate.h"`
	`19`	`+#include "SignedUpdateFirmware.h"`
`20`	`20`	`#include "IRpc.h"`
`21`	`21`	`#include "Url.h"`
`22`	`22`
`@@ -40,8 +40,8 @@ namespace messages`
`40`	`40`	`{`
`41`	`41`
`42`	`42`	`/** @copydoc bool IMessageConverter<DataType>::fromJson(const rapidjson::Value&, DataType&, const char&, std::string&) /`
`43`		`-bool SignedFirmwareUpdateReqConverter::fromJson(const rapidjson::Value& json,`
`44`		`- SignedFirmwareUpdateReq& data,`
	`43`	`+bool SignedUpdateFirmwareReqConverter::fromJson(const rapidjson::Value& json,`
	`44`	`+ SignedUpdateFirmwareReq& data,`
`45`	`45`	`const char*& error_code,`
`46`	`46`	`std::string& error_message)`
`47`	`47`	`{`
`@@ -66,7 +66,7 @@ bool SignedFirmwareUpdateReqConverter::fromJson(const rapidjson::Value& json,`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`/** @copydoc bool IMessageConverter<DataType>::toJson(DataType&, rapidjson::Document&, const char&, std::string&) /`
`69`		`-bool SignedFirmwareUpdateReqConverter::toJson(const SignedFirmwareUpdateReq& data, rapidjson::Document& json)`
	`69`	`+bool SignedUpdateFirmwareReqConverter::toJson(const SignedUpdateFirmwareReq& data, rapidjson::Document& json)`
`70`	`70`	`{`
`71`	`71`	`fill(json, "requestId", data.requestId);`
`72`	`72`	`fill(json, "retries", data.retries);`
`@@ -84,8 +84,8 @@ bool SignedFirmwareUpdateReqConverter::toJson(const SignedFirmwareUpdateReq& dat`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`/** @copydoc bool IMessageConverter<DataType>::fromJson(const rapidjson::Value&, DataType&, const char&, std::string&) /`
`87`		`-bool SignedFirmwareUpdateConfConverter::fromJson(const rapidjson::Value& json,`
`88`		`- SignedFirmwareUpdateConf& data,`
	`87`	`+bool SignedUpdateFirmwareConfConverter::fromJson(const rapidjson::Value& json,`
	`88`	`+ SignedUpdateFirmwareConf& data,`
`89`	`89`	`const char*& error_code,`
`90`	`90`	`std::string& error_message)`
`91`	`91`	`{`
`@@ -96,7 +96,7 @@ bool SignedFirmwareUpdateConfConverter::fromJson(const rapidjson::Value& json,`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`/** @copydoc bool IMessageConverter<DataType>::toJson(DataType&, rapidjson::Document&, const char&, std::string&) /`
`99`		`-bool SignedFirmwareUpdateConfConverter::toJson(const SignedFirmwareUpdateConf& data, rapidjson::Document& json)`
	`99`	`+bool SignedUpdateFirmwareConfConverter::toJson(const SignedUpdateFirmwareConf& data, rapidjson::Document& json)`
`100`	`100`	`{`
`101`	`101`	`fill(json, "status", UpdateFirmwareStatusEnumTypeHelper.toString(data.status));`
`102`	`102`	`return true;`