From 8bc80f9885c491c720abdde7fa50b8f7d200dd56 Mon Sep 17 00:00:00 2001
From: Henry Winkel <henrywinkel@bundeswehr.org>
Date: Wed, 5 Jul 2023 18:02:23 +0200
Subject: [PATCH] CHG: changed the return val from the tcp classes to string

---
 include/DirectCommunicationClient.hpp | 2 +-
 include/DirectCommunicationServer.hpp | 2 +-
 src/DirectCommunicationClient.cpp     | 4 ++--
 src/DirectCommunicationServer.cpp     | 4 ++--
 tests/test_DirectComms.cpp            | 8 ++++----
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/include/DirectCommunicationClient.hpp b/include/DirectCommunicationClient.hpp
index e1c61dc..80669b9 100644
--- a/include/DirectCommunicationClient.hpp
+++ b/include/DirectCommunicationClient.hpp
@@ -25,7 +25,7 @@ namespace DirectCommunication
             ~DirectCommunicationClient();
 
             void sendMessage(std::string msg);
-            std::unique_ptr<std::string> getLatestMessage();
+            std::string getLatestMessage();
 
         private:
             ushort port_;
diff --git a/include/DirectCommunicationServer.hpp b/include/DirectCommunicationServer.hpp
index c3c315b..7b9873f 100644
--- a/include/DirectCommunicationServer.hpp
+++ b/include/DirectCommunicationServer.hpp
@@ -25,7 +25,7 @@ namespace DirectCommunication
             ~DirectCommunicationServer();
 
             void sendMessage(std::string msg);
-            std::unique_ptr<std::string> getLatestMessage();
+            std::string getLatestMessage();
 
             int countClients();
 
diff --git a/src/DirectCommunicationClient.cpp b/src/DirectCommunicationClient.cpp
index d4cc912..78b8f25 100644
--- a/src/DirectCommunicationClient.cpp
+++ b/src/DirectCommunicationClient.cpp
@@ -46,13 +46,13 @@ namespace DirectCommunication
         
     }
 
-    std::unique_ptr<std::string>  DirectCommunicationClient::getLatestMessage()
+    std::string  DirectCommunicationClient::getLatestMessage()
     {
         if (receivedMessages_.size() > 0) 
         {   
             std::string msg; 
             receivedMessages_.get(msg);
-            return std::make_unique<std::string>(std::move(msg));
+            return msg;
         }
         return nullptr;
     }
diff --git a/src/DirectCommunicationServer.cpp b/src/DirectCommunicationServer.cpp
index 9286532..ad0a0e8 100644
--- a/src/DirectCommunicationServer.cpp
+++ b/src/DirectCommunicationServer.cpp
@@ -47,13 +47,13 @@ namespace DirectCommunication
         }
     }
 
-    std::unique_ptr<std::string>  DirectCommunicationServer::getLatestMessage()
+    std::string  DirectCommunicationServer::getLatestMessage()
     {
         if (receivedMessages_.size() > 0) 
         {   
             std::string msg; 
             receivedMessages_.get(msg);
-            return std::make_unique<std::string>(std::move(msg));
+            return msg;
         }
         return nullptr;
     }
diff --git a/tests/test_DirectComms.cpp b/tests/test_DirectComms.cpp
index cc537f0..c3ee1d8 100644
--- a/tests/test_DirectComms.cpp
+++ b/tests/test_DirectComms.cpp
@@ -49,23 +49,23 @@ SCENARIO("A test scenario","[keywords]")
       std::this_thread::sleep_for(std::chrono::milliseconds(1000));
 
       auto msg1FromClient = server.getLatestMessage();  
-      LOG_S(INFO)<< *msg1FromClient.get();
+      LOG_S(INFO)<< msg1FromClient;
       LOG_S(INFO)<< server.countClients();
       THEN("expecting something to happen")
       {
         REQUIRE(server.countClients() == 1 );
         std::this_thread::sleep_for(std::chrono::milliseconds(1000));
 
-        REQUIRE(*msg1FromClient.get() == "hello server");
+        REQUIRE(msg1FromClient == "hello server");
         std::this_thread::sleep_for(std::chrono::milliseconds(1000));
 
         server.sendMessage(msg1);
         std::this_thread::sleep_for(std::chrono::milliseconds(100));
-        REQUIRE(*client.getLatestMessage().get() == msg1);
+        REQUIRE(client.getLatestMessage() == msg1);
 
         server.sendMessage(msg2);
         std::this_thread::sleep_for(std::chrono::milliseconds(100));
-        REQUIRE(*client.getLatestMessage().get() == msg2);
+        REQUIRE(client.getLatestMessage() == msg2);
 
 
       } // THEN