Fix build after back merge

7 files changed, 30 insertions, 18 deletions

diff --git a/src/components/transport_manager/include/transport_manager/transport_manager_default.h b/src/components/transport_manager/include/transport_manager/transport_manager_default.h
index 9d428cf817..81fc92dc38 100644
--- a/src/components/transport_manager/include/transport_manager/transport_manager_default.h
+++ b/src/components/transport_manager/include/transport_manager/transport_manager_default.h
@@ -61,6 +61,10 @@ struct TransportAdapterFactory {
   CreatorTA<resumption::LastStateWrapperPtr&, const TransportManagerSettings&>
       ta_cloud_creator_;
 #endif
+#if defined(WEBSOCKET_SERVER_TRANSPORT_SUPPORT)
+  CreatorTA<resumption::LastStateWrapperPtr&, const TransportManagerSettings&>
+      ta_websocket_server_creator_;
+#endif
 };
 
 /**
diff --git a/src/components/transport_manager/include/transport_manager/websocket_server/websocket_server_transport_adapter.h b/src/components/transport_manager/include/transport_manager/websocket_server/websocket_server_transport_adapter.h
index b519707f23..23122b2e98 100644
--- a/src/components/transport_manager/include/transport_manager/websocket_server/websocket_server_transport_adapter.h
+++ b/src/components/transport_manager/include/transport_manager/websocket_server/websocket_server_transport_adapter.h
@@ -50,8 +50,9 @@ class WebSocketServerTransportAdapter : public TransportAdapterImpl {
   /**
    * @brief Constructor.
    */
-  WebSocketServerTransportAdapter(resumption::LastState& last_state,
-                                  const TransportManagerSettings& settings);
+  WebSocketServerTransportAdapter(
+      resumption::LastStateWrapperPtr last_state_wrapper,
+      const TransportManagerSettings& settings);
 
   /**
    * @brief Destructor.
diff --git a/src/components/transport_manager/src/transport_manager_default.cc b/src/components/transport_manager/src/transport_manager_default.cc
index f3ad70bae9..74c5b9ceee 100644
--- a/src/components/transport_manager/src/transport_manager_default.cc
+++ b/src/components/transport_manager/src/transport_manager_default.cc
@@ -88,11 +88,12 @@ TransportAdapterFactory::TransportAdapterFactory() {
 #endif
 
 #if defined(WEBSOCKET_SERVER_TRANSPORT_SUPPORT)
-  ta_websocket_server_creator_ = [](resumption::LastStateWrapperPtr last_state_wrapper,
-                         const TransportManagerSettings& settings) {
-    return new transport_adapter::WebSocketServerTransportAdapter(
-        last_state_wrapper, settings);
-  };
+  ta_websocket_server_creator_ =
+      [](resumption::LastStateWrapperPtr last_state_wrapper,
+         const TransportManagerSettings& settings) {
+        return new transport_adapter::WebSocketServerTransportAdapter(
+            last_state_wrapper, settings);
+      };
 #endif
 }
 
@@ -156,7 +157,8 @@ int TransportManagerDefault::Init(
 #endif  // CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT
 
 #ifdef WEBSOCKET_SERVER_TRANSPORT_SUPPORT
-  auto ta_websocket = ta_factory_.ta_websocket_server_creator_(last_state_wrapper, settings);
+  auto ta_websocket =
+      ta_factory_.ta_websocket_server_creator_(last_state_wrapper, settings);
 
 #ifdef TELEMETRY_MONITOR
   if (metric_observer_) {
diff --git a/src/components/transport_manager/src/websocket_server/websocket_server_transport_adapter.cc b/src/components/transport_manager/src/websocket_server/websocket_server_transport_adapter.cc
index fa26a07d46..ac8789eee8 100644
--- a/src/components/transport_manager/src/websocket_server/websocket_server_transport_adapter.cc
+++ b/src/components/transport_manager/src/websocket_server/websocket_server_transport_adapter.cc
@@ -51,11 +51,12 @@ namespace transport_adapter {
 CREATE_LOGGERPTR_GLOBAL(logger_, "WebSocketTransportAdapter")
 
 WebSocketServerTransportAdapter::WebSocketServerTransportAdapter(
-    resumption::LastState& last_state, const TransportManagerSettings& settings)
+    resumption::LastStateWrapperPtr last_state_wrapper,
+    const TransportManagerSettings& settings)
     : TransportAdapterImpl(nullptr,
                            nullptr,
                            new WebSocketListener(this, settings),
-                           last_state,
+                           last_state_wrapper,
                            settings) {}
 
 WebSocketServerTransportAdapter::~WebSocketServerTransportAdapter() {}
diff --git a/src/components/transport_manager/test/transport_manager_default_test.cc b/src/components/transport_manager/test/transport_manager_default_test.cc
index a8100ed329..67b4a0a8ba 100644
--- a/src/components/transport_manager/test/transport_manager_default_test.cc
+++ b/src/components/transport_manager/test/transport_manager_default_test.cc
@@ -166,7 +166,7 @@ class TestTransportManagerDefault : public ::testing::Test {
  protected:
   MockTransportManagerSettings transport_manager_settings_;
   std::unique_ptr<TransportManagerDefault> transport_manager_;
-  NiceMock<MockLastState> mock_last_state_;
+  std::shared_ptr<MockLastState> mock_last_state_;
   Json::Value custom_dictionary_;
   const std::string unique_tcp_dev_name_;
   const std::string dev_id_;
@@ -198,7 +198,7 @@ void TestTransportManagerDefault::ExpectationsSettings_TM(
   custom_dictionary_[kTransportManager][kTcpAdapter][kDevices][0] = tcp_device;
   custom_dictionary_[kTransportManager][kBluetoothAdapter][kDevices][0] =
       bluetooth_device;
- ON_CALL(transport_manager_settings_, websocket_server_port())
+  ON_CALL(transport_manager_settings_, websocket_server_port())
       .WillByDefault(Return(kPort));
   ON_CALL(transport_manager_settings_, websocket_server_address())
       .WillByDefault(ReturnRef(kAddress));
@@ -208,9 +208,9 @@ void TestTransportManagerDefault::ExpectationsSettings_TM(
       .WillByDefault(ReturnRef(kWSServerKeyPathKey));
   ON_CALL(transport_manager_settings_, ws_server_ca_cert_path())
       .WillByDefault(ReturnRef(kWSServerCACertPath));
-  ON_CALL(mock_last_state_, dictionary())
+  ON_CALL(*mock_last_state_, dictionary())
       .WillByDefault(Return(custom_dictionary_));
-  ON_CALL(mock_last_state_, get_dictionary())
+  ON_CALL(*mock_last_state_, get_dictionary())
       .WillByDefault(ReturnRef(custom_dictionary_));
 
   EXPECT_CALL(transport_manager_settings_, use_last_state())
diff --git a/src/components/transport_manager/test/websocket_client_connection_test.cc b/src/components/transport_manager/test/websocket_client_connection_test.cc
index 9b0e94f8c3..b9aa6f7c7e 100644
--- a/src/components/transport_manager/test/websocket_client_connection_test.cc
+++ b/src/components/transport_manager/test/websocket_client_connection_test.cc
@@ -33,6 +33,7 @@
 #include "transport_manager/cloud/websocket_client_connection.h"
 #include "gtest/gtest.h"
 #include "resumption/last_state_impl.h"
+#include "resumption/last_state_wrapper_impl.h"
 #include "transport_manager/cloud/cloud_websocket_transport_adapter.h"
 #include "transport_manager/cloud/sample_websocket_server.h"
 #include "transport_manager/transport_adapter/connection.h"
@@ -66,7 +67,7 @@ class WebsocketConnectionTest : public ::testing::Test {
 
     client_out =
         WebsocketClient{std::make_shared<CloudWebsocketTransportAdapter>(
-                            last_state_, transport_manager_settings),
+                            last_state_wrapper_, transport_manager_settings),
                         nullptr};
     client_out.adapter->SetAppCloudTransportConfig(uniq_id, properties);
 
@@ -99,7 +100,10 @@ class WebsocketConnectionTest : public ::testing::Test {
 
  protected:
   WebsocketConnectionTest()
-      : last_state_("app_storage_folder", "app_info_storage") {}
+      : last_state_(std::make_shared<resumption::LastStateImpl>(
+            "app_storage_folder", "app_info_storage"))
+      , last_state_wrapper_(
+            std::make_shared<resumption::LastStateWrapperImpl>(last_state_)) {}
 
   ~WebsocketConnectionTest() {}
 
@@ -109,7 +113,8 @@ class WebsocketConnectionTest : public ::testing::Test {
   }
 
   NiceMock<MockTransportManagerSettings> transport_manager_settings;
-  resumption::LastStateImpl last_state_;
+  std::shared_ptr<resumption::LastStateImpl> last_state_;
+  std::shared_ptr<resumption::LastStateWrapperImpl> last_state_wrapper_;
   std::string dev_id;
   std::string uniq_id;
   std::shared_ptr<websocket::WSSession> ws_session;
diff --git a/src/components/transport_manager/test/websocket_connection_test.cc b/src/components/transport_manager/test/websocket_connection_test.cc
index 1be0ac334f..306bdc4784 100644
--- a/src/components/transport_manager/test/websocket_connection_test.cc
+++ b/src/components/transport_manager/test/websocket_connection_test.cc
@@ -39,7 +39,6 @@
 #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"