diff options
author | Andriy Byzhynar <abyzhynar@luxoft.com> | 2020-02-13 13:58:41 +0200 |
---|---|---|
committer | Andriy Byzhynar <abyzhynar@luxoft.com> | 2020-02-13 13:58:41 +0200 |
commit | b0b1c52ead4d9178d0393f0f2c6ebd2b75703f8d (patch) | |
tree | abca5bc7094bf3a22e6a15ae79ea07ec65a4431c | |
parent | 41f89d9e65d710d16cd2ec8160a85a5a7e833cdb (diff) | |
download | sdl_core-b0b1c52ead4d9178d0393f0f2c6ebd2b75703f8d.tar.gz |
Rename WebSocketTransport adapter to WebSocketServerTransportAdapter
-rw-r--r-- | src/components/transport_manager/include/transport_manager/websocket_server/websocket_server_transport_adapter.h (renamed from src/components/transport_manager/include/transport_manager/websocket_server/websocket_transport_adapter.h) | 16 | ||||
-rw-r--r-- | src/components/transport_manager/src/transport_manager_default.cc | 4 | ||||
-rw-r--r-- | src/components/transport_manager/src/websocket_server/websocket_server_transport_adapter.cc (renamed from src/components/transport_manager/src/websocket_server/websocket_transport_adapter.cc) | 16 |
3 files changed, 18 insertions, 18 deletions
diff --git a/src/components/transport_manager/include/transport_manager/websocket_server/websocket_transport_adapter.h b/src/components/transport_manager/include/transport_manager/websocket_server/websocket_server_transport_adapter.h index 912cdda277..28e4436605 100644 --- a/src/components/transport_manager/include/transport_manager/websocket_server/websocket_transport_adapter.h +++ b/src/components/transport_manager/include/transport_manager/websocket_server/websocket_server_transport_adapter.h @@ -33,8 +33,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#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_ +#ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_SERVER_WEBSOCKET_SERVER_TRANSPORT_ADAPTER_H_ +#define SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_SERVER_WEBSOCKET_SERVER_TRANSPORT_ADAPTER_H_ #include "transport_manager/transport_adapter/transport_adapter_impl.h" @@ -44,21 +44,21 @@ namespace transport_adapter { /** * @brief Transport adapter that uses WebSocket transport. */ -class WebSocketTransportAdapter : public TransportAdapterImpl { +class WebSocketServerTransportAdapter : public TransportAdapterImpl { public: /** * @brief Constructor. */ - explicit WebSocketTransportAdapter(resumption::LastState& last_state, - const TransportManagerSettings& settings); + WebSocketServerTransportAdapter(resumption::LastState& last_state, + const TransportManagerSettings& settings); /** * @brief Destructor. */ - virtual ~WebSocketTransportAdapter(); + virtual ~WebSocketServerTransportAdapter(); /** - * @brief Websocket transport adapter + * @brief Websocket server transport adapter * specific Init() method * @note Perform additional actions required by WS transport adapter * then calls basic class Init() @@ -112,4 +112,4 @@ class WebSocketTransportAdapter : public TransportAdapterImpl { } // namespace transport_adapter } // namespace transport_manager -#endif // SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_SERVER_WEBSOCKET_TRANSPORT_ADAPTER_H_ +#endif // SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_SERVER_WEBSOCKET_SERVER_TRANSPORT_ADAPTER_H_ diff --git a/src/components/transport_manager/src/transport_manager_default.cc b/src/components/transport_manager/src/transport_manager_default.cc index 2d6f1769cb..0a8289253f 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_server/websocket_transport_adapter.h" +#include "transport_manager/websocket_server/websocket_server_transport_adapter.h" #endif #if defined(BUILD_TESTS) @@ -144,7 +144,7 @@ int TransportManagerDefault::Init(resumption::LastState& last_state) { #endif // CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT #ifdef WEBSOCKET_SERVER_TRANSPORT_SUPPORT - auto ta_websocket = new transport_adapter::WebSocketTransportAdapter( + auto ta_websocket = new transport_adapter::WebSocketServerTransportAdapter( last_state, get_settings()); #ifdef TELEMETRY_MONITOR if (metric_observer_) { diff --git a/src/components/transport_manager/src/websocket_server/websocket_transport_adapter.cc b/src/components/transport_manager/src/websocket_server/websocket_server_transport_adapter.cc index 0f601ea921..2983d1db9a 100644 --- a/src/components/transport_manager/src/websocket_server/websocket_transport_adapter.cc +++ b/src/components/transport_manager/src/websocket_server/websocket_server_transport_adapter.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "transport_manager/websocket_server/websocket_transport_adapter.h" +#include "transport_manager/websocket_server/websocket_server_transport_adapter.h" #include <errno.h> #include <memory.h> @@ -49,7 +49,7 @@ namespace transport_adapter { CREATE_LOGGERPTR_GLOBAL(logger_, "WebSocketTransportAdapter") -WebSocketTransportAdapter::WebSocketTransportAdapter( +WebSocketServerTransportAdapter::WebSocketServerTransportAdapter( resumption::LastState& last_state, const TransportManagerSettings& settings) : TransportAdapterImpl(nullptr, nullptr, @@ -57,9 +57,9 @@ WebSocketTransportAdapter::WebSocketTransportAdapter( last_state, settings) {} -WebSocketTransportAdapter::~WebSocketTransportAdapter() {} +WebSocketServerTransportAdapter::~WebSocketServerTransportAdapter() {} -void WebSocketTransportAdapter::TransportConfigUpdated( +void WebSocketServerTransportAdapter::TransportConfigUpdated( const TransportConfig& new_config) { LOG4CXX_AUTO_TRACE(logger_); @@ -70,22 +70,22 @@ void WebSocketTransportAdapter::TransportConfigUpdated( TransportAdapterImpl::TransportConfigUpdated(new_config); } -TransportConfig WebSocketTransportAdapter::GetTransportConfiguration() const { +TransportConfig WebSocketServerTransportAdapter::GetTransportConfiguration() const { LOG4CXX_AUTO_TRACE(logger_); return transport_config_; } -DeviceType WebSocketTransportAdapter::GetDeviceType() const { +DeviceType WebSocketServerTransportAdapter::GetDeviceType() const { return WEBENGINE_WEBSOCKET; } -DeviceSptr WebSocketTransportAdapter::AddDevice(DeviceSptr device) { +DeviceSptr WebSocketServerTransportAdapter::AddDevice(DeviceSptr device) { LOG4CXX_AUTO_TRACE(logger_); webengine_device_ = device; return TransportAdapterImpl::AddDevice(webengine_device_); } -TransportAdapter::Error WebSocketTransportAdapter::Init() { +TransportAdapter::Error WebSocketServerTransportAdapter::Init() { LOG4CXX_AUTO_TRACE(logger_); if (webengine_device_) { AddDevice(webengine_device_); |