Move ResponseTaker class to response directory

Change-Id: I5bbe58347dbe1411eaeb88dd173c0107b4bfd636

diff --git a/src/service/CMakeLists.txt b/src/service/CMakeLists.txt
index d1e9972..69d35ee 100644 (file)
--- a/src/service/CMakeLists.txt
+++ b/src/service/CMakeLists.txt
@@ -25,9 +25,9 @@ SET(CYNARA_SOURCES
     ${CYNARA_SERVICE_PATH}/protocol/ProtocolAdmin.cpp
     ${CYNARA_SERVICE_PATH}/protocol/ProtocolClient.cpp
     ${CYNARA_SERVICE_PATH}/protocol/ProtocolSignal.cpp
-    ${CYNARA_SERVICE_PATH}/protocol/ResponseTaker.cpp
     ${CYNARA_SERVICE_PATH}/request/CheckRequest.cpp
     ${CYNARA_SERVICE_PATH}/request/RequestTaker.cpp
+    ${CYNARA_SERVICE_PATH}/response/ResponseTaker.cpp
     ${CYNARA_SERVICE_PATH}/sockets/Descriptor.cpp
     ${CYNARA_SERVICE_PATH}/sockets/SocketManager.cpp
     ${CYNARA_SERVICE_PATH}/storage/InMemoryStorageBackend.cpp

diff --git a/src/service/protocol/Protocol.h b/src/service/protocol/Protocol.h
index f296c3f..5500cba 100644 (file)
--- a/src/service/protocol/Protocol.h
+++ b/src/service/protocol/Protocol.h
@@ -27,8 +27,8 @@
 
 #include <common.h>
 
-#include <protocol/ResponseTaker.h>
 #include <request/pointers.h>
+#include <response/ResponseTaker.h>
 
 namespace Cynara {
 

diff --git a/src/service/request/RequestContext.h b/src/service/request/RequestContext.h
index 77e3175..55ff9fe 100644 (file)
--- a/src/service/request/RequestContext.h
+++ b/src/service/request/RequestContext.h
@@ -25,7 +25,7 @@
 
 #include <common.h>
 
-#include <protocol/ResponseTaker.h>
+#include <response/ResponseTaker.h>
 
 namespace Cynara {
 

diff --git a/src/service/protocol/ResponseTaker.cpp b/src/service/response/ResponseTaker.cpp
similarity index 100%
rename from src/service/protocol/ResponseTaker.cpp
rename to src/service/response/ResponseTaker.cpp

diff --git a/src/service/protocol/ResponseTaker.h b/src/service/response/ResponseTaker.h
similarity index 88%
rename from src/service/protocol/ResponseTaker.h
rename to src/service/response/ResponseTaker.h
index a4305d9..771adbc 100644 (file)
--- a/src/service/protocol/ResponseTaker.h
+++ b/src/service/response/ResponseTaker.h
@@ -20,8 +20,8 @@
  * @brief       This file defines ResponseTaker class
  */
 
-#ifndef SRC_SERVICE_PROTOCOL_RESPONSETAKER_H_
-#define SRC_SERVICE_PROTOCOL_RESPONSETAKER_H_
+#ifndef SRC_SERVICE_RESPONSE_RESPONSETAKER_H_
+#define SRC_SERVICE_RESPONSE_RESPONSETAKER_H_
 
 #include <common.h>
 
@@ -39,4 +39,4 @@ public:
 
 } // namespace Cynara
 
-#endif /* SRC_SERVICE_PROTOCOL_RESPONSETAKER_H_ */
+#endif /* SRC_SERVICE_RESPONSE_RESPONSETAKER_H_ */