[common] Simplify instance methods registration (4)

[platform/core/api/webapi-plugins.git] / src / push / push_instance.cc

diff --git a/src/push/push_instance.cc b/src/push/push_instance.cc
index bc321f9..06d728a 100644 (file)
--- a/src/push/push_instance.cc
+++ b/src/push/push_instance.cc
@@ -31,39 +31,33 @@ const std::string kPrivilegePush = "http://tizen.org/privilege/push";
 }  // namespace
 
 PushInstance::PushInstance() {
-  LoggerD("Enter");
+  ScopeLogger();
   using std::placeholders::_1;
   using std::placeholders::_2;
 
-#define REGISTER_ASYNC(c, func) RegisterSyncHandler(c, func);
-#define REGISTER_SYNC(c, func) RegisterSyncHandler(c, func);
-
-  REGISTER_ASYNC("Push_registerService", std::bind(&PushInstance::registerService, this, _1, _2));
-  REGISTER_ASYNC("Push_registerApplication",
-                 std::bind(&PushInstance::registerApplication, this, _1, _2));
-  REGISTER_ASYNC("Push_unregisterService",
-                 std::bind(&PushInstance::unregisterService, this, _1, _2));
-  REGISTER_ASYNC("Push_unregisterApplication",
-                 std::bind(&PushInstance::unregisterApplication, this, _1, _2));
-  REGISTER_SYNC("Push_connectService", std::bind(&PushInstance::connectService, this, _1, _2));
-  REGISTER_SYNC("Push_connect", std::bind(&PushInstance::connect, this, _1, _2));
-  REGISTER_SYNC("Push_disconnectService",
-                std::bind(&PushInstance::disconnectService, this, _1, _2));
-  REGISTER_SYNC("Push_disconnect", std::bind(&PushInstance::disconnect, this, _1, _2));
-  REGISTER_SYNC("Push_getRegistrationId",
-                std::bind(&PushInstance::getRegistrationId, this, _1, _2));
-  REGISTER_SYNC("Push_getUnreadNotifications",
-                std::bind(&PushInstance::getUnreadNotifications, this, _1, _2));
-  REGISTER_SYNC("Push_getPushMessage", std::bind(&PushInstance::getPushMessage, this, _1, _2));
-
-#undef REGISTER_ASYNC
-#undef REGISTER_SYNC
+#define REGISTER_METHOD(M) \
+    RegisterSyncHandler(#M, std::bind(&PushInstance::M, this, _1, _2))
+  REGISTER_METHOD(PushRegisterService);
+  REGISTER_METHOD(PushRegisterApplication);
+  REGISTER_METHOD(PushUnregisterService);
+  REGISTER_METHOD(PushUnregisterApplication);
+  REGISTER_METHOD(PushConnectService);
+  REGISTER_METHOD(PushConnect);
+  REGISTER_METHOD(PushDisconnectService);
+  REGISTER_METHOD(PushDisconnect);
+  REGISTER_METHOD(PushGetRegistrationId);
+  REGISTER_METHOD(PushGetUnreadNotifications);
+  REGISTER_METHOD(PushGetPushMessage);
+#undef REGISTER_METHOD
 
   impl = new PushManager(this);
 }
 
-void PushInstance::registerService(const picojson::value& args, picojson::object& out) {
-  LoggerD("Enter");
+void PushInstance::PushRegisterService(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
+  LoggerW(
+      "DEPRECATION WARNING: registerService() is deprecated and will be removed from next release. "
+      "Use register() instead.");
 
   CHECK_PRIVILEGE_ACCESS(kPrivilegePush, &out);
   common::PlatformResult result = impl->registerService(args.get("callbackId").get<double>());
@@ -74,8 +68,8 @@ void PushInstance::registerService(const picojson::value& args, picojson::object
   }
 }
 
-void PushInstance::registerApplication(const picojson::value& args, picojson::object& out) {
-  LoggerD("Enter");
+void PushInstance::PushRegisterApplication(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
 
   CHECK_PRIVILEGE_ACCESS(kPrivilegePush, &out);
   common::PlatformResult result = impl->registerApplication(args.get("callbackId").get<double>());
@@ -86,8 +80,11 @@ void PushInstance::registerApplication(const picojson::value& args, picojson::ob
   }
 }
 
-void PushInstance::unregisterService(const picojson::value& args, picojson::object& out) {
-  LoggerD("Enter");
+void PushInstance::PushUnregisterService(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
+  LoggerW(
+      "DEPRECATION WARNING: unregisterService() is deprecated and will be removed from next "
+      "release. Use unregister() instead.");
 
   CHECK_PRIVILEGE_ACCESS(kPrivilegePush, &out);
 
@@ -99,8 +96,8 @@ void PushInstance::unregisterService(const picojson::value& args, picojson::obje
   }
 }
 
-void PushInstance::unregisterApplication(const picojson::value& args, picojson::object& out) {
-  LoggerD("Enter");
+void PushInstance::PushUnregisterApplication(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
 
   CHECK_PRIVILEGE_ACCESS(kPrivilegePush, &out);
 
@@ -112,8 +109,11 @@ void PushInstance::unregisterApplication(const picojson::value& args, picojson::
   }
 }
 
-void PushInstance::connectService(const picojson::value& args, picojson::object& out) {
-  LoggerD("Enter");
+void PushInstance::PushConnectService(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
+  LoggerW(
+      "DEPRECATION WARNING: connectService() is deprecated and will be removed from next release. "
+      "Use connect() instead.");
 
   CHECK_PRIVILEGE_ACCESS(kPrivilegePush, &out);
 
@@ -125,8 +125,8 @@ void PushInstance::connectService(const picojson::value& args, picojson::object&
   }
 }
 
-void PushInstance::connect(const picojson::value& args, picojson::object& out) {
-  LoggerD("Enter");
+void PushInstance::PushConnect(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
 
   CHECK_PRIVILEGE_ACCESS(kPrivilegePush, &out);
 
@@ -138,8 +138,11 @@ void PushInstance::connect(const picojson::value& args, picojson::object& out) {
   }
 }
 
-void PushInstance::disconnectService(const picojson::value& args, picojson::object& out) {
-  LoggerD("Enter");
+void PushInstance::PushDisconnectService(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
+  LoggerW(
+      "DEPRECATION WARNING: disconnectService() is deprecated and will be removed from next "
+      "release. Use disconnect() instead.");
 
   CHECK_PRIVILEGE_ACCESS(kPrivilegePush, &out);
 
@@ -151,8 +154,8 @@ void PushInstance::disconnectService(const picojson::value& args, picojson::obje
   }
 }
 
-void PushInstance::disconnect(const picojson::value& args, picojson::object& out) {
-  LoggerD("Enter");
+void PushInstance::PushDisconnect(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
 
   CHECK_PRIVILEGE_ACCESS(kPrivilegePush, &out);
 
@@ -164,8 +167,8 @@ void PushInstance::disconnect(const picojson::value& args, picojson::object& out
   }
 }
 
-void PushInstance::getRegistrationId(const picojson::value& args, picojson::object& out) {
-  LoggerD("Enter");
+void PushInstance::PushGetRegistrationId(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
 
   CHECK_PRIVILEGE_ACCESS(kPrivilegePush, &out);
 
@@ -181,8 +184,8 @@ void PushInstance::getRegistrationId(const picojson::value& args, picojson::obje
   }
 }
 
-void PushInstance::getUnreadNotifications(const picojson::value& args, picojson::object& out) {
-  LoggerD("Enter");
+void PushInstance::PushGetUnreadNotifications(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
 
   CHECK_PRIVILEGE_ACCESS(kPrivilegePush, &out);
 
@@ -194,8 +197,8 @@ void PushInstance::getUnreadNotifications(const picojson::value& args, picojson:
   }
 }
 
-void PushInstance::getPushMessage(const picojson::value& args, picojson::object& out) {
-  LoggerD("Enter");
+void PushInstance::PushGetPushMessage(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
 
   CHECK_PRIVILEGE_ACCESS(kPrivilegePush, &out);
 
@@ -211,7 +214,7 @@ void PushInstance::getPushMessage(const picojson::value& args, picojson::object&
 }
 
 void PushInstance::onPushState(push_service_state_e state, common::PlatformResult result) {
-  LoggerD("Enter");
+  ScopeLogger();
   picojson::value res{picojson::object()};
   picojson::object& dict = res.get<picojson::object>();
 
@@ -226,6 +229,7 @@ void PushInstance::onPushState(push_service_state_e state, common::PlatformResul
 
 void PushInstance::onPushRegister(double callbackId, common::PlatformResult result,
                                   const std::string& id) {
+  ScopeLogger();
   picojson::value res{picojson::object()};
   picojson::object& dict = res.get<picojson::object>();
 
@@ -239,7 +243,7 @@ void PushInstance::onPushRegister(double callbackId, common::PlatformResult resu
 }
 
 void PushInstance::onPushNotify(push_service_notification_h noti) {
-  LoggerD("Enter");
+  ScopeLogger();
   picojson::value res{picojson::object()};
   picojson::object& dict = res.get<picojson::object>();
 
@@ -254,7 +258,7 @@ void PushInstance::onPushNotify(push_service_notification_h noti) {
 }
 
 void PushInstance::onDeregister(double callbackId, common::PlatformResult result) {
-  LoggerD("Enter");
+  ScopeLogger();
   picojson::value res{picojson::object()};
   picojson::object& dict = res.get<picojson::object>();
 
@@ -266,7 +270,7 @@ void PushInstance::onDeregister(double callbackId, common::PlatformResult result
 }
 
 PushInstance::~PushInstance() {
-  LoggerD("Enter");
+  ScopeLogger();
   if (impl) {
     delete impl;
     impl = nullptr;