Fix bug with creating a ComponentVariable with variable as std::nullopt instead of customData.

Signed-off-by: Maaike Zijderveld, iolar <git.mail@iolar.nl>

Author: maaikez

include/ocpp/v201/ctrlr_component_variables.hpp

@@ -4,6 +4,8 @@
 #ifndef OCPP_V201_CTRLR_COMPONENT_VARIABLES
 #define OCPP_V201_CTRLR_COMPONENT_VARIABLES
 
+#include <set>
+
 #include <ocpp/v201/ocpp_types.hpp>
 
 namespace ocpp {

include/ocpp/v201/ocpp_types.hpp

@@ -5,7 +5,6 @@
 #ifndef OCPP_V201_OCPP_TYPES_HPP
 #define OCPP_V201_OCPP_TYPES_HPP
 
-#include <set>
 #include <string>
 
 #include <nlohmann/json_fwd.hpp>

lib/ocpp/v201/functional_blocks/provisioning.cpp

@@ -389,7 +389,7 @@ void Provisioning::handle_set_network_profile_req(Call<SetNetworkProfileRequest>
 
     int index_to_override = -1;
     int index = 0;
-    for (const SetNetworkProfileRequest network_profile : network_connection_profiles) {
+    for (const SetNetworkProfileRequest& network_profile : network_connection_profiles) {
         if (network_profile.configurationSlot == msg.configurationSlot) {
             index_to_override = index;
         }
@@ -515,7 +515,7 @@ void Provisioning::handle_reset_req(Call<ResetRequest> call) {
 }
 
 void Provisioning::handle_variable_changed(const SetVariableData& set_variable_data) {
-    ComponentVariable component_variable = {set_variable_data.component, std::nullopt, set_variable_data.variable};
+    ComponentVariable component_variable = {set_variable_data.component, set_variable_data.variable, std::nullopt};
 
     if (set_variable_data.attributeType.has_value() and
         set_variable_data.attributeType.value() != AttributeEnum::Actual) {
@@ -602,7 +602,7 @@ void Provisioning::handle_variables_changed(const std::map<SetVariableData, SetV
 }
 
 bool Provisioning::validate_set_variable(const SetVariableData& set_variable_data) {
-    ComponentVariable cv = {set_variable_data.component, std::nullopt, set_variable_data.variable};
+    ComponentVariable cv = {set_variable_data.component, set_variable_data.variable, std::nullopt};
     if (cv == ControllerComponentVariables::NetworkConfigurationPriority) {
         const auto network_configuration_priorities = ocpp::split_string(set_variable_data.attributeValue.get(), ',');
         const auto active_security_profile =
@@ -611,7 +611,7 @@ bool Provisioning::validate_set_variable(const SetVariableData& set_variable_dat
         try {
             const auto network_connection_profiles = json::parse(
                 this->device_model.get_value<std::string>(ControllerComponentVariables::NetworkConnectionProfiles));
-            for (const auto configuration_slot : network_configuration_priorities) {
+            for (const auto& configuration_slot : network_configuration_priorities) {
                 auto network_profile_it =
                     std::find_if(network_connection_profiles.begin(), network_connection_profiles.end(),
                                  [configuration_slot](const SetNetworkProfileRequest& network_profile) {

src/code_generator/common/templates/ocpp_types.hpp.jinja

@@ -43,7 +43,7 @@ struct {{type.name}} {
     /// \brief Conversion from a given json object \p j to a given {{ type.name }} \p k
     void from_json(const json& j, {{ type.name }}& k);
 
-    // \brief Writes the string representation of the given {{ type.name }} \p k to the given output stream \p os
+    /// \brief Writes the string representation of the given {{ type.name }} \p k to the given output stream \p os
     /// \returns an output stream with the {{ type.name }} written to
     std::ostream& operator<<(std::ostream& os, const {{ type.name }}& k);