Renaming interfaces

MessageControl/MessageControl.cpp

@@ -19,7 +19,7 @@
 
 #include "MessageControl.h"
 #include "MessageOutput.h"
-#include <interfaces/json/JMessageControl.h>
+#include <interfaces/json/JMessagingControl.h>
 
 namespace Thunder {
 
@@ -140,7 +140,7 @@ namespace Thunder {
 #endif
         _webSocketExporter.Initialize(service, _config.MaxExportConnections.Value());
 
-        Exchange::JMessageControl::Register(*this, this);
+        Exchange::JMessagingControl::Register(*this, this);
 
         _service->Register(&_observer);
 
@@ -156,7 +156,7 @@ namespace Thunder {
         if (_service != nullptr) {
             ASSERT (_service == service);
 
-            Exchange::JMessageControl::Unregister(*this);
+            Exchange::JMessagingControl::Unregister(*this);
 
             Callback(nullptr);
 

MessageControl/MessageControl.h

@@ -30,7 +30,7 @@ namespace Thunder {
 
 namespace Plugin {
 
-    class MessageControl : public PluginHost::JSONRPC, public PluginHost::IPluginExtended, public PluginHost::IWebSocket, public Exchange::IMessageControl {
+    class MessageControl : public PluginHost::JSONRPC, public PluginHost::IPluginExtended, public PluginHost::IWebSocket, public Exchange::IMessagingControl {
     private:
         using Cleanups  = std::vector<uint32_t>;
 
@@ -158,7 +158,7 @@ namespace Plugin {
 
         public:
             //
-            // Exchange::IMessageControl::INotification
+            // Exchange::IMessagingControl::INotification
             // ----------------------------------------------------------
             void Message(const Core::Messaging::MessageInfo& metadata, const Core::Messaging::IEvent& event) override {
                 _parent.Message(metadata, event);
@@ -303,7 +303,7 @@ namespace Plugin {
             INTERFACE_ENTRY(PluginHost::IDispatcher)
             INTERFACE_ENTRY(PluginHost::IPluginExtended)
             INTERFACE_ENTRY(PluginHost::IWebSocket)
-            INTERFACE_ENTRY(Exchange::IMessageControl)
+            INTERFACE_ENTRY(Exchange::IMessagingControl)
         END_INTERFACE_MAP
 
     public:
@@ -424,7 +424,7 @@ namespace Plugin {
             return (Core::ERROR_NONE);
         }
 
-        Core::hresult Modules(Exchange::IMessageControl::IStringIterator*& modules) const override
+        Core::hresult Modules(Exchange::IMessagingControl::IStringIterator*& modules) const override
         {
             std::vector<string> list;
 
@@ -436,18 +436,18 @@ namespace Plugin {
             return (Core::ERROR_NONE);
         }
 
-        Core::hresult Controls(const string& module, Exchange::IMessageControl::IControlIterator*& controls) const override
+        Core::hresult Controls(const string& module, Exchange::IMessagingControl::IControlIterator*& controls) const override
         {
-            std::vector<Exchange::IMessageControl::Control> list;
+            std::vector<Exchange::IMessagingControl::Control> list;
             Messaging::MessageUnit::Iterator index;
             _client.Controls(index, module);
 
             while (index.Next() == true) {
                 list.push_back( { static_cast<messagetype>(index.Type()), index.Category(), index.Module(), index.Enabled() } );
             }
 
-            using Implementation = RPC::IteratorType<Exchange::IMessageControl::IControlIterator, std::vector<Exchange::IMessageControl::Control>>;
-            controls = Core::ServiceType<Implementation>::Create<Exchange::IMessageControl::IControlIterator>(std::move(list));
+            using Implementation = RPC::IteratorType<Exchange::IMessagingControl::IControlIterator, std::vector<Exchange::IMessagingControl::Control>>;
+            controls = Core::ServiceType<Implementation>::Create<Exchange::IMessagingControl::IControlIterator>(std::move(list));
 
             return (Core::ERROR_NONE);
         }

MessageControl/MessageControlPlugin.json

@@ -55,6 +55,6 @@
       ]
     },
     "interface": {
-      "$ref": "{cppinterfacedir}/IMessageControl.h"
+      "$ref": "{cppinterfacedir}/IMessagingControl.h"
     }
   }

MessageControl/Module.h

@@ -27,8 +27,8 @@
 #include <plugins/plugins.h>
 #include <definitions/definitions.h>
 
-#include <interfaces/IMessageControl.h>
-#include <interfaces/json/JsonData_MessageControl.h>
+#include <interfaces/IMessagingControl.h>
+#include <interfaces/json/JsonData_MessagingControl.h>
 
 
 #undef EXTERNAL

MessageControl/doc/MessageControlPlugin.md

@@ -1,4 +1,4 @@
-<!-- Generated automatically, DO NOT EDIT! -->
+<!-- Generated automatically, DO NOT EDIT! --> 
 <a id="head_MessageControl_Plugin"></a>
 # MessageControl Plugin
 
@@ -91,7 +91,7 @@ The table below lists configuration options of the plugin.
 
 This plugin implements the following interfaces:
 
-- IMessageControl ([IMessageControl.h](https://github.com/rdkcentral/ThunderInterfaces/blob/master/interfaces/IMessageControl.h)) (version 1.0.0) (compliant format)
+- IMessagingControl ([IMessagingControl.h](https://github.com/rdkcentral/ThunderInterfaces/blob/master/interfaces/IMessagingControl.h)) (version 1.0.0) (compliant format)
 > This interface uses legacy ```lowercase``` naming convention. With the next major release the naming convention will change to ```camelCase```.
 
 <a id="head_Methods"></a>
@@ -140,7 +140,7 @@ This method takes no parameters.
 {
   "jsonrpc": "2.0",
   "id": 42,
-  "method": "MessageControl.1.versions"
+  "method": "MessageControl.versions"
 }
 ```
 
@@ -191,9 +191,9 @@ This method will return *True* for the following methods/properties: *modules, c
 {
   "jsonrpc": "2.0",
   "id": 42,
-  "method": "MessageControl.1.exists",
+  "method": "MessageControl.exists",
   "params": {
-    "method": "modules"
+    "method": "methodName"
   }
 }
 ```
@@ -218,7 +218,7 @@ Enables/disables a message control.
 | Name | Type | M/O | Description |
 | :-------- | :-------- | :-------- | :-------- |
 | params | object | mandatory | *...* |
-| params.type | string | mandatory | Message type (must be one of the following: *Assert, Invalid, Logging, OperationalStream, Reporting, Tracing*) |
+| params.type | string | mandatory | Message type (must be one of the following: *Assert, Invalid, Logging, OperationalStream, Reporting, Telemetry, Tracing*) |
 | params.category | string | mandatory | Name of the message category |
 | params.module | string | mandatory | Name of the module the message is originating from |
 | params.enabled | boolean | mandatory | Denotes if control should be enabled (true) or disabled (false) |
@@ -237,7 +237,7 @@ Enables/disables a message control.
 {
   "jsonrpc": "2.0",
   "id": 42,
-  "method": "MessageControl.1.enable",
+  "method": "MessageControl.enable",
   "params": {
     "type": "Tracing",
     "category": "Information",
@@ -291,7 +291,7 @@ Provides access to the retrieves a list of current message modules.
 {
   "jsonrpc": "2.0",
   "id": 42,
-  "method": "MessageControl.1.modules"
+  "method": "MessageControl.modules"
 }
 ```
 
@@ -328,7 +328,7 @@ Provides access to the retrieves a list of current message controls for a specif
 | :-------- | :-------- | :-------- | :-------- |
 | (property) | array | mandatory | Retrieves a list of current message controls for a specific module |
 | (property)[#] | object | mandatory | *...* |
-| (property)[#].type | string | mandatory | Type of message (must be one of the following: *Assert, Invalid, Logging, OperationalStream, Reporting, Tracing*) |
+| (property)[#].type | string | mandatory | Type of message (must be one of the following: *Assert, Invalid, Logging, OperationalStream, Reporting, Telemetry, Tracing*) |
 | (property)[#].category | string | mandatory | Name of the message category |
 | (property)[#].module | string | mandatory | Name of the module the message is originating from |
 | (property)[#].enabled | boolean | mandatory | Denotes if the control is enabled (true) or disabled (false) |
@@ -341,7 +341,7 @@ Provides access to the retrieves a list of current message controls for a specif
 {
   "jsonrpc": "2.0",
   "id": 42,
-  "method": "MessageControl.1.controls@xyz"
+  "method": "MessageControl.controls@xyz"
 }
 ```