Fix build

Author: sgallou

sources/plugins/RfxLanXpl/xplcore/XplMessage.cpp

@@ -199,13 +199,11 @@ namespace xplcore
       try
       {
          //we explode the string onto the { char
-         std::vector<std::string> result;
          auto trimRawMessage = boost::trim_copy(rawMessage);
          if (trimRawMessage[trimRawMessage.size() - 1] == '\0')
             trimRawMessage.erase(trimRawMessage.end() - 1);
 
-         boost::split(result, trimRawMessage, boost::is_any_of("{}"), boost::token_compress_on);
-
+         std::vector<std::string> result = shared::CStringExtension::splitAnyOfAndCompress(trimRawMessage, "{}");
 
          //we trim each '\n' '\r' at the beggining or the end of each line
          //and we suppress empty lines due to previous trim
@@ -255,9 +253,8 @@ namespace xplcore
          //Header block parsing
 
          //we explode onto line feed char and also '\r' to be more peaceful
-         std::vector<std::string> header;
          auto trimHeaderBlockIndex = boost::trim_copy(result[headerBlockIndex]);
-         boost::split(header, trimHeaderBlockIndex, boost::is_any_of("\n\r"), boost::token_compress_on);
+         std::vector<std::string> header = shared::CStringExtension::splitAnyOfAndCompress(trimHeaderBlockIndex, "\n\r");
 
          //We must have 3 results : hop, source and dest
          if (header.size() != 3)
@@ -270,9 +267,8 @@ namespace xplcore
          for (auto headerLineIter = header.begin(); headerLineIter != header.end(); ++headerLineIter)
          {
             auto headerLine = *headerLineIter;
-            std::vector<std::string> headerLineDecomposed;
             auto trimHeaderLine = boost::trim_copy(headerLine);
-            boost::split(headerLineDecomposed, trimHeaderLine, boost::is_any_of("="), boost::token_compress_on);
+            std::vector<std::string> headerLineDecomposed = shared::CStringExtension::splitAnyOfAndCompress(trimHeaderLine, "=");
 
             const auto nameIndex = 0;
             const auto valueIndex = 1;
@@ -319,16 +315,14 @@ namespace xplcore
          msg.setMessageSchemaIdentifier(CXplMessageSchemaIdentifier::parse(result[messageSchemaIndex]));
 
          //Body parsing
-         std::vector<std::string> body;
          auto trimBodyIndex = boost::trim_copy(result[bodyIndex]);
-         boost::split(body, trimBodyIndex, boost::is_any_of("\n\r"), boost::token_compress_on);
-
+         std::vector<std::string> body = shared::CStringExtension::splitAnyOfAndCompress(trimBodyIndex, "\n\r");
+         
          for (auto bodyIter = body.begin(); bodyIter != body.end(); ++bodyIter)
          {
             auto bodyLine = *bodyIter;
-            std::vector<std::string> bodyLineDecomposed;
             auto trimBodyLine = boost::trim_copy(bodyLine);
-            boost::split(bodyLineDecomposed, trimBodyLine, boost::is_any_of("="), boost::token_compress_on);
+            std::vector<std::string> bodyLineDecomposed = shared::CStringExtension::splitAnyOfAndCompress(trimBodyLine, "=");
 
             //we must have a couple of name=value -> 2 elements
             if (bodyLineDecomposed.size() != 2)

sources/plugins/RfxLanXpl/xplcore/XplMessageFilter.cpp

@@ -4,6 +4,8 @@
 #include "XplException.h"
 #include <boost/algorithm/string.hpp>
 
+#include "shared/StringExtension.h"
+
 // A client send its data as broadcast on the XPL port,
 // and listen on a certain port, given in its XPL frame.
 
@@ -24,8 +26,7 @@ namespace xplcore
       //we allow a single "*" for all filter instead of *.*.*.*.*.*
       if (lineString != CXplHelper::WildcardString)
       {
-         std::vector<std::string> line;
-         boost::split(line, lineString, boost::is_any_of("."), boost::token_compress_on);
+         std::vector<std::string> line = shared::CStringExtension::splitAnyOfAndCompress(lineString, ".");
          if (line.size() != 6)
             throw CXplException("The filter string must be formed like : [msgtype].[vendor].[device].[instance].[class].[type] (wildchar * is allowed). Value given : " + filter);
 

sources/plugins/RfxLanXpl/xplcore/XplMessageSchemaIdentifier.cpp

@@ -4,6 +4,8 @@
 #include "XplException.h"
 #include <boost/algorithm/string.hpp>
 
+#include "shared/StringExtension.h"
+
 namespace xplcore
 {
    CXplMessageSchemaIdentifier::CXplMessageSchemaIdentifier()
@@ -64,8 +66,7 @@ namespace xplcore
    {
       auto lineString = boost::trim_copy(rawMessageSchemaIdentifier);
 
-      std::vector<std::string> line;
-      boost::split(line, lineString, boost::is_any_of("."), boost::token_compress_on);
+      std::vector<std::string> line = shared::CStringExtension::splitAnyOfAndCompress(lineString, ".");
 
       //We must have 2 results : class Id, type Id
       if (line.size() != 2)

sources/plugins/RfxLanXpl/xplrules/Protocol.h

@@ -35,9 +35,7 @@ namespace xplrules
       //------------------------------------
       ///\brief Destructor
       //------------------------------------
-      virtual ~CProtocol()
-      {
-      }
+      ~CProtocol() override = default;
 
       // IProtocol implementation
       boost::shared_ptr<IRule> createRuleInstance(CRuleInstanceManager& instanceManager) override

sources/plugins/RfxLanXpl/xplrules/rfxLanXpl/AcBasic.cpp

@@ -9,25 +9,20 @@ namespace xplrules
    namespace rfxLanXpl
    {
       DECLARE_ENUM_IMPLEMENTATION_NESTED(CAcBasic::EState, EState,
-         ((Off))
-         ((On))
-         ((Dim))
+                                         ((Off))
+                                         ((On))
+                                         ((Dim))
       );
 
       std::string CAcBasic::m_keywordAddress = "address";
       std::string CAcBasic::m_keywordUnit = "unit";
       std::string CAcBasic::m_keywordCommand = "command";
-      std::string CAcBasic::m_keywordCommandValues = "{ \"values\" : [\"on\", \"off\", \"preset\"] }";
+      std::string CAcBasic::m_keywordCommandValues = R"({ "values" : ["on", "off", "preset"] })";
       std::string CAcBasic::m_keywordLevel = "level";
       xplcore::CXplMessageSchemaIdentifier CAcBasic::m_protocol = xplcore::CXplMessageSchemaIdentifier::parse("ac.basic");
 
-      CAcBasic::CAcBasic()
-      {
-      }
-
-      CAcBasic::~CAcBasic()
-      {
-      }
+      CAcBasic::CAcBasic() = default;
+      CAcBasic::~CAcBasic() = default;
 
       // IRule implementation
       xplcore::CXplMessageSchemaIdentifier CAcBasic::getProtocol()
@@ -39,13 +34,13 @@ namespace xplrules
       {
          std::string deviceId = msg.getBodyValue(m_keywordAddress) + "-" + msg.getBodyValue(m_keywordUnit);
          std::string commercialName("ANSLUT, Chacon, DI.O, KlikAanKlikUit, NEXA, Proove, Intertechno, Düwi, HomeEasy UK/EU");
-         return CDeviceIdentifier(deviceId, commercialName, m_protocol, m_protocol);
+         return {deviceId, commercialName, m_protocol, m_protocol};
       }
 
       KeywordList CAcBasic::identifyKeywords(xplcore::CXplMessage& msg)
       {
          KeywordList keywords;
-         keywords.push_back(boost::make_shared<shared::plugin::yPluginApi::historization::CDimmable>(m_keywordCommand));
+         keywords.emplace_back(boost::make_shared<shared::plugin::yPluginApi::historization::CDimmable>(m_keywordCommand));
          return keywords;
       }
 
@@ -61,6 +56,7 @@ namespace xplrules
             EState valFromEquipment(msg.getBodyValue(m_keywordCommand));
 
             auto sw(boost::make_shared<shared::plugin::yPluginApi::historization::CDimmable>(m_keywordCommand));
+            // ReSharper disable once CppDefaultCaseNotHandledInSwitchStatement
             switch (valFromEquipment)
             {
             case EState::kOnValue:
@@ -73,9 +69,9 @@ namespace xplrules
                sw->set(boost::lexical_cast<int>(msg.getBodyValue(m_keywordLevel)));
                break;
             }
-            data.push_back(sw);
+            data.emplace_back(sw);
          }
-         catch (...)
+         catch (...) // NOLINT(bugprone-empty-catch)
          {
          }
 
@@ -96,8 +92,7 @@ namespace xplrules
 
          //check the device address is valid
          std::string address = commandData->getDevice();
-         std::vector<std::string> splittedAddress;
-         boost::split(splittedAddress, address, boost::is_any_of("-"), boost::token_compress_on);
+         std::vector<std::string> splittedAddress = shared::CStringExtension::splitAnyOfAndCompress(address, "-");
 
          if (splittedAddress.size() != 2)
          {
@@ -149,7 +144,7 @@ namespace xplrules
             //set the command
             auto s = EState::kDim;
             newMessage->addToBody(m_keywordCommand, s);
-            newMessage->addToBody(m_keywordLevel, boost::lexical_cast<std::string>(commandDetails.switchLevel()));
+            newMessage->addToBody(m_keywordLevel, std::to_string(commandDetails.switchLevel()));
          }
 
          return newMessage;
@@ -177,5 +172,3 @@ namespace xplrules
       }
    } //namespace rfxLanXpl
 } //namespace xplrules
-
-

sources/plugins/RfxLanXpl/xplrules/rfxLanXpl/AcBasic.h

@@ -17,7 +17,7 @@ namespace xplrules
       {
       public:
          CAcBasic();
-         virtual ~CAcBasic();
+         ~CAcBasic() override;
 
          //------------------------------------
          ///\brief Provide the xpl protocol implemented by this class
@@ -52,7 +52,7 @@ namespace xplrules
             ((Off))
             ((On))
             ((Dim))
-         ) ;
+         )
 
       private:
 

sources/shared/shared/StringExtension.h

@@ -1,7 +1,6 @@
 #pragma once
 #include "exception/Exception.hpp"
 #include <cstdarg>
-#include <Poco/Types.h>
 #include <ostream>
 #include <string_view>
 #include <vector>