mqtt: FB renaming

Author: viacheslauK

examples/custom-mqtt-sub/src/custom-mqtt-sub.cpp

@@ -123,13 +123,13 @@ int main(int argc, char* argv[])
 
     // Create OpenDAQ instance and add MQTT broker FB
     const InstancePtr instance = InstanceBuilder().addModulePath(MODULE_PATH).build();
-    const std::string rootFbName = "rootMqttFb";
+    const std::string rootFbName = "RootMqttFb";
     auto rootFbConfig = instance.getAvailableFunctionBlockTypes().get(rootFbName).createDefaultConfig();
     rootFbConfig.setPropertyValue("MqttBrokerAddress", appConfig.brokerAddress);
     auto brokerFB = instance.addFunctionBlock(rootFbName, rootFbConfig);
     auto availableFbs = brokerFB.getAvailableFunctionBlockTypes();
 
-    const std::string jsonFbName = "jsonMqttFb";
+    const std::string jsonFbName = "JsonSubscriberMqttFb";
     std::cout << "Try to add the " << jsonFbName << std::endl;
 
     auto config = availableFbs.get(jsonFbName).createDefaultConfig();

examples/raw-mqtt-sub/src/raw-mqtt-sub.cpp

@@ -55,13 +55,13 @@ int main(int argc, char* argv[])
 
     // Create OpenDAQ instance and add MQTT broker FB
     const InstancePtr instance = InstanceBuilder().addModulePath(MODULE_PATH).build();
-    const std::string rootFbName = "rootMqttFb";
+    const std::string rootFbName = "RootMqttFb";
     auto rootFbConfig = instance.getAvailableFunctionBlockTypes().get(rootFbName).createDefaultConfig();
     rootFbConfig.setPropertyValue("MqttBrokerAddress", appConfig.brokerAddress);
     auto brokerFB = instance.addFunctionBlock(rootFbName, rootFbConfig);
     auto availableFbs = brokerFB.getAvailableFunctionBlockTypes();
 
-    const std::string fbName = "rawMqttFb";
+    const std::string fbName = "RawSubscriberMqttFb";
     std::cout << "Try to add the " << fbName << std::endl;
 
     // Create RAW function block configuration

examples/ref-dev-mqtt-pub/src/ref-dev-mqtt-pub.cpp

@@ -89,12 +89,12 @@ int main(int argc, char* argv[])
     channels[3].setPropertyValue("Frequency", 20);
 
     // Create and configure MQTT server
-    const std::string rootFbName = "rootMqttFb";
+    const std::string rootFbName = "RootMqttFb";
     auto rootFbConfig = instance.getAvailableFunctionBlockTypes().get(rootFbName).createDefaultConfig();
     rootFbConfig.setPropertyValue("MqttBrokerAddress", appConfig.brokerAddress);
     auto brokerFB = instance.addFunctionBlock(rootFbName, rootFbConfig);
     auto availableFbs = brokerFB.getAvailableFunctionBlockTypes();
-    const std::string fbName = "publisherMqttFb";
+    const std::string fbName = "PublisherMqttFb";
     std::cout << "Try to add the " << fbName << std::endl;
 
     auto config = availableFbs.get(fbName).createDefaultConfig();

mqtt_streaming_module/include/mqtt_streaming_module/constants.h

@@ -46,17 +46,17 @@ static constexpr const char* PROPERTY_NAME_PUB_QOS = "MqttQoS";
 static constexpr const char* PROPERTY_NAME_SUB_QOS = "MqttQoS";
 static constexpr const char* PROPERTY_NAME_PUB_READ_PERIOD = "ReaderPeriod";
 
-static constexpr const char* RAW_FB_NAME = "rawMqttFb";
-static constexpr const char* JSON_FB_NAME = "jsonMqttFb";
-static constexpr const char* PUB_FB_NAME = "publisherMqttFb";
-static constexpr const char* ROOT_FB_NAME = "rootMqttFb";
-static constexpr const char* JSON_DECODER_FB_NAME = "jsonDecoderMqttFb";
-
-static const char* MQTT_LOCAL_ROOT_FB_ID_PREFIX = "rootMqttFb";
-static const char* MQTT_LOCAL_PUB_FB_ID_PREFIX = "publisherMqttFb";
-static const char* MQTT_LOCAL_RAW_FB_ID_PREFIX = "rawMqttFb";
-static const char* MQTT_LOCAL_JSON_FB_ID_PREFIX = "jsonMqttFb";
-static const char* MQTT_LOCAL_JSON_DECODER_FB_ID_PREFIX = "jsonDecoderMqttFb";
+static constexpr const char* RAW_FB_NAME = "RawSubscriberMqttFb";
+static constexpr const char* JSON_FB_NAME = "JsonSubscriberMqttFb";
+static constexpr const char* PUB_FB_NAME = "PublisherMqttFb";
+static constexpr const char* ROOT_FB_NAME = "RootMqttFb";
+static constexpr const char* JSON_DECODER_FB_NAME = "JsonDecoderMqttFb";
+
+static const char* MQTT_LOCAL_ROOT_FB_ID_PREFIX = "RootMqttFb";
+static const char* MQTT_LOCAL_PUB_FB_ID_PREFIX = "PublisherMqttFb";
+static const char* MQTT_LOCAL_RAW_FB_ID_PREFIX = "RawSubscriberMqttFb";
+static const char* MQTT_LOCAL_JSON_FB_ID_PREFIX = "JsonSubscriberMqttFb";
+static const char* MQTT_LOCAL_JSON_DECODER_FB_ID_PREFIX = "JsonDecoderMqttFb";
 
 
 static const char* MQTT_ROOT_FB_CON_STATUS_TYPE = "BrokerConnectionStatusType";