Adjust client socket classes after move to common library

Fix #ifndef guards, include paths and CMakeLists.

This patch should be verified together with previous one (Raw move).

Change-Id: I81640c5297c11435e2fe0e8b18c9d37ded5318a3

diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index 2f51764..89fe001 100644 (file)
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -24,8 +24,6 @@ SET(CYNARA_LIB_CYNARA_PATH ${CYNARA_PATH}/client)
 SET(LIB_CYNARA_SOURCES
     ${CYNARA_LIB_CYNARA_PATH}/api/client-api.cpp
     ${CYNARA_LIB_CYNARA_PATH}/logic/Logic.cpp
-    ${CYNARA_LIB_CYNARA_PATH}/sockets/Socket.cpp
-    ${CYNARA_LIB_CYNARA_PATH}/sockets/SocketClient.cpp
     )
 
 INCLUDE_DIRECTORIES(

diff --git a/src/client/logic/Logic.cpp b/src/client/logic/Logic.cpp
index 6b04973..aa62511 100644 (file)
--- a/src/client/logic/Logic.cpp
+++ b/src/client/logic/Logic.cpp
@@ -32,10 +32,10 @@
 #include <request/pointers.h>
 #include <response/CheckResponse.h>
 #include <response/pointers.h>
+#include <sockets/SocketClient.h>
 #include <types/PolicyKey.h>
 #include <types/PolicyResult.h>
 
-#include <sockets/SocketClient.h>
 #include "Logic.h"
 
 namespace Cynara {

diff --git a/src/client/logic/Logic.h b/src/client/logic/Logic.h
index 512b313..e16a451 100644 (file)
--- a/src/client/logic/Logic.h
+++ b/src/client/logic/Logic.h
@@ -25,9 +25,10 @@
 
 #include <string>
 
-#include <api/ApiInterface.h>
 #include <sockets/SocketClient.h>
 
+#include <api/ApiInterface.h>
+
 namespace Cynara {
 
 class Logic : public ApiInterface {

diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index dbc5c3a..a689435 100644 (file)
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -32,6 +32,8 @@ SET(COMMON_SOURCES
     ${COMMON_PATH}/request/RequestTaker.cpp
     ${COMMON_PATH}/response/CheckResponse.cpp
     ${COMMON_PATH}/response/ResponseTaker.cpp
+    ${COMMON_PATH}/sockets/Socket.cpp
+    ${COMMON_PATH}/sockets/SocketClient.cpp
     ${COMMON_PATH}/types/PolicyBucket.cpp
     ${COMMON_PATH}/types/PolicyKey.cpp
     )

diff --git a/src/common/sockets/Socket.cpp b/src/common/sockets/Socket.cpp
index cddd05f..81be8d4 100644 (file)
--- a/src/common/sockets/Socket.cpp
+++ b/src/common/sockets/Socket.cpp
@@ -31,6 +31,8 @@
 #include <sys/un.h>
 #include <unistd.h>
 
+#include <containers/BinaryQueue.h>
+#include <containers/RawBuffer.h>
 #include <exceptions/InitException.h>
 #include <exceptions/ServerConnectionErrorException.h>
 #include <exceptions/UnexpectedErrorException.h>

diff --git a/src/common/sockets/Socket.h b/src/common/sockets/Socket.h
index 7c6a286..7ea8c61 100644 (file)
--- a/src/common/sockets/Socket.h
+++ b/src/common/sockets/Socket.h
@@ -21,12 +21,12 @@
  * @brief       This file contains definition of UNIX client socket class
  */
 
-#ifndef SRC_CLIENT_SOCKETS_SOCKET_H_
-#define SRC_CLIENT_SOCKETS_SOCKET_H_
+#ifndef SRC_COMMON_SOCKETS_SOCKET_H_
+#define SRC_COMMON_SOCKETS_SOCKET_H_
 
 #include <string>
 
-#include <common.h>
+#include <containers/BinaryQueue.h>
 
 namespace Cynara {
 
@@ -76,4 +76,4 @@ public:
 
 } // namespace Cynara
 
-#endif /* SRC_CLIENT_SOCKETS_SOCKET_H_ */
+#endif /* SRC_COMMON_SOCKETS_SOCKET_H_ */

diff --git a/src/common/sockets/SocketClient.cpp b/src/common/sockets/SocketClient.cpp
index 90f89de..6eff9f5 100644 (file)
--- a/src/common/sockets/SocketClient.cpp
+++ b/src/common/sockets/SocketClient.cpp
@@ -29,7 +29,6 @@
 #include <request/Request.h>
 #include <request/RequestContext.h>
 #include <response/pointers.h>
-
 #include <sockets/Socket.h>
 
 #include "SocketClient.h"

diff --git a/src/common/sockets/SocketClient.h b/src/common/sockets/SocketClient.h
index d3e16a1..04f0436 100644 (file)
--- a/src/common/sockets/SocketClient.h
+++ b/src/common/sockets/SocketClient.h
@@ -20,17 +20,16 @@
  * @brief       This file contains definition of cynara's socket client
  */
 
-#ifndef SRC_CLIENT_SOCKETS_SOCKETCLIENT_H_
-#define SRC_CLIENT_SOCKETS_SOCKETCLIENT_H_
+#ifndef SRC_COMMON_SOCKETS_SOCKETCLIENT_H_
+#define SRC_COMMON_SOCKETS_SOCKETCLIENT_H_
 
 #include <memory>
 
-#include <common.h>
+#include <containers/BinaryQueue.h>
 #include <protocol/Protocol.h>
 #include <request/pointers.h>
 #include <response/pointers.h>
 #include <response/ResponseTaker.h>
-
 #include <sockets/Socket.h>
 
 namespace Cynara {
@@ -56,4 +55,4 @@ public:
 
 } // namespace Cynara
 
-#endif /* SRC_CLIENT_SOCKETS_SOCKETCLIENT_H_ */
+#endif /* SRC_COMMON_SOCKETS_SOCKETCLIENT_H_ */