mqtt: removing unnecessary linkage from examples

Author: viacheslauK

examples/custom-mqtt-sub/src/CMakeLists.txt

@@ -4,7 +4,5 @@ add_compile_definitions(MODULE_PATH="${OPENDAQ_MODULES_DIR}")
 add_compile_definitions(APP_NAME="${EXAMPLE_PROJECT_NAME}")
 
 add_executable(${EXAMPLE_PROJECT_NAME} custom-mqtt-sub.cpp)
-target_link_libraries(${EXAMPLE_PROJECT_NAME} PRIVATE daq::opendaq
-                                                      mqtt_stream_cli_module
-)
+target_link_libraries(${EXAMPLE_PROJECT_NAME} PRIVATE daq::opendaq)
 target_include_directories(${EXAMPLE_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../)

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

@@ -1,14 +1,12 @@
 #include "../../InputArgs.h"
 #include <iomanip>
-#include <mqtt_streaming_client_module/constants.h>
 #include <opendaq/opendaq.h>
 
 #include <fstream>
 #include <iostream>
 #include <sstream>
 
 using namespace daq;
-using namespace daq::modules::mqtt_streaming_client_module;
 
 struct ConfigStruct {
     std::string brokerAddress;
@@ -128,13 +126,13 @@ int main(int argc, char* argv[])
     auto brokerDevice = instance.addDevice("daq.mqtt://" + appConfig.brokerAddress);
     auto availableDeviceNodes = brokerDevice.getAvailableFunctionBlockTypes();
 
-    const std::string fbName = JSON_FB_NAME;
+    const std::string fbName = "@jsonMqttFb";
     std::cout << "Try to add the " << fbName << std::endl;
 
     // Read JSON function block configuration from file and fill out the function block config
     const std::string jsonConfig = readFileToString(appConfig.configFilePath);
     auto config = availableDeviceNodes.get(fbName).createDefaultConfig();
-    config.setPropertyValue(PROPERTY_NAME_SIGNAL_LIST, jsonConfig);
+    config.setPropertyValue("SignalList", jsonConfig);
 
     // Add the JSON function block to the broker device
     daq::FunctionBlockPtr jsonFb = brokerDevice.addFunctionBlock(fbName, config);

examples/ref-dev-mqtt-raw-sub/src/CMakeLists.txt

@@ -7,7 +7,6 @@ add_executable(${EXAMPLE_PROJECT_NAME} ref-dev-mqtt-raw-sub.cpp)
 
 target_link_libraries(${EXAMPLE_PROJECT_NAME} PRIVATE daq::opendaq
                                                       rapidjson
-                                                      mqtt_stream_cli_module
 )
 target_include_directories(${EXAMPLE_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../)
 

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

@@ -1,13 +1,11 @@
 #include "../../InputArgs.h"
-#include <mqtt_streaming_client_module/constants.h>
 #include <opendaq/opendaq.h>
 #include <rapidjson/document.h>
 #include <rapidjson/stringbuffer.h>
 
 #include <iostream>
 
 using namespace daq;
-using namespace daq::modules::mqtt_streaming_client_module;
 
 struct ConfigStruct {
     std::string brokerAddress;
@@ -60,7 +58,7 @@ int main(int argc, char* argv[])
     auto brokerDevice = instance.addDevice("daq.mqtt://" + appConfig.brokerAddress);
     auto availableDeviceNodes = brokerDevice.getAvailableFunctionBlockTypes();
 
-    const std::string fbName = RAW_FB_NAME;
+    const std::string fbName = "@rawMqttFb";
     std::cout << "Try to add the " << fbName << std::endl;
 
     // Create RAW function block configuration
@@ -70,7 +68,7 @@ int main(int argc, char* argv[])
     {
         addToList(topicList, std::move(topic));
     }
-    config.setPropertyValue(PROPERTY_NAME_SIGNAL_LIST, topicList);
+    config.setPropertyValue("SignalList", topicList);
 
     // Add the RAW function block to the broker device
     daq::FunctionBlockPtr rawFb = brokerDevice.addFunctionBlock(fbName, config);

examples/ref-dev-mqtt-sub/src/CMakeLists.txt

@@ -3,7 +3,5 @@ cmake_minimum_required(VERSION 3.16)
 add_compile_definitions(MODULE_PATH="${OPENDAQ_MODULES_DIR}")
 
 add_executable(${EXAMPLE_PROJECT_NAME} ref-dev-mqtt-sub.cpp)
-target_link_libraries(${EXAMPLE_PROJECT_NAME} PRIVATE daq::opendaq
-                                                      mqtt_stream_cli_module
-)
+target_link_libraries(${EXAMPLE_PROJECT_NAME} PRIVATE daq::opendaq)
 target_include_directories(${EXAMPLE_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../)

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

@@ -1,11 +1,9 @@
 #include "../../InputArgs.h"
-#include <mqtt_streaming_client_module/constants.h>
 #include <opendaq/opendaq.h>
 
 #include <iostream>
 
 using namespace daq;
-using namespace daq::modules::mqtt_streaming_client_module;
 
 struct ConfigStruct {
     std::string brokerAddress;
@@ -89,7 +87,7 @@ int main(int argc, char* argv[])
     for (const auto& [key, value] : availableDeviceNodes)
     {
         std::cout << " - " << key << std::endl;
-        if (key == RAW_FB_NAME || key == JSON_FB_NAME)
+        if (key == "@rawMqttFb" || key == "@jsonMqttFb")
             continue;
         fbList.push_back(brokerDevice.addFunctionBlock(key));
     }