implicit conversion ByteArray to std::string_view, remove template for comm::TelegramHeader construct_from_data

Author: w0lek

vpr/src/server/bytearray.h

@@ -58,8 +58,8 @@ class ByteArray : public std::vector<char> {
         return std::make_pair(false, 0);
     }
 
-    std::string to_string() const {
-        return std::string(reinterpret_cast<const char*>(this->data()), this->size());
+    operator std::string_view() const {
+        return std::string_view(this->data(), this->size());
     }
 
     uint32_t calc_check_sum() {

vpr/src/server/gateio.cpp

@@ -134,7 +134,7 @@ GateIO::ActivityStatus GateIO::handle_telegrams(std::vector<comm::TelegramFrameP
     telegram_buff.take_telegram_frames(telegram_frames);
     for (const comm::TelegramFramePtr& telegram_frame: telegram_frames) {
         // process received data
-        std::string message{telegram_frame->data.to_string()};
+        std::string message{telegram_frame->data};
         bool is_echo_telegram = false;
         if ((message.size() == comm::ECHO_DATA.size()) && (message == comm::ECHO_DATA)) {
             m_logger.queue(LogLevel::Detail, "received", comm::ECHO_DATA);
@@ -168,7 +168,7 @@ GateIO::ActivityStatus GateIO::handle_client_alive_tracker(sockpp::tcp6_socket&
         /// handle sending echo to client
         if (client_alive_tracker_ptr->is_time_to_sent_echo()) {
             comm::TelegramHeader echo_header = comm::TelegramHeader::construct_from_data(comm::ECHO_DATA);
-            std::string message = echo_header.buffer().to_string();
+            std::string message{echo_header.buffer()};
             message.append(comm::ECHO_DATA);
             try {
                 std::size_t bytes_sent = client.write(message);

vpr/src/server/telegramheader.cpp

@@ -73,6 +73,11 @@ std::string TelegramHeader::info() const {
     return ss.str();
 }
 
+comm::TelegramHeader TelegramHeader::construct_from_data(const std::string_view& body, uint8_t compressor_id) {
+    uint32_t body_check_sum = ByteArray::calc_check_sum(body);
+    return comm::TelegramHeader{static_cast<uint32_t>(body.size()), body_check_sum, compressor_id};
+}
+
 } // namespace comm
 
 #endif /* NO_SERVER */

vpr/src/server/telegramheader.h

@@ -42,11 +42,7 @@ class TelegramHeader {
     explicit TelegramHeader(const ByteArray& body);
     ~TelegramHeader()=default;
 
-    template<typename T>
-    static comm::TelegramHeader construct_from_data(const T& body, uint8_t compressor_id = 0) {
-        uint32_t body_check_sum = ByteArray::calc_check_sum(body);
-        return comm::TelegramHeader{static_cast<uint32_t>(body.size()), body_check_sum, compressor_id};
-    }
+    static comm::TelegramHeader construct_from_data(const std::string_view& body, uint8_t compressor_id = 0);
 
     static constexpr size_t size() {
         return SIGNATURE_SIZE + LENGTH_SIZE + CHECKSUM_SIZE + COMPRESSORID_SIZE;

vpr/test/test_server_telegrambuffer.cpp

@@ -18,21 +18,21 @@ TEST_CASE("test_server_bytearray", "[vpr]") {
     REQUIRE(array.at(4) == '2');
     REQUIRE(array.at(5) == '2');
 
-    REQUIRE(array.to_string() == "111222");
+    REQUIRE(std::string_view{array} == "111222");
 
     REQUIRE(array.size() == 6);
 
     array.append('3');
 
     REQUIRE(array.size() == 7);
-    REQUIRE(array.to_string() == "1112223");
+    REQUIRE(std::string_view{array} == "1112223");
 
     REQUIRE(array.at(6) == '3');
 
     array.clear();
 
     REQUIRE(array.size() == 0);
-    REQUIRE(array.to_string() == "");
+    REQUIRE(std::string_view{array} == "");
 }
 
 TEST_CASE("test_server_telegrambuffer_oneOpened", "[vpr]") {
@@ -43,7 +43,7 @@ TEST_CASE("test_server_telegrambuffer_oneOpened", "[vpr]") {
     auto frames = buff.take_telegram_frames();
     REQUIRE(frames.size() == 0);
 
-    REQUIRE(buff.data().to_string() == "111222");
+    REQUIRE(std::string_view{buff.data()} == "111222");
 }
 
 TEST_CASE("test_server_telegrambuffer_notFilledTelegramButWithPrependedRubish", "[vpr]")