[Convergence] Constants

[Details] Removed some unnecessary constants, moved some constants into utils,
added some new constants.

Change-Id: Idbd5761f3f686e59e990cd96c1dc6bfab7909030
Signed-off-by: Mateusz Bruno-Kaminski <m.bruno2@samsung.com>

diff --git a/src/convergence/convergence_app_communication_service.cc b/src/convergence/convergence_app_communication_service.cc
index 0be7f1d538f25061a742c3f3c154ea784b2828f0..da80249b02da32d0f3b4031189c8ac9fceabe26d 100644 (file)
--- a/src/convergence/convergence_app_communication_service.cc
+++ b/src/convergence/convergence_app_communication_service.cc
@@ -25,6 +25,7 @@
 #include "convergence/convergence_channel_info.h"
 #include "convergence/convergence_payload.h"
 #include "convergence/convergence_client_info.h"
+#include "convergence/convergence_utils.h"
 #include "common/logger.h"
 
 namespace extension {
@@ -34,19 +35,10 @@ using common::TizenResult;
 using common::TizenSuccess;
 
 namespace {
+static const std::string kChannel = "channel";
+
 // Payload data keys and some values
 static const std::string kPayload = "payload"; // ---
-
-// Service connection status keys
-static const std::string kServiceConnectionStatus = "connect_status"; // ---
-static const std::string kServiceConnectionStatusConnected = "service_connected";
-static const std::string kServiceConnectionStatusNotConnected = "service_not_connected";
-
-// Service listener status keys
-static const std::string kServiceListenerStatus = "listener_status"; //---
-static const std::string kServiceListenerStatusOk = "listener_ok"; // ---
-static const std::string kServiceListenerStatusError = "listener_error"; //---
-static const std::string kServiceListenerError = "listener_error"; //---
 } // namespace
 
 ConvergenceAppCommunicationService::ConvergenceAppCommunicationService()
@@ -220,35 +212,35 @@ void ConvergenceAppCommunicationService::ServiceListenerCb(conv_service_h servic
   }
 
   // Parse the payload
-  const std::string result_type = ConvergencePayloadArray::ExtractPayloadString(result, "result_type"); // TODO extract to constant kResultType = "result_type";
+  const std::string result_type = ConvergencePayloadArray::ExtractPayloadString(result, kServiceResultType.c_str());
   LoggerI("Callback type [%s]", result_type.c_str());
 
   picojson::object param;
   param[kServiceListenerStatus] = picojson::value(kServiceListenerStatusOk);
-  param["channel"] = ConvergenceChannel::ToJson(channel_handle);
-  param["result_type"] = picojson::value(result_type);
+  param[kChannel] = ConvergenceChannel::ToJson(channel_handle);
+  param[kServiceResultType] = picojson::value(result_type);
 
-  if (("onStart" == result_type)
-   || ("onPublish" == result_type)
-   || ("onStop" == result_type)) {
+  if ((kServiceResultTypeOnStart == result_type)
+   || (kServiceResultTypeOnPublish == result_type)
+   || (kServiceResultTypeOnStop == result_type)) {
     // The service doesn't send any callback with thie response
-  } else if ("onMessage" == result_type) {
+  } else if (kServiceResultTypeOnMessage == result_type) {
     param["senderId"] = picojson::value(
       ConvergencePayloadArray::ExtractPayloadString(result, "from")); // Define the string as a constant
-    param["payload"] = ConvergencePayloadArray::ToJson(result);
-  } else if ("onConnect" == result_type) {
+    param[kPayload] = ConvergencePayloadArray::ToJson(result);
+  } else if (kServiceResultTypeOnConnect == result_type) {
     //param["clientInfo"] = ConvergenceClientInfo(result).ToJson();
     //callbackParam->plugin_->ReplyAsync(kAppCommunicationClientServiceConnectCallback,
     //  callbackParam->callback_id_, true, param);
     return;
-  } else if ("onClientConnect" == result_type) {
+  } else if (kServiceResultTypeOnClientConnect == result_type) {
     // TODO the service doesn't send any callback with thie response
     return; // TODO
-  } else if ("onDisconnect" == result_type) {
+  } else if (kServiceResultTypeOnDisconnect == result_type) {
     return; // TODO
-  } else if ("onClientDisconnect" == result_type) {
+  } else if (kServiceResultTypeOnClientDisconnect == result_type) {
     return; // TODO
-  } else if ("onRead" == result_type) {
+  } else if (kServiceResultTypeOnRead == result_type) {
     // TODO
   } else {
     // Unsupported payload type, ignoring it
@@ -420,8 +412,8 @@ common::TizenResult ConvergenceAppCommunicationServerService::Start(
 
   // The object 'channel' will be deleted in the super::Start() so we should
   // add its json before
-  param["channel"] = ConvergenceChannel::ToJson(channel->GetHandle()); // Define string as constant
-  param["result_type"] = picojson::value("onStart");
+  param[kChannel] = ConvergenceChannel::ToJson(channel->GetHandle()); // Define string as constant
+  param[kServiceResultType] = picojson::value(kServiceResultTypeOnStart);
 
   common::TizenResult result = ConvergenceAppCommunicationService::Start(
     channel, cur_listener_id);
@@ -447,8 +439,8 @@ common::TizenResult ConvergenceAppCommunicationServerService::Stop(
 
   // The object 'channel' will be deleted in the super::Start() so we should
   // add its json before
-  param["channel"] = ConvergenceChannel::ToJson(channel->GetHandle());
-  param["result_type"] = picojson::value("onStop");
+  param[kChannel] = ConvergenceChannel::ToJson(channel->GetHandle());
+  param[kServiceResultType] = picojson::value(kServiceResultTypeOnStop);
 
   common::TizenResult result = ConvergenceAppCommunicationService::Stop(
     channel, cur_listener_id);
@@ -487,7 +479,7 @@ void ConvergenceAppCommunicationClientService::ServiceConnectedCb(conv_service_h
 
   picojson::object param;
   param[kPayload] = ConvergenceAppCommunicationService::PayloadToJson(result);
-  param["result_type"] = picojson::value("Connected");
+  param[kServiceResultType] = picojson::value("Connected");
 
   if (CONV_ERROR_NONE == error) {
     param[kServiceConnectionStatus] = picojson::value(kServiceConnectionStatusConnected);

diff --git a/src/convergence/convergence_manager.cc b/src/convergence/convergence_manager.cc
index 07b05b92263d8c876452109ef4cda2e7368ffc36..3479b90d9d06dad84cc2831cbab5fe3fa8e82546 100644 (file)
--- a/src/convergence/convergence_manager.cc
+++ b/src/convergence/convergence_manager.cc
@@ -32,43 +32,9 @@ using common::TizenResult;
 using common::TizenSuccess;
 
 
-// TODO check which fields are needed
-// TODO remove dublications, marked with //---
 namespace {
-// Commonly used key words
-static const std::string kId = "id"; //---
-static const std::string kName = "name"; //--
-static const std::string kKey = "key";
-static const std::string kValue = "value";
-
-// Channel data keys
-static const std::string kChannel = "channel";
-static const std::string kChannelDataChannelId = "channel_id";
-static const std::string kChannelDataChannelOption = "option";
-static const std::string kChannelDataChannelOptions = "options";
-
-// Payload data keys and some values
-static const std::string kPayload = "payload"; // ---
-static const std::string kPayloadDataType = "type"; // String, bytes or app control
-static const std::string kTypeString = "STRING";
-static const std::string kTypeRawBytes = "RAW_BYTES";
-static const std::string kTypeAppControl = "APP_CONTROL";
-static const std::string kPayloadDataAppControlAppId = "appI";
-static const std::string kPayloadDataAppControlOperation = "operation";
-static const std::string kPayloadDataAppControlUri = "uri";
-static const std::string kPayloadDataAppControlMime = "mime";
-static const std::string kPayloadDataAppControlLaunchMode = "launch_mode";
-static const std::string kPayloadDataAppControlCategory = "category";
-
-// Service keys
-static const std::string kServiceType = "serviceType"; //---
-static const std::string kServiceConnectionState = "connectionState"; //---
-static const std::string kServiceProperties = "properties";
-
 // Device keys
 static const std::string kDevice = "device";
-static const std::string kDeviceType = "profile"; //---
-static const std::string kDeviceServices = "services"; //---
 
 // Discovery keys
 static const std::string kDiscoveryStatus = "discovery_status";
@@ -76,17 +42,6 @@ static const std::string kDiscoveryStatusDeviceFound = "device_found";
 static const std::string kDiscoveryStatusFinished = "discovery_finished";
 static const std::string kDiscoveryStatusError = "discovery_error";
 static const std::string kDiscoveryError = "discovery_error";
-
-// Service connection status keys
-static const std::string kServiceConnectionStatus = "connect_status"; //---
-static const std::string kServiceConnectionStatusConnected = "service_connected"; //---
-static const std::string kServiceConnectionStatusNotConnected = "service_not_connected"; //---
-
-// Service listener status keys
-static const std::string kServiceListenerStatus = "listener_status"; //---
-static const std::string kServiceListenerStatusOk = "listener_ok"; // ---
-static const std::string kServiceListenerStatusError = "listener_error"; //---
-static const std::string kServiceListenerError = "listener_error"; //---
 } // namespace
 
 

diff --git a/src/convergence/convergence_remote_app_control_service.cc b/src/convergence/convergence_remote_app_control_service.cc
index de3380b4c09d55b3901b3e2d20fef9b53fa37962..aa36181f1568834675ac1b6825335472b967a45c 100644 (file)
--- a/src/convergence/convergence_remote_app_control_service.cc
+++ b/src/convergence/convergence_remote_app_control_service.cc
@@ -22,6 +22,7 @@
 
 #include "convergence/convergence_instance.h"
 #include "convergence/convergence_payload.h"
+#include "convergence/convergence_utils.h"
 #include "common/logger.h"
 
 namespace extension {
@@ -30,22 +31,6 @@ namespace convergence {
 using common::TizenResult;
 using common::TizenSuccess;
 
-namespace {
-// Payload data keys and some values
-static const std::string kPayload = "payload"; // ---
-
-// Service connection status keys
-static const std::string kServiceConnectionStatus = "connect_status"; // ---
-static const std::string kServiceConnectionStatusConnected = "service_connected";
-static const std::string kServiceConnectionStatusNotConnected = "service_not_connected";
-
-// Service listener status keys
-static const std::string kServiceListenerStatus = "listener_status"; //---
-static const std::string kServiceListenerStatusOk = "listener_ok"; // ---
-static const std::string kServiceListenerStatusError = "listener_error"; //---
-static const std::string kServiceListenerError = "listener_error"; //---
-} // namespace
-
 ConvergenceRemoteAppControlService::ConvergenceRemoteAppControlService()
  : ConvergenceService()
  , started_(false) {
@@ -79,7 +64,7 @@ void ConvergenceRemoteAppControlService::ServiceConnectedCb(conv_service_h servi
   }
 
   picojson::object param;
-  param["result_type"] = picojson::value("Connected");
+  param[kServiceResultType] = picojson::value("Connected");
   //param[kPayload] = ConvergenceRemoteAppControlService::PayloadToJson(result);
 
   if (CONV_ERROR_NONE == error) {
@@ -154,8 +139,8 @@ void ConvergenceRemoteAppControlService::ServiceListenerCb(conv_service_h servic
 
   // TODO parse the payload and fill the param
 
-  const std::string result_type = ConvergencePayloadArray::ExtractPayloadString(result, "result_type"); // TODO extract to constant kResultType = "result_type";
-  param["result_type"] = picojson::value(result_type);
+  const std::string result_type = ConvergencePayloadArray::ExtractPayloadString(result, kServiceResultType.c_str());
+  param[kServiceResultType] = picojson::value(result_type);
 
 
   if (CONV_ERROR_NONE == error) {

diff --git a/src/convergence/convergence_utils.h b/src/convergence/convergence_utils.h
index 1afde74d14eacafc5b9c6fe10258689e493b5c62..e12921603a24ca192b009afb304da9616526de3e 100644 (file)
--- a/src/convergence/convergence_utils.h
+++ b/src/convergence/convergence_utils.h
@@ -30,6 +30,31 @@ namespace convergence {
 
 class ConvergenceInstance;
 
+namespace {
+// Service result type
+static const std::string kServiceResultType = "result_type";
+static const std::string kServiceResultTypeOnStart = "onStart";
+static const std::string kServiceResultTypeOnStop = "onStop";
+static const std::string kServiceResultTypeOnConnect = "onConnect";
+static const std::string kServiceResultTypeOnDisconnect = "onDisconnect";
+static const std::string kServiceResultTypeOnClientConnect = "onClientConnect";
+static const std::string kServiceResultTypeOnClientDisconnect = "onClientDisconnect";
+static const std::string kServiceResultTypeOnPublish = "onPublish";
+static const std::string kServiceResultTypeOnMessage = "onMessage";
+static const std::string kServiceResultTypeOnRead = "onRead";
+
+// Service connection status keys
+static const std::string kServiceConnectionStatus = "connect_status";
+static const std::string kServiceConnectionStatusConnected = "service_connected";
+static const std::string kServiceConnectionStatusNotConnected = "service_not_connected";
+
+// Service listener status keys
+static const std::string kServiceListenerStatus = "listener_status";
+static const std::string kServiceListenerStatusOk = "listener_ok";
+static const std::string kServiceListenerStatusError = "listener_error";
+static const std::string kServiceListenerError = "listener_error";
+} // namespace
+
 struct CallbackParam {
  CallbackParam(ConvergenceInstance *plg,  int cbId)
    : plugin_(plg), callback_id_(cbId) {}