Skip to content

Commit 802cc96

Browse files
committed
mqtt: refactoring
1 parent 76fa5c9 commit 802cc96

3 files changed

Lines changed: 3 additions & 5 deletions

File tree

mqtt_streaming_protocol/include/MqttDataWrapper.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@ class MqttDataWrapper final
5252
static std::string extractDeviceName(const std::string& topic);
5353

5454
static std::string serializeSampleData(const SampleData& data);
55-
static std::string serializeSignalDescriptors(
56-
daq::ListObjectPtr<daq::IList, daq::ISignal, daq::GenericSignalPtr<daq::ISignal>> signals);
55+
static std::string serializeSignalDescriptors(daq::ListPtr<daq::ISignal> signals);
5756

5857
static std::string buildTopicFromId(const std::string& globalId);
5958
static std::string buildSignalsTopic(const std::string& deviceId);

mqtt_streaming_protocol/src/MqttDataWrapper.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ std::string MqttDataWrapper::serializeSampleData(const SampleData& data)
4444
return result;
4545
}
4646

47-
std::string MqttDataWrapper::serializeSignalDescriptors(
48-
daq::ListObjectPtr<daq::IList, daq::ISignal, daq::GenericSignalPtr<daq::ISignal>> signals)
47+
std::string MqttDataWrapper::serializeSignalDescriptors(daq::ListPtr<daq::ISignal> signals)
4948
{
5049
std::string result;
5150
rapidjson::Document doc;

mqtt_streaming_server_module/include/mqtt_streaming_server_module/mqtt_streaming_server_impl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class MqttStreamingServerImpl : public daq::Server
6868

6969
static void populateDefaultConfigFromProvider(const ContextPtr& context, const PropertyObjectPtr& config);
7070

71-
daq::ListObjectPtr<daq::IList, daq::ISignal, daq::GenericSignalPtr<daq::ISignal>> signals;
71+
daq::ListPtr<ISignal> signals;
7272
std::vector<StreamReaderPtr> streamReaders;
7373

7474
std::string rootDeviceGlobalId;

0 commit comments

Comments
 (0)