revise prototype of serialization function

diff --git a/include/Plugin.h b/include/Plugin.h
index d120ccd07395f2212d1057cc90bf7a9a91123985..f7f1a22d07d5d313bf2d7840c694af39760bcdac 100644 (file)
--- a/include/Plugin.h
+++ b/include/Plugin.h
@@ -71,9 +71,12 @@ namespace ModeSupervisorNamespace {
                {
                        return nullptr;
                }
-               virtual int serializeAction(PluginAction *piAction, std::string *output)
+               virtual std::string serializeAction(PluginAction *piAction)
                {
-                       return MODES_ERROR_NOT_SUPPORTED;
+                       if (NULL == piAction)
+                               return std::string();
+
+                       return piAction->serialize();
                }
                void freeAction(PluginAction *piAction)
                {

diff --git a/include/PluginAction.h b/include/PluginAction.h
index 87aaa2d98305f9c5033e51d5814dac93d2a9c56d..6a440ff8b65001196805ff03c320450db0edeb1e 100644 (file)
--- a/include/PluginAction.h
+++ b/include/PluginAction.h
@@ -36,9 +36,9 @@ namespace ModeSupervisorNamespace {
                {
                        return MODES_ERROR_NOT_SUPPORTED;
                }
-               virtual int serialize(std::string *output)
+               virtual std::string serialize()
                {
-                       return MODES_ERROR_NOT_SUPPORTED;
+                       return std::string();
                }
                virtual int parse(const std::string &data)
                {

diff --git a/plugin/TestPlugin.cpp b/plugin/TestPlugin.cpp
index e944731b8174f66b6e479166b278b87b71e77860..52ccb23c968e22e6a16d7abd7369c430a4767367 100644 (file)
--- a/plugin/TestPlugin.cpp
+++ b/plugin/TestPlugin.cpp
@@ -36,7 +36,6 @@ public:
 
        int undo(PluginAction *piAction) override;
        PluginAction* getUndoAction(const std::string &key, const std::string &info) override;
-       int serializeAction(PluginAction *piAction, std::string *output) override;
 
        int getInt(const std::string &key) override;
        double getDouble(const std::string &key) override;
@@ -131,19 +130,6 @@ PluginAction* TestPlugin::getUndoAction(const std::string &key, const std::strin
        return piAction;
 }
 
-int TestPlugin::serializeAction(PluginAction *piAction, std::string *output)
-{
-       RETV_IF(nullptr == piAction, MODES_ERROR_INVALID_PARAMETER);
-
-       int ret = piAction->serialize(output);
-       if (MODES_ERROR_NONE != ret) {
-               ERR("serialize() Fail(%d)", ret);
-               return ret;
-       }
-
-       return MODES_ERROR_NONE;
-}
-
 int TestPlugin::getInt(const std::string &key)
 {
        DBG("TestPlugin::getInt(%s)", key.c_str());

diff --git a/plugin/TestPluginAction.cpp b/plugin/TestPluginAction.cpp
index bd4c164c3977a4ba2e8536d65662f1a891904c2a..90f042cc02e96c041704d55fa8cf5e11d1e76999 100644 (file)
--- a/plugin/TestPluginAction.cpp
+++ b/plugin/TestPluginAction.cpp
@@ -36,10 +36,9 @@ int TestPluginAction::undo()
        return MODES_ERROR_NONE;
 }
 
-int TestPluginAction::serialize(std::string *output)
+std::string TestPluginAction::serialize()
 {
-       *output = "testAction";
-       return MODES_ERROR_NONE;
+       return "testAction";
 }
 
 int TestPluginAction::parse(const std::string &info)

diff --git a/plugin/TestPluginAction.h b/plugin/TestPluginAction.h
index 4664242a01fb00d95af4144f21d65797214f6b17..c8dffbd6149513a5568976bcdd3feda8b546ef63 100644 (file)
--- a/plugin/TestPluginAction.h
+++ b/plugin/TestPluginAction.h
@@ -27,7 +27,7 @@ public:
        ~TestPluginAction() override;
 
        int undo() override;
-       int serialize(std::string *output) override;
+       std::string serialize() override;
        int parse(const std::string &data) override;
 };
 

diff --git a/supervisor/TAction.h b/supervisor/TAction.h
index 75f269821de4251f6dbee0c33cb43c9f6826b8b7..0d45885bbaf10b68fc89a58f15fe6615a2a02697 100644 (file)
--- a/supervisor/TAction.h
+++ b/supervisor/TAction.h
@@ -92,13 +92,12 @@ public:
        {
                RETVM_IF(NULL == plugin, std::string(), "Action(%s) : No plugin", ruleName.c_str());
 
-               std::string backup;
-               int ret = plugin->serializeAction(piAction, &backup);
-               if (MODES_ERROR_NONE != ret) {
-                       ERR("plugin(%s) serializeAction() Fail(%d)", plugin->getName().c_str(), ret);
+               if (nullptr == piAction) {
+                       DBG("No plugin Action(%s) for undo", ruleName.c_str());
                        return std::string();
                }
-               return backup;
+
+               return plugin->serializeAction(piAction);
        }
 
        int apply() override