From 132479d10bad0d45808cf4f8b419273f31a44de7 Mon Sep 17 00:00:00 2001 From: Sivarajappan Siva Date: Thu, 4 Jun 2026 05:34:28 +0000 Subject: [PATCH 1/3] Renaming interfaces --- MessageControl/MessageControl.cpp | 6 +++--- MessageControl/MessageControl.h | 20 ++++++++++---------- MessageControl/MessageControlPlugin.json | 2 +- MessageControl/Module.h | 4 ++-- MessageControl/doc/MessageControlPlugin.md | 18 +++++++++--------- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/MessageControl/MessageControl.cpp b/MessageControl/MessageControl.cpp index 426f7887..8489b651 100644 --- a/MessageControl/MessageControl.cpp +++ b/MessageControl/MessageControl.cpp @@ -19,7 +19,7 @@ #include "MessageControl.h" #include "MessageOutput.h" -#include +#include 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); diff --git a/MessageControl/MessageControl.h b/MessageControl/MessageControl.h index e1afdaa6..7c6588ce 100644 --- a/MessageControl/MessageControl.h +++ b/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; @@ -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: @@ -417,14 +417,14 @@ namespace Plugin { } } - Core::hresult Enable(const messagetype type, const string& category, const string& module, const bool enabled) override + Core::hresult Enable(const messagingtype type, const string& category, const string& module, const bool enabled) override { _client.Enable({static_cast(type), category, module}, enabled); return (Core::ERROR_NONE); } - Core::hresult Modules(Exchange::IMessageControl::IStringIterator*& modules) const override + Core::hresult Modules(Exchange::IMessagingControl::IStringIterator*& modules) const override { std::vector 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 list; + std::vector list; Messaging::MessageUnit::Iterator index; _client.Controls(index, module); while (index.Next() == true) { - list.push_back( { static_cast(index.Type()), index.Category(), index.Module(), index.Enabled() } ); + list.push_back( { static_cast(index.Type()), index.Category(), index.Module(), index.Enabled() } ); } - using Implementation = RPC::IteratorType>; - controls = Core::ServiceType::Create(std::move(list)); + using Implementation = RPC::IteratorType>; + controls = Core::ServiceType::Create(std::move(list)); return (Core::ERROR_NONE); } diff --git a/MessageControl/MessageControlPlugin.json b/MessageControl/MessageControlPlugin.json index db687f60..464c38f3 100644 --- a/MessageControl/MessageControlPlugin.json +++ b/MessageControl/MessageControlPlugin.json @@ -55,6 +55,6 @@ ] }, "interface": { - "$ref": "{cppinterfacedir}/IMessageControl.h" + "$ref": "{cppinterfacedir}/IMessagingControl.h" } } \ No newline at end of file diff --git a/MessageControl/Module.h b/MessageControl/Module.h index 0623a8c2..d082a918 100644 --- a/MessageControl/Module.h +++ b/MessageControl/Module.h @@ -27,8 +27,8 @@ #include #include -#include -#include +#include +#include #undef EXTERNAL diff --git a/MessageControl/doc/MessageControlPlugin.md b/MessageControl/doc/MessageControlPlugin.md index 420e8677..b581fc52 100644 --- a/MessageControl/doc/MessageControlPlugin.md +++ b/MessageControl/doc/MessageControlPlugin.md @@ -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```. @@ -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" } ``` From e63ab91e06247ee1cc7bfad501dac99c00bbb627 Mon Sep 17 00:00:00 2001 From: Sivarajappan Siva Date: Thu, 4 Jun 2026 11:24:47 +0000 Subject: [PATCH 2/3] clean up --- MessageControl/MessageControl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MessageControl/MessageControl.h b/MessageControl/MessageControl.h index 7c6588ce..a5d1bdc0 100644 --- a/MessageControl/MessageControl.h +++ b/MessageControl/MessageControl.h @@ -417,7 +417,7 @@ namespace Plugin { } } - Core::hresult Enable(const messagingtype type, const string& category, const string& module, const bool enabled) override + Core::hresult Enable(const messagetype type, const string& category, const string& module, const bool enabled) override { _client.Enable({static_cast(type), category, module}, enabled); @@ -443,7 +443,7 @@ namespace Plugin { _client.Controls(index, module); while (index.Next() == true) { - list.push_back( { static_cast(index.Type()), index.Category(), index.Module(), index.Enabled() } ); + list.push_back( { static_cast(index.Type()), index.Category(), index.Module(), index.Enabled() } ); } using Implementation = RPC::IteratorType>; From 711b067c10e3b7af81693b7d403b50fb4fdba777 Mon Sep 17 00:00:00 2001 From: MFransen69 <39826971+MFransen69@users.noreply.github.com> Date: Thu, 4 Jun 2026 13:55:21 +0200 Subject: [PATCH 3/3] Update MessageControlPlugin.md --- MessageControl/doc/MessageControlPlugin.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MessageControl/doc/MessageControlPlugin.md b/MessageControl/doc/MessageControlPlugin.md index b581fc52..e13b3dbf 100644 --- a/MessageControl/doc/MessageControlPlugin.md +++ b/MessageControl/doc/MessageControlPlugin.md @@ -1,4 +1,4 @@ - + # MessageControl Plugin