[OCC] Fix serialization of Transition arguments

Author: teo

occ/plugin/OccFMQCommon.cxx

@@ -89,8 +89,8 @@ std::tuple<OccLite::nopb::TransitionResponse, ::grpc::Status> doTransition(fair:
                 "sndKernelSize"
             };
             for (auto it = arguments.cbegin(); it != arguments.cend(); ++it) {
-                std::string key = it->first;
-                std::string value = it->second;
+                std::string key = it->key;
+                std::string value = it->value;
                 if (boost::starts_with(key, "chans.")) {
                     key.erase(0, 6);
                     std::vector<std::string> split;
@@ -138,8 +138,8 @@ std::tuple<OccLite::nopb::TransitionResponse, ::grpc::Status> doTransition(fair:
         if (evt == fair::mq::PluginServices::DeviceStateTransition::InitDevice) {
             std::unordered_map<std::string, std::unordered_map<std::string, std::string>> channels;
             for (auto it = arguments.cbegin(); it != arguments.cend(); ++it) {
-                std::string key = it->first;
-                std::string value = it->second;
+                std::string key = it->key;
+                std::string value = it->value;
                 if (boost::starts_with(key, "chans.")) {
                     key.erase(0, 6);
                     std::vector<std::string> split;
@@ -171,8 +171,8 @@ std::tuple<OccLite::nopb::TransitionResponse, ::grpc::Status> doTransition(fair:
             // Run number must be pushed immediately before RUN transition
         else if (evt == fair::mq::PluginServices::DeviceStateTransition::Run) {
             try {
-                for (auto const& [key, value] : arguments) {
-                    m_pluginServices->SetProperty(key, value);
+                for (auto const& entry : arguments) {
+                    m_pluginServices->SetProperty(entry.key, entry.value);
                 }
             }
             catch (std::runtime_error &e) {

occ/plugin/litestructs/GetState.h

@@ -54,7 +54,6 @@ struct GetStateResponse : public JsonMessage
 } // namespace nopb
 } // namespace OccLite
 
-
 namespace grpc
 {
 template<>

occ/plugin/litestructs/Transition.cxx

@@ -32,10 +32,7 @@ bool OccLite::nopb::TransitionRequest::Serialize(rapidjson::Writer<rapidjson::St
     writer->String("transitionEvent"); writer->String(transitionEvent);
     writer->String("arguments"); writer->StartArray();
     for (const auto& it : arguments) {
-        writer->StartObject();
-        writer->String("key"); writer->String(it.first);
-        writer->String("value"); writer->String(it.second);
-        writer->EndObject();
+        it.Serialize(writer);
     }
     writer->EndArray();
     writer->EndObject();
@@ -52,9 +49,10 @@ bool OccLite::nopb::TransitionRequest::Deserialize(const rapidjson::Value& obj)
 
     if (obj.HasMember("arguments")) {
         auto array = obj["arguments"].GetArray();
-        for (const auto& it : array) {
-            auto thisItem = it.GetObject();
-            arguments[thisItem["key"].GetString()] = thisItem["value"].GetString();
+        for (auto it = array.Begin(); it != array.End(); ++it) {
+            ConfigEntry *ce = new ConfigEntry;
+            ce->Deserialize(*it);
+            arguments.push_back(*ce);
         }
     }
     OLOG(INFO) << "Deserialized TransitionRequest:";
@@ -80,3 +78,21 @@ bool OccLite::nopb::TransitionResponse::Deserialize(const rapidjson::Value& obj)
 {
     return false;
 }
+
+bool OccLite::nopb::ConfigEntry::Serialize(rapidjson::Writer<rapidjson::StringBuffer>* writer) const
+{
+    writer->StartObject();
+    writer->String("key");
+    writer->String(key);
+    writer->String("value");
+    writer->String(value);
+    writer->EndObject();
+    return true;
+}
+
+bool OccLite::nopb::ConfigEntry::Deserialize(const rapidjson::Value& obj)
+{
+    key = obj["key"].GetString();
+    value = obj["value"].GetString();
+    return true;
+}

occ/plugin/litestructs/Transition.h

@@ -39,11 +39,18 @@ namespace OccLite
 namespace nopb
 {
 
+struct ConfigEntry : public JsonMessage {
+    std::string key;
+    std::string value;
+
+    bool Serialize(rapidjson::Writer<rapidjson::StringBuffer>* writer) const override;
+    bool Deserialize(const rapidjson::Value& obj) override;
+};
 struct TransitionRequest : public JsonMessage
 {
     std::string srcState;
     std::string transitionEvent;
-    std::map<std::string, std::string> arguments;
+    std::vector<ConfigEntry> arguments;
 
     bool Serialize(rapidjson::Writer<rapidjson::StringBuffer>* writer) const override;
     bool Deserialize(const rapidjson::Value& obj) override;