WIP

Author: sgallou

sources/plugins/EnOcean/message/LearnMode.h

@@ -5,56 +5,56 @@
 
 namespace message
 {
-    enum class LearnMode
-    {
-        SimpleLearnMode,
-        AdvancedLearnMode,
-        AdvancedLearnModeSelectRepeater,
-    };
+	enum class LearnMode
+	{
+		SimpleLearnMode,
+		AdvancedLearnMode,
+		AdvancedLearnModeSelectRepeater,
+	};
 
-    static std::string ToString(LearnMode learnMode)
-    {
-        switch (learnMode)
-        {
-        case LearnMode::SimpleLearnMode:
-            return "Simple";
-        case LearnMode::AdvancedLearnMode:
-            return "Advanced";
-        case LearnMode::AdvancedLearnModeSelectRepeater:
-            return "Advanced, select repeater";
-        default: // NOLINT(clang-diagnostic-covered-switch-default)
-            return "Unknown";
-        }
-    }
+	static std::string ToString(LearnMode learnMode)
+	{
+		switch (learnMode)
+		{
+		case LearnMode::SimpleLearnMode:
+			return "Simple";
+		case LearnMode::AdvancedLearnMode:
+			return "Advanced";
+		case LearnMode::AdvancedLearnModeSelectRepeater:
+			return "Advanced, select repeater";
+		default: // NOLINT(clang-diagnostic-covered-switch-default)
+			return "Unknown";
+		}
+	}
 
-    static unsigned char ToProtocolValue(const LearnMode learnMode)
-    {
-        switch (learnMode)
-        {
-        case LearnMode::SimpleLearnMode:
-            return 0;
-        case LearnMode::AdvancedLearnMode:
-            return 1;
-        case LearnMode::AdvancedLearnModeSelectRepeater:
-            return 2;
-        default: // NOLINT(clang-diagnostic-covered-switch-default)
-            throw std::invalid_argument("LeanMode invalid value"); // NOLINT(clang-diagnostic-covered-switch-default)
-        }
-    }
+	static unsigned char ToProtocolValue(const LearnMode learnMode)
+	{
+		switch (learnMode)
+		{
+		case LearnMode::SimpleLearnMode:
+			return 0;
+		case LearnMode::AdvancedLearnMode:
+			return 1;
+		case LearnMode::AdvancedLearnModeSelectRepeater:
+			return 2;
+		default: // NOLINT(clang-diagnostic-covered-switch-default)
+			throw std::invalid_argument("LeanMode invalid value"); // NOLINT(clang-diagnostic-covered-switch-default)
+		}
+	}
 
-    static LearnMode ToLearnMode(const unsigned char protocolValue)
-    {
-        switch (protocolValue)
-        {
-        case 0:
-            return LearnMode::SimpleLearnMode;
-        case 1:
-            return LearnMode::AdvancedLearnMode;
-        case 2:
-            return LearnMode::AdvancedLearnModeSelectRepeater;
-        default:
-            YADOMS_LOG(error) << boost::format("Smart Ack response : unsupported LearnModeExtended value %1%") % protocolValue;
-            return LearnMode::SimpleLearnMode;
-        }
-    }
+	static LearnMode ToLearnMode(const unsigned char protocolValue)
+	{
+		switch (protocolValue)
+		{
+		case 0:
+			return LearnMode::SimpleLearnMode;
+		case 1:
+			return LearnMode::AdvancedLearnMode;
+		case 2:
+			return LearnMode::AdvancedLearnModeSelectRepeater;
+		default:
+			YADOMS_LOG(error) << "Smart Ack response : unsupported LearnModeExtended value " << static_cast<int>(protocolValue);
+			return LearnMode::SimpleLearnMode;
+		}
+	}
 } // namespace message

sources/plugins/EnOcean/message/MessageHelpers.cpp

@@ -42,8 +42,11 @@ namespace message
                                   {
                                       answer = std::move(esp3Packet);
                                   }))
-            throw std::runtime_error(
-                (boost::format("Fail to send message to %1% : no answer to \"%2%\"") % message.destinationId() % messageName).str());
+            throw std::runtime_error(std::string("Fail to send message to ")
+                                     + message.destinationId() 
+                                     + " : no answer to \""
+                                     + messageName
+                                     + "\"");
 
         if (const auto response = boost::make_shared<response::CReceivedMessage>(answer);
             response->returnCode() != response::CReceivedMessage::RET_OK)

sources/plugins/EnOcean/message/RequestDongleVersionCommand.cpp

@@ -55,10 +55,10 @@ namespace message
 
         static constexpr auto ExpectedDataSize = 33u;
         if (answer->header().dataLength() != ExpectedDataSize)
-            throw CProtocolException(
-                (boost::format("Invalid data length %1%, expected %2%")
-                    % answer->header().dataLength()
-                    % ExpectedDataSize).str());
+            throw CProtocolException(std::string("Invalid data length ")
+                                     + std::to_string(answer->header().dataLength())
+                                     + ", expected "
+                                     + std::to_string(ExpectedDataSize));
 
         processAnswer(response::CReceivedMessage(answer),
                       "CO_RD_VERSION");

sources/server/pluginSystem/Factory.h

@@ -1,9 +1,12 @@
 #pragma once
 #include "IFactory.h"
 #include "InstanceStateHandler.h"
+#include <shared/ILocation.h>
 #include <shared/process/IProcess.h>
 #include <shared/process/ICommandLine.h>
 #include <shared/process/IExternalProcessLogger.h>
+#include <shared/versioning/SemVer.h>
+#include "IPathProvider.h"
 #include "IIpcAdapter.h"
 #include <IPathProvider.h>
 #include "yPluginApiImplementation.h"

sources/server/pluginSystem/internalPlugin/Information.h

@@ -20,8 +20,8 @@ namespace pluginSystem
          const shared::versioning::CSemVer& getVersion() const override;
          const std::string& getAuthor() const override;
          const std::string& getUrl() const override;
-         std::string toString() const override;
          std::string getIdentity() const override;
+         std::string toString() const override;
          bool isSupportedOnThisPlatform() const override;
          bool getSupportManuallyCreatedDevice() const override;
          bool getSupportDeviceRemovedNotification() const override;