Add locale parameter in HandleRequest (#55)

* Add locale parameter in HandleRequest

Signed-off-by: Changgyu Choi <changyu.choi@samsung.com>
* Fix wrong inheritance implementation

Signed-off-by: Changgyu Choi <changyu.choi@samsung.com>

diff --git a/src/server/abstract_request_handler.hh b/src/server/abstract_request_handler.hh
index f6c8843..ec86054 100644 (file)
--- a/src/server/abstract_request_handler.hh
+++ b/src/server/abstract_request_handler.hh
@@ -16,7 +16,8 @@ namespace request_handler {
 
 class EXPORT_API AbstractRequestHandler {
  public:
-  virtual bool HandleRequest(std::string data) = 0;
+  virtual ~AbstractRequestHandler() = default;
+  virtual bool HandleRequest(std::string data, std::string locale) = 0;
 
   virtual std::string GetResult() = 0;
 };

diff --git a/src/server/get_appctrlpriv_request_handler.cc b/src/server/get_appctrlpriv_request_handler.cc
index 0181ec5..aa55d15 100644 (file)
--- a/src/server/get_appctrlpriv_request_handler.cc
+++ b/src/server/get_appctrlpriv_request_handler.cc
@@ -9,7 +9,8 @@
 namespace pkgmgr_server {
 namespace request_handler {
 
-bool GetAppctrlprivRequestHandler::HandleRequest(std::string data) {
+bool GetAppctrlprivRequestHandler::HandleRequest(std::string data,
+    std::string locale) {
   return true;
 }
 

diff --git a/src/server/get_appctrlpriv_request_handler.hh b/src/server/get_appctrlpriv_request_handler.hh
index f4456a5..d062f9e 100644 (file)
--- a/src/server/get_appctrlpriv_request_handler.hh
+++ b/src/server/get_appctrlpriv_request_handler.hh
@@ -18,9 +18,9 @@ namespace request_handler {
 
 class EXPORT_API GetAppctrlprivRequestHandler : public AbstractRequestHandler {
  public:
-  bool HandleRequest(std::string data);
+  bool HandleRequest(std::string data, std::string locale) override;
 
-  std::string GetResult();
+  std::string GetResult() override;
 };
 
 }  // namespace request_handler

diff --git a/src/server/get_appinfo_request_handler.cc b/src/server/get_appinfo_request_handler.cc
index ec47935..c8528ee 100644 (file)
--- a/src/server/get_appinfo_request_handler.cc
+++ b/src/server/get_appinfo_request_handler.cc
@@ -9,7 +9,8 @@
 namespace pkgmgr_server {
 namespace request_handler {
 
-bool GetAppinfoRequestHandler::HandleRequest(std::string data) { return true; }
+bool GetAppinfoRequestHandler::HandleRequest(std::string data,
+    std::string locale) { return true; }
 
 std::string GetAppinfoRequestHandler::GetResult() {
   std::string tmp_result("tmp_result");

diff --git a/src/server/get_appinfo_request_handler.hh b/src/server/get_appinfo_request_handler.hh
index 6773a15..8a32317 100644 (file)
--- a/src/server/get_appinfo_request_handler.hh
+++ b/src/server/get_appinfo_request_handler.hh
@@ -18,9 +18,9 @@ namespace request_handler {
 
 class EXPORT_API GetAppinfoRequestHandler : public AbstractRequestHandler {
  public:
-  bool HandleRequest(std::string data);
+  bool HandleRequest(std::string data, std::string locale) override;
 
-  std::string GetResult();
+  std::string GetResult() override;
 };
 
 }  // namespace request_handler

diff --git a/src/server/get_cert_request_handler.cc b/src/server/get_cert_request_handler.cc
index ad1aec9..0e776b1 100644 (file)
--- a/src/server/get_cert_request_handler.cc
+++ b/src/server/get_cert_request_handler.cc
@@ -9,7 +9,7 @@
 namespace pkgmgr_server {
 namespace request_handler {
 
-bool GetCertRequestHandler::HandleRequest(std::string data) { return true; }
+bool GetCertRequestHandler::HandleRequest(std::string data, std::string locale) { return true; }
 
 std::string GetCertRequestHandler::GetResult() {
   std::string tmp_result("tmp_result");

diff --git a/src/server/get_cert_request_handler.hh b/src/server/get_cert_request_handler.hh
index 453aa53..9f51fa1 100644 (file)
--- a/src/server/get_cert_request_handler.hh
+++ b/src/server/get_cert_request_handler.hh
@@ -18,9 +18,9 @@ namespace request_handler {
 
 class EXPORT_API GetCertRequestHandler : public AbstractRequestHandler {
  public:
-  bool HandleRequest(std::string data);
+  bool HandleRequest(std::string data, std::string locale) override;
 
-  std::string GetResult();
+  std::string GetResult() override;
 };
 
 }  // namespace request_handler

diff --git a/src/server/get_datacontrol_request_handler.cc b/src/server/get_datacontrol_request_handler.cc
index d3310db..40ef64e 100644 (file)
--- a/src/server/get_datacontrol_request_handler.cc
+++ b/src/server/get_datacontrol_request_handler.cc
@@ -9,7 +9,8 @@
 namespace pkgmgr_server {
 namespace request_handler {
 
-bool GetDatacontrolRequestHandler::HandleRequest(std::string data) {
+bool GetDatacontrolRequestHandler::HandleRequest(std::string data,
+    std::string locale) {
   return true;
 }
 

diff --git a/src/server/get_datacontrol_request_handler.hh b/src/server/get_datacontrol_request_handler.hh
index a5dd735..506f350 100644 (file)
--- a/src/server/get_datacontrol_request_handler.hh
+++ b/src/server/get_datacontrol_request_handler.hh
@@ -18,9 +18,9 @@ namespace request_handler {
 
 class EXPORT_API GetDatacontrolRequestHandler : public AbstractRequestHandler {
  public:
-  bool HandleRequest(std::string data);
+  bool HandleRequest(std::string data, std::string locale) override;
 
-  std::string GetResult();
+  std::string GetResult() override;
 };
 
 }  // namespace request_handler

diff --git a/src/server/get_pkginfo_request_handler.cc b/src/server/get_pkginfo_request_handler.cc
index 9e6e3ff..45cc0a7 100644 (file)
--- a/src/server/get_pkginfo_request_handler.cc
+++ b/src/server/get_pkginfo_request_handler.cc
@@ -9,7 +9,8 @@
 namespace pkgmgr_server {
 namespace request_handler {
 
-bool GetPkginfoRequestHandler::HandleRequest(std::string data) { return true; }
+bool GetPkginfoRequestHandler::HandleRequest(std::string data,
+    std::string locale) { return true; }
 
 std::string GetPkginfoRequestHandler::GetResult() {
   std::string tmp_result("tmp_result");

diff --git a/src/server/get_pkginfo_request_handler.hh b/src/server/get_pkginfo_request_handler.hh
index 1b2be6f..e30d1c9 100644 (file)
--- a/src/server/get_pkginfo_request_handler.hh
+++ b/src/server/get_pkginfo_request_handler.hh
@@ -18,9 +18,9 @@ namespace request_handler {
 
 class EXPORT_API GetPkginfoRequestHandler : public AbstractRequestHandler {
  public:
-  bool HandleRequest(std::string data);
+  bool HandleRequest(std::string data, std::string locale) override;
 
-  std::string GetResult();
+  std::string GetResult() override;
 };
 
 }  // namespace request_handler

diff --git a/src/server/query_request_handler.cc b/src/server/query_request_handler.cc
index 60dc145..e7d053a 100644 (file)
--- a/src/server/query_request_handler.cc
+++ b/src/server/query_request_handler.cc
@@ -9,7 +9,8 @@
 namespace pkgmgr_server {
 namespace request_handler {
 
-bool QueryRequestHandler::HandleRequest(std::string data) { return true; }
+bool QueryRequestHandler::HandleRequest(std::string data,
+    std::string locale) { return true; }
 
 std::string QueryRequestHandler::GetResult() {
   std::string tmp_result("tmp_result");

diff --git a/src/server/query_request_handler.hh b/src/server/query_request_handler.hh
index f34471c..49bfeb7 100644 (file)
--- a/src/server/query_request_handler.hh
+++ b/src/server/query_request_handler.hh
@@ -18,9 +18,9 @@ namespace request_handler {
 
 class EXPORT_API QueryRequestHandler : public AbstractRequestHandler {
  public:
-  bool HandleRequest(std::string data);
+  bool HandleRequest(std::string data, std::string locale) override;
 
-  std::string GetResult();
+  std::string GetResult() override;
 };
 
 }  // namespace request_handler

diff --git a/src/server/set_cert_request_handler.cc b/src/server/set_cert_request_handler.cc
index c1b5b0a..c227602 100644 (file)
--- a/src/server/set_cert_request_handler.cc
+++ b/src/server/set_cert_request_handler.cc
@@ -9,7 +9,8 @@
 namespace pkgmgr_server {
 namespace request_handler {
 
-bool SetCertRequestHandler::HandleRequest(std::string data) { return true; }
+bool SetCertRequestHandler::HandleRequest(std::string data,
+    std::string locale) { return true; }
 
 std::string SetCertRequestHandler::GetResult() {
   std::string tmp_result("tmp_result");

diff --git a/src/server/set_cert_request_handler.hh b/src/server/set_cert_request_handler.hh
index b5533f1..dffe770 100644 (file)
--- a/src/server/set_cert_request_handler.hh
+++ b/src/server/set_cert_request_handler.hh
@@ -18,9 +18,9 @@ namespace request_handler {
 
 class EXPORT_API SetCertRequestHandler : public AbstractRequestHandler {
  public:
-  bool HandleRequest(std::string data);
+  bool HandleRequest(std::string data, std::string locale) override;
 
-  std::string GetResult();
+  std::string GetResult() override;
 };
 
 }  // namespace request_handler

diff --git a/src/server/set_pkginfo_request_handler.cc b/src/server/set_pkginfo_request_handler.cc
index f84f980..05f5a72 100644 (file)
--- a/src/server/set_pkginfo_request_handler.cc
+++ b/src/server/set_pkginfo_request_handler.cc
@@ -9,7 +9,8 @@
 namespace pkgmgr_server {
 namespace request_handler {
 
-bool SetPkginfoRequestHandler::HandleRequest(std::string data) { return true; }
+bool SetPkginfoRequestHandler::HandleRequest(std::string data,
+    std::string locale) { return true; }
 
 std::string SetPkginfoRequestHandler::GetResult() {
   std::string tmp_result("tmp_result");

diff --git a/src/server/set_pkginfo_request_handler.hh b/src/server/set_pkginfo_request_handler.hh
index 12b4db8..190b5b7 100644 (file)
--- a/src/server/set_pkginfo_request_handler.hh
+++ b/src/server/set_pkginfo_request_handler.hh
@@ -18,9 +18,9 @@ namespace request_handler {
 
 class EXPORT_API SetPkginfoRequestHandler : public AbstractRequestHandler {
  public:
-  bool HandleRequest(std::string data);
+  bool HandleRequest(std::string data, std::string locale) override;
 
-  std::string GetResult();
+  std::string GetResult() override;
 };
 
 }  // namespace request_handler