mqtt: renaming

viacheslauK · viacheslauK · commit 786976a32bf0 · 2026-01-07T11:34:05.000+01:00
diff --git a/mqtt_streaming_module/include/mqtt_streaming_module/mqtt_json_receiver_fb_impl.h b/mqtt_streaming_module/include/mqtt_streaming_module/mqtt_json_receiver_fb_impl.h
@@ -46,12 +46,12 @@ class MqttJsonReceiverFbImpl final : public MqttBaseFb
     std::string topicForSubscribing;
     static std::atomic<int> localIndex;
 
-    DictObjectPtr<IDict, IString, IFunctionBlockType> baseFbTypes;
+    DictObjectPtr<IDict, IString, IFunctionBlockType> nestedFbTypes;
     std::vector<FunctionBlockPtr> nestedFunctionBlocks;
 
     static std::string generateLocalId();
 
-    void initBaseFunctionalBlocks();
+    void initNestedFbTypes();
 
     void createSignals() override;
     void clearSubscribedTopic() override;
diff --git a/mqtt_streaming_module/include/mqtt_streaming_module/mqtt_root_fb_impl.h b/mqtt_streaming_module/include/mqtt_streaming_module/mqtt_root_fb_impl.h
@@ -52,14 +52,14 @@ class MqttRootFbImpl : public FunctionBlock
     DictPtr<IString, IFunctionBlockType> onGetAvailableFunctionBlockTypes() override;
     FunctionBlockPtr onAddFunctionBlock(const StringPtr& typeId, const PropertyObjectPtr& config) override;
 
-    void initBaseFunctionalBlocks();
+    void initNestedFbTypes();
     void initMqttSubscriber();
     void initConnectionStatus();
     void initProperties(const PropertyObjectPtr& config);
     void readProperties();
     bool waitForConnection(const int timeoutMs);
 
-    DictObjectPtr<IDict, IString, IFunctionBlockType> baseFbTypes;
+    DictObjectPtr<IDict, IString, IFunctionBlockType> nestedFbTypes;
 
     StatusHelper<ConnectionStatus> connectionStatus;
 
diff --git a/mqtt_streaming_module/src/mqtt_json_receiver_fb_impl.cpp b/mqtt_streaming_module/src/mqtt_json_receiver_fb_impl.cpp
@@ -20,7 +20,7 @@ MqttJsonReceiverFbImpl::MqttJsonReceiverFbImpl(const ContextPtr& ctx,
     : MqttBaseFb(ctx, parent, type, generateLocalId(), subscriber, config),
       jsonDataWorker(loggerComponent)
 {
-    initBaseFunctionalBlocks();
+    initNestedFbTypes();
     if (config.assigned())
         initProperties(populateDefaultConfig(type.createDefaultConfig(), config));
     else
@@ -122,13 +122,13 @@ std::string MqttJsonReceiverFbImpl::generateLocalId()
     return std::string(MQTT_LOCAL_JSON_FB_ID_PREFIX + std::to_string(localIndex++));
 }
 
-void MqttJsonReceiverFbImpl::initBaseFunctionalBlocks()
+void MqttJsonReceiverFbImpl::initNestedFbTypes()
 {
-    baseFbTypes = Dict<IString, IFunctionBlockType>();
+    nestedFbTypes = Dict<IString, IFunctionBlockType>();
     // Add a function block type for manual JSON configuration
     {
         const auto fbType = MqttJsonDecoderFbImpl::CreateType();
-        baseFbTypes.set(fbType.getId(), fbType);
+        nestedFbTypes.set(fbType.getId(), fbType);
     }
 }
 
@@ -290,16 +290,16 @@ bool MqttJsonReceiverFbImpl::setTopic(std::string topic)
 
 DictPtr<IString, IFunctionBlockType> MqttJsonReceiverFbImpl::onGetAvailableFunctionBlockTypes()
 {
-    return baseFbTypes;
+    return nestedFbTypes;
 }
 
 FunctionBlockPtr MqttJsonReceiverFbImpl::onAddFunctionBlock(const StringPtr& typeId, const PropertyObjectPtr& config)
 {
 
     FunctionBlockPtr nestedFunctionBlock;
-    if (baseFbTypes.hasKey(typeId))
+    if (nestedFbTypes.hasKey(typeId))
     {
-        auto fbTypePtr = baseFbTypes.getOrDefault(typeId);
+        auto fbTypePtr = nestedFbTypes.getOrDefault(typeId);
         if (fbTypePtr.getName() == JSON_DECODER_FB_NAME)
         {
             nestedFunctionBlock = createWithImplementation<IFunctionBlock, MqttJsonDecoderFbImpl>(context, functionBlocks, fbTypePtr, config);
diff --git a/mqtt_streaming_module/src/mqtt_root_fb_impl.cpp b/mqtt_streaming_module/src/mqtt_root_fb_impl.cpp
@@ -30,7 +30,7 @@ MqttRootFbImpl::MqttRootFbImpl(const ContextPtr& ctx, const ComponentPtr& parent
     initComponentStatus();
     initConnectionStatus();
     initProperties(config);
-    initBaseFunctionalBlocks();
+    initNestedFbTypes();
     initMqttSubscriber();
 
     if (!waitForConnection(connectTimeout))
@@ -58,24 +58,24 @@ void MqttRootFbImpl::removed()
     }
 }
 
-void MqttRootFbImpl::initBaseFunctionalBlocks()
+void MqttRootFbImpl::initNestedFbTypes()
 {
-    baseFbTypes = Dict<IString, IFunctionBlockType>();
+    nestedFbTypes = Dict<IString, IFunctionBlockType>();
     // Add a function block type for manual JSON configuration
     {
         const auto fbType = MqttJsonReceiverFbImpl::CreateType();
-        baseFbTypes.set(fbType.getId(), fbType);
+        nestedFbTypes.set(fbType.getId(), fbType);
     }
     // Add a function block type for raw MQTT messages
     {
         const auto fbType = MqttRawReceiverFbImpl::CreateType();
-        baseFbTypes.set(fbType.getId(), fbType);
+        nestedFbTypes.set(fbType.getId(), fbType);
     }
 
     // Add a function block type for MQTT publisher
     {
         const auto fbType = MqttPublisherFbImpl::CreateType();
-        baseFbTypes.set(fbType.getId(), fbType);
+        nestedFbTypes.set(fbType.getId(), fbType);
     }
 }
 
@@ -176,16 +176,16 @@ bool MqttRootFbImpl::waitForConnection(const int timeoutMs)
 
 DictPtr<IString, IFunctionBlockType> MqttRootFbImpl::onGetAvailableFunctionBlockTypes()
 {
-    return baseFbTypes;
+    return nestedFbTypes;
 }
 
 FunctionBlockPtr MqttRootFbImpl::onAddFunctionBlock(const StringPtr& typeId, const PropertyObjectPtr& config)
 {
     FunctionBlockPtr nestedFunctionBlock;
     {
-        if (baseFbTypes.hasKey(typeId))
+        if (nestedFbTypes.hasKey(typeId))
         {
-            auto fbTypePtr = baseFbTypes.getOrDefault(typeId);
+            auto fbTypePtr = nestedFbTypes.getOrDefault(typeId);
             if (fbTypePtr.getName() == RAW_FB_NAME)
             {
                 nestedFunctionBlock = createWithImplementation<IFunctionBlock, MqttRawReceiverFbImpl>(context, functionBlocks, fbTypePtr, subscriber, config);

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ MqttJsonReceiverFbImpl::MqttJsonReceiverFbImpl(const ContextPtr& ctx,`
`20`	`20`	`: MqttBaseFb(ctx, parent, type, generateLocalId(), subscriber, config),`
`21`	`21`	`jsonDataWorker(loggerComponent)`
`22`	`22`	`{`
`23`		`- initBaseFunctionalBlocks();`
	`23`	`+ initNestedFbTypes();`
`24`	`24`	`if (config.assigned())`
`25`	`25`	`initProperties(populateDefaultConfig(type.createDefaultConfig(), config));`
`26`	`26`	`else`
`@@ -122,13 +122,13 @@ std::string MqttJsonReceiverFbImpl::generateLocalId()`
`122`	`122`	`return std::string(MQTT_LOCAL_JSON_FB_ID_PREFIX + std::to_string(localIndex++));`
`123`	`123`	`}`
`124`	`124`
`125`		`-void MqttJsonReceiverFbImpl::initBaseFunctionalBlocks()`
	`125`	`+void MqttJsonReceiverFbImpl::initNestedFbTypes()`
`126`	`126`	`{`
`127`		`- baseFbTypes = Dict<IString, IFunctionBlockType>();`
	`127`	`+ nestedFbTypes = Dict<IString, IFunctionBlockType>();`
`128`	`128`	`// Add a function block type for manual JSON configuration`
`129`	`129`	`{`
`130`	`130`	`const auto fbType = MqttJsonDecoderFbImpl::CreateType();`
`131`		`- baseFbTypes.set(fbType.getId(), fbType);`
	`131`	`+ nestedFbTypes.set(fbType.getId(), fbType);`
`132`	`132`	`}`
`133`	`133`	`}`
`134`	`134`
`@@ -290,16 +290,16 @@ bool MqttJsonReceiverFbImpl::setTopic(std::string topic)`
`290`	`290`
`291`	`291`	`DictPtr<IString, IFunctionBlockType> MqttJsonReceiverFbImpl::onGetAvailableFunctionBlockTypes()`
`292`	`292`	`{`
`293`		`- return baseFbTypes;`
	`293`	`+ return nestedFbTypes;`
`294`	`294`	`}`
`295`	`295`
`296`	`296`	`FunctionBlockPtr MqttJsonReceiverFbImpl::onAddFunctionBlock(const StringPtr& typeId, const PropertyObjectPtr& config)`
`297`	`297`	`{`
`298`	`298`
`299`	`299`	`FunctionBlockPtr nestedFunctionBlock;`
`300`		`- if (baseFbTypes.hasKey(typeId))`
	`300`	`+ if (nestedFbTypes.hasKey(typeId))`
`301`	`301`	`{`
`302`		`- auto fbTypePtr = baseFbTypes.getOrDefault(typeId);`
	`302`	`+ auto fbTypePtr = nestedFbTypes.getOrDefault(typeId);`
`303`	`303`	`if (fbTypePtr.getName() == JSON_DECODER_FB_NAME)`
`304`	`304`	`{`
`305`	`305`	`nestedFunctionBlock = createWithImplementation<IFunctionBlock, MqttJsonDecoderFbImpl>(context, functionBlocks, fbTypePtr, config);`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ MqttRootFbImpl::MqttRootFbImpl(const ContextPtr& ctx, const ComponentPtr& parent`
`30`	`30`	`initComponentStatus();`
`31`	`31`	`initConnectionStatus();`
`32`	`32`	`initProperties(config);`
`33`		`- initBaseFunctionalBlocks();`
	`33`	`+ initNestedFbTypes();`
`34`	`34`	`initMqttSubscriber();`
`35`	`35`
`36`	`36`	`if (!waitForConnection(connectTimeout))`
`@@ -58,24 +58,24 @@ void MqttRootFbImpl::removed()`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`
`61`		`-void MqttRootFbImpl::initBaseFunctionalBlocks()`
	`61`	`+void MqttRootFbImpl::initNestedFbTypes()`
`62`	`62`	`{`
`63`		`- baseFbTypes = Dict<IString, IFunctionBlockType>();`
	`63`	`+ nestedFbTypes = Dict<IString, IFunctionBlockType>();`
`64`	`64`	`// Add a function block type for manual JSON configuration`
`65`	`65`	`{`
`66`	`66`	`const auto fbType = MqttJsonReceiverFbImpl::CreateType();`
`67`		`- baseFbTypes.set(fbType.getId(), fbType);`
	`67`	`+ nestedFbTypes.set(fbType.getId(), fbType);`
`68`	`68`	`}`
`69`	`69`	`// Add a function block type for raw MQTT messages`
`70`	`70`	`{`
`71`	`71`	`const auto fbType = MqttRawReceiverFbImpl::CreateType();`
`72`		`- baseFbTypes.set(fbType.getId(), fbType);`
	`72`	`+ nestedFbTypes.set(fbType.getId(), fbType);`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`// Add a function block type for MQTT publisher`
`76`	`76`	`{`
`77`	`77`	`const auto fbType = MqttPublisherFbImpl::CreateType();`
`78`		`- baseFbTypes.set(fbType.getId(), fbType);`
	`78`	`+ nestedFbTypes.set(fbType.getId(), fbType);`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`
`@@ -176,16 +176,16 @@ bool MqttRootFbImpl::waitForConnection(const int timeoutMs)`
`176`	`176`
`177`	`177`	`DictPtr<IString, IFunctionBlockType> MqttRootFbImpl::onGetAvailableFunctionBlockTypes()`
`178`	`178`	`{`
`179`		`- return baseFbTypes;`
	`179`	`+ return nestedFbTypes;`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`FunctionBlockPtr MqttRootFbImpl::onAddFunctionBlock(const StringPtr& typeId, const PropertyObjectPtr& config)`
`183`	`183`	`{`
`184`	`184`	`FunctionBlockPtr nestedFunctionBlock;`
`185`	`185`	`{`
`186`		`- if (baseFbTypes.hasKey(typeId))`
	`186`	`+ if (nestedFbTypes.hasKey(typeId))`
`187`	`187`	`{`
`188`		`- auto fbTypePtr = baseFbTypes.getOrDefault(typeId);`
	`188`	`+ auto fbTypePtr = nestedFbTypes.getOrDefault(typeId);`
`189`	`189`	`if (fbTypePtr.getName() == RAW_FB_NAME)`
`190`	`190`	`{`
`191`	`191`	`nestedFunctionBlock = createWithImplementation<IFunctionBlock, MqttRawReceiverFbImpl>(context, functionBlocks, fbTypePtr, subscriber, config);`