new layout

viacheslauK · viacheslauK · commit 7e3039bf6914 · 2026-03-13T16:29:34.000+01:00
diff --git a/modules/mqtt_streaming_module/include/mqtt_streaming_module/mqtt_client_fb_impl.h b/modules/mqtt_streaming_module/include/mqtt_streaming_module/mqtt_client_fb_impl.h
@@ -15,8 +15,8 @@
  */
 
 #pragma once
-#include "MqttAsyncClient.h"
-#include "MqttSettings.h"
+#include "mqtt_streaming_protocol/MqttAsyncClient.h"
+#include "mqtt_streaming_protocol/MqttSettings.h"
 #include <future>
 #include <mqtt_streaming_module/common.h>
 #include <opendaq/function_block_impl.h>
diff --git a/modules/mqtt_streaming_module/include/mqtt_streaming_module/mqtt_json_decoder_fb_impl.h b/modules/mqtt_streaming_module/include/mqtt_streaming_module/mqtt_json_decoder_fb_impl.h
@@ -15,7 +15,7 @@
  */
 
 #pragma once
-#include "MqttDataWrapper.h"
+#include "mqtt_streaming_protocol/MqttDataWrapper.h"
 #include <mqtt_streaming_module/common.h>
 #include <opendaq/function_block_impl.h>
 
diff --git a/modules/mqtt_streaming_module/include/mqtt_streaming_module/mqtt_publisher_fb_impl.h b/modules/mqtt_streaming_module/include/mqtt_streaming_module/mqtt_publisher_fb_impl.h
@@ -15,8 +15,8 @@
  */
 
 #pragma once
-#include "MqttAsyncClient.h"
-#include "MqttDataWrapper.h"
+#include "mqtt_streaming_protocol/MqttAsyncClient.h"
+#include "mqtt_streaming_protocol/MqttDataWrapper.h"
 #include "mqtt_streaming_module/handler_base.h"
 #include "mqtt_streaming_module/status_helper.h"
 #include <mqtt_streaming_module/common.h>
diff --git a/modules/mqtt_streaming_module/include/mqtt_streaming_module/mqtt_subscriber_fb_impl.h b/modules/mqtt_streaming_module/include/mqtt_streaming_module/mqtt_subscriber_fb_impl.h
@@ -15,12 +15,12 @@
  */
 
 #pragma once
-#include "MqttAsyncClient.h"
-#include "MqttDataWrapper.h"
+#include "mqtt_streaming_protocol/MqttAsyncClient.h"
 #include <mqtt_streaming_module/common.h>
 #include <opendaq/function_block_impl.h>
 #include "mqtt_streaming_module/constants.h"
-#include <opendaq/function_block_impl.h>
+#include <opendaq/data_packet_ptr.h>
+#include "mqtt_streaming_protocol/common.h"
 
 BEGIN_NAMESPACE_OPENDAQ_MQTT_STREAMING_MODULE
 
diff --git a/modules/mqtt_streaming_module/src/mqtt_publisher_fb_impl.cpp b/modules/mqtt_streaming_module/src/mqtt_publisher_fb_impl.cpp
@@ -1,12 +1,13 @@
 #include "mqtt_streaming_module/constants.h"
 #include "mqtt_streaming_module/handler_factory.h"
+#include "mqtt_streaming_protocol/JsonConfigWrapper.h"
+#include "mqtt_streaming_protocol/utils.h"
 #include <boost/algorithm/string.hpp>
 #include <mqtt_streaming_module/helper.h>
 #include <mqtt_streaming_module/mqtt_publisher_fb_impl.h>
+#include <mqtt_streaming_module/property_helper.h>
 #include <opendaq/binary_data_packet_factory.h>
 #include <opendaq/event_packet_params.h>
-#include <mqtt_streaming_module/property_helper.h>
-#include "JsonConfigWrapper.h"
 
 BEGIN_NAMESPACE_OPENDAQ_MQTT_STREAMING_MODULE
 
@@ -513,7 +514,7 @@ void MqttPublisherFbImpl::readProperties()
 
     if (config.mode == PublisherMode::Json && config.topicMode == TopicMode::Single)
     {
-        auto result = mqtt::JsonConfigWrapper::validateTopic(config.topicName, loggerComponent);
+        auto result = mqtt::utils::validateTopic(config.topicName);
         hasSettingError = !result.success;
         settingErrors.push_back(std::move(result.msg));
     }
diff --git a/modules/mqtt_streaming_module/src/mqtt_subscriber_fb_impl.cpp b/modules/mqtt_streaming_module/src/mqtt_subscriber_fb_impl.cpp
@@ -1,13 +1,14 @@
 #include "mqtt_streaming_module/constants.h"
-#include <mqtt_streaming_module/property_helper.h>
+#include "mqtt_streaming_protocol/JsonConfigWrapper.h"
+#include "mqtt_streaming_protocol/utils.h"
 #include <boost/algorithm/string.hpp>
 #include <fstream>
 #include <mqtt_streaming_module/helper.h>
 #include <mqtt_streaming_module/mqtt_json_decoder_fb_impl.h>
 #include <mqtt_streaming_module/mqtt_subscriber_fb_impl.h>
+#include <mqtt_streaming_module/property_helper.h>
 #include <opendaq/binary_data_packet_factory.h>
 #include <sstream>
-#include "JsonConfigWrapper.h"
 
 BEGIN_NAMESPACE_OPENDAQ_MQTT_STREAMING_MODULE
 
@@ -316,7 +317,7 @@ void MqttSubscriberFbImpl::propertyChanged()
 
 bool MqttSubscriberFbImpl::setTopic(std::string topic)
 {
-    const auto validationStatus = mqtt::JsonConfigWrapper::validateTopic(topic, loggerComponent);
+    const auto validationStatus = mqtt::utils::validateTopic(topic);
     if (validationStatus.success)
     {
         LOG_I("An MQTT topic: {}", topic);
diff --git a/modules/mqtt_streaming_module/tests/test_mqtt_json_decoder_fb.cpp b/modules/mqtt_streaming_module/tests/test_mqtt_json_decoder_fb.cpp
@@ -4,14 +4,15 @@
 #include "mqtt_streaming_module/mqtt_json_decoder_fb_impl.h"
 #include "test_daq_test_helper.h"
 #include "test_data.h"
-#include "timestampConverter.h"
+#include "mqtt_streaming_protocol/utils.h"
 #include <cmath>
 #include <coreobjects/property_factory.h>
 #include <coreobjects/property_object_factory.h>
 #include <mqtt_streaming_module/constants.h>
 #include <opendaq/reader_factory.h>
 #include <testutils/testutils.h>
 #include <chrono>
+#include <iomanip>
 
 using namespace daq;
 using namespace daq::modules::mqtt_streaming_module;
diff --git a/shared/mqtt_streaming_protocol/include/mqtt_streaming_protocol/JsonConfigWrapper.h b/shared/mqtt_streaming_protocol/include/mqtt_streaming_protocol/JsonConfigWrapper.h
@@ -14,8 +14,6 @@ class JsonConfigWrapper final
 public:
     JsonConfigWrapper(const std::string& config);
 
-    static CmdResult validateTopic(const daq::StringPtr topic, const daq::LoggerComponentPtr loggerComponent = nullptr);
-
     std::vector<std::pair<std::string, MqttMsgDescriptor>> extractDescription();
     std::string extractTopic();
     CmdResult isJsonValid();
diff --git a/shared/mqtt_streaming_protocol/include/mqtt_streaming_protocol/MqttAsyncClient.h b/shared/mqtt_streaming_protocol/include/mqtt_streaming_protocol/MqttAsyncClient.h
diff --git a/shared/mqtt_streaming_protocol/include/mqtt_streaming_protocol/MqttDataWrapper.h b/shared/mqtt_streaming_protocol/include/mqtt_streaming_protocol/MqttDataWrapper.h
diff --git a/shared/mqtt_streaming_protocol/include/mqtt_streaming_protocol/MqttMessage.h b/shared/mqtt_streaming_protocol/include/mqtt_streaming_protocol/MqttMessage.h
diff --git a/shared/mqtt_streaming_protocol/include/mqtt_streaming_protocol/MqttSettings.h b/shared/mqtt_streaming_protocol/include/mqtt_streaming_protocol/MqttSettings.h
diff --git a/shared/mqtt_streaming_protocol/include/mqtt_streaming_protocol/common.h b/shared/mqtt_streaming_protocol/include/mqtt_streaming_protocol/common.h
diff --git a/shared/mqtt_streaming_protocol/include/mqtt_streaming_protocol/utils.h b/shared/mqtt_streaming_protocol/include/mqtt_streaming_protocol/utils.h
@@ -0,0 +1,13 @@
+#pragma once
+
+#include "mqtt_streaming_protocol/common.h"
+#include <string>
+
+namespace mqtt::utils
+{
+
+mqtt::CmdResult validateTopic(const daq::StringPtr topic);
+uint64_t numericToMicroseconds(uint64_t val);
+uint64_t toUnixTicks(const std::string& input);
+
+} // namespace mqtt::utils
diff --git a/shared/mqtt_streaming_protocol/src/CMakeLists.txt b/shared/mqtt_streaming_protocol/src/CMakeLists.txt
@@ -3,18 +3,19 @@ set(LIB_NAME mqtt_streaming_protocol)
 set(SRC_Cpp MqttAsyncClient.cpp
             MqttDataWrapper.cpp
             JsonConfigWrapper.cpp
+            utils.cpp
 )
 
 set(SRC_PublicHeaders   MqttAsyncClient.h
 			MqttMessage.h
 			MqttSettings.h
                         MqttDataWrapper.h
                         JsonConfigWrapper.h
-                        timestampConverter.h
+                        utils.h
                         common.h
 )
 
-set(INCLUDE_DIR ../include)
+set(INCLUDE_DIR ../include/${TARGET_FOLDER_NAME})
 opendaq_prepend_include(${INCLUDE_DIR} SRC_PublicHeaders)
 
 source_group("include" FILES ${SRC_PublicHeaders})
diff --git a/shared/mqtt_streaming_protocol/src/JsonConfigWrapper.cpp b/shared/mqtt_streaming_protocol/src/JsonConfigWrapper.cpp
@@ -1,4 +1,4 @@
-#include "JsonConfigWrapper.h"
+#include "mqtt_streaming_protocol/JsonConfigWrapper.h"
 
 #include <boost/algorithm/string.hpp>
 #include <coreobjects/unit_factory.h>
@@ -19,39 +19,6 @@ JsonConfigWrapper::JsonConfigWrapper(const std::string& config)
     doc.Parse(config.c_str());
 }
 
-CmdResult JsonConfigWrapper::validateTopic(const daq::StringPtr topic, const daq::LoggerComponentPtr loggerComponent)
-{
-
-    CmdResult result(true, "");
-    if (!topic.assigned() || topic.getLength() == 0)
-    {
-        result = CmdResult(false, "Empty topic is not allowed!");
-        if (loggerComponent.assigned())
-        {
-            LOG_W("{}", result.msg);
-        }
-        return result;
-    }
-
-    std::vector<std::string> list;
-    boost::split(list, topic.toStdString(), boost::is_any_of("/"));
-
-    for (const auto& part : list)
-    {
-        if (part == "#" || part == "+")
-        {
-            result = CmdResult(false, fmt::format("Wildcard characters '+' and '#' are not allowed in topic: {}", topic.toStdString()));
-            if (loggerComponent.assigned())
-            {
-                LOG_W("{}", result.msg);
-            }
-            return result;
-        }
-    }
-
-    return result;
-}
-
 std::vector<std::pair<std::string, MqttMsgDescriptor>> JsonConfigWrapper::extractDescription()
 {
     std::vector<std::pair<std::string, MqttMsgDescriptor>> result;
diff --git a/shared/mqtt_streaming_protocol/src/MqttAsyncClient.cpp b/shared/mqtt_streaming_protocol/src/MqttAsyncClient.cpp
@@ -1,4 +1,4 @@
-#include "MqttAsyncClient.h"
+#include "mqtt_streaming_protocol/MqttAsyncClient.h"
 #include <future>
 
 namespace mqtt
diff --git a/shared/mqtt_streaming_protocol/src/MqttDataWrapper.cpp b/shared/mqtt_streaming_protocol/src/MqttDataWrapper.cpp
@@ -1,12 +1,12 @@
-#include "MqttDataWrapper.h"
+#include "mqtt_streaming_protocol/MqttDataWrapper.h"
 
 #include <opendaq/binary_data_packet_factory.h>
 #include <opendaq/data_descriptor_factory.h>
 #include <opendaq/packet_factory.h>
 #include <opendaq/sample_type_traits.h>
 #include <rapidjson/document.h>
 
-#include <timestampConverter.h>
+#include <mqtt_streaming_protocol/utils.h>
 
 namespace
 {
diff --git a/shared/mqtt_streaming_protocol/src/utils.cpp b/shared/mqtt_streaming_protocol/src/utils.cpp
@@ -1,15 +1,40 @@
 #pragma once
 
+#include "mqtt_streaming_protocol/utils.h"
 #include <algorithm>
 #include <boost/date_time/posix_time/posix_time.hpp>
+#include <boost/algorithm/string.hpp>
 #include <cctype>
 #include <cmath>
 #include <cstdint>
 #include <string>
 
 namespace mqtt::utils
 {
-inline uint64_t numericToMicroseconds(uint64_t val)
+mqtt::CmdResult validateTopic(const daq::StringPtr topic)
+{
+    CmdResult result(true, "");
+    if (!topic.assigned() || topic.getLength() == 0)
+    {
+        result = CmdResult(false, "Empty topic is not allowed!");
+        return result;
+    }
+
+    std::vector<std::string> list;
+    boost::split(list, topic.toStdString(), boost::is_any_of("/"));
+
+    for (const auto& part : list)
+    {
+        if (part == "#" || part == "+")
+        {
+            result = CmdResult(false, fmt::format("Wildcard characters '+' and '#' are not allowed in topic: {}", topic.toStdString()));
+            return result;
+        }
+    }
+
+    return result;
+}
+uint64_t numericToMicroseconds(uint64_t val)
 {
     // Determine number of digits
     int digits = (val == 0) ? 1 : static_cast<int>(std::log10(val)) + 1;
@@ -29,7 +54,7 @@ inline uint64_t numericToMicroseconds(uint64_t val)
     }
 }
 
-inline uint64_t toUnixTicks(const std::string& input)
+uint64_t toUnixTicks(const std::string& input)
 {
     std::string str = input;
     // Trim leading/trailing spaces
diff --git a/shared/mqtt_streaming_protocol/tests/MqttAsyncClientWrapper.cpp b/shared/mqtt_streaming_protocol/tests/MqttAsyncClientWrapper.cpp
@@ -1,5 +1,5 @@
 #include "MqttAsyncClientWrapper.h"
-#include "MqttAsyncClient.h"
+#include "mqtt_streaming_protocol/MqttAsyncClient.h"
 #include "mqtt_streaming_helper/timer.h"
 #include <future>
 
diff --git a/shared/mqtt_streaming_protocol/tests/MqttAsyncClientWrapper.h b/shared/mqtt_streaming_protocol/tests/MqttAsyncClientWrapper.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "MqttAsyncClient.h"
+#include "mqtt_streaming_protocol/MqttAsyncClient.h"
 #include <future>
 #include <iostream>
 
diff --git a/shared/mqtt_streaming_protocol/tests/test_mqtt_streaming_protocol.cpp b/shared/mqtt_streaming_protocol/tests/test_mqtt_streaming_protocol.cpp
@@ -1,7 +1,7 @@
-#include "MqttAsyncClient.h"
+#include "mqtt_streaming_protocol/MqttAsyncClient.h"
 #include "MqttAsyncClientWrapper.h"
 #include "mqtt_streaming_helper/timer.h"
-#include "timestampConverter.h"
+#include "mqtt_streaming_protocol/utils.h"
 #include <future>
 #include <testutils/testutils.h>
 #include <thread>
