[websocket] Align listener namings between client and server implementations

Author: c-jimenez

src/rpc/RpcClient.h

@@ -34,7 +34,7 @@ namespace rpc
 {
 
 /** @brief RPC client implementation */
-class RpcClient : public IRpcClient, public ocpp::websockets::IWebsocketClient::IWebsocketClientListener
+class RpcClient : public IRpcClient, public ocpp::websockets::IWebsocketClient::IListener
 {
   public:
     /** @brief Constructor */

src/websockets/IWebsocketClient.h

@@ -32,7 +32,7 @@ class IWebsocketClient
 {
   public:
     // Forward declarations
-    class IWebsocketClientListener;
+    class IListener;
     struct Credentials;
 
     /** @brief Destructor */
@@ -79,33 +79,25 @@ class IWebsocketClient
      * @brief Register a listener to the websocket events
      * @param listener Listener object
      */
-    virtual void registerListener(IWebsocketClientListener& listener) = 0;
+    virtual void registerListener(IListener& listener) = 0;
 
     /** @brief Interface for the websocket clients listeners */
-    class IWebsocketClientListener
+    class IListener
     {
       public:
         /** @brief Destructor */
-        virtual ~IWebsocketClientListener() { }
+        virtual ~IListener() { }
 
-        /**
-         * @brief Called when connection is successfull
-         */
+        /** @brief Called when connection is successfull */
         virtual void wsClientConnected() = 0;
 
-        /**
-         * @brief Called when connection failed
-         */
+        /** @brief Called when connection failed */
         virtual void wsClientFailed() = 0;
 
-        /**
-         * @brief Called when connection is lost
-         */
+        /** @brief Called when connection is lost */
         virtual void wsClientDisconnected() = 0;
 
-        /**
-         * @brief Called when a critical error occured
-         */
+        /** @brief Called when a critical error occured */
         virtual void wsClientError() = 0;
 
         /**

src/websockets/libwebsockets/LibWebsocketClient.cpp

@@ -184,8 +184,8 @@ bool LibWebsocketClient::send(const void* data, size_t size)
     return ret;
 }
 
-/** @copydoc void IWebsocketClient::registerListener(IWebsocketClientListener&) */
-void LibWebsocketClient::registerListener(IWebsocketClientListener& listener)
+/** @copydoc void IWebsocketClient::registerListener(IListener&) */
+void LibWebsocketClient::registerListener(IListener& listener)
 {
     m_listener = &listener;
 }

src/websockets/libwebsockets/LibWebsocketClient.h

@@ -60,8 +60,8 @@ class LibWebsocketClient : public IWebsocketClient
     /** @copydoc bool IWebsocketClient::send(const void*, size_t) */
     bool send(const void* data, size_t size) override;
 
-    /** @copydoc void IWebsocketClient::registerListener(IWebsocketClientListener&) */
-    void registerListener(IWebsocketClientListener& listener) override;
+    /** @copydoc void IWebsocketClient::registerListener(IListener&) */
+    void registerListener(IListener& listener) override;
 
   private:
     /** @brief Message to send */
@@ -87,7 +87,7 @@ class LibWebsocketClient : public IWebsocketClient
     };
 
     /** @brief Listener */
-    IWebsocketClientListener* m_listener;
+    IListener* m_listener;
     /** @brief Internal thread */
     std::thread* m_thread;
     /** @brief Indicate the end of processing to the thread */

src/websockets/stubs/WebsocketClientStub.cpp

@@ -106,8 +106,8 @@ bool WebsocketClientStub::send(const void* data, size_t size)
     return returnValue();
 }
 
-/** @copydoc void IWebsocketClient::registerListener(IWebsocketClientListener&) */
-void WebsocketClientStub::registerListener(IWebsocketClientListener& listener)
+/** @copydoc void IWebsocketClient::registerListener(IListener&) */
+void WebsocketClientStub::registerListener(IListener& listener)
 {
     m_listener = &listener;
 }

src/websockets/stubs/WebsocketClientStub.h

@@ -58,8 +58,8 @@ class WebsocketClientStub : public IWebsocketClient
     /** @copydoc bool IWebsocketClient::send(const void*, size_t) */
     bool send(const void* data, size_t size) override;
 
-    /** @copydoc void IWebsocketClient::registerListener(IWebsocketClientListener&) */
-    void registerListener(IWebsocketClientListener& listener) override;
+    /** @copydoc void IWebsocketClient::registerListener(IListener&) */
+    void registerListener(IListener& listener) override;
 
     /// Stub interface
 
@@ -127,7 +127,7 @@ class WebsocketClientStub : public IWebsocketClient
     /** @brief Sent data size */
     size_t m_sent_size;
     /** @brief Listener */
-    IWebsocketClientListener* m_listener;
+    IListener* m_listener;
     /** @brief Indicate that the next call will fail */
     bool m_next_call_will_fail;