Give independent allowed sample type set for each handler

Author: NikolaiShipilov

modules/mqtt_streaming_module/include/mqtt_streaming_module/atomic_signal_atomic_sample_handler.h

@@ -18,6 +18,7 @@
 
 #include <opendaq/function_block_ptr.h>
 #include <mqtt_streaming_module/handler_base.h>
+#include <set>
 
 BEGIN_NAMESPACE_OPENDAQ_MQTT_STREAMING_MODULE
 
@@ -41,6 +42,18 @@ class AtomicSignalAtomicSampleHandler : public HandlerBase
     MqttDataSample processDataPacket(SignalContext& signalContext, const DataPacketPtr& dataPacket, size_t offset);
     std::string toString(const std::string valueFieldName, daq::DataPacketPtr packet, size_t offset);
     std::string buildTopicName(const SignalContext& signalContext);
+
+
+    inline static const std::set<SampleType> allowedSampleTypes{SampleType::Float64,
+                                                                SampleType::Float32,
+                                                                SampleType::UInt8,
+                                                                SampleType::Int8,
+                                                                SampleType::UInt16,
+                                                                SampleType::Int16,
+                                                                SampleType::UInt32,
+                                                                SampleType::Int32,
+                                                                SampleType::UInt64,
+                                                                SampleType::Int64};
 };
 
 END_NAMESPACE_OPENDAQ_MQTT_STREAMING_MODULE

modules/mqtt_streaming_module/include/mqtt_streaming_module/group_signal_shared_ts_handler.h

@@ -19,6 +19,7 @@
 #include <opendaq/function_block_ptr.h>
 #include <mqtt_streaming_module/handler_base.h>
 #include <opendaq/multi_reader_ptr.h>
+#include <set>
 
 BEGIN_NAMESPACE_OPENDAQ_MQTT_STREAMING_MODULE
 
@@ -70,6 +71,18 @@ class GroupSignalSharedTsHandler : public HandlerBase
     static std::string messageFromFields(const std::vector<std::string>& fields);
     static TimestampTickStruct domainToTs(const MultiReaderStatusPtr status);
     bool processEvents(const daq::MultiReaderStatusPtr& status);    // true if descriptor changed or invalid reader
+
+
+    inline static const std::set<SampleType> allowedSampleTypes{SampleType::Float64,
+                                                                SampleType::Float32,
+                                                                SampleType::UInt8,
+                                                                SampleType::Int8,
+                                                                SampleType::UInt16,
+                                                                SampleType::Int16,
+                                                                SampleType::UInt32,
+                                                                SampleType::Int32,
+                                                                SampleType::UInt64,
+                                                                SampleType::Int64};
 };
 
 END_NAMESPACE_OPENDAQ_MQTT_STREAMING_MODULE

modules/mqtt_streaming_module/include/mqtt_streaming_module/handler_base.h

@@ -21,7 +21,6 @@
 #include <mqtt_streaming_module/types.h>
 #include <opendaq/sample_type_traits.h>
 #include <vector>
-#include <set>
 
 BEGIN_NAMESPACE_OPENDAQ_MQTT_STREAMING_MODULE
 
@@ -174,17 +173,6 @@ class HandlerBase
         }
         return valueFieldName;
     }
-
-    inline static const std::set<SampleType> allowedSampleTypes{SampleType::Float64,
-                                                         SampleType::Float32,
-                                                         SampleType::UInt8,
-                                                         SampleType::Int8,
-                                                         SampleType::UInt16,
-                                                         SampleType::Int16,
-                                                         SampleType::UInt32,
-                                                         SampleType::Int32,
-                                                         SampleType::UInt64,
-                                                         SampleType::Int64};
 };
 
 END_NAMESPACE_OPENDAQ_MQTT_STREAMING_MODULE

modules/mqtt_streaming_module/include/mqtt_streaming_module/signal_arr_atomic_sample_handler.h

@@ -19,6 +19,7 @@
 #include <opendaq/function_block_ptr.h>
 #include <mqtt_streaming_module/handler_base.h>
 #include <opendaq/multi_reader_ptr.h>
+#include <set>
 
 BEGIN_NAMESPACE_OPENDAQ_MQTT_STREAMING_MODULE
 
@@ -39,6 +40,18 @@ class SignalArrayAtomicSampleHandler : public HandlerBase
     std::string toString(const std::string valueFieldName, daq::DataPacketPtr packet);
     std::string buildTopicName();
     static std::string messageFromArray(const std::vector<std::string>& array);
+
+
+    inline static const std::set<SampleType> allowedSampleTypes{SampleType::Float64,
+                                                                SampleType::Float32,
+                                                                SampleType::UInt8,
+                                                                SampleType::Int8,
+                                                                SampleType::UInt16,
+                                                                SampleType::Int16,
+                                                                SampleType::UInt32,
+                                                                SampleType::Int32,
+                                                                SampleType::UInt64,
+                                                                SampleType::Int64};
 };
 
 END_NAMESPACE_OPENDAQ_MQTT_STREAMING_MODULE