From: Youngjae Shin <yj99.shin@samsung.com>
Date: Mon, 21 Oct 2019 08:17:58 +0000 (+0900)
Subject: revise prototype of serialization function
X-Git-Tag: submit/tizen/20200319.043412~44
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=361de692ab06bac54770a50e0d515cf97e513817;p=platform%2Fcore%2Fsystem%2Fmodes.git

revise prototype of serialization function
---

diff --git a/include/Plugin.h b/include/Plugin.h
index d120ccd..f7f1a22 100644
--- 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 87aaa2d..6a440ff 100644
--- 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 e944731..52ccb23 100644
--- 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 bd4c164..90f042c 100644
--- 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 4664242..c8dffbd 100644
--- 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 75f2698..0d45885 100644
--- 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