Rename websocket dir to websocket_server

18 files changed, 47 insertions, 41 deletions

diff --git a/src/components/transport_manager/CMakeLists.txt b/src/components/transport_manager/CMakeLists.txt
index 3ed845a06f..f5b78034d8 100644
--- a/src/components/transport_manager/CMakeLists.txt
+++ b/src/components/transport_manager/CMakeLists.txt
@@ -108,13 +108,13 @@ endif()
 
 if(NOT BUILD_WEBSOCKET_SERVER_SUPPORT)
   list(APPEND EXCLUDE_PATHS
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/transport_manager/websocket
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/websocket
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/transport_manager/websocket_server
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/websocket_server
   )
 elseif(NOT ENABLE_SECURITY)
   list(APPEND EXCLUDE_PATHS
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/transport_manager/websocket/websocket_secure_session.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/websocket/websocket_secure_session.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/transport_manager/websocket_server/websocket_secure_session.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/websocket_server/websocket_secure_session.cc
   )
 endif()
 
diff --git a/src/components/transport_manager/include/transport_manager/websocket/websocket_connection.h b/src/components/transport_manager/include/transport_manager/websocket_server/websocket_connection.h
index d811ca261b..fb904d645e 100644
--- a/src/components/transport_manager/include/transport_manager/websocket/websocket_connection.h
+++ b/src/components/transport_manager/include/transport_manager/websocket_server/websocket_connection.h
@@ -28,17 +28,19 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_WEBSOCKET_CONNECTION_H_
-#define SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_WEBSOCKET_CONNECTION_H_
+#ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_SERVER_WEBSOCKET_CONNECTION_H_
+#define SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_SERVER_WEBSOCKET_CONNECTION_H_
 
+#include <memory>
+#include <queue>
 #include "transport_manager/transport_adapter/connection.h"
 #include "utils/message_queue.h"
 #include "utils/threads/thread.h"
 
 #ifdef ENABLE_SECURITY
-#include "transport_manager/websocket/websocket_secure_session.h"
+#include "transport_manager/websocket_server/websocket_secure_session.h"
 #else
-#include "transport_manager/websocket/websocket_session.h"
+#include "transport_manager/websocket_server/websocket_session.h"
 #endif  // ENABLE_SECURITY
 
 namespace transport_manager {
@@ -121,4 +123,4 @@ class WebSocketConnection
 }  // namespace transport_adapter
 }  // namespace transport_manager
 
-#endif  // SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_WEBSOCKET_CONNECTION_H_
+#endif  // SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_SERVER_WEBSOCKET_CONNECTION_H_
diff --git a/src/components/transport_manager/include/transport_manager/websocket/websocket_device.h b/src/components/transport_manager/include/transport_manager/websocket_server/websocket_device.h
index 455498c8fb..10c6e54424 100644
--- a/src/components/transport_manager/include/transport_manager/websocket/websocket_device.h
+++ b/src/components/transport_manager/include/transport_manager/websocket_server/websocket_device.h
@@ -35,10 +35,11 @@
  * \brief WebSocketDevice class header file.
  */
 
-#ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_WEBSOCKET_DEVICE_H_
-#define SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_WEBSOCKET_DEVICE_H_
+#ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_SERVER_WEBSOCKET_DEVICE_H_
+#define SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_SERVER_WEBSOCKET_DEVICE_H_
 
 #include <boost/beast/websocket.hpp>
+#include <string>
 #include "transport_manager/transport_adapter/device.h"
 
 namespace transport_manager {
@@ -71,4 +72,4 @@ class WebSocketDevice : public Device {
 }  // namespace transport_adapter
 }  // namespace transport_manager
 
-#endif  // SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_WEBSOCKET_DEVICE_H_
+#endif  // SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_SERVER_WEBSOCKET_DEVICE_H_
diff --git a/src/components/transport_manager/include/transport_manager/websocket/websocket_listener.h b/src/components/transport_manager/include/transport_manager/websocket_server/websocket_listener.h
index a81190a736..3a0131f087 100644
--- a/src/components/transport_manager/include/transport_manager/websocket/websocket_listener.h
+++ b/src/components/transport_manager/include/transport_manager/websocket_server/websocket_listener.h
@@ -33,13 +33,15 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_WEBSOCKET_LISTENER_H_
-#define SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_WEBSOCKET_LISTENER_H_
+#ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_SERVER_WEBSOCKET_LISTENER_H_
+#define SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_SERVER_WEBSOCKET_LISTENER_H_
 
 #include <boost/asio/thread_pool.hpp>
+#include <memory>
+#include <vector>
 #include "transport_manager/transport_adapter/client_connection_listener.h"
 #include "transport_manager/transport_manager_settings.h"
-#include "transport_manager/websocket/websocket_connection.h"
+#include "transport_manager/websocket_server/websocket_connection.h"
 
 namespace transport_manager {
 namespace transport_adapter {
@@ -115,4 +117,4 @@ class WebSocketListener : public ClientConnectionListener {
 }  // namespace transport_adapter
 }  // namespace transport_manager
 
-#endif  // SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_WEBSOCKET_LISTENER_H_
+#endif  // SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_SERVER_WEBSOCKET_LISTENER_H_
diff --git a/src/components/transport_manager/include/transport_manager/websocket/websocket_secure_session.h b/src/components/transport_manager/include/transport_manager/websocket_server/websocket_secure_session.h
index 1ec8dbcf29..72c16ff85b 100644
--- a/src/components/transport_manager/include/transport_manager/websocket/websocket_secure_session.h
+++ b/src/components/transport_manager/include/transport_manager/websocket_server/websocket_secure_session.h
@@ -28,10 +28,11 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_WEBSOCKET_SECURE_SESSION_H_
-#define SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_WEBSOCKET_SECURE_SESSION_H_
+#ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_SERVER_WEBSOCKET_SECURE_SESSION_H_
+#define SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_SERVER_WEBSOCKET_SECURE_SESSION_H_
 
-#include "transport_manager/websocket/websocket_session.h"
+#include "transport_manager/websocket_server/websocket_session.h"
+#include <memory>
 
 namespace transport_manager {
 namespace transport_adapter {
@@ -60,4 +61,4 @@ class WebSocketSecureSession : public WebSocketSession<ExecutorType> {
 }  // namespace transport_adapter
 }  // namespace transport_manager
 
-#endif  // SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_WEBSOCKET_SECURE_SESSION_H_
+#endif  // SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_SERVER_WEBSOCKET_SECURE_SESSION_H_
diff --git a/src/components/transport_manager/include/transport_manager/websocket/websocket_session.h b/src/components/transport_manager/include/transport_manager/websocket_server/websocket_session.h
index 7383136e24..a8dadc9831 100644
--- a/src/components/transport_manager/include/transport_manager/websocket/websocket_session.h
+++ b/src/components/transport_manager/include/transport_manager/websocket_server/websocket_session.h
@@ -28,8 +28,8 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_WEBSOCKET_SESSION_H_
-#define SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_WEBSOCKET_SESSION_H_
+#ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_SERVER_WEBSOCKET_SESSION_H_
+#define SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_SERVER_WEBSOCKET_SESSION_H_
 
 #include <boost/asio/bind_executor.hpp>
 #include <boost/asio/strand.hpp>
@@ -104,4 +104,4 @@ class WebSocketSession
 }  // namespace transport_adapter
 }  // namespace transport_manager
 
-#endif  // SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_WEBSOCKET_SESSION_H_
+#endif  // SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_SERVER_WEBSOCKET_SESSION_H_
diff --git a/src/components/transport_manager/include/transport_manager/websocket/websocket_transport_adapter.h b/src/components/transport_manager/include/transport_manager/websocket_server/websocket_transport_adapter.h
index ce64c277b5..912cdda277 100644
--- a/src/components/transport_manager/include/transport_manager/websocket/websocket_transport_adapter.h
+++ b/src/components/transport_manager/include/transport_manager/websocket_server/websocket_transport_adapter.h
@@ -33,8 +33,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_WEBSOCKET_TRANSPORT_ADAPTER_H_
-#define SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_WEBSOCKET_TRANSPORT_ADAPTER_H_
+#ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_SERVER_WEBSOCKET_TRANSPORT_ADAPTER_H_
+#define SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_SERVER_WEBSOCKET_TRANSPORT_ADAPTER_H_
 
 #include "transport_manager/transport_adapter/transport_adapter_impl.h"
 
@@ -112,4 +112,4 @@ class WebSocketTransportAdapter : public TransportAdapterImpl {
 }  // namespace transport_adapter
 }  // namespace transport_manager
 
-#endif  // SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_WEBSOCKET_TRANSPORT_ADAPTER_H_
+#endif  // SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_SERVER_WEBSOCKET_TRANSPORT_ADAPTER_H_
diff --git a/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc b/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc
index f8e9c8a15f..56d809a05f 100644
--- a/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc
+++ b/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc
@@ -41,7 +41,7 @@
 #include "transport_manager/transport_adapter/transport_adapter_impl.h"
 #include "transport_manager/transport_adapter/transport_adapter_listener.h"
 #ifdef WEBSOCKET_SERVER_TRANSPORT_SUPPORT
-#include "transport_manager/websocket/websocket_device.h"
+#include "transport_manager/websocket_server/websocket_device.h"
 #endif
 
 namespace transport_manager {
diff --git a/src/components/transport_manager/src/transport_manager_default.cc b/src/components/transport_manager/src/transport_manager_default.cc
index 7955ca3655..2d6f1769cb 100644
--- a/src/components/transport_manager/src/transport_manager_default.cc
+++ b/src/components/transport_manager/src/transport_manager_default.cc
@@ -49,7 +49,7 @@
 #endif  // CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT
 
 #ifdef WEBSOCKET_SERVER_TRANSPORT_SUPPORT
-#include "transport_manager/websocket/websocket_transport_adapter.h"
+#include "transport_manager/websocket_server/websocket_transport_adapter.h"
 #endif
 
 #if defined(BUILD_TESTS)
diff --git a/src/components/transport_manager/src/transport_manager_impl.cc b/src/components/transport_manager/src/transport_manager_impl.cc
index 90972ed10d..66a892a322 100644
--- a/src/components/transport_manager/src/transport_manager_impl.cc
+++ b/src/components/transport_manager/src/transport_manager_impl.cc
@@ -55,7 +55,7 @@
 #include "transport_manager/transport_manager_listener.h"
 #include "transport_manager/transport_manager_listener_empty.h"
 #ifdef WEBSOCKET_SERVER_TRANSPORT_SUPPORT
-#include "transport_manager/websocket/websocket_device.h"
+#include "transport_manager/websocket_server/websocket_device.h"
 #endif
 #include "utils/timer_task_impl.h"
 
diff --git a/src/components/transport_manager/src/websocket/websocket_connection.cc b/src/components/transport_manager/src/websocket_server/websocket_connection.cc
index b467493a13..7bcc4baef2 100644
--- a/src/components/transport_manager/src/websocket/websocket_connection.cc
+++ b/src/components/transport_manager/src/websocket_server/websocket_connection.cc
@@ -28,7 +28,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "transport_manager/websocket/websocket_connection.h"
+#include "transport_manager/websocket_server/websocket_connection.h"
 #include <unistd.h>
 #include "transport_manager/transport_adapter/transport_adapter_controller.h"
 
diff --git a/src/components/transport_manager/src/websocket/websocket_device.cc b/src/components/transport_manager/src/websocket_server/websocket_device.cc
index 2a4ab4fe03..1a5db29d36 100644
--- a/src/components/transport_manager/src/websocket/websocket_device.cc
+++ b/src/components/transport_manager/src/websocket_server/websocket_device.cc
@@ -31,7 +31,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "transport_manager/websocket/websocket_device.h"
+#include "transport_manager/websocket_server/websocket_device.h"
 
 #include "utils/logger.h"
 
diff --git a/src/components/transport_manager/src/websocket/websocket_listener.cc b/src/components/transport_manager/src/websocket_server/websocket_listener.cc
index 6c31948d51..87fff3acbc 100644
--- a/src/components/transport_manager/src/websocket/websocket_listener.cc
+++ b/src/components/transport_manager/src/websocket_server/websocket_listener.cc
@@ -1,6 +1,6 @@
-#include "transport_manager/websocket/websocket_listener.h"
+#include "transport_manager/websocket_server/websocket_listener.h"
 #include "transport_manager/transport_adapter/transport_adapter_controller.h"
-#include "transport_manager/websocket/websocket_device.h"
+#include "transport_manager/websocket_server/websocket_device.h"
 #include "utils/file_system.h"
 
 namespace transport_manager {
diff --git a/src/components/transport_manager/src/websocket/websocket_secure_session.cc b/src/components/transport_manager/src/websocket_server/websocket_secure_session.cc
index 0d85fb4935..9be94119b6 100644
--- a/src/components/transport_manager/src/websocket/websocket_secure_session.cc
+++ b/src/components/transport_manager/src/websocket_server/websocket_secure_session.cc
@@ -28,7 +28,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "transport_manager/websocket/websocket_secure_session.h"
+#include "transport_manager/websocket_server/websocket_secure_session.h"
 #include <unistd.h>
 #include "transport_manager/transport_adapter/transport_adapter_controller.h"
 
diff --git a/src/components/transport_manager/src/websocket/websocket_session.cc b/src/components/transport_manager/src/websocket_server/websocket_session.cc
index df9d2d76a0..ab62530963 100644
--- a/src/components/transport_manager/src/websocket/websocket_session.cc
+++ b/src/components/transport_manager/src/websocket_server/websocket_session.cc
@@ -28,7 +28,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "transport_manager/websocket/websocket_session.h"
+#include "transport_manager/websocket_server/websocket_session.h"
 #include <unistd.h>
 #include "transport_manager/transport_adapter/transport_adapter_controller.h"
 
diff --git a/src/components/transport_manager/src/websocket/websocket_transport_adapter.cc b/src/components/transport_manager/src/websocket_server/websocket_transport_adapter.cc
index eff7f13441..0f601ea921 100644
--- a/src/components/transport_manager/src/websocket/websocket_transport_adapter.cc
+++ b/src/components/transport_manager/src/websocket_server/websocket_transport_adapter.cc
@@ -30,7 +30,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "transport_manager/websocket/websocket_transport_adapter.h"
+#include "transport_manager/websocket_server/websocket_transport_adapter.h"
 
 #include <errno.h>
 #include <memory.h>
@@ -40,7 +40,7 @@
 #include <cstdlib>
 #include <sstream>
 
-#include "transport_manager/websocket/websocket_listener.h"
+#include "transport_manager/websocket_server/websocket_listener.h"
 #include "utils/logger.h"
 #include "utils/threads/thread_delegate.h"
 
diff --git a/src/components/transport_manager/test/websocket_connection_test.cc b/src/components/transport_manager/test/websocket_connection_test.cc
index 664c4a5155..306bdc4784 100644
--- a/src/components/transport_manager/test/websocket_connection_test.cc
+++ b/src/components/transport_manager/test/websocket_connection_test.cc
@@ -36,8 +36,8 @@
 #include <string>
 
 #include "resumption/last_state_impl.h"
-#include "transport_manager/websocket/websocket_connection.h"
-#include "transport_manager/websocket/websocket_session.h"
+#include "transport_manager/websocket_server/websocket_connection.h"
+#include "transport_manager/websocket_server/websocket_session.h"
 
 #include "transport_manager/mock_transport_manager_settings.h"
 #include "transport_manager/transport_adapter/mock_transport_adapter_controller.h"
diff --git a/src/components/transport_manager/test/websocket_server_listener_test.cc b/src/components/transport_manager/test/websocket_server_listener_test.cc
index 32b2960fb9..7991c6f1cb 100644
--- a/src/components/transport_manager/test/websocket_server_listener_test.cc
+++ b/src/components/transport_manager/test/websocket_server_listener_test.cc
@@ -34,8 +34,8 @@
 #include "gtest/gtest.h"
 #include "transport_manager/mock_transport_manager_settings.h"
 #include "transport_manager/transport_adapter/mock_transport_adapter_controller.h"
-#include "transport_manager/websocket/websocket_device.h"
-#include "transport_manager/websocket/websocket_listener.h"
+#include "transport_manager/websocket_server/websocket_device.h"
+#include "transport_manager/websocket_server/websocket_listener.h"
 #include "utils/timer.h"
 #include "utils/timer_task_impl.h"