Browse Source

Address SonarLint findings in SerializableJsonEvent like class

Patrick-Christopher Mattulat 11 months ago
parent
commit
c34af385f7

+ 2 - 2
include/ls-std/event/serialization/SerializableJsonEvent.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-12-07
- * Changed:         2023-02-22
+ * Changed:         2023-05-19
  *
  * */
 
@@ -33,7 +33,7 @@ namespace ls::std::event
 
       // additional functionality
 
-      [[nodiscard]] ::std::shared_ptr<ls::std::event::Event> getValue();
+      [[nodiscard]] ::std::shared_ptr<ls::std::event::Event> getValue() const;
       void setValue(const ::std::shared_ptr<ls::std::event::Event> &_value);
 
     private:

+ 5 - 5
source/ls-std/event/serialization/SerializableJsonEvent.cpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-12-07
- * Changed:         2023-02-23
+ * Changed:         2023-05-19
  *
  * */
 
@@ -41,7 +41,7 @@ void SerializableJsonEvent::unmarshal(const byte_field &_data)
   this->_unmarshalParameterList();
 }
 
-shared_ptr<Event> SerializableJsonEvent::getValue()
+shared_ptr<Event> SerializableJsonEvent::getValue() const
 {
   return this->value;
 }
@@ -79,9 +79,9 @@ void SerializableJsonEvent::_updateEventParameterList()
 {
   string jsonString{};
 
-  for (const auto &eventParameter : this->value->getParameterList())
+  for (const auto &[eventParameterId, eventParameter] : this->value->getParameterList())
   {
-    json parameterJson = {eventParameter.first, eventParameter.second};
-    this->jsonObject["parameterList"][eventParameter.first] = parameterJson;
+    json parameterJson = {eventParameterId, eventParameter};
+    this->jsonObject["parameterList"][eventParameterId] = parameterJson;
   }
 }

+ 3 - 5
test/cases/event/serialization/SerializableJsonEventTest.cpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-12-20
- * Changed:         2023-03-25
+ * Changed:         2023-05-19
  *
  * */
 
@@ -63,8 +63,7 @@ namespace
 
   TEST_F(SerializableJsonEventTest, unmarshal)
   {
-    Event event{"TMP_EVENT"};
-    SerializableJsonEvent serializable{make_shared<Event>(event)};
+    SerializableJsonEvent serializable{make_shared<Event>("TMP_EVENT")};
     string jsonString = R"({"id":"OPEN_DOOR_EVENT","parameterList":{"door_id":["door_id","16675"],"key_available":["key_available","true"]}})";
 
     serializable.unmarshal(jsonString);
@@ -79,8 +78,7 @@ namespace
 
   TEST_F(SerializableJsonEventTest, setValue_parameter_not_set)
   {
-    Event event{"TMP_EVENT"};
-    SerializableJsonEvent serializable{make_shared<Event>(event)};
+    SerializableJsonEvent serializable{make_shared<Event>("TMP_EVENT")};
 
     EXPECT_THROW(
         {