Adapt protocol, request and response classes to common

Update of includes, defines and CMakeLists.
This patch should be verified together with previous one.

Change-Id: I08e38dcba381a2514981068adbabb2e3b35088a5

diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index edefcd8..feac88e 100644 (file)
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -24,7 +24,13 @@ SET(COMMON_PATH ${CYNARA_PATH}/common)
 SET(COMMON_SOURCES
     ${COMMON_PATH}/containers/BinaryQueue.cpp
     ${COMMON_PATH}/log/log.cpp
+    ${COMMON_PATH}/protocol/ProtocolAdmin.cpp
+    ${COMMON_PATH}/protocol/ProtocolClient.cpp
     ${COMMON_PATH}/protocol/ProtocolSerialization.cpp
+    ${COMMON_PATH}/protocol/ProtocolSignal.cpp
+    ${COMMON_PATH}/request/CheckRequest.cpp
+    ${COMMON_PATH}/request/RequestTaker.cpp
+    ${COMMON_PATH}/response/ResponseTaker.cpp
     ${COMMON_PATH}/types/PolicyBucket.cpp
     ${COMMON_PATH}/types/PolicyKey.cpp
     )

diff --git a/src/common/protocol/Protocol.h b/src/common/protocol/Protocol.h
index 984e528..a4e0839 100644 (file)
--- a/src/common/protocol/Protocol.h
+++ b/src/common/protocol/Protocol.h
@@ -20,13 +20,12 @@
  * @brief       This file defines protocol base class
  */
 
-#ifndef SRC_SERVICE_PROTOCOL_PROTOCOL_H_
-#define SRC_SERVICE_PROTOCOL_PROTOCOL_H_
+#ifndef SRC_COMMON_PROTOCOL_PROTOCOL_H_
+#define SRC_COMMON_PROTOCOL_PROTOCOL_H_
 
 #include <memory>
 
-#include <common.h>
-
+#include <containers/BinaryQueue.h>
 #include <request/pointers.h>
 #include <request/RequestTaker.h>
 #include <response/ResponseTaker.h>
@@ -45,4 +44,4 @@ typedef std::shared_ptr<Protocol> ProtocolPtr;
 
 } // namespace Cynara
 
-#endif /* SRC_SERVICE_PROTOCOL_PROTOCOL_H_ */
+#endif /* SRC_COMMON_PROTOCOL_PROTOCOL_H_ */

diff --git a/src/common/protocol/ProtocolAdmin.h b/src/common/protocol/ProtocolAdmin.h
index 3fe459d..ce7388a 100644 (file)
--- a/src/common/protocol/ProtocolAdmin.h
+++ b/src/common/protocol/ProtocolAdmin.h
@@ -20,8 +20,8 @@
  * @brief       This file defines protocol class for administration
  */
 
-#ifndef SRC_SERVICE_PROTOCOL_PROTOCOLADMIN_H_
-#define SRC_SERVICE_PROTOCOL_PROTOCOLADMIN_H_
+#ifndef SRC_COMMON_PROTOCOL_PROTOCOLADMIN_H_
+#define SRC_COMMON_PROTOCOL_PROTOCOLADMIN_H_
 
 #include "Protocol.h"
 
@@ -37,4 +37,4 @@ public:
 
 } // namespace Cynara
 
-#endif /* SRC_SERVICE_PROTOCOL_PROTOCOLADMIN_H_ */
+#endif /* SRC_COMMON_PROTOCOL_PROTOCOLADMIN_H_ */

diff --git a/src/common/protocol/ProtocolClient.h b/src/common/protocol/ProtocolClient.h
index 19c5d14..8eb8052 100644 (file)
--- a/src/common/protocol/ProtocolClient.h
+++ b/src/common/protocol/ProtocolClient.h
@@ -20,8 +20,8 @@
  * @brief       This file defines protocol class for communication with client
  */
 
-#ifndef SRC_SERVICE_PROTOCOL_PROTOCOLCLIENT_H_
-#define SRC_SERVICE_PROTOCOL_PROTOCOLCLIENT_H_
+#ifndef SRC_COMMON_PROTOCOL_PROTOCOLCLIENT_H_
+#define SRC_COMMON_PROTOCOL_PROTOCOLCLIENT_H_
 
 #include "Protocol.h"
 
@@ -37,4 +37,4 @@ public:
 
 } // namespace Cynara
 
-#endif /* SRC_SERVICE_PROTOCOL_PROTOCOLCLIENT_H_ */
+#endif /* SRC_COMMON_PROTOCOL_PROTOCOLCLIENT_H_ */

diff --git a/src/common/protocol/ProtocolSignal.h b/src/common/protocol/ProtocolSignal.h
index c74cf7d..bb93af9 100644 (file)
--- a/src/common/protocol/ProtocolSignal.h
+++ b/src/common/protocol/ProtocolSignal.h
@@ -20,8 +20,8 @@
  * @brief       This file defines protocol class for signals
  */
 
-#ifndef SRC_SERVICE_PROTOCOL_PROTOCOLSIGNAL_H_
-#define SRC_SERVICE_PROTOCOL_PROTOCOLSIGNAL_H_
+#ifndef SRC_COMMON_PROTOCOL_PROTOCOLSIGNAL_H_
+#define SRC_COMMON_PROTOCOL_PROTOCOLSIGNAL_H_
 
 #include "Protocol.h"
 
@@ -37,4 +37,4 @@ public:
 
 } // namespace Cynara
 
-#endif /* SRC_SERVICE_PROTOCOL_PROTOCOLSIGNAL_H_ */
+#endif /* SRC_COMMON_PROTOCOL_PROTOCOLSIGNAL_H_ */

diff --git a/src/common/request/CheckRequest.h b/src/common/request/CheckRequest.h
index 83f0203..7e547fb 100644 (file)
--- a/src/common/request/CheckRequest.h
+++ b/src/common/request/CheckRequest.h
@@ -20,8 +20,8 @@
  * @brief       This file defines check request class
  */
 
-#ifndef SRC_SERVICE_REQUEST_CHECKREQUEST_H_
-#define SRC_SERVICE_REQUEST_CHECKREQUEST_H_
+#ifndef SRC_COMMON_REQUEST_CHECKREQUEST_H_
+#define SRC_COMMON_REQUEST_CHECKREQUEST_H_
 
 #include <types/PolicyKey.h>
 
@@ -50,4 +50,4 @@ public:
 
 } // namespace Cynara
 
-#endif /* SRC_SERVICE_REQUEST_CHECKREQUEST_H_ */
+#endif /* SRC_COMMON_REQUEST_CHECKREQUEST_H_ */

diff --git a/src/common/request/Request.h b/src/common/request/Request.h
index fa76ffa..aadbd4c 100644 (file)
--- a/src/common/request/Request.h
+++ b/src/common/request/Request.h
@@ -20,11 +20,10 @@
  * @brief       This file defines request base class
  */
 
-#ifndef SRC_SERVICE_REQUEST_REQUEST_H_
-#define SRC_SERVICE_REQUEST_REQUEST_H_
+#ifndef SRC_COMMON_REQUEST_REQUEST_H_
+#define SRC_COMMON_REQUEST_REQUEST_H_
 
 #include <request/pointers.h>
-#include <request/pointers.h>
 #include <request/RequestTaker.h>
 
 namespace Cynara {
@@ -39,4 +38,4 @@ public:
 
 } // namespace Cynara
 
-#endif /* SRC_SERVICE_REQUEST_REQUEST_H_ */
+#endif /* SRC_COMMON_REQUEST_REQUEST_H_ */

diff --git a/src/common/request/RequestContext.h b/src/common/request/RequestContext.h
index d8e9578..880583e 100644 (file)
--- a/src/common/request/RequestContext.h
+++ b/src/common/request/RequestContext.h
@@ -20,13 +20,12 @@
  * @brief       This file defines request context class
  */
 
-#ifndef SRC_SERVICE_REQUEST_REQUESTCONTEXT_H_
-#define SRC_SERVICE_REQUEST_REQUESTCONTEXT_H_
+#ifndef SRC_COMMON_REQUEST_REQUESTCONTEXT_H_
+#define SRC_COMMON_REQUEST_REQUESTCONTEXT_H_
 
 #include <memory>
 
-#include <common.h>
-
+#include <containers/BinaryQueue.h>
 #include <request/pointers.h>
 #include <response/pointers.h>
 #include <response/ResponseTaker.h>
@@ -58,4 +57,4 @@ public:
 
 } // namespace Cynara
 
-#endif /* SRC_SERVICE_REQUEST_REQUESTCONTEXT_H_ */
+#endif /* SRC_COMMON_REQUEST_REQUESTCONTEXT_H_ */

diff --git a/src/common/request/RequestTaker.cpp b/src/common/request/RequestTaker.cpp
index f634ea8..13d2ee9 100644 (file)
--- a/src/common/request/RequestTaker.cpp
+++ b/src/common/request/RequestTaker.cpp
@@ -20,8 +20,7 @@
  * @brief       This file implements RequestTaker class
  */
 
-#include <common.h>
-
+#include <attributes/attributes.h>
 #include <exceptions/NotImplementedException.h>
 
 #include "RequestTaker.h"

diff --git a/src/common/request/RequestTaker.h b/src/common/request/RequestTaker.h
index 9ebbe32..581d342 100644 (file)
--- a/src/common/request/RequestTaker.h
+++ b/src/common/request/RequestTaker.h
@@ -20,8 +20,8 @@
  * @brief       This file defines RequestTaker class
  */
 
-#ifndef SRC_SERVICE_REQUEST_REQUESTTAKER_H_
-#define SRC_SERVICE_REQUEST_REQUESTTAKER_H_
+#ifndef SRC_COMMON_REQUEST_REQUESTTAKER_H_
+#define SRC_COMMON_REQUEST_REQUESTTAKER_H_
 
 #include <request/pointers.h>
 
@@ -37,4 +37,4 @@ public:
 
 } // namespace Cynara
 
-#endif /* SRC_SERVICE_REQUEST_REQUESTTAKER_H_ */
+#endif /* SRC_COMMON_REQUEST_REQUESTTAKER_H_ */

diff --git a/src/common/request/pointers.h b/src/common/request/pointers.h
index 7bfc66e..cc306f3 100644 (file)
--- a/src/common/request/pointers.h
+++ b/src/common/request/pointers.h
@@ -20,8 +20,8 @@
  * @brief       This file defines request base class
  */
 
-#ifndef SRC_SERVICE_REQUEST_POINTERS_H_
-#define SRC_SERVICE_REQUEST_POINTERS_H_
+#ifndef SRC_COMMON_REQUEST_POINTERS_H_
+#define SRC_COMMON_REQUEST_POINTERS_H_
 
 #include <memory>
 
@@ -38,4 +38,4 @@ typedef std::shared_ptr<RequestContext> RequestContextPtr;
 
 } // namespace Cynara
 
-#endif /* SRC_SERVICE_REQUEST_POINTERS_H_ */
+#endif /* SRC_COMMON_REQUEST_POINTERS_H_ */

diff --git a/src/common/response/CheckResponse.h b/src/common/response/CheckResponse.h
index 69ae983..0c0fec2 100644 (file)
--- a/src/common/response/CheckResponse.h
+++ b/src/common/response/CheckResponse.h
@@ -20,10 +20,9 @@
  * @brief       This file defines response class for check request
  */
 
-#ifndef SRC_SERVICE_RESPONSE_CHECKRESPONSE_H_
-#define SRC_SERVICE_RESPONSE_CHECKRESPONSE_H_
+#ifndef SRC_COMMON_RESPONSE_CHECKRESPONSE_H_
+#define SRC_COMMON_RESPONSE_CHECKRESPONSE_H_
 
-#include <common.h>
 #include <types/PolicyResult.h>
 
 namespace Cynara {
@@ -37,4 +36,4 @@ struct CheckResponse {
 
 } // namespace Cynara
 
-#endif /* SRC_SERVICE_RESPONSE_CHECKRESPONSE_H_ */
+#endif /* SRC_COMMON_RESPONSE_CHECKRESPONSE_H_ */

diff --git a/src/common/response/ResponseTaker.cpp b/src/common/response/ResponseTaker.cpp
index fff9774..6e52094 100644 (file)
--- a/src/common/response/ResponseTaker.cpp
+++ b/src/common/response/ResponseTaker.cpp
@@ -21,7 +21,7 @@
  */
 
 
-#include <common.h>
+#include <attributes/attributes.h>
 #include <exceptions/NotImplementedException.h>
 
 #include "ResponseTaker.h"

diff --git a/src/common/response/ResponseTaker.h b/src/common/response/ResponseTaker.h
index 0c880b6..8093fab 100644 (file)
--- a/src/common/response/ResponseTaker.h
+++ b/src/common/response/ResponseTaker.h
@@ -20,10 +20,8 @@
  * @brief       This file defines ResponseTaker class
  */
 
-#ifndef SRC_SERVICE_RESPONSE_RESPONSETAKER_H_
-#define SRC_SERVICE_RESPONSE_RESPONSETAKER_H_
-
-#include <common.h>
+#ifndef SRC_COMMON_RESPONSE_RESPONSETAKER_H_
+#define SRC_COMMON_RESPONSE_RESPONSETAKER_H_
 
 #include <request/pointers.h>
 #include <response/CheckResponse.h>
@@ -40,4 +38,4 @@ public:
 
 } // namespace Cynara
 
-#endif /* SRC_SERVICE_RESPONSE_RESPONSETAKER_H_ */
+#endif /* SRC_COMMON_RESPONSE_RESPONSETAKER_H_ */

diff --git a/src/common/response/pointers.h b/src/common/response/pointers.h
index 6d12a8b..3f238d6 100644 (file)
--- a/src/common/response/pointers.h
+++ b/src/common/response/pointers.h
@@ -20,8 +20,8 @@
  * @brief       This file defines response classes pointers
  */
 
-#ifndef SRC_SERVICE_RESPONSE_POINTERS_H_
-#define SRC_SERVICE_RESPONSE_POINTERS_H_
+#ifndef SRC_COMMON_RESPONSE_POINTERS_H_
+#define SRC_COMMON_RESPONSE_POINTERS_H_
 
 #include <memory>
 
@@ -33,4 +33,4 @@ typedef std::weak_ptr<ResponseTaker> ResponseTakerWeakPtr;
 
 } // namespace Cynara
 
-#endif /* SRC_SERVICE_RESPONSE_POINTERS_H_ */
+#endif /* SRC_COMMON_RESPONSE_POINTERS_H_ */

diff --git a/src/service/CMakeLists.txt b/src/service/CMakeLists.txt
index 69d35ee..915cc00 100644 (file)
--- a/src/service/CMakeLists.txt
+++ b/src/service/CMakeLists.txt
@@ -22,12 +22,6 @@ SET(CYNARA_SOURCES
     ${CYNARA_SERVICE_PATH}/logic/Logic.cpp
     ${CYNARA_SERVICE_PATH}/main/Cynara.cpp
     ${CYNARA_SERVICE_PATH}/main/main.cpp
-    ${CYNARA_SERVICE_PATH}/protocol/ProtocolAdmin.cpp
-    ${CYNARA_SERVICE_PATH}/protocol/ProtocolClient.cpp
-    ${CYNARA_SERVICE_PATH}/protocol/ProtocolSignal.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