[ocpp20] Fix clang build

c-jimenez · Oct 23, 2024 · 572018c · 572018c
1 parent 3759c49
commit 572018c
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 26 deletions.
diff --git a/examples/ocpp20/quick_start_chargepoint/main.cpp b/examples/ocpp20/quick_start_chargepoint/main.cpp
@@ -125,8 +125,8 @@ int main(int argc, char* argv[])
     std::string error;
     std::string error_msg;
 
-    auto                         last_boot_notif        = std::chrono::steady_clock::time_point();
-    std::chrono::seconds         hb_boot_notif_interval = std::chrono::seconds(10);
+    auto                       last_boot_notif        = std::chrono::steady_clock::time_point();
+    std::chrono::seconds       hb_boot_notif_interval = std::chrono::seconds(10);
     RegistrationStatusEnumType registration_status    = RegistrationStatusEnumType::Rejected;
 
     unsigned int transaction_id = std::chrono::system_clock::now().time_since_epoch().count();

diff --git a/src/ocpp20/centralsystem/chargepoint/ChargePointHandler20.cpp b/src/ocpp20/centralsystem/chargepoint/ChargePointHandler20.cpp
@@ -39,8 +39,7 @@ namespace ocpp20
 /** @brief Constructor */
 ChargePointHandler20::ChargePointHandler20(const std::string&                                 identifier,
                                            const ocpp::messages::ocpp20::MessagesConverter20& messages_converter,
-                                           ocpp::messages::MessageDispatcher&                 msg_dispatcher,
-                                           const ocpp::config::ICentralSystemConfig20&        stack_config)
+                                           ocpp::messages::MessageDispatcher&                 msg_dispatcher)
     : GenericMessageHandler<BootNotificationReq, BootNotificationConf>(BOOTNOTIFICATION_ACTION, messages_converter),
       GenericMessageHandler<AuthorizeReq, AuthorizeConf>(AUTHORIZE_ACTION, messages_converter),
       GenericMessageHandler<ClearedChargingLimitReq, ClearedChargingLimitConf>(CLEAREDCHARGINGLIMIT_ACTION, messages_converter),
@@ -71,8 +70,6 @@ ChargePointHandler20::ChargePointHandler20(const std::string&
       GenericMessageHandler<TransactionEventReq, TransactionEventConf>(TRANSACTIONEVENT_ACTION, messages_converter),
 
       m_identifier(identifier),
-      m_stack_config(stack_config),
-      m_messages_converter(messages_converter),
       m_handler(nullptr)
 {
     msg_dispatcher.registerHandler(BOOTNOTIFICATION_ACTION,

diff --git a/src/ocpp20/centralsystem/chargepoint/ChargePointHandler20.h b/src/ocpp20/centralsystem/chargepoint/ChargePointHandler20.h
@@ -119,12 +119,10 @@ class ChargePointHandler20
      * @param identifier Charge point's identifier
      * @param messages_converter Converter from/to OCPP to/from JSON messages
      * @param msg_dispatcher Message dispatcher
-     * @param stack_config Stack configuration
      */
     ChargePointHandler20(const std::string&                                 identifier,
                          const ocpp::messages::ocpp20::MessagesConverter20& messages_converter,
-                         ocpp::messages::MessageDispatcher&                 msg_dispatcher,
-                         const ocpp::config::ICentralSystemConfig20&        stack_config);
+                         ocpp::messages::MessageDispatcher&                 msg_dispatcher);
     /** @brief Destructor */
     virtual ~ChargePointHandler20();
 
@@ -352,10 +350,6 @@ class ChargePointHandler20
   private:
     /** @brief Charge point's identifier */
     const std::string m_identifier;
-    /** @brief Stack configuration */
-    const ocpp::config::ICentralSystemConfig20& m_stack_config;
-    /** @brief Messages converters */
-    const ocpp::messages::GenericMessagesConverter& m_messages_converter;
     /** @brief Request handler */
     IChargePointRequestHandler20* m_handler;
 };

diff --git a/src/ocpp20/centralsystem/chargepoint/ChargePointProxy20.cpp b/src/ocpp20/centralsystem/chargepoint/ChargePointProxy20.cpp
@@ -44,7 +44,7 @@ ChargePointProxy20::ChargePointProxy20(ICentralSystem20&
       m_rpc(rpc),
       m_msg_dispatcher(messages_validator),
       m_msg_sender(*m_rpc, messages_converter, messages_validator, stack_config.callRequestTimeout()),
-      m_handler(m_identifier, messages_converter, m_msg_dispatcher, stack_config),
+      m_handler(m_identifier, messages_converter, m_msg_dispatcher),
       m_messages_validator(messages_validator),
       m_messages_converter(messages_converter)
 {

diff --git a/tools/json2cpp/templates/centralsystem/ChargePointHandler.cpp.j2 b/tools/json2cpp/templates/centralsystem/ChargePointHandler.cpp.j2
@@ -39,16 +39,13 @@ namespace {{ocpp_version_namespace}}
 /** @brief Constructor */
 ChargePointHandler{{ocpp_version_suffix}}::ChargePointHandler{{ocpp_version_suffix}}(const std::string&                               identifier,
                                        const ocpp::messages::{{ocpp_version_namespace}}::MessagesConverter{{ocpp_version_suffix}}& messages_converter,
-                                       ocpp::messages::MessageDispatcher&               msg_dispatcher,
-                                       const ocpp::config::ICentralSystemConfig{{ocpp_version_suffix}}&        stack_config)
+                                       ocpp::messages::MessageDispatcher&               msg_dispatcher)
     : 
       {%- for msg_name in cs_msgs %}
       GenericMessageHandler<{{msg_name}}Req, {{msg_name}}Conf>({{msg_name.upper()}}_ACTION, messages_converter),
       {%- endfor %}
 
       m_identifier(identifier),
-      m_stack_config(stack_config),
-      m_messages_converter(messages_converter),
       m_handler(nullptr)
 {
     {%- for msg_name in cs_msgs %}

diff --git a/tools/json2cpp/templates/centralsystem/ChargePointHandler.h.j2 b/tools/json2cpp/templates/centralsystem/ChargePointHandler.h.j2
@@ -63,12 +63,10 @@ class ChargePointHandler{{ocpp_version_suffix}}
      * @param identifier Charge point's identifier
      * @param messages_converter Converter from/to OCPP to/from JSON messages
      * @param msg_dispatcher Message dispatcher
-     * @param stack_config Stack configuration
      */
     ChargePointHandler{{ocpp_version_suffix}}(const std::string&                               identifier,
                        const ocpp::messages::{{ocpp_version_namespace}}::MessagesConverter{{ocpp_version_suffix}}& messages_converter,
-                       ocpp::messages::MessageDispatcher&               msg_dispatcher,
-                       const ocpp::config::ICentralSystemConfig20&        stack_config);
+                       ocpp::messages::MessageDispatcher&               msg_dispatcher);
     /** @brief Destructor */
     virtual ~ChargePointHandler{{ocpp_version_suffix}}();
 
@@ -92,10 +90,6 @@ class ChargePointHandler{{ocpp_version_suffix}}
   private:
     /** @brief Charge point's identifier */
     const std::string m_identifier;
-    /** @brief Stack configuration */
-    const ocpp::config::ICentralSystemConfig{{ocpp_version_suffix}}& m_stack_config;
-    /** @brief Messages converters */
-    const ocpp::messages::GenericMessagesConverter& m_messages_converter;
     /** @brief Request handler */
     IChargePointRequestHandler{{ocpp_version_suffix}}* m_handler;
 };

diff --git a/tools/json2cpp/templates/centralsystem/ChargePointProxy.cpp.j2 b/tools/json2cpp/templates/centralsystem/ChargePointProxy.cpp.j2
@@ -44,7 +44,7 @@ ChargePointProxy{{ocpp_version_suffix}}::ChargePointProxy{{ocpp_version_suffix}}
       m_rpc(rpc),
       m_msg_dispatcher(messages_validator),
       m_msg_sender(*m_rpc, messages_converter, messages_validator, stack_config.callRequestTimeout()),
-      m_handler(m_identifier, messages_converter, m_msg_dispatcher, stack_config),
+      m_handler(m_identifier, messages_converter, m_msg_dispatcher),
       m_messages_validator(messages_validator),
       m_messages_converter(messages_converter)
 {