commit 4b90909ddd51e6ff59c493a0f9a92de7fa9f5af2
author CJCombrink <carel.combrink@gmail.com> Sat Apr 27 19:51:39 2024 +0200
committer Jens Geyer <jensg@apache.org> Mon Jun 17 22:26:56 2024 +0200
tree 845fd6242eba4c2e73e1a75fc9aef367396b406e
parent 6944912b578e5ab2721af3ea2d0fdbab2951343d

THRIFT-5773 Strong UUID wrapper for C++
Client: cpp/CMakeLists.txt
Patch: Carel Combrink

This closes #2958

test/cpp/src/TestClient.cpp

diff --git a/test/cpp/src/TestClient.cpp b/test/cpp/src/TestClient.cpp
index c15281a..6bda294 100644
--- a/test/cpp/src/TestClient.cpp
+++ b/test/cpp/src/TestClient.cpp
@@ -653,12 +653,12 @@
     /**
      * UUID TEST
      */
-    const std::string expected_uuid{"5e2ab188-1726-4e75-a04f-1ed9a6a89c4c"};
-    UUID_TEST(testUuid, std::string{"{5e2ab188-1726-4e75-a04f-1ed9a6a89c4c}"}, expected_uuid);
-    UUID_TEST(testUuid, std::string{"5e2ab188-1726-4e75-a04f-1ed9a6a89c4c"}, expected_uuid);
-    UUID_TEST(testUuid, std::string{"5e2ab18817264e75a04f1ed9a6a89c4c"}, expected_uuid);
-    UUID_TEST(testUuid, std::string{"{5e2ab18817264e75a04f1ed9a6a89c4c}"}, expected_uuid);
-    UUID_TEST(testUuid, std::string{}, std::string{"00000000-0000-0000-0000-000000000000"});
+    const TUuid expected_uuid{"5e2ab188-1726-4e75-a04f-1ed9a6a89c4c"};
+    UUID_TEST(testUuid, TUuid{"{5e2ab188-1726-4e75-a04f-1ed9a6a89c4c}"}, expected_uuid);
+    UUID_TEST(testUuid, TUuid{"5e2ab188-1726-4e75-a04f-1ed9a6a89c4c"}, expected_uuid);
+    UUID_TEST(testUuid, TUuid{"5e2ab18817264e75a04f1ed9a6a89c4c"}, expected_uuid);
+    UUID_TEST(testUuid, TUuid{"{5e2ab18817264e75a04f1ed9a6a89c4c}"}, expected_uuid);
+    UUID_TEST(testUuid, TUuid{}, TUuid{"00000000-0000-0000-0000-000000000000"});
 
     /**
      * STRUCT TEST

test/cpp/src/TestServer.cpp

diff --git a/test/cpp/src/TestServer.cpp b/test/cpp/src/TestServer.cpp
index afd2938..dc6e69f 100644
--- a/test/cpp/src/TestServer.cpp
+++ b/test/cpp/src/TestServer.cpp
@@ -132,8 +132,8 @@
     _return = thing;
   }
 
-  std::string testUuid(const std::string thing) override {
-    printf("testUuid(\"{%s}\")\n", thing.c_str());
+  TUuid testUuid(const TUuid thing) override {
+    printf("testUuid(\"{%s}\")\n", to_string(thing).c_str());
     return thing;
   }
 
@@ -447,8 +447,8 @@
     cob(res);
   }
 
-  void testUuid(::std::function<void(std::string const& _return)> cob, const std::string thing) override {
-    std::string res = _delegate->testUuid(thing);
+  void testUuid(::std::function<void(TUuid const& _return)> cob, const TUuid thing) override {
+    TUuid res = _delegate->testUuid(thing);
     cob(res);
   }