Code cleanup: JobAction::build() uses Json::Value::isMember() instead of getMemberNames() 28/142628/2
authorMu-Woong Lee <muwoong.lee@samsung.com>
Sun, 6 Aug 2017 06:32:20 +0000 (15:32 +0900)
committerMu-Woong Lee <muwoong.lee@samsung.com>
Sun, 6 Aug 2017 07:04:37 +0000 (07:04 +0000)
Change-Id: I8b31aff20ab99f880984001e511496f907a0a3c9
Signed-off-by: Mu-Woong Lee <muwoong.lee@samsung.com>
src/shared/JobAction.cpp

index 7e13f75..e6c3978 100644 (file)
@@ -70,19 +70,16 @@ JobAction::~JobAction()
 
 JobAction* JobAction::build(Json::Value& jsonNode)
 {
-       Json::Value::Members members = jsonNode.getMemberNames();
-       IF_FAIL_RETURN(!members.empty(), NULL);
+       if (jsonNode.isMember(KEY_APP_CTRL))
+               return new JobAppControl(jsonNode[KEY_APP_CTRL]);
 
-       if (members[0] == KEY_DBUS) {
+       if (jsonNode.isMember(KEY_DBUS))
                return new JobDBusCall(jsonNode[KEY_DBUS]);
 
-       } else if (members[0] == KEY_APP_CTRL) {
-               return new JobAppControl(jsonNode[KEY_APP_CTRL]);
-
-       } else if (members[0] == KEY_NOTI) {
+       if (jsonNode.isMember(KEY_NOTI))
                return new JobNotification(jsonNode[KEY_NOTI]);
-       }
 
+       _W("No action");
        return NULL;
 }