Rename methods read and readOne in each service

[Issue#]        SSDWSSP-577
[Feature]       Method read and readOne should be renames to process and
                processOne.
[Cause]         There is nothing to read in this methods.
[Solution]      Method was renames.
[Verification]  Build security server and run tests on target.

Change-Id: I1c67834e73f021402b1bfb45323ba5d5370a9f2f

diff --git a/src/server2/service/app-permissions.cpp b/src/server2/service/app-permissions.cpp
index b108930a6a408fc099d0db61ed8f98cfe1c3e2b3..4ccfda011cdd9016a2c35629c3657254d4169eb0 100644 (file)
--- a/src/server2/service/app-permissions.cpp
+++ b/src/server2/service/app-permissions.cpp
@@ -77,14 +77,14 @@ void AppPermissionsService::write(const WriteEvent &event) {
         m_serviceManager->Close(event.connectionID);
 }
 
-void AppPermissionsService::read(const ReadEvent &event) {
+void AppPermissionsService::process(const ReadEvent &event) {
     LogDebug("Read event for counter: " << event.connectionID.counter);
     auto &buffer = m_messageBufferMap[event.connectionID.counter];
     buffer.Push(event.rawBuffer);
 
     // We can get several requests in one package.
     // Extract and process them all
-    while(readOne(event.connectionID, buffer));
+    while(processOne(event.connectionID, buffer));
 }
 
 void AppPermissionsService::close(const CloseEvent &event) {
@@ -92,7 +92,7 @@ void AppPermissionsService::close(const CloseEvent &event) {
     m_messageBufferMap.erase(event.connectionID.counter);
 }
 
-bool AppPermissionsService::readOne(const ConnectionID &conn, MessageBuffer &buffer)
+bool AppPermissionsService::processOne(const ConnectionID &conn, MessageBuffer &buffer)
 {
     LogDebug("Iteration begin");
     MessageBuffer send, recv;

diff --git a/src/server2/service/app-permissions.h b/src/server2/service/app-permissions.h
index 920a96553d51d6f25e0aa7e7e600ef6aa4bb7e66..f5ee6388e7c78d236ef9c7faa07d993a797173fb 100644 (file)
--- a/src/server2/service/app-permissions.h
+++ b/src/server2/service/app-permissions.h
@@ -45,16 +45,16 @@ public:
 
     DECLARE_THREAD_EVENT(AcceptEvent, accept)
     DECLARE_THREAD_EVENT(WriteEvent, write)
-    DECLARE_THREAD_EVENT(ReadEvent, read)
+    DECLARE_THREAD_EVENT(ReadEvent, process)
     DECLARE_THREAD_EVENT(CloseEvent, close)
 
     void accept(const AcceptEvent &event);
     void write(const WriteEvent &event);
-    void read(const ReadEvent &event);
+    void process(const ReadEvent &event);
     void close(const CloseEvent &event);
 
 private:
-    bool readOne(const ConnectionID &conn, MessageBuffer &buffer);
+    bool processOne(const ConnectionID &conn, MessageBuffer &buffer);
 
     MessageBufferMap m_messageBufferMap;
 };

diff --git a/src/server2/service/cookie.cpp b/src/server2/service/cookie.cpp
index 634a27bd2feeca200dbf3a64099aec9d1cfd14b8..6c0697c4a4df1d6dd06f04e82970a8995aeb8caf 100644 (file)
--- a/src/server2/service/cookie.cpp
+++ b/src/server2/service/cookie.cpp
@@ -78,14 +78,14 @@ void CookieService::write(const WriteEvent &event) {
         m_serviceManager->Close(event.connectionID);
 }
 
-void CookieService::read(const ReadEvent &event) {
+void CookieService::process(const ReadEvent &event) {
     LogDebug("Read event for counter: " << event.connectionID.counter);
     auto &info = m_socketInfoMap[event.connectionID.counter];
     info.buffer.Push(event.rawBuffer);
 
     // We can get several requests in one package.
     // Extract and process them all
-    while(readOne(event.connectionID, info.buffer, info.interfaceID));
+    while(processOne(event.connectionID, info.buffer, info.interfaceID));
 }
 
 void CookieService::close(const CloseEvent &event) {
@@ -93,7 +93,7 @@ void CookieService::close(const CloseEvent &event) {
     m_socketInfoMap.erase(event.connectionID.counter);
 }
 
-bool CookieService::readOne(const ConnectionID &conn, MessageBuffer &buffer, int interfaceID)
+bool CookieService::processOne(const ConnectionID &conn, MessageBuffer &buffer, int interfaceID)
 {
     LogDebug("Iteration begin");
     MessageBuffer send, recv;

diff --git a/src/server2/service/cookie.h b/src/server2/service/cookie.h
index 0ab53c68c626ff40ea6e08fd9bce4781a268bfcc..309d212e3af164149c8f8c25b0d8f90b130b2cdc 100644 (file)
--- a/src/server2/service/cookie.h
+++ b/src/server2/service/cookie.h
@@ -51,16 +51,16 @@ public:
 
     DECLARE_THREAD_EVENT(AcceptEvent, accept)
     DECLARE_THREAD_EVENT(WriteEvent, write)
-    DECLARE_THREAD_EVENT(ReadEvent, read)
+    DECLARE_THREAD_EVENT(ReadEvent, process)
     DECLARE_THREAD_EVENT(CloseEvent, close)
 
     void accept(const AcceptEvent &event);
     void write(const WriteEvent &event);
-    void read(const ReadEvent &event);
+    void process(const ReadEvent &event);
     void close(const CloseEvent &event);
 
 private:
-    bool readOne(const ConnectionID &conn, MessageBuffer &buffer, int interfaceID);
+    bool processOne(const ConnectionID &conn, MessageBuffer &buffer, int interfaceID);
 
     bool cookieRequest(MessageBuffer &send, int socket);
 

diff --git a/src/server2/service/data-share.cpp b/src/server2/service/data-share.cpp
index 604e650b2420a3fb1fda61485237ca6b67caec15..13e43a63a6b64a1bdabdebe1e2b296acb119ec12 100644 (file)
--- a/src/server2/service/data-share.cpp
+++ b/src/server2/service/data-share.cpp
@@ -77,7 +77,7 @@ void SharedMemoryService::write(const WriteEvent &event) {
         m_serviceManager->Close(event.connectionID);
 }
 
-bool SharedMemoryService::readOne(const ConnectionID &conn, MessageBuffer &buffer) {
+bool SharedMemoryService::processOne(const ConnectionID &conn, MessageBuffer &buffer) {
     LogDebug("Iteration begin");
     static const char * const revoke = "-----";
     static const char * const permissions = "rwxat";
@@ -143,14 +143,14 @@ end:
     return true;
 }
 
-void SharedMemoryService::read(const ReadEvent &event) {
+void SharedMemoryService::process(const ReadEvent &event) {
     LogDebug("Read event for counter: " << event.connectionID.counter);
     auto &buffer = m_messageBufferMap[event.connectionID.counter];
     buffer.Push(event.rawBuffer);
 
     // We can get several requests in one package.
     // Extract and process them all
-    while(readOne(event.connectionID, buffer));
+    while(processOne(event.connectionID, buffer));
 }
 
 void SharedMemoryService::close(const CloseEvent &event) {

diff --git a/src/server2/service/data-share.h b/src/server2/service/data-share.h
index 106f50213972b7959962fdf175553a9beaf858c4..1626c323dbda1dfaeb313723228d7d64445e6e45 100644 (file)
--- a/src/server2/service/data-share.h
+++ b/src/server2/service/data-share.h
@@ -43,15 +43,15 @@ public:
 
     DECLARE_THREAD_EVENT(AcceptEvent, accept)
     DECLARE_THREAD_EVENT(WriteEvent, write)
-    DECLARE_THREAD_EVENT(ReadEvent, read)
+    DECLARE_THREAD_EVENT(ReadEvent, process)
     DECLARE_THREAD_EVENT(CloseEvent, close)
 
     void accept(const AcceptEvent &event);
     void write(const WriteEvent &event);
-    void read(const ReadEvent &event);
+    void process(const ReadEvent &event);
     void close(const CloseEvent &event);
 private:
-    bool readOne(const ConnectionID &conn, MessageBuffer &buffer);
+    bool processOne(const ConnectionID &conn, MessageBuffer &buffer);
 
     MessageBufferMap m_messageBufferMap;
 };

diff --git a/src/server2/service/echo.cpp b/src/server2/service/echo.cpp
index 5a0d60e996675c6f9a59d8dd793395679a20c030..26a46c643869b8bebed0cf3e2b3c167aec8ebfb4 100644 (file)
--- a/src/server2/service/echo.cpp
+++ b/src/server2/service/echo.cpp
@@ -69,7 +69,7 @@ void EchoService::write(const WriteEvent &event) {
         m_serviceManager->Close(event.connectionID);
 }
 
-void EchoService::read(const ReadEvent &event) {
+void EchoService::process(const ReadEvent &event) {
     LogDebug("ReadEvent. ConnectionID: " << event.connectionID.sock <<
       " Buffer size: " << event.rawBuffer.size());
     m_serviceManager->Write(event.connectionID, event.rawBuffer);

diff --git a/src/server2/service/echo.h b/src/server2/service/echo.h
index cd1c5290507e1ae6ae0ab26fab1aa2fc17127001..80d36850609e1512cd275bb70c73ef68741e79ff 100644 (file)
--- a/src/server2/service/echo.h
+++ b/src/server2/service/echo.h
@@ -43,12 +43,12 @@ public:
 
     DECLARE_THREAD_EVENT(AcceptEvent, accept)
     DECLARE_THREAD_EVENT(WriteEvent, write)
-    DECLARE_THREAD_EVENT(ReadEvent, read)
+    DECLARE_THREAD_EVENT(ReadEvent, process)
     DECLARE_THREAD_EVENT(CloseEvent, close)
 
     void accept(const AcceptEvent &event);
     void write(const WriteEvent &event);
-    void read(const ReadEvent &event);
+    void process(const ReadEvent &event);
     void close(const CloseEvent &event);
 };
 

diff --git a/src/server2/service/exec-path.cpp b/src/server2/service/exec-path.cpp
index 9c8ac8103d19856be228926afc1f8b2bf9819825..3d4ed4163d79385cddab6b81d57c503225fe384b 100644 (file)
--- a/src/server2/service/exec-path.cpp
+++ b/src/server2/service/exec-path.cpp
@@ -124,7 +124,7 @@ bool ExecPathService::processOne(const ConnectionID &conn, MessageBuffer &buffer
     return true;
 }
 
-void ExecPathService::read(const ReadEvent &event) {
+void ExecPathService::process(const ReadEvent &event) {
     LogDebug("Read event for counter: " << event.connectionID.counter);
     auto &buffer = m_messageBufferMap[event.connectionID.counter];
     buffer.Push(event.rawBuffer);

diff --git a/src/server2/service/exec-path.h b/src/server2/service/exec-path.h
index 4e004bb5e11eca7b6c6c6daf8db4b89c853fca0f..12aa7a6e1614f166c570f81cdd76dccf99f2a58e 100644 (file)
--- a/src/server2/service/exec-path.h
+++ b/src/server2/service/exec-path.h
@@ -43,12 +43,12 @@ public:
 
     DECLARE_THREAD_EVENT(AcceptEvent, accept)
     DECLARE_THREAD_EVENT(WriteEvent, write)
-    DECLARE_THREAD_EVENT(ReadEvent, read)
+    DECLARE_THREAD_EVENT(ReadEvent, process)
     DECLARE_THREAD_EVENT(CloseEvent, close)
 
     void accept(const AcceptEvent &event);
     void write(const WriteEvent &event);
-    void read(const ReadEvent &event);
+    void process(const ReadEvent &event);
     void close(const CloseEvent &event);
 private:
     bool processOne(const ConnectionID &conn, MessageBuffer &buffer);

diff --git a/src/server2/service/get-gid.cpp b/src/server2/service/get-gid.cpp
index dd0e884014645301d10282a0da9265490a690c19..3190b9430e833eef5c5ca98b9a7581396940560f 100644 (file)
--- a/src/server2/service/get-gid.cpp
+++ b/src/server2/service/get-gid.cpp
@@ -116,7 +116,7 @@ int GetGidService::setGid(std::string& obj)
 }
 
 
-bool GetGidService::readOne(const ConnectionID &conn, MessageBuffer &buffer) {
+bool GetGidService::processOne(const ConnectionID &conn, MessageBuffer &buffer) {
     LogDebug("Iteration begin");
     std::string objectName;
     int retCode = SECURITY_SERVER_API_ERROR_SERVER_ERROR;
@@ -145,14 +145,14 @@ bool GetGidService::readOne(const ConnectionID &conn, MessageBuffer &buffer) {
     return true;
 }
 
-void GetGidService::read(const ReadEvent &event) {
+void GetGidService::process(const ReadEvent &event) {
     LogDebug("Read event for counter: " << event.connectionID.counter);
     auto &buffer = m_messageBufferMap[event.connectionID.counter];
     buffer.Push(event.rawBuffer);
 
     // We can get several requests in one package.
     // Extract and process them all
-    while(readOne(event.connectionID, buffer));
+    while(processOne(event.connectionID, buffer));
 }
 
 void GetGidService::close(const CloseEvent &event) {

diff --git a/src/server2/service/get-gid.h b/src/server2/service/get-gid.h
index 085b436f35c53b1d7e62e24937711dd2c870dc4f..332191de28a47374eee384f1a8ed8898ceefb01e 100644 (file)
--- a/src/server2/service/get-gid.h
+++ b/src/server2/service/get-gid.h
@@ -46,16 +46,16 @@ public:
 
     DECLARE_THREAD_EVENT(AcceptEvent, accept)
     DECLARE_THREAD_EVENT(WriteEvent, write)
-    DECLARE_THREAD_EVENT(ReadEvent, read)
+    DECLARE_THREAD_EVENT(ReadEvent, process)
     DECLARE_THREAD_EVENT(CloseEvent, close)
 
     void accept(const AcceptEvent &event);
     void write(const WriteEvent &event);
-    void read(const ReadEvent &event);
+    void process(const ReadEvent &event);
     void close(const CloseEvent &event);
 private:
     gid_t m_gid;
-    bool readOne(const ConnectionID &conn, MessageBuffer &buffer);
+    bool processOne(const ConnectionID &conn, MessageBuffer &buffer);
     int  setGid(std::string& objectName);
     MessageBufferMap m_messageBufferMap;
 };

diff --git a/src/server2/service/get-object-name.cpp b/src/server2/service/get-object-name.cpp
index d6d5cdf07ece1d0ff37abdfefad8a9ff6c741582..4a1724769a0be395eb3b0767c936979e872744cd 100644 (file)
--- a/src/server2/service/get-object-name.cpp
+++ b/src/server2/service/get-object-name.cpp
@@ -119,7 +119,7 @@ int GetObjectNameService::setName(const gid_t gid)
 }
 
 
-bool GetObjectNameService::readOne(const ConnectionID &conn, MessageBuffer &buffer) {
+bool GetObjectNameService::processOne(const ConnectionID &conn, MessageBuffer &buffer) {
     LogDebug("Iteration begin");
     gid_t gid;
     int retCode = SECURITY_SERVER_API_ERROR_SERVER_ERROR;
@@ -148,14 +148,14 @@ bool GetObjectNameService::readOne(const ConnectionID &conn, MessageBuffer &buff
     return true;
 }
 
-void GetObjectNameService::read(const ReadEvent &event) {
+void GetObjectNameService::process(const ReadEvent &event) {
     LogDebug("Read event for counter: " << event.connectionID.counter);
     auto &buffer = m_messageBufferMap[event.connectionID.counter];
     buffer.Push(event.rawBuffer);
 
     // We can get several requests in one package.
     // Extract and process them all
-    while(readOne(event.connectionID, buffer));
+    while(processOne(event.connectionID, buffer));
 }
 
 void GetObjectNameService::close(const CloseEvent &event) {

diff --git a/src/server2/service/get-object-name.h b/src/server2/service/get-object-name.h
index 08e3574e2b2a634cd225dc2bf94a39b6c7ce0c4f..3a6bd4c2146fd8e3c91dfa7c857220bdfff2c0de 100644 (file)
--- a/src/server2/service/get-object-name.h
+++ b/src/server2/service/get-object-name.h
@@ -46,17 +46,17 @@ public:
 
     DECLARE_THREAD_EVENT(AcceptEvent, accept)
     DECLARE_THREAD_EVENT(WriteEvent, write)
-    DECLARE_THREAD_EVENT(ReadEvent, read)
+    DECLARE_THREAD_EVENT(ReadEvent, process)
     DECLARE_THREAD_EVENT(CloseEvent, close)
 
     void accept(const AcceptEvent &event);
     void write(const WriteEvent &event);
-    void read(const ReadEvent &event);
+    void process(const ReadEvent &event);
     void close(const CloseEvent &event);
 
 private:
     std::string m_name;
-    bool readOne(const ConnectionID &conn, MessageBuffer &buffer);
+    bool processOne(const ConnectionID &conn, MessageBuffer &buffer);
     int  setName(gid_t gid);
     MessageBufferMap m_messageBufferMap;
 };

diff --git a/src/server2/service/privilege-by-pid.cpp b/src/server2/service/privilege-by-pid.cpp
index 105625bba0c9f97b4d553f0d3922bda1b892aef9..a1e19ec56e77e26edb4a0938f7044dd1da719dfb 100644 (file)
--- a/src/server2/service/privilege-by-pid.cpp
+++ b/src/server2/service/privilege-by-pid.cpp
@@ -81,7 +81,7 @@ void PrivilegeByPidService::write(const WriteEvent &event) {
         m_serviceManager->Close(event.connectionID);
 }
 
-bool PrivilegeByPidService::readOne(const ConnectionID &conn, MessageBuffer &buffer) {
+bool PrivilegeByPidService::processOne(const ConnectionID &conn, MessageBuffer &buffer) {
     LogDebug("Iteration begin");
 
     int retval;
@@ -155,14 +155,14 @@ bool PrivilegeByPidService::readOne(const ConnectionID &conn, MessageBuffer &buf
     return true;
 }
 
-void PrivilegeByPidService::read(const ReadEvent &event) {
+void PrivilegeByPidService::process(const ReadEvent &event) {
     LogDebug("Read event for counter: " << event.connectionID.counter);
     auto &buffer = m_messageBufferMap[event.connectionID.counter];
     buffer.Push(event.rawBuffer);
 
     // We can get several requests in one package.
     // Extract and process them all
-    while(readOne(event.connectionID, buffer));
+    while(processOne(event.connectionID, buffer));
 }
 
 void PrivilegeByPidService::close(const CloseEvent &event) {

diff --git a/src/server2/service/privilege-by-pid.h b/src/server2/service/privilege-by-pid.h
index 685bd19c0bc1ac58b164dcf942a4d1ebe12caf6e..da5cddefd40fe2b990b810f6b0b360e7836008de 100644 (file)
--- a/src/server2/service/privilege-by-pid.h
+++ b/src/server2/service/privilege-by-pid.h
@@ -42,15 +42,15 @@ public:
 
     DECLARE_THREAD_EVENT(AcceptEvent, accept)
     DECLARE_THREAD_EVENT(WriteEvent, write)
-    DECLARE_THREAD_EVENT(ReadEvent, read)
+    DECLARE_THREAD_EVENT(ReadEvent, process)
     DECLARE_THREAD_EVENT(CloseEvent, close)
 
     void accept(const AcceptEvent &event);
     void write(const WriteEvent &event);
-    void read(const ReadEvent &event);
+    void process(const ReadEvent &event);
     void close(const CloseEvent &event);
 private:
-    bool readOne(const ConnectionID &conn, MessageBuffer &buffer);
+    bool processOne(const ConnectionID &conn, MessageBuffer &buffer);
 
     MessageBufferMap m_messageBufferMap;
 };