mqtt: refactoring

Author: viacheslauK

mqtt_streaming_client_module/src/mqtt_json_receiver_fb_impl.cpp

@@ -33,7 +33,7 @@ MqttJsonReceiverFbImpl::~MqttJsonReceiverFbImpl()
 
 void MqttJsonReceiverFbImpl::readProperties()
 {
-    auto lock = std::scoped_lock<std::mutex>(sync);
+    auto lock = std::scoped_lock(sync);
     subscribedSignals.clear();
     signalIdList.clear();
     bool isPresent = false;
@@ -66,7 +66,7 @@ void MqttJsonReceiverFbImpl::readProperties()
 
 void MqttJsonReceiverFbImpl::createDataPacket(const std::string& topic, const std::string& json)
 {
-    auto lock = std::scoped_lock<std::mutex>(sync);
+    auto lock = std::scoped_lock(sync);
     jsonDataWorker.createAndSendDataPacket(topic, json);
 }
 
@@ -79,7 +79,7 @@ void MqttJsonReceiverFbImpl::processMessage(const mqtt::MqttMessage& msg)
 
 void MqttJsonReceiverFbImpl::createSignals()
 {
-    auto lock = std::scoped_lock<std::mutex>(sync);
+    auto lock = std::scoped_lock(sync);
     if (!subscribedSignals.empty())
     {
         LOG_I("Creating signals...");
@@ -133,7 +133,7 @@ void MqttJsonReceiverFbImpl::createSignals()
 
 std::vector<std::string> MqttJsonReceiverFbImpl::getSubscribedTopics() const
 {
-    auto lock = std::scoped_lock<std::mutex>(sync);
+    auto lock = std::scoped_lock(sync);
     std::set<std::string> topicsSet;
     for (const auto& [signalId, _] : subscribedSignals)
     {
@@ -144,7 +144,7 @@ std::vector<std::string> MqttJsonReceiverFbImpl::getSubscribedTopics() const
 
 void MqttJsonReceiverFbImpl::clearSubscribedTopics()
 {
-    auto lock = std::scoped_lock<std::mutex>(sync);
+    auto lock = std::scoped_lock(sync);
     subscribedSignals.clear();
     signalIdList.clear();
 }

mqtt_streaming_client_module/src/mqtt_raw_receiver_fb_impl.cpp

@@ -33,7 +33,7 @@ MqttRawReceiverFbImpl::~MqttRawReceiverFbImpl()
 
 void MqttRawReceiverFbImpl::readProperties()
 {
-    auto lock = std::scoped_lock<std::mutex>(sync);
+    auto lock = std::scoped_lock(sync);
     topicsForSubscribing.clear();
     bool isPresent = false;
     if (objPtr.hasProperty(PROPERTY_NAME_SIGNAL_LIST))
@@ -71,7 +71,7 @@ void MqttRawReceiverFbImpl::processMessage(const mqtt::MqttMessage& msg)
 {
     std::string topic(msg.getTopic());
 
-    auto lock = std::scoped_lock<std::mutex>(sync);
+    auto lock = std::scoped_lock(sync);
     auto signalIter = outputSignals.find(topic);
     if (signalIter == outputSignals.end())
     {
@@ -86,7 +86,7 @@ void MqttRawReceiverFbImpl::processMessage(const mqtt::MqttMessage& msg)
 
 void MqttRawReceiverFbImpl::createSignals()
 {
-    auto lock = std::scoped_lock<std::mutex>(sync);
+    auto lock = std::scoped_lock(sync);
     if (!topicsForSubscribing.empty())
     {
         LOG_I("Creating signals...");

mqtt_streaming_client_module/src/mqtt_streaming_client_module_impl.cpp

@@ -72,7 +72,7 @@ MqttStreamingClientModule::onCreateDevice(const StringPtr& connectionString, con
     std::string host = configPtr.getPropertyValue(PROPERTY_NAME_MQTT_BROKER_ADDRESS);
     Int port = configPtr.getPropertyValue(PROPERTY_NAME_MQTT_BROKER_PORT);
 
-    std::scoped_lock lock(sync);
+    auto lock = std::scoped_lock(sync);
 
     DevicePtr device = createWithImplementation<IDevice, MqttStreamingDeviceImpl>(context, parent, configPtr);
 

mqtt_streaming_protocol/src/MqttAsyncClient.cpp

@@ -149,7 +149,7 @@ MqttConnectionStatus MqttAsyncClient::isConnected() const
 
 std::scoped_lock<std::recursive_mutex> MqttAsyncClient::getCbLock()
 {
-    return std::scoped_lock<decltype(cbMtx)>(cbMtx);
+    return std::scoped_lock(cbMtx);
 }
 
 void MqttAsyncClient::setUsernamePasswrod(std::string username, std::string password)

mqtt_streaming_server_module/src/mqtt_streaming_server_impl.cpp

@@ -149,7 +149,7 @@ void MqttStreamingServerImpl::processingThreadFunc()
     while (processingThreadRunning)
     {
         {
-            std::scoped_lock lock(readersSync);
+            auto lock = std::scoped_lock(readersSync);
             if (!topicsAreSent)
                 sendTopicList();
             bool hasPacketsToRead;
@@ -350,7 +350,7 @@ void MqttStreamingServerImpl::onStopServer()
 
 void MqttStreamingServerImpl::addReader(SignalPtr signalToRead)
 {
-    std::scoped_lock lock(readersSync);
+    auto lock = std::scoped_lock(readersSync);
     signals.pushBack(signalToRead);
     streamReaders.emplace_back(StreamReaderBuilder()
                                    .setSignal(signalToRead)