Merge branch 'release/4.1.0'

9 files changed, 217 insertions, 165 deletions

diff --git a/src/components/transport_manager/include/transport_manager/transport_adapter/client_connection_listener.h b/src/components/transport_manager/include/transport_manager/transport_adapter/client_connection_listener.h
index 018dd46810..8df2c4d299 100644
--- a/src/components/transport_manager/include/transport_manager/transport_adapter/client_connection_listener.h
+++ b/src/components/transport_manager/include/transport_manager/transport_adapter/client_connection_listener.h
@@ -35,10 +35,8 @@
 
 #include "transport_manager/transport_adapter/transport_adapter.h"
 
-
 namespace transport_manager {
 
-
 namespace transport_adapter {
 
 /**
@@ -49,7 +47,8 @@ class ClientConnectionListener {
   /**
    * @brief Run client connection listener.
    *
-   * @return Error information about possible reason of starting client listener failure.
+   * @return Error information about possible reason of starting client listener
+   *failure.
    */
   virtual TransportAdapter::Error Init() = 0;
 
@@ -79,8 +78,7 @@ class ClientConnectionListener {
   /**
    * @brief Destructor.
    */
-  virtual ~ClientConnectionListener() {
-  }
+  virtual ~ClientConnectionListener() {}
 };
 
 }  // namespace transport_adapter
diff --git a/src/components/transport_manager/include/transport_manager/transport_adapter/connection.h b/src/components/transport_manager/include/transport_manager/transport_adapter/connection.h
index e3f0b3d1d7..537e94b055 100644
--- a/src/components/transport_manager/include/transport_manager/transport_adapter/connection.h
+++ b/src/components/transport_manager/include/transport_manager/transport_adapter/connection.h
@@ -58,7 +58,8 @@ class Connection {
    *
    * @return Error Information about possible reason of sending data failure.
    */
-  virtual TransportAdapter::Error SendData(::protocol_handler::RawMessagePtr message) = 0;
+  virtual TransportAdapter::Error SendData(
+      ::protocol_handler::RawMessagePtr message) = 0;
 
   /**
    * @brief Disconnect the current connection.
@@ -70,4 +71,4 @@ typedef utils::SharedPtr<Connection> ConnectionSPtr;
 
 }  // namespace transport_adapter
 }  // namespace transport_manager
-#endif // SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_ADAPTER_CONNECTION_H_
+#endif  // SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_ADAPTER_CONNECTION_H_
diff --git a/src/components/transport_manager/include/transport_manager/transport_adapter/device_scanner.h b/src/components/transport_manager/include/transport_manager/transport_adapter/device_scanner.h
index 36759a9385..6e58f692a9 100644
--- a/src/components/transport_manager/include/transport_manager/transport_adapter/device_scanner.h
+++ b/src/components/transport_manager/include/transport_manager/transport_adapter/device_scanner.h
@@ -76,8 +76,7 @@ class DeviceScanner {
   /**
    * @brief Destructor.
    */
-  virtual ~DeviceScanner() {
-  }
+  virtual ~DeviceScanner() {}
 };
 
 }  // namespace transport_adapter
diff --git a/src/components/transport_manager/include/transport_manager/transport_adapter/server_connection_factory.h b/src/components/transport_manager/include/transport_manager/transport_adapter/server_connection_factory.h
index 19c37aa6a6..3cd93e1316 100644
--- a/src/components/transport_manager/include/transport_manager/transport_adapter/server_connection_factory.h
+++ b/src/components/transport_manager/include/transport_manager/transport_adapter/server_connection_factory.h
@@ -41,7 +41,8 @@ namespace transport_manager {
 namespace transport_adapter {
 
 /**
- * @brief Implement transport dependent connection that was originated by the user.
+ * @brief Implement transport dependent connection that was originated by the
+ * user.
  */
 class ServerConnectionFactory {
  public:
@@ -79,8 +80,7 @@ class ServerConnectionFactory {
   /**
    * @brief Destructor.
    */
-  virtual ~ServerConnectionFactory() {
-  }
+  virtual ~ServerConnectionFactory() {}
 };
 
 }  // namespace transport_adapter
diff --git a/src/components/transport_manager/include/transport_manager/transport_adapter/threaded_socket_connection.h b/src/components/transport_manager/include/transport_manager/transport_adapter/threaded_socket_connection.h
index d764979fbd..ab0c5cbf85 100644
--- a/src/components/transport_manager/include/transport_manager/transport_adapter/threaded_socket_connection.h
+++ b/src/components/transport_manager/include/transport_manager/transport_adapter/threaded_socket_connection.h
@@ -140,6 +140,7 @@ class ThreadedSocketConnection : public Connection {
     explicit SocketConnectionDelegate(ThreadedSocketConnection* connection);
     void threadMain() OVERRIDE;
     void exitThreadMain() OVERRIDE;
+
    private:
     ThreadedSocketConnection* connection_;
   };
diff --git a/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_controller.h b/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_controller.h
index f0148ad1af..0b38f82637 100644
--- a/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_controller.h
+++ b/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_controller.h
@@ -42,8 +42,7 @@ namespace transport_adapter {
 
 class TransportAdapterController {
  public:
-  virtual ~TransportAdapterController() {
-  }
+  virtual ~TransportAdapterController() {}
 
   /**
    * @brief Add device to the container(map), if container doesn't hold it yet.
@@ -55,7 +54,8 @@ class TransportAdapterController {
   virtual DeviceSptr AddDevice(DeviceSptr device) = 0;
 
   /**
-   * @brief Search for device in container of devices, if it is not there - adds it.
+   * @brief Search for device in container of devices, if it is not there - adds
+   *it.
    *
    * @param devices Container(vector) of smart pointers to devices.
    */
@@ -100,7 +100,8 @@ class TransportAdapterController {
                                  const ApplicationHandle& app_handle) = 0;
 
   /**
-   * @brief Make state of specified connection - ESTABLISHED and launch OnConnectDone event in device adapter listener.
+   * @brief Make state of specified connection - ESTABLISHED and launch
+   *OnConnectDone event in device adapter listener.
    *
    * @param devcie_handle Device unique identifier.
    * @param app_handle Handle of application.
@@ -109,7 +110,8 @@ class TransportAdapterController {
                            const ApplicationHandle& app_handle) = 0;
 
   /**
-   * @brief Delete connection from the container of connections and launch OnConnectFailed event in the device adapter listener.
+   * @brief Delete connection from the container of connections and launch
+   *OnConnectFailed event in the device adapter listener.
    *
    * @param device_handle Device unique identifier.
    * @param app_handle Handle of application.
@@ -119,7 +121,7 @@ class TransportAdapterController {
                              const ConnectError& error) = 0;
 
   /**
-   * @brief Make state of specified connection - FINILIZING.
+   * @brief Make state of specified connection - FINALISING.
    *
    * @param device_handle Device unique identifier.
    * @param app_handle Handle of application.
@@ -128,7 +130,8 @@ class TransportAdapterController {
                                   const ApplicationHandle& app_handle) = 0;
 
   /**
-   * @brief Set specified connection state to FINALISING and launch OnUnexpectedDisconnect event in the device adapter listener.
+   * @brief Set specified connection state to FINALISING and launch
+   *OnUnexpectedDisconnect event in the device adapter listener.
    *
    * @param device_handle Device unique identifier.
    * @param app_handle Handle of application.
@@ -147,7 +150,8 @@ class TransportAdapterController {
                                   const DisconnectDeviceError& error) = 0;
 
   /**
-   * @brief Delete specified connection from the container(map) of connections and launch event in the device adapter listener.
+   * @brief Delete specified connection from the container(map) of connections
+   *and launch event in the device adapter listener.
    *
    * @param device_handle Device unique identifier.
    * @param app_handle Handle of application.
@@ -155,13 +159,13 @@ class TransportAdapterController {
   virtual void DisconnectDone(const DeviceUID& device_handle,
                               const ApplicationHandle& app_handle) = 0;
 
-   /**
-   * @brief Launch OnDataReceiveDone event in the device adapter listener.
-   *
-   * @param device_handle Device unique identifier.
-   * @param app_handle Handle of application.
-   * @param message Smart pointer to the raw message.
-   */
+  /**
+  * @brief Launch OnDataReceiveDone event in the device adapter listener.
+  *
+  * @param device_handle Device unique identifier.
+  * @param app_handle Handle of application.
+  * @param message Smart pointer to the raw message.
+  */
   virtual void DataReceiveDone(const DeviceUID& device_handle,
                                const ApplicationHandle& app_handle,
                                ::protocol_handler::RawMessagePtr message) = 0;
@@ -198,7 +202,8 @@ class TransportAdapterController {
    */
   virtual void DataSendFailed(const DeviceUID& device_handle,
                               const ApplicationHandle& app_handle,
-                              ::protocol_handler::RawMessagePtr message, const DataSendError&) = 0;
+                              ::protocol_handler::RawMessagePtr message,
+                              const DataSendError&) = 0;
 };
 
 }  // namespace transport_adapter
diff --git a/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_impl.h b/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_impl.h
index 5306a7af5a..3dedead540 100644
--- a/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_impl.h
+++ b/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_impl.h
@@ -41,13 +41,16 @@
 
 #include "utils/lock.h"
 #include "utils/rwlock.h"
+
 #include "transport_manager/transport_adapter/transport_adapter.h"
 #include "transport_manager/transport_adapter/transport_adapter_controller.h"
 #include "transport_manager/transport_adapter/connection.h"
+#include "transport_manager/transport_manager_settings.h"
+#include "resumption/last_state.h"
 
-#ifdef TIME_TESTER
-#include "transport_manager/time_metric_observer.h"
-#endif  // TIME_TESTER
+#ifdef TELEMETRY_MONITOR
+#include "transport_manager/telemetry_observer.h"
+#endif  // TELEMETRY_MONITOR
 
 namespace transport_manager {
 
@@ -75,7 +78,9 @@ class TransportAdapterImpl : public TransportAdapter,
    **/
   TransportAdapterImpl(DeviceScanner* device_scanner,
                        ServerConnectionFactory* server_connection_factory,
-                       ClientConnectionListener* client_connection_listener);
+                       ClientConnectionListener* client_connection_listener,
+                       resumption::LastState& last_state,
+                       const TransportManagerSettings& settings);
 
   /**
    * @brief Destructor.
@@ -88,7 +93,7 @@ class TransportAdapterImpl : public TransportAdapter,
    * @return true if initialized.
    * @return false if not initialized.
    */
-  virtual bool IsInitialised() const;
+  bool IsInitialised() const OVERRIDE;
 
  public:
   /**
@@ -98,20 +103,20 @@ class TransportAdapterImpl : public TransportAdapter,
    *
    * @return Error information about possible reason of failure.
    **/
-  virtual TransportAdapter::Error Init();
+  TransportAdapter::Error Init() OVERRIDE;
 
   /**
    * @brief Stops device adapter
    * Called from transport manager to stop device adapter
    */
-  virtual void Terminate();
+  void Terminate() OVERRIDE;
 
   /**
    * @brief Add listener to the container(list) of device adapter listeners.
    *
    * @param listener Pointer to the device adapter listener.
    */
-  virtual void AddListener(TransportAdapterListener* listener);
+  void AddListener(TransportAdapterListener* listener) OVERRIDE;
 
   /**
    * @brief Start scanning for new devices.
@@ -120,7 +125,7 @@ class TransportAdapterImpl : public TransportAdapter,
    *
    * @return Error information about possible reason of search devices failure.
    **/
-  virtual TransportAdapter::Error SearchDevices();
+  TransportAdapter::Error SearchDevices() OVERRIDE;
 
   /**
    * @brief Connect to the specified application discovered on device.
@@ -130,15 +135,16 @@ class TransportAdapterImpl : public TransportAdapter,
    *
    * @return Error information about possible reason of failure.
    **/
-  virtual TransportAdapter::Error Connect(const DeviceUID& device_handle,
-                                          const ApplicationHandle& app_handle);
+  TransportAdapter::Error Connect(const DeviceUID& device_handle,
+                                  const ApplicationHandle& app_handle) OVERRIDE;
 
   /**
    * @brief Connect to all applications discovered on device
    * @param device_handle Handle of device
    * @return Error information about connecting applications on device
    */
-  virtual TransportAdapter::Error ConnectDevice(const DeviceUID& device_handle);
+  TransportAdapter::Error ConnectDevice(
+      const DeviceUID& device_handle) OVERRIDE;
 
   /**
    * @brief Disconnect from specified session.
@@ -148,8 +154,9 @@ class TransportAdapterImpl : public TransportAdapter,
    *
    * @return Error information about possible reason of disconnecting failure.
    **/
-  virtual TransportAdapter::Error Disconnect(
-      const DeviceUID& device_handle, const ApplicationHandle& app_handle);
+  TransportAdapter::Error Disconnect(
+      const DeviceUID& device_handle,
+      const ApplicationHandle& app_handle) OVERRIDE;
 
   /**
    * @brief Disconnect from all sessions on specified device.
@@ -159,8 +166,8 @@ class TransportAdapterImpl : public TransportAdapter,
    * @return Error information about possible reason of disconnecting from
    *specified device failure.
    **/
-  virtual TransportAdapter::Error DisconnectDevice(
-      const DeviceUID& device_handle);
+  TransportAdapter::Error DisconnectDevice(
+      const DeviceUID& device_handle) OVERRIDE;
 
   /**
    * @brief Send frame of data.
@@ -171,51 +178,52 @@ class TransportAdapterImpl : public TransportAdapter,
    *
    * @return Error information about possible reason of sending data failure
    **/
-  virtual TransportAdapter::Error SendData(const DeviceUID& device_handle,
-                                           const ApplicationHandle& app_handle,
-                                           const ::protocol_handler::RawMessagePtr data);
+  TransportAdapter::Error SendData(
+      const DeviceUID& device_handle,
+      const ApplicationHandle& app_handle,
+      const ::protocol_handler::RawMessagePtr data) OVERRIDE;
 
   /**
    * @brief Start client listener.
    *
    * @return Error information about possible reason of failure.
    */
-  virtual TransportAdapter::Error StartClientListening();
+  TransportAdapter::Error StartClientListening() OVERRIDE;
 
   /**
    * @brief Stop client listener.
    *
    * @return Error information about possible reason of failure.
    */
-  virtual TransportAdapter::Error StopClientListening();
+  TransportAdapter::Error StopClientListening() OVERRIDE;
 
   /**
    * @brief Notify that device scanner is available.
    *
    * @return True - available, false - not available.
    */
-  virtual bool IsSearchDevicesSupported() const;
+  bool IsSearchDevicesSupported() const OVERRIDE;
 
   /**
    * @brief Notify that server connection factory is available.
    *
    * @return True - available, false - not available.
    */
-  virtual bool IsServerOriginatedConnectSupported() const;
+  bool IsServerOriginatedConnectSupported() const OVERRIDE;
 
   /**
    * @brief Notify that listener of client connection is available.
    *
    * @return True - available, false - not available.
    */
-  virtual bool IsClientOriginatedConnectSupported() const;
+  bool IsClientOriginatedConnectSupported() const OVERRIDE;
 
   /**
    * @brief Create container(vector) of device unique identifiers.
    *
    * @return Container(vector) of device unique identifiers.
    */
-  virtual DeviceList GetDeviceList() const;
+  DeviceList GetDeviceList() const OVERRIDE;
 
   /**
    * @brief Get container(vector) of application unique identifiers that
@@ -225,8 +233,8 @@ class TransportAdapterImpl : public TransportAdapter,
    *
    * @return Container(vector) that holds application unique identifiers.
    */
-  virtual ApplicationList GetApplicationList(const DeviceUID& device_handle)
-      const;
+  ApplicationList GetApplicationList(
+      const DeviceUID& device_handle) const OVERRIDE;
 
   /**
    * @brief Find device in the internal container(map).
@@ -235,7 +243,7 @@ class TransportAdapterImpl : public TransportAdapter,
    *
    * @return Smart pointer to device.
    */
-  virtual DeviceSptr FindDevice(const DeviceUID& device_handle) const;
+  DeviceSptr FindDevice(const DeviceUID& device_handle) const OVERRIDE;
 
   /**
    * @brief Search for device in container of devices, if it is not there - adds
@@ -243,18 +251,18 @@ class TransportAdapterImpl : public TransportAdapter,
    *
    * @param devices Container(vector) of smart pointers to devices.
    */
-  virtual void SearchDeviceDone(const DeviceVector& devices);
+  void SearchDeviceDone(const DeviceVector& devices) OVERRIDE;
 
-  virtual void ApplicationListUpdated(const DeviceUID& device_handle);
+  void ApplicationListUpdated(const DeviceUID& device_handle) OVERRIDE;
 
-  virtual void FindNewApplicationsRequest();
+  void FindNewApplicationsRequest() OVERRIDE;
 
   /**
    * @brief Launch OnSearchDeviceFailed event in device adapter listener.
    *
    * @param error Error class that contains details of this error situation.
    */
-  virtual void SearchDeviceFailed(const SearchDeviceError& error);
+  void SearchDeviceFailed(const SearchDeviceError& error) OVERRIDE;
 
   /**
    * @brief Add device to the container(map), if container doesn't hold it yet.
@@ -263,7 +271,7 @@ class TransportAdapterImpl : public TransportAdapter,
    *
    * @return Smart pointer to the device.
    */
-  virtual DeviceSptr AddDevice(DeviceSptr device);
+  DeviceSptr AddDevice(DeviceSptr device) OVERRIDE;
 
   /**
    * @brief Create connection and fill its parameters.
@@ -272,30 +280,30 @@ class TransportAdapterImpl : public TransportAdapter,
    * @param device_handle Device unique identifier.
    * @param app_handle Handle of application.
    */
-  virtual void ConnectionCreated(ConnectionSPtr connection,
-                                 const DeviceUID& device_handle,
-                                 const ApplicationHandle& app_handle);
+  void ConnectionCreated(ConnectionSPtr connection,
+                         const DeviceUID& device_handle,
+                         const ApplicationHandle& app_handle) OVERRIDE;
 
   /**
-   * @brief Set state of specified connection - FINILIZING.
+   * @brief Set state of specified connection - FINALISING.
    *
    * @param device_handle Device unique identifier.
    * @param app_handle Handle of application.
    */
-  virtual void ConnectionFinished(const DeviceUID& device_handle,
-                                  const ApplicationHandle& app_handle);
+  void ConnectionFinished(const DeviceUID& device_handle,
+                          const ApplicationHandle& app_handle) OVERRIDE;
 
   /**
-   * @brief Set specified connection state to FINILIZING and launch
+   * @brief Set specified connection state to FINALISING and launch
    *OnUnexpectedDisconnect event in the device adapter listener.
    *
    * @param device_handle Device unique identifier.
    * @param app_handle Handle of application.
    * @param error Error class that contains details of this error situation.
    */
-  virtual void ConnectionAborted(const DeviceUID& device_handle,
-                                 const ApplicationHandle& app_handle,
-                                 const CommunicationError& error);
+  void ConnectionAborted(const DeviceUID& device_handle,
+                         const ApplicationHandle& app_handle,
+                         const CommunicationError& error) OVERRIDE;
 
   /**
    * @brief Set state of specified connection - ESTABLISHED and launch
@@ -304,8 +312,8 @@ class TransportAdapterImpl : public TransportAdapter,
    * @param devcie_handle Device unique identifier.
    * @param app_handle Handle of application.
    */
-  virtual void ConnectDone(const DeviceUID& device_handle,
-                           const ApplicationHandle& app_handle);
+  void ConnectDone(const DeviceUID& device_handle,
+                   const ApplicationHandle& app_handle) OVERRIDE;
 
   /**
    * @brief Delete connection from the container of connections and launch
@@ -314,17 +322,26 @@ class TransportAdapterImpl : public TransportAdapter,
    * @param device_handle Device unique identifier.
    * @param app_handle Handle of application.
    */
-  virtual void ConnectFailed(const DeviceUID& device_handle,
-                             const ApplicationHandle& app_handle,
-                             const ConnectError& error);
+  void ConnectFailed(const DeviceUID& device_handle,
+                     const ApplicationHandle& app_handle,
+                     const ConnectError& error) OVERRIDE;
+
+  /**
+   * @brief Remove marked as FINALISING connection from accounting.
+   *
+   * @param device_handle Device unique identifier.
+   * @param app_handle Handle of application.
+   */
+  void RemoveFinalizedConnection(const DeviceUID& device_handle,
+                                 const ApplicationHandle& app_handle) OVERRIDE;
 
   /**
    * @brief Remove specified device and all its connections
    * @param device_handle Device unique identifier.
    * @param error Error class that contains details of this error situation.
    */
-  virtual void DeviceDisconnected(const DeviceUID& device_handle,
-                                  const DisconnectDeviceError& error);
+  void DeviceDisconnected(const DeviceUID& device_handle,
+                          const DisconnectDeviceError& error) OVERRIDE;
 
   /**
    * @brief Delete specified connection from the container(map) of connections
@@ -333,8 +350,8 @@ class TransportAdapterImpl : public TransportAdapter,
    * @param device_handle Device unique identifier.
    * @param app_handle Handle of application.
    */
-  virtual void DisconnectDone(const DeviceUID& device_handle,
-                              const ApplicationHandle& app_handle);
+  void DisconnectDone(const DeviceUID& device_handle,
+                      const ApplicationHandle& app_handle) OVERRIDE;
 
   /**
    * @brief Launch OnDataReceiveDone event in the device adapter listener.
@@ -343,9 +360,9 @@ class TransportAdapterImpl : public TransportAdapter,
    * @param app_handle Handle of application.
    * @param message Smart pointer to the raw message.
    */
-  virtual void DataReceiveDone(const DeviceUID& device_handle,
-                               const ApplicationHandle& app_handle,
-                               ::protocol_handler::RawMessagePtr message);
+  void DataReceiveDone(const DeviceUID& device_handle,
+                       const ApplicationHandle& app_handle,
+                       ::protocol_handler::RawMessagePtr message) OVERRIDE;
 
   /**
    * @brief Launch OnDataReceiveFailed event in the device adapter listener.
@@ -354,9 +371,9 @@ class TransportAdapterImpl : public TransportAdapter,
    * @param app_handle Handle of application.
    * @param error Class that contains details of this error situation.
    */
-  virtual void DataReceiveFailed(const DeviceUID& device_handle,
-                                 const ApplicationHandle& app_handle,
-                                 const DataReceiveError& error);
+  void DataReceiveFailed(const DeviceUID& device_handle,
+                         const ApplicationHandle& app_handle,
+                         const DataReceiveError& error) OVERRIDE;
 
   /**
    * @brief Launch OnDataSendDone event in the device adapter listener.
@@ -365,9 +382,9 @@ class TransportAdapterImpl : public TransportAdapter,
    * @param app_handle Handle of application.
    * @param message Smart pointer to raw message.
    */
-  virtual void DataSendDone(const DeviceUID& device_handle,
-                            const ApplicationHandle& app_handle,
-                            ::protocol_handler::RawMessagePtr message);
+  void DataSendDone(const DeviceUID& device_handle,
+                    const ApplicationHandle& app_handle,
+                    ::protocol_handler::RawMessagePtr message) OVERRIDE;
 
   /**
    * @brief Launch OnDataSendFailed event in the device adapter listener.
@@ -377,10 +394,10 @@ class TransportAdapterImpl : public TransportAdapter,
    * @param message Smart pointer to raw message.
    * @param error Class that contains details of this error situation.
    */
-  virtual void DataSendFailed(const DeviceUID& device_handle,
-                              const ApplicationHandle& app_handle,
-                              ::protocol_handler::RawMessagePtr message,
-                              const DataSendError& error);
+  void DataSendFailed(const DeviceUID& device_handle,
+                      const ApplicationHandle& app_handle,
+                      ::protocol_handler::RawMessagePtr message,
+                      const DataSendError& error) OVERRIDE;
 
   /**
    * @brief Return name of device.
@@ -389,29 +406,29 @@ class TransportAdapterImpl : public TransportAdapter,
    *
    * @return String with name.
    */
-  virtual std::string DeviceName(const DeviceUID& device_id) const;
+  std::string DeviceName(const DeviceUID& device_id) const OVERRIDE;
 
   /**
    * @brief Allows to obtain connection type used by device.
    * @return connection type.
    */
-  virtual std::string GetConnectionType() const;
+  std::string GetConnectionType() const OVERRIDE;
 
-#ifdef TIME_TESTER
+#ifdef TELEMETRY_MONITOR
   /**
    * @brief Setup observer for time metric.
    *
    * @param observer - pointer to observer
    */
-  void SetTimeMetricObserver(TMMetricObserver* observer);
+  void SetTelemetryObserver(TMTelemetryObserver* observer);
 
   /**
    * @brief Return Time metric observer
    *
    * @param return pointer to Time metric observer
    */
-  virtual TMMetricObserver* GetTimeMetricObserver();
-#endif  // TIME_TESTER
+  TMTelemetryObserver* GetTelemetryObserver() OVERRIDE;
+#endif  // TELEMETRY_MONITOR
 
  protected:
   /**
@@ -431,7 +448,6 @@ class TransportAdapterImpl : public TransportAdapter,
    */
   virtual bool ToBeAutoConnected(DeviceSptr device) const;
 
-
   /**
    * @brief Returns true if \a device is to be disconnected automatically when
    * all applications will be closed
@@ -446,8 +462,13 @@ class TransportAdapterImpl : public TransportAdapter,
    *
    * @return pointer to the connection.
    */
-  ConnectionSPtr FindEstablishedConnection(const DeviceUID& device_handle,
-                                           const ApplicationHandle& app_handle) const;
+  virtual ConnectionSPtr FindEstablishedConnection(
+      const DeviceUID& device_handle,
+      const ApplicationHandle& app_handle) const;
+
+  const TransportManagerSettings& get_settings() const {
+    return settings_;
+  }
 
  private:
   /**
@@ -489,11 +510,7 @@ class TransportAdapterImpl : public TransportAdapter,
     ConnectionSPtr connection;
     DeviceUID device_id;
     ApplicationHandle app_handle;
-    enum {
-      NEW,
-      ESTABLISHED,
-      FINALISING
-    } state;
+    enum { NEW, ESTABLISHED, FINALISING } state;
   };
 
   /**
@@ -528,12 +545,16 @@ class TransportAdapterImpl : public TransportAdapter,
   mutable sync_primitives::RWLock connections_lock_;
 
  protected:
-#ifdef TIME_TESTER
+#ifdef TELEMETRY_MONITOR
   /**
    * @brief Pointer to time metric observer
    */
-  TMMetricObserver* metric_observer_;
-#endif  // TIME_TESTER
+  TMTelemetryObserver* metric_observer_;
+#endif  // TELEMETRY_MONITOR
+
+  resumption::LastState& last_state() const {
+    return last_state_;
+  }
 
   /**
    * @brief Pointer to the device scanner.
@@ -549,9 +570,12 @@ class TransportAdapterImpl : public TransportAdapter,
    * @brief Pointer to the factory of connections initiated from client.
    */
   ClientConnectionListener* client_connection_listener_;
+
+  resumption::LastState& last_state_;
+  const TransportManagerSettings& settings_;
 };
 
 }  // namespace transport_adapter
 }  // namespace transport_manager
 
-#endif // SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_ADAPTER_TRANSPORT_ADAPTER_IMPL_H_
+#endif  // SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_ADAPTER_TRANSPORT_ADAPTER_IMPL_H_
diff --git a/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_listener.h b/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_listener.h
index 3c302caf14..0a1eeb6b4a 100644
--- a/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_listener.h
+++ b/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_listener.h
@@ -50,11 +50,11 @@ class TransportAdapterListener {
   /**
    * @brief Destructor.
    */
-  virtual ~TransportAdapterListener() {
-  }
+  virtual ~TransportAdapterListener() {}
 
   /**
-   * @brief Search specified device adapter in the container of shared pointers to device adapters to be sure it is available,
+   * @brief Search specified device adapter in the container of shared pointers
+   *to device adapters to be sure it is available,
    * launch event ON_SEARCH_DONE in transport manager.
    *
    * @param transport_adapter Pointer to the device adapter.
@@ -63,11 +63,13 @@ class TransportAdapterListener {
       const TransportAdapter* transport_adapter) = 0;
 
   /**
-   * @brief Search specified device adapter in the container of shared pointers to device adapters to be sure it is available, create search device error,
+   * @brief Search specified device adapter in the container of shared pointers
+   *to device adapters to be sure it is available, create search device error,
    * launch event ON_SEARCH_FAIL in transport manager.
    *
    * @param transport_adapter Pointer to the device adapter.
-   * @param error Error class with information about possible reason of search device failure.
+   * @param error Error class with information about possible reason of search
+   *device failure.
    */
   virtual void OnSearchDeviceFailed(const TransportAdapter* transport_adapter,
                                     const SearchDeviceError& error) = 0;
@@ -86,10 +88,12 @@ class TransportAdapterListener {
    * @brief Reaction to "Find new applications" request
    * @param adapter Current transport adapter
    */
-  virtual void OnFindNewApplicationsRequest(const TransportAdapter* adapter) = 0;
+  virtual void OnFindNewApplicationsRequest(
+      const TransportAdapter* adapter) = 0;
 
   /**
-   * @brief Search specified device adapter in the container of shared pointers to device adapters to be sure it is available,
+   * @brief Search specified device adapter in the container of shared pointers
+   *to device adapters to be sure it is available,
    * launch event ON_CONNECT_DONE in transport manager.
    *
    * @param device_adater Pointer to the device adapter.
@@ -101,13 +105,15 @@ class TransportAdapterListener {
                              const ApplicationHandle& app_handle) = 0;
 
   /**
-   * @brief Search specified device adapter in the container of shared pointers to device adapters to be sure it is available,
+   * @brief Search specified device adapter in the container of shared pointers
+   *to device adapters to be sure it is available,
    * launch event ON_CONNECT_FAIL in transport manager.
    *
    * @param transport_adapter Pointer to the device adapter.
    * @param device Device unique identifier.
    * @param app_id Handle of application.
-   * @param error Error class with information about possible reason of connect failure.
+   * @param error Error class with information about possible reason of connect
+   *failure.
    */
   virtual void OnConnectFailed(const TransportAdapter* transport_adapter,
                                const DeviceUID& device_handle,
@@ -126,20 +132,23 @@ class TransportAdapterListener {
                                   const ApplicationHandle& app_handle) = 0;
 
   /**
-   * @brief Search specified device adapter in the container of shared pointers to device adapters to be sure it is available,
+   * @brief Search specified device adapter in the container of shared pointers
+   *to device adapters to be sure it is available,
    * launch event ON_UNEXPECTED_DISCONNECT in transport manager.
    *
    * @param transport_adapter Pointer to the device adapter.
    * @param device Device unique identifier.
    * @param app_id Handle of application.
-   * @param error Error class with information about possible reason of unexpected Disconnect.
+   * @param error Error class with information about possible reason of
+   *unexpected Disconnect.
    */
   virtual void OnUnexpectedDisconnect(const TransportAdapter* transport_adapter,
                                       const DeviceUID& device_handle,
                                       const ApplicationHandle& app_handle,
                                       const CommunicationError& error) = 0;
   /**
-   * @brief Search specified device adapter in the container of shared pointers to device adapters to be sure it is available,
+   * @brief Search specified device adapter in the container of shared pointers
+   *to device adapters to be sure it is available,
    * launch event ON_DISCONNECT_DONE in transport manager.
    *
    * @param transport_adapter Pointer to the device adapter.
@@ -151,13 +160,15 @@ class TransportAdapterListener {
                                 const ApplicationHandle& app_handle) = 0;
 
   /**
-   * @brief Search specified device adapter in the container of shared pointers to device adapters to be sure it is available, create Disconnect error,
+   * @brief Search specified device adapter in the container of shared pointers
+   *to device adapters to be sure it is available, create Disconnect error,
    * launch event ON_DISCONNECT_FAIL in transport manager.
    *
    * @param transport_adapter Pointer to the device adapter.
    * @param device Device unique identifier.
    * @param app_id Handle of application.
-   * @param error Error class with information about possible reason of Disconnect failure.
+   * @param error Error class with information about possible reason of
+   *Disconnect failure.
    */
   virtual void OnDisconnectFailed(const TransportAdapter* transport_adapter,
                                   const DeviceUID& device_handle,
@@ -178,14 +189,17 @@ class TransportAdapterListener {
    *
    * @param transport_adapter Pointer to the device adapter.
    * @param device Device unique identifier.
-   * @param error Error class with information about possible reason of Disconnect from device failure.
+   * @param error Error class with information about possible reason of
+   *Disconnect from device failure.
    */
   virtual void OnDisconnectDeviceFailed(
-      const TransportAdapter* transport_adapter, const DeviceUID& device_handle,
+      const TransportAdapter* transport_adapter,
+      const DeviceUID& device_handle,
       const DisconnectDeviceError& error) = 0;
 
   /**
-   * @brief Search specified device adapter in the container of shared pointers to device adapters to be sure it is available, create error,
+   * @brief Search specified device adapter in the container of shared pointers
+   *to device adapters to be sure it is available, create error,
    * launch event ON_RECEIVED_DONE in transport manager.
    *
    * @param transport_adapter Pointer to the device adapter.
@@ -193,28 +207,33 @@ class TransportAdapterListener {
    * @param app_id Handle of application.
    * @param data_container Smart pointer to the raw message.
    */
-  virtual void OnDataSendDone(const TransportAdapter* transport_adapter,
-                              const DeviceUID& device_handle,
-                              const ApplicationHandle& app_handle,
-                              const ::protocol_handler::RawMessagePtr data_container) = 0;
+  virtual void OnDataSendDone(
+      const TransportAdapter* transport_adapter,
+      const DeviceUID& device_handle,
+      const ApplicationHandle& app_handle,
+      const ::protocol_handler::RawMessagePtr data_container) = 0;
 
   /**
-   * @brief Search specified device adapter in the container of shared pointers to device adapters to be sure it is available, create data receive error,
+   * @brief Search specified device adapter in the container of shared pointers
+   *to device adapters to be sure it is available, create data receive error,
    * launch event ON_RECEIVED_DONE in transport manager.
    *
    * @param transport_adapter Pointer to the device adapter.
    * @param device Device unique identifier.
    * @param app_id Handle of application.
-   * @param error Error class with information about possible reason of data receive failure.
+   * @param error Error class with information about possible reason of data
+   *receive failure.
    */
-  virtual void OnDataSendFailed(const TransportAdapter* transport_adapter,
-                                const DeviceUID& device_handle,
-                                const ApplicationHandle& app_handle,
-                                const ::protocol_handler::RawMessagePtr data_container,
-                                const DataSendError& error) = 0;
+  virtual void OnDataSendFailed(
+      const TransportAdapter* transport_adapter,
+      const DeviceUID& device_handle,
+      const ApplicationHandle& app_handle,
+      const ::protocol_handler::RawMessagePtr data_container,
+      const DataSendError& error) = 0;
 
   /**
-   * @brief Search specified device adapter in the container of shared pointers to device adapters to be sure it is available, create error,
+   * @brief Search specified device adapter in the container of shared pointers
+   *to device adapters to be sure it is available, create error,
    * launch event ON_SEND_DONE in transport manager.
    *
    * @param transport_adapter Pointer to the device adapter.
@@ -222,13 +241,15 @@ class TransportAdapterListener {
    * @param app_id Handle of application.
    * @param data_container Smart pointer to the raw message.
    */
-  virtual void OnDataReceiveDone(const TransportAdapter* transport_adapter,
-                                 const DeviceUID& device_handle,
-                                 const ApplicationHandle& app_handle,
-                                 const ::protocol_handler::RawMessagePtr data_container) = 0;
+  virtual void OnDataReceiveDone(
+      const TransportAdapter* transport_adapter,
+      const DeviceUID& device_handle,
+      const ApplicationHandle& app_handle,
+      const ::protocol_handler::RawMessagePtr data_container) = 0;
 
   /**
-   * @brief Search specified device adapter in the container of shared pointers to device adapters to be sure it is available, create data send error,
+   * @brief Search specified device adapter in the container of shared pointers
+   * to device adapters to be sure it is available, create data send error,
    * launch event ON_SEND_FAIL in transport manager.
    */
   virtual void OnDataReceiveFailed(const TransportAdapter* transport_adapter,
@@ -237,7 +258,8 @@ class TransportAdapterListener {
                                    const DataReceiveError& error) = 0;
 
   /**
-   * @brief Search specified device adapter in the container of shared pointers to device adapters to be sure it is available, create error,
+   * @brief Search specified device adapter in the container of shared pointers
+   *to device adapters to be sure it is available, create error,
    * launch event ON_COMMUNICATION_ERROR in transport manager.
    *
    * @param transport_adapter Pointer to the device adapter.
diff --git a/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_listener_impl.h b/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_listener_impl.h
index 87d71ea56f..a0daa7b594 100644
--- a/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_listener_impl.h
+++ b/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_listener_impl.h
@@ -36,13 +36,12 @@
 #include "transport_manager/common.h"
 #include "transport_manager/transport_adapter/transport_adapter_listener.h"
 #include "transport_manager/transport_adapter/transport_adapter.h"
+#include "transport_manager/transport_manager.h"
 
 namespace transport_manager {
 
 using transport_manager::transport_adapter::TransportAdapter;
 
-class TransportManagerImpl;
-
 /**
  * @brief Implementation of TransportAdapterListener class.
  */
@@ -72,10 +71,10 @@ class TransportAdapterListenerImpl
   /**
    * @brief Constructor.
    *
-   * @param manager Pointer to the transport manager implementation class.
+   * @param manager Pointer to the transport manager class.
    * @param adapter Pointer to the transport adapter associated with listener.
    */
-  TransportAdapterListenerImpl(TransportManagerImpl* manager,
+  TransportAdapterListenerImpl(TransportManager* manager,
                                TransportAdapter* adapter);
 
   /**
@@ -100,7 +99,7 @@ class TransportAdapterListenerImpl
                                     const SearchDeviceError& error);
 
   /**
-   * @brief Passes notification to TransportManagerImpl
+   * @brief Passes notification to TransportManager
    *
    * @param adapter Transport adapter that sent notification
    */
@@ -223,10 +222,11 @@ class TransportAdapterListenerImpl
    * @param app_id Handle of application.
    * @param data_container Smart pointer to the raw message.
    */
-  virtual void OnDataReceiveDone(const TransportAdapter* adapter,
-                                 const DeviceUID& device,
-                                 const ApplicationHandle& app_id,
-                                 const ::protocol_handler::RawMessagePtr data_container);
+  virtual void OnDataReceiveDone(
+      const TransportAdapter* adapter,
+      const DeviceUID& device,
+      const ApplicationHandle& app_id,
+      const ::protocol_handler::RawMessagePtr data_container);
 
   /**
    * @brief Search specified device adapter in the container of shared pointers
@@ -254,21 +254,23 @@ class TransportAdapterListenerImpl
    * @param app_id Handle of application.
    * @param data_container Smart pointer to the raw message.
    */
-  virtual void OnDataSendDone(const TransportAdapter* adapter,
-                              const DeviceUID& device,
-                              const ApplicationHandle& app_id,
-                              const ::protocol_handler::RawMessagePtr data_container);
+  virtual void OnDataSendDone(
+      const TransportAdapter* adapter,
+      const DeviceUID& device,
+      const ApplicationHandle& app_id,
+      const ::protocol_handler::RawMessagePtr data_container);
 
   /**
    * @brief Search specified device adapter in the container of shared pointers
    * to device adapters to be sure it is available, create data send error,
    * launch event ON_SEND_FAIL in transport manager.
    */
-  virtual void OnDataSendFailed(const TransportAdapter* adapter,
-                                const DeviceUID& device,
-                                const ApplicationHandle& app_id,
-                                const ::protocol_handler::RawMessagePtr data_container,
-                                const DataSendError& error);
+  virtual void OnDataSendFailed(
+      const TransportAdapter* adapter,
+      const DeviceUID& device,
+      const ApplicationHandle& app_id,
+      const ::protocol_handler::RawMessagePtr data_container,
+      const DataSendError& error);
 
   /**
    * @brief Search specified device adapter in the container of shared pointers
@@ -284,7 +286,7 @@ class TransportAdapterListenerImpl
                                     const ApplicationHandle& app_id);
 
  private:
-  TransportManagerImpl* transport_manager_impl_;
+  TransportManager* transport_manager_;
   TransportAdapter* transport_adapter_;
 };
 }  // namespace transport_manager