Review comments.

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

Author: maaikez

include/ocpp/v201/ctrlr_component_variables.hpp

@@ -8,6 +8,33 @@
 
 namespace ocpp {
 namespace v201 {
+///
+/// \brief Required ComponentVariable.
+///
+struct RequiredComponentVariable : ComponentVariable {
+    /// \brief Constructor
+    RequiredComponentVariable() : required_for({OcppProtocolVersion::v201, OcppProtocolVersion::v21}) {};
+
+           ///
+           /// \brief RequiredComponentVariable
+           /// \param component    Component
+           /// \param variable     Variable
+           /// \param custom_data  Custom data (default nullopt)
+           /// \param required_for Required for which version. Multiple versions can be given.
+           ///
+    RequiredComponentVariable(const Component component, const std::optional<Variable> variable,
+                              const std::optional<CustomData> custom_data = std::nullopt,
+                              const std::set<OcppProtocolVersion> required_for = {OcppProtocolVersion::v201,
+                                                                                  OcppProtocolVersion::v21}) :
+        ComponentVariable(), required_for(required_for) {
+        this->component = component;
+        this->variable = variable;
+        this->customData = custom_data;
+    };
+
+           /// \brief For which ocpp protocol version(s) this component variable is required.
+    std::set<OcppProtocolVersion> required_for;
+};
 
 ///
 /// \brief Required variables per component.

include/ocpp/v201/device_model.hpp

@@ -8,6 +8,7 @@
 
 #include <everest/logging.hpp>
 
+#include <ocpp/v201/ctrlr_component_variables.hpp>
 #include <ocpp/v201/device_model_storage_interface.hpp>
 
 namespace ocpp {

include/ocpp/v201/ocpp_types.hpp

@@ -2239,34 +2239,6 @@ void from_json(const json& j, Firmware& k);
 /// \brief Writes the string representation of the given Firmware \p k to the given output stream \p os
 /// \returns an output stream with the Firmware written to
 std::ostream& operator<<(std::ostream& os, const Firmware& k);
-
-///
-/// \brief Required ComponentVariable.
-///
-struct RequiredComponentVariable : ComponentVariable {
-    /// \brief Constructor
-    RequiredComponentVariable() : required_for({OcppProtocolVersion::v201, OcppProtocolVersion::v21}) {};
-
-    ///
-    /// \brief RequiredComponentVariable
-    /// \param component    Component
-    /// \param variable     Variable
-    /// \param custom_data  Custom data (default nullopt)
-    /// \param required_for Required for which version. Multiple versions can be given.
-    ///
-    RequiredComponentVariable(const Component component, const std::optional<Variable> variable,
-                              const std::optional<CustomData> custom_data = std::nullopt,
-                              const std::set<OcppProtocolVersion> required_for = {OcppProtocolVersion::v201,
-                                                                                  OcppProtocolVersion::v21}) :
-        ComponentVariable(), required_for(required_for) {
-        this->component = component;
-        this->variable = variable;
-        this->customData = custom_data;
-    };
-
-    /// \brief For which ocpp protocol version(s) this component variable is required.
-    std::set<OcppProtocolVersion> required_for;
-};
 } // namespace v201
 } // namespace ocpp
 

lib/ocpp/v201/device_model_storage_sqlite.cpp

@@ -456,6 +456,7 @@ int32_t DeviceModelStorageSqlite::clear_custom_variable_monitors() {
 }
 
 void DeviceModelStorageSqlite::check_integrity() {
+    // Function is now empty because checks are already done elsewhere (for example the check for 'required' variables).
 }
 
 } // namespace v201

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

@@ -51,10 +51,6 @@ struct {{type.name}} {
 {% endif %}
 {% endfor %}
 {%- endif %}
-{% if last %}
-{% if namespace == "v201" %}
-    struct RequiredComponentVariable : ComponentVariable {};
-{% endif %}
 } // namespace {{namespace}}
 } // namespace ocpp
 

tests/lib/ocpp/v201/test_device_model.cpp

@@ -23,7 +23,8 @@ class DeviceModelTest : public ::testing::Test {
     }
 };
 
-TEST_F(DeviceModelTest, test_allow_zero2) {
+/// \brief Test if value can be changed. And test if setting a value of 0 is allowed for a value that is allowed to be 0.
+TEST_F(DeviceModelTest, test_set_value_and_allow_zero) {
     // default value is 900
     auto r = dm->get_value<int>(cv, ocpp::v201::AttributeEnum::Actual);
     ASSERT_EQ(r, 900);
@@ -42,7 +43,7 @@ TEST_F(DeviceModelTest, test_allow_zero2) {
 
 /// \brief Test if value of 0 is allowed for ControllerComponentVariables::AlignedDataInterval although the minLimit is
 /// set to 5
-TEST_F(DeviceModelTest, test_allow_zero) {
+TEST_F(DeviceModelTest, test_min_limit_and_allow_zero) {
     // Set a min limit to 'Interval' of 'AlignedDataCtrlr'.
     VariableCharacteristics c;
     c.minLimit = 10;