couchbase 4.1.2 → 4.1.3

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/test/test_unit_connection_string.cxx

@@ -17,29 +17,30 @@
 
 #include "test_helper.hxx"
 
-#include <couchbase/utils/connection_string.hxx>
+#include "core/utils/connection_string.hxx"
 
 TEST_CASE("unit: connection string", "[unit]")
 {
     SECTION("full example")
     {
-        auto spec = couchbase::utils::parse_connection_string("couchbase://localhost:8091=http;127.0.0.1=mcd/default?enable_tracing=false");
+        auto spec =
+          couchbase::core::utils::parse_connection_string("couchbase://localhost:8091=http;127.0.0.1=mcd/default?enable_tracing=false");
         CHECK(spec.scheme == "couchbase");
         CHECK(spec.default_port == 11210);
-        CHECK(spec.default_mode == couchbase::utils::connection_string::bootstrap_mode::gcccp);
+        CHECK(spec.default_mode == couchbase::core::utils::connection_string::bootstrap_mode::gcccp);
         CHECK(spec.tls == false);
         CHECK(spec.params == std::map<std::string, std::string>{
                                { "enable_tracing", "false" },
                              });
-        CHECK(spec.bootstrap_nodes == std::vector<couchbase::utils::connection_string::node>{
+        CHECK(spec.bootstrap_nodes == std::vector<couchbase::core::utils::connection_string::node>{
                                         { "localhost",
                                           8091,
-                                          couchbase::utils::connection_string::address_type::dns,
-                                          couchbase::utils::connection_string::bootstrap_mode::http },
+                                          couchbase::core::utils::connection_string::address_type::dns,
+                                          couchbase::core::utils::connection_string::bootstrap_mode::http },
                                         { "127.0.0.1",
                                           0,
-                                          couchbase::utils::connection_string::address_type::ipv4,
-                                          couchbase::utils::connection_string::bootstrap_mode::gcccp },
+                                          couchbase::core::utils::connection_string::address_type::ipv4,
+                                          couchbase::core::utils::connection_string::bootstrap_mode::gcccp },
                                       });
         CHECK(spec.options.enable_tracing == false);
         CHECK(spec.default_bucket_name == "default");
@@ -47,36 +48,36 @@ TEST_CASE("unit: connection string", "[unit]")
 
     SECTION("scheme")
     {
-        CHECK(couchbase::utils::parse_connection_string("couchbase://127.0.0.1").scheme == "couchbase");
-        CHECK(couchbase::utils::parse_connection_string("http://127.0.0.1").scheme == "http");
-        CHECK(couchbase::utils::parse_connection_string("couchbase://").scheme == "couchbase");
-        CHECK(couchbase::utils::parse_connection_string("my+scheme://").scheme == "my+scheme");
+        CHECK(couchbase::core::utils::parse_connection_string("couchbase://127.0.0.1").scheme == "couchbase");
+        CHECK(couchbase::core::utils::parse_connection_string("http://127.0.0.1").scheme == "http");
+        CHECK(couchbase::core::utils::parse_connection_string("couchbase://").scheme == "couchbase");
+        CHECK(couchbase::core::utils::parse_connection_string("my+scheme://").scheme == "my+scheme");
 
         SECTION("default bootstrap mode")
         {
-            CHECK(couchbase::utils::parse_connection_string("couchbase://").default_mode ==
-                  couchbase::utils::connection_string::bootstrap_mode::gcccp);
-            CHECK(couchbase::utils::parse_connection_string("https://").default_mode ==
-                  couchbase::utils::connection_string::bootstrap_mode::http);
-            CHECK(couchbase::utils::parse_connection_string("my+scheme://").default_mode ==
-                  couchbase::utils::connection_string::bootstrap_mode::unspecified);
+            CHECK(couchbase::core::utils::parse_connection_string("couchbase://").default_mode ==
+                  couchbase::core::utils::connection_string::bootstrap_mode::gcccp);
+            CHECK(couchbase::core::utils::parse_connection_string("https://").default_mode ==
+                  couchbase::core::utils::connection_string::bootstrap_mode::http);
+            CHECK(couchbase::core::utils::parse_connection_string("my+scheme://").default_mode ==
+                  couchbase::core::utils::connection_string::bootstrap_mode::unspecified);
         }
 
         SECTION("default port")
         {
-            CHECK(couchbase::utils::parse_connection_string("couchbase://").default_port == 11210);
-            CHECK(couchbase::utils::parse_connection_string("couchbases://").default_port == 11207);
-            CHECK(couchbase::utils::parse_connection_string("http://").default_port == 8091);
-            CHECK(couchbase::utils::parse_connection_string("https://").default_port == 18091);
-            CHECK(couchbase::utils::parse_connection_string("my+scheme://").default_port == 0);
+            CHECK(couchbase::core::utils::parse_connection_string("couchbase://").default_port == 11210);
+            CHECK(couchbase::core::utils::parse_connection_string("couchbases://").default_port == 11207);
+            CHECK(couchbase::core::utils::parse_connection_string("http://").default_port == 8091);
+            CHECK(couchbase::core::utils::parse_connection_string("https://").default_port == 18091);
+            CHECK(couchbase::core::utils::parse_connection_string("my+scheme://").default_port == 0);
         }
 
         SECTION("tls")
         {
-            CHECK(couchbase::utils::parse_connection_string("couchbase://").tls == false);
-            CHECK(couchbase::utils::parse_connection_string("http://").tls == false);
-            CHECK(couchbase::utils::parse_connection_string("couchbases://").tls == true);
-            CHECK(couchbase::utils::parse_connection_string("https://").tls == true);
+            CHECK(couchbase::core::utils::parse_connection_string("couchbase://").tls == false);
+            CHECK(couchbase::core::utils::parse_connection_string("http://").tls == false);
+            CHECK(couchbase::core::utils::parse_connection_string("couchbases://").tls == true);
+            CHECK(couchbase::core::utils::parse_connection_string("https://").tls == true);
         }
     }
 
@@ -84,261 +85,261 @@ TEST_CASE("unit: connection string", "[unit]")
     {
         SECTION("single node")
         {
-            CHECK(couchbase::utils::parse_connection_string("couchbase://1.2.3.4").bootstrap_nodes ==
-                  std::vector<couchbase::utils::connection_string::node>{
+            CHECK(couchbase::core::utils::parse_connection_string("couchbase://1.2.3.4").bootstrap_nodes ==
+                  std::vector<couchbase::core::utils::connection_string::node>{
                     { "1.2.3.4",
                       0,
-                      couchbase::utils::connection_string::address_type::ipv4,
-                      couchbase::utils::connection_string::bootstrap_mode::unspecified },
+                      couchbase::core::utils::connection_string::address_type::ipv4,
+                      couchbase::core::utils::connection_string::bootstrap_mode::unspecified },
                   });
-            CHECK(couchbase::utils::parse_connection_string("couchbase://231.1.1.1").bootstrap_nodes ==
-                  std::vector<couchbase::utils::connection_string::node>{
+            CHECK(couchbase::core::utils::parse_connection_string("couchbase://231.1.1.1").bootstrap_nodes ==
+                  std::vector<couchbase::core::utils::connection_string::node>{
                     { "231.1.1.1",
                       0,
-                      couchbase::utils::connection_string::address_type::ipv4,
-                      couchbase::utils::connection_string::bootstrap_mode::unspecified },
+                      couchbase::core::utils::connection_string::address_type::ipv4,
+                      couchbase::core::utils::connection_string::bootstrap_mode::unspecified },
                   });
-            CHECK(couchbase::utils::parse_connection_string("couchbase://255.1.1.1").bootstrap_nodes ==
-                  std::vector<couchbase::utils::connection_string::node>{
+            CHECK(couchbase::core::utils::parse_connection_string("couchbase://255.1.1.1").bootstrap_nodes ==
+                  std::vector<couchbase::core::utils::connection_string::node>{
                     { "255.1.1.1",
                       0,
-                      couchbase::utils::connection_string::address_type::ipv4,
-                      couchbase::utils::connection_string::bootstrap_mode::unspecified },
+                      couchbase::core::utils::connection_string::address_type::ipv4,
+                      couchbase::core::utils::connection_string::bootstrap_mode::unspecified },
                   });
-            CHECK(couchbase::utils::parse_connection_string("couchbase://256.1.1.1").bootstrap_nodes ==
-                  std::vector<couchbase::utils::connection_string::node>{
+            CHECK(couchbase::core::utils::parse_connection_string("couchbase://256.1.1.1").bootstrap_nodes ==
+                  std::vector<couchbase::core::utils::connection_string::node>{
                     { "256.1.1.1",
                       0,
-                      couchbase::utils::connection_string::address_type::dns,
-                      couchbase::utils::connection_string::bootstrap_mode::unspecified },
+                      couchbase::core::utils::connection_string::address_type::dns,
+                      couchbase::core::utils::connection_string::bootstrap_mode::unspecified },
                   });
-            CHECK(couchbase::utils::parse_connection_string("couchbase://[::ffff:13.15.49.232]").bootstrap_nodes ==
-                  std::vector<couchbase::utils::connection_string::node>{
+            CHECK(couchbase::core::utils::parse_connection_string("couchbase://[::ffff:13.15.49.232]").bootstrap_nodes ==
+                  std::vector<couchbase::core::utils::connection_string::node>{
                     { "::ffff:13.15.49.232",
                       0,
-                      couchbase::utils::connection_string::address_type::ipv6,
-                      couchbase::utils::connection_string::bootstrap_mode::unspecified },
+                      couchbase::core::utils::connection_string::address_type::ipv6,
+                      couchbase::core::utils::connection_string::bootstrap_mode::unspecified },
                   });
-            CHECK(couchbase::utils::parse_connection_string("couchbase://[::]").bootstrap_nodes ==
-                  std::vector<couchbase::utils::connection_string::node>{
+            CHECK(couchbase::core::utils::parse_connection_string("couchbase://[::]").bootstrap_nodes ==
+                  std::vector<couchbase::core::utils::connection_string::node>{
                     { "::",
                       0,
-                      couchbase::utils::connection_string::address_type::ipv6,
-                      couchbase::utils::connection_string::bootstrap_mode::unspecified },
+                      couchbase::core::utils::connection_string::address_type::ipv6,
+                      couchbase::core::utils::connection_string::bootstrap_mode::unspecified },
                   });
-            CHECK(couchbase::utils::parse_connection_string("couchbase://[::1]").bootstrap_nodes ==
-                  std::vector<couchbase::utils::connection_string::node>{
+            CHECK(couchbase::core::utils::parse_connection_string("couchbase://[::1]").bootstrap_nodes ==
+                  std::vector<couchbase::core::utils::connection_string::node>{
                     { "::1",
                       0,
-                      couchbase::utils::connection_string::address_type::ipv6,
-                      couchbase::utils::connection_string::bootstrap_mode::unspecified },
+                      couchbase::core::utils::connection_string::address_type::ipv6,
+                      couchbase::core::utils::connection_string::bootstrap_mode::unspecified },
                   });
-            CHECK(couchbase::utils::parse_connection_string("couchbase://[2001:db8::1]").bootstrap_nodes ==
-                  std::vector<couchbase::utils::connection_string::node>{
+            CHECK(couchbase::core::utils::parse_connection_string("couchbase://[2001:db8::1]").bootstrap_nodes ==
+                  std::vector<couchbase::core::utils::connection_string::node>{
                     { "2001:db8::1",
                       0,
-                      couchbase::utils::connection_string::address_type::ipv6,
-                      couchbase::utils::connection_string::bootstrap_mode::unspecified },
+                      couchbase::core::utils::connection_string::address_type::ipv6,
+                      couchbase::core::utils::connection_string::bootstrap_mode::unspecified },
                   });
-            CHECK(couchbase::utils::parse_connection_string("couchbase://[2001:db8:85a3:8d3:1319:8a2e:370:7348]").bootstrap_nodes ==
-                  std::vector<couchbase::utils::connection_string::node>{
+            CHECK(couchbase::core::utils::parse_connection_string("couchbase://[2001:db8:85a3:8d3:1319:8a2e:370:7348]").bootstrap_nodes ==
+                  std::vector<couchbase::core::utils::connection_string::node>{
                     { "2001:db8:85a3:8d3:1319:8a2e:370:7348",
                       0,
-                      couchbase::utils::connection_string::address_type::ipv6,
-                      couchbase::utils::connection_string::bootstrap_mode::unspecified },
+                      couchbase::core::utils::connection_string::address_type::ipv6,
+                      couchbase::core::utils::connection_string::bootstrap_mode::unspecified },
                   });
-            CHECK(couchbase::utils::parse_connection_string("couchbase://example.com").bootstrap_nodes ==
-                  std::vector<couchbase::utils::connection_string::node>{
+            CHECK(couchbase::core::utils::parse_connection_string("couchbase://example.com").bootstrap_nodes ==
+                  std::vector<couchbase::core::utils::connection_string::node>{
                     { "example.com",
                       0,
-                      couchbase::utils::connection_string::address_type::dns,
-                      couchbase::utils::connection_string::bootstrap_mode::unspecified },
+                      couchbase::core::utils::connection_string::address_type::dns,
+                      couchbase::core::utils::connection_string::bootstrap_mode::unspecified },
                   });
         }
 
         SECTION("multiple nodes")
         {
-            CHECK(couchbase::utils::parse_connection_string("couchbase://1.2.3.4,4.3.2.1").bootstrap_nodes ==
-                  std::vector<couchbase::utils::connection_string::node>{
+            CHECK(couchbase::core::utils::parse_connection_string("couchbase://1.2.3.4,4.3.2.1").bootstrap_nodes ==
+                  std::vector<couchbase::core::utils::connection_string::node>{
                     { "1.2.3.4",
                       0,
-                      couchbase::utils::connection_string::address_type::ipv4,
-                      couchbase::utils::connection_string::bootstrap_mode::unspecified },
+                      couchbase::core::utils::connection_string::address_type::ipv4,
+                      couchbase::core::utils::connection_string::bootstrap_mode::unspecified },
                     { "4.3.2.1",
                       0,
-                      couchbase::utils::connection_string::address_type::ipv4,
-                      couchbase::utils::connection_string::bootstrap_mode::unspecified },
+                      couchbase::core::utils::connection_string::address_type::ipv4,
+                      couchbase::core::utils::connection_string::bootstrap_mode::unspecified },
                   });
-            CHECK(couchbase::utils::parse_connection_string("couchbase://1.2.3.4;4.3.2.1").bootstrap_nodes ==
-                  std::vector<couchbase::utils::connection_string::node>{
+            CHECK(couchbase::core::utils::parse_connection_string("couchbase://1.2.3.4;4.3.2.1").bootstrap_nodes ==
+                  std::vector<couchbase::core::utils::connection_string::node>{
                     { "1.2.3.4",
                       0,
-                      couchbase::utils::connection_string::address_type::ipv4,
-                      couchbase::utils::connection_string::bootstrap_mode::unspecified },
+                      couchbase::core::utils::connection_string::address_type::ipv4,
+                      couchbase::core::utils::connection_string::bootstrap_mode::unspecified },
                     { "4.3.2.1",
                       0,
-                      couchbase::utils::connection_string::address_type::ipv4,
-                      couchbase::utils::connection_string::bootstrap_mode::unspecified },
+                      couchbase::core::utils::connection_string::address_type::ipv4,
+                      couchbase::core::utils::connection_string::bootstrap_mode::unspecified },
                   });
-            CHECK(couchbase::utils::parse_connection_string("couchbase://[2001:db8::1];123.123.12.4").bootstrap_nodes ==
-                  std::vector<couchbase::utils::connection_string::node>{
+            CHECK(couchbase::core::utils::parse_connection_string("couchbase://[2001:db8::1];123.123.12.4").bootstrap_nodes ==
+                  std::vector<couchbase::core::utils::connection_string::node>{
                     { "2001:db8::1",
                       0,
-                      couchbase::utils::connection_string::address_type::ipv6,
-                      couchbase::utils::connection_string::bootstrap_mode::unspecified },
+                      couchbase::core::utils::connection_string::address_type::ipv6,
+                      couchbase::core::utils::connection_string::bootstrap_mode::unspecified },
                     { "123.123.12.4",
                       0,
-                      couchbase::utils::connection_string::address_type::ipv4,
-                      couchbase::utils::connection_string::bootstrap_mode::unspecified },
+                      couchbase::core::utils::connection_string::address_type::ipv4,
+                      couchbase::core::utils::connection_string::bootstrap_mode::unspecified },
                   });
-            CHECK(couchbase::utils::parse_connection_string("couchbase://example.com,[::1];127.0.0.1").bootstrap_nodes ==
-                  std::vector<couchbase::utils::connection_string::node>{
+            CHECK(couchbase::core::utils::parse_connection_string("couchbase://example.com,[::1];127.0.0.1").bootstrap_nodes ==
+                  std::vector<couchbase::core::utils::connection_string::node>{
                     { "example.com",
                       0,
-                      couchbase::utils::connection_string::address_type::dns,
-                      couchbase::utils::connection_string::bootstrap_mode::unspecified },
+                      couchbase::core::utils::connection_string::address_type::dns,
+                      couchbase::core::utils::connection_string::bootstrap_mode::unspecified },
                     { "::1",
                       0,
-                      couchbase::utils::connection_string::address_type::ipv6,
-                      couchbase::utils::connection_string::bootstrap_mode::unspecified },
+                      couchbase::core::utils::connection_string::address_type::ipv6,
+                      couchbase::core::utils::connection_string::bootstrap_mode::unspecified },
                     { "127.0.0.1",
                       0,
-                      couchbase::utils::connection_string::address_type::ipv4,
-                      couchbase::utils::connection_string::bootstrap_mode::unspecified },
+                      couchbase::core::utils::connection_string::address_type::ipv4,
+                      couchbase::core::utils::connection_string::bootstrap_mode::unspecified },
                   });
         }
 
         SECTION("custom ports")
         {
-            CHECK(couchbase::utils::parse_connection_string("couchbase://1.2.3.4,4.3.2.1:11210").bootstrap_nodes ==
-                  std::vector<couchbase::utils::connection_string::node>{
+            CHECK(couchbase::core::utils::parse_connection_string("couchbase://1.2.3.4,4.3.2.1:11210").bootstrap_nodes ==
+                  std::vector<couchbase::core::utils::connection_string::node>{
                     { "1.2.3.4",
                       0,
-                      couchbase::utils::connection_string::address_type::ipv4,
-                      couchbase::utils::connection_string::bootstrap_mode::unspecified },
+                      couchbase::core::utils::connection_string::address_type::ipv4,
+                      couchbase::core::utils::connection_string::bootstrap_mode::unspecified },
                     { "4.3.2.1",
                       11210,
-                      couchbase::utils::connection_string::address_type::ipv4,
-                      couchbase::utils::connection_string::bootstrap_mode::unspecified },
+                      couchbase::core::utils::connection_string::address_type::ipv4,
+                      couchbase::core::utils::connection_string::bootstrap_mode::unspecified },
                   });
-            CHECK(couchbase::utils::parse_connection_string("couchbase://1.2.3.4:8091,4.3.2.1").bootstrap_nodes ==
-                  std::vector<couchbase::utils::connection_string::node>{
+            CHECK(couchbase::core::utils::parse_connection_string("couchbase://1.2.3.4:8091,4.3.2.1").bootstrap_nodes ==
+                  std::vector<couchbase::core::utils::connection_string::node>{
                     { "1.2.3.4",
                       8091,
-                      couchbase::utils::connection_string::address_type::ipv4,
-                      couchbase::utils::connection_string::bootstrap_mode::unspecified },
+                      couchbase::core::utils::connection_string::address_type::ipv4,
+                      couchbase::core::utils::connection_string::bootstrap_mode::unspecified },
                     { "4.3.2.1",
                       0,
-                      couchbase::utils::connection_string::address_type::ipv4,
-                      couchbase::utils::connection_string::bootstrap_mode::unspecified },
+                      couchbase::core::utils::connection_string::address_type::ipv4,
+                      couchbase::core::utils::connection_string::bootstrap_mode::unspecified },
                   });
-            CHECK(couchbase::utils::parse_connection_string("couchbase://[2001:db8::1]:18091;123.123.12.4").bootstrap_nodes ==
-                  std::vector<couchbase::utils::connection_string::node>{
+            CHECK(couchbase::core::utils::parse_connection_string("couchbase://[2001:db8::1]:18091;123.123.12.4").bootstrap_nodes ==
+                  std::vector<couchbase::core::utils::connection_string::node>{
                     { "2001:db8::1",
                       18091,
-                      couchbase::utils::connection_string::address_type::ipv6,
-                      couchbase::utils::connection_string::bootstrap_mode::unspecified },
+                      couchbase::core::utils::connection_string::address_type::ipv6,
+                      couchbase::core::utils::connection_string::bootstrap_mode::unspecified },
                     { "123.123.12.4",
                       0,
-                      couchbase::utils::connection_string::address_type::ipv4,
-                      couchbase::utils::connection_string::bootstrap_mode::unspecified },
+                      couchbase::core::utils::connection_string::address_type::ipv4,
+                      couchbase::core::utils::connection_string::bootstrap_mode::unspecified },
                   });
-            CHECK(couchbase::utils::parse_connection_string("couchbase://example.com:123,[::1]:456;127.0.0.1:789").bootstrap_nodes ==
-                  std::vector<couchbase::utils::connection_string::node>{
+            CHECK(couchbase::core::utils::parse_connection_string("couchbase://example.com:123,[::1]:456;127.0.0.1:789").bootstrap_nodes ==
+                  std::vector<couchbase::core::utils::connection_string::node>{
                     { "example.com",
                       123,
-                      couchbase::utils::connection_string::address_type::dns,
-                      couchbase::utils::connection_string::bootstrap_mode::unspecified },
+                      couchbase::core::utils::connection_string::address_type::dns,
+                      couchbase::core::utils::connection_string::bootstrap_mode::unspecified },
                     { "::1",
                       456,
-                      couchbase::utils::connection_string::address_type::ipv6,
-                      couchbase::utils::connection_string::bootstrap_mode::unspecified },
+                      couchbase::core::utils::connection_string::address_type::ipv6,
+                      couchbase::core::utils::connection_string::bootstrap_mode::unspecified },
                     { "127.0.0.1",
                       789,
-                      couchbase::utils::connection_string::address_type::ipv4,
-                      couchbase::utils::connection_string::bootstrap_mode::unspecified },
+                      couchbase::core::utils::connection_string::address_type::ipv4,
+                      couchbase::core::utils::connection_string::bootstrap_mode::unspecified },
                   });
         }
 
         SECTION("custom bootstrap mode")
         {
-            CHECK(couchbase::utils::parse_connection_string("couchbase://1.2.3.4,4.3.2.1=MCD").bootstrap_nodes ==
-                  std::vector<couchbase::utils::connection_string::node>{
+            CHECK(couchbase::core::utils::parse_connection_string("couchbase://1.2.3.4,4.3.2.1=MCD").bootstrap_nodes ==
+                  std::vector<couchbase::core::utils::connection_string::node>{
                     { "1.2.3.4",
                       0,
-                      couchbase::utils::connection_string::address_type::ipv4,
-                      couchbase::utils::connection_string::bootstrap_mode::unspecified },
+                      couchbase::core::utils::connection_string::address_type::ipv4,
+                      couchbase::core::utils::connection_string::bootstrap_mode::unspecified },
                     { "4.3.2.1",
                       0,
-                      couchbase::utils::connection_string::address_type::ipv4,
-                      couchbase::utils::connection_string::bootstrap_mode::gcccp },
+                      couchbase::core::utils::connection_string::address_type::ipv4,
+                      couchbase::core::utils::connection_string::bootstrap_mode::gcccp },
                   });
-            CHECK(couchbase::utils::parse_connection_string("couchbase://1.2.3.4:8091=http;4.3.2.1").bootstrap_nodes ==
-                  std::vector<couchbase::utils::connection_string::node>{
+            CHECK(couchbase::core::utils::parse_connection_string("couchbase://1.2.3.4:8091=http;4.3.2.1").bootstrap_nodes ==
+                  std::vector<couchbase::core::utils::connection_string::node>{
                     { "1.2.3.4",
                       8091,
-                      couchbase::utils::connection_string::address_type::ipv4,
-                      couchbase::utils::connection_string::bootstrap_mode::http },
+                      couchbase::core::utils::connection_string::address_type::ipv4,
+                      couchbase::core::utils::connection_string::bootstrap_mode::http },
                     { "4.3.2.1",
                       0,
-                      couchbase::utils::connection_string::address_type::ipv4,
-                      couchbase::utils::connection_string::bootstrap_mode::unspecified },
+                      couchbase::core::utils::connection_string::address_type::ipv4,
+                      couchbase::core::utils::connection_string::bootstrap_mode::unspecified },
                   });
-            CHECK(couchbase::utils::parse_connection_string("couchbase://1.2.3.4:8091=http;4.3.2.1=gcccp").bootstrap_nodes ==
-                  std::vector<couchbase::utils::connection_string::node>{
+            CHECK(couchbase::core::utils::parse_connection_string("couchbase://1.2.3.4:8091=http;4.3.2.1=gcccp").bootstrap_nodes ==
+                  std::vector<couchbase::core::utils::connection_string::node>{
                     { "1.2.3.4",
                       8091,
-                      couchbase::utils::connection_string::address_type::ipv4,
-                      couchbase::utils::connection_string::bootstrap_mode::http },
+                      couchbase::core::utils::connection_string::address_type::ipv4,
+                      couchbase::core::utils::connection_string::bootstrap_mode::http },
                     { "4.3.2.1",
                       0,
-                      couchbase::utils::connection_string::address_type::ipv4,
-                      couchbase::utils::connection_string::bootstrap_mode::gcccp },
+                      couchbase::core::utils::connection_string::address_type::ipv4,
+                      couchbase::core::utils::connection_string::bootstrap_mode::gcccp },
                   });
-            CHECK(couchbase::utils::parse_connection_string("couchbase://[2001:db8::1]:18091=mcd;123.123.12.4").bootstrap_nodes ==
-                  std::vector<couchbase::utils::connection_string::node>{
+            CHECK(couchbase::core::utils::parse_connection_string("couchbase://[2001:db8::1]:18091=mcd;123.123.12.4").bootstrap_nodes ==
+                  std::vector<couchbase::core::utils::connection_string::node>{
                     { "2001:db8::1",
                       18091,
-                      couchbase::utils::connection_string::address_type::ipv6,
-                      couchbase::utils::connection_string::bootstrap_mode::gcccp },
+                      couchbase::core::utils::connection_string::address_type::ipv6,
+                      couchbase::core::utils::connection_string::bootstrap_mode::gcccp },
                     { "123.123.12.4",
                       0,
-                      couchbase::utils::connection_string::address_type::ipv4,
-                      couchbase::utils::connection_string::bootstrap_mode::unspecified },
+                      couchbase::core::utils::connection_string::address_type::ipv4,
+                      couchbase::core::utils::connection_string::bootstrap_mode::unspecified },
                   });
-            CHECK(couchbase::utils::parse_connection_string("couchbase://example.com=CcCp,[::1];127.0.0.1=Http").bootstrap_nodes ==
-                  std::vector<couchbase::utils::connection_string::node>{
+            CHECK(couchbase::core::utils::parse_connection_string("couchbase://example.com=CcCp,[::1];127.0.0.1=Http").bootstrap_nodes ==
+                  std::vector<couchbase::core::utils::connection_string::node>{
                     { "example.com",
                       0,
-                      couchbase::utils::connection_string::address_type::dns,
-                      couchbase::utils::connection_string::bootstrap_mode::gcccp },
+                      couchbase::core::utils::connection_string::address_type::dns,
+                      couchbase::core::utils::connection_string::bootstrap_mode::gcccp },
                     { "::1",
                       0,
-                      couchbase::utils::connection_string::address_type::ipv6,
-                      couchbase::utils::connection_string::bootstrap_mode::unspecified },
+                      couchbase::core::utils::connection_string::address_type::ipv6,
+                      couchbase::core::utils::connection_string::bootstrap_mode::unspecified },
                     { "127.0.0.1",
                       0,
-                      couchbase::utils::connection_string::address_type::ipv4,
-                      couchbase::utils::connection_string::bootstrap_mode::http },
+                      couchbase::core::utils::connection_string::address_type::ipv4,
+                      couchbase::core::utils::connection_string::bootstrap_mode::http },
                   });
         }
 
         SECTION("default bucket name")
         {
-            CHECK(couchbase::utils::parse_connection_string("couchbase://127.0.0.1/bucket").default_bucket_name == "bucket");
-            CHECK(couchbase::utils::parse_connection_string("couchbase://127.0.0.1/bUcKeT").default_bucket_name == "bUcKeT");
-            CHECK(couchbase::utils::parse_connection_string("couchbase://127.0.0.1/bU%1F-K__big__.mp3").default_bucket_name ==
+            CHECK(couchbase::core::utils::parse_connection_string("couchbase://127.0.0.1/bucket").default_bucket_name == "bucket");
+            CHECK(couchbase::core::utils::parse_connection_string("couchbase://127.0.0.1/bUcKeT").default_bucket_name == "bUcKeT");
+            CHECK(couchbase::core::utils::parse_connection_string("couchbase://127.0.0.1/bU%1F-K__big__.mp3").default_bucket_name ==
                   "bU%1F-K__big__.mp3");
-            CHECK(couchbase::utils::parse_connection_string("couchbase://127.0.0.1").default_bucket_name.has_value() == false);
+            CHECK(couchbase::core::utils::parse_connection_string("couchbase://127.0.0.1").default_bucket_name.has_value() == false);
         }
     }
 
     SECTION("options")
     {
-        CHECK(couchbase::utils::parse_connection_string("couchbase://127.0.0.1").options.trust_certificate.empty());
-        CHECK(couchbase::utils::parse_connection_string("couchbase://127.0.0.1?trust_certificate=/etc/tls/example.cert")
+        CHECK(couchbase::core::utils::parse_connection_string("couchbase://127.0.0.1").options.trust_certificate.empty());
+        CHECK(couchbase::core::utils::parse_connection_string("couchbase://127.0.0.1?trust_certificate=/etc/tls/example.cert")
                 .options.trust_certificate == "/etc/tls/example.cert");
-        auto spec = couchbase::utils::parse_connection_string("couchbase://127.0.0.1?key_value_timeout=42&query_timeout=123");
+        auto spec = couchbase::core::utils::parse_connection_string("couchbase://127.0.0.1?key_value_timeout=42&query_timeout=123");
         CHECK(spec.options.key_value_timeout == std::chrono::milliseconds(42));
         CHECK(spec.options.query_timeout == std::chrono::milliseconds(123));
 
@@ -349,14 +350,14 @@ TEST_CASE("unit: connection string", "[unit]")
                                    { "query_timeout", "123" },
                                  });
 
-            spec = couchbase::utils::parse_connection_string("couchbase://127.0.0.1?kv_timeout=42&foo=bar");
+            spec = couchbase::core::utils::parse_connection_string("couchbase://127.0.0.1?kv_timeout=42&foo=bar");
             CHECK(spec.params == std::map<std::string, std::string>{
                                    { "kv_timeout", "42" },
                                    { "foo", "bar" },
                                  });
             CHECK(spec.options.key_value_timeout == std::chrono::milliseconds(42));
 
-            spec = couchbase::utils::parse_connection_string("couchbase://127.0.0.1?kv_timeout=4s2ms");
+            spec = couchbase::core::utils::parse_connection_string("couchbase://127.0.0.1?kv_timeout=4s2ms");
             CHECK(spec.params == std::map<std::string, std::string>{
                                    { "kv_timeout", "4s2ms" },
                                  });
@@ -366,14 +367,14 @@ TEST_CASE("unit: connection string", "[unit]")
 
     SECTION("parsing errors")
     {
-        CHECK(couchbase::utils::parse_connection_string("").error == "failed to parse connection string: empty input");
-        CHECK(couchbase::utils::parse_connection_string("couchbase://127.0.0.1/bucket/foo").error ==
+        CHECK(couchbase::core::utils::parse_connection_string("").error == "failed to parse connection string: empty input");
+        CHECK(couchbase::core::utils::parse_connection_string("couchbase://127.0.0.1/bucket/foo").error ==
               R"(failed to parse connection string (column: 29, trailer: "/foo"))");
-        CHECK(couchbase::utils::parse_connection_string("couchbase://[:13.15.49.232]").error ==
+        CHECK(couchbase::core::utils::parse_connection_string("couchbase://[:13.15.49.232]").error ==
               R"(failed to parse connection string (column: 14, trailer: ":13.15.49.232]"))");
-        CHECK(couchbase::utils::parse_connection_string("couchbase://[2001:1:db8:85a3:8d3:1319:8a2e:370:7348]").error ==
+        CHECK(couchbase::core::utils::parse_connection_string("couchbase://[2001:1:db8:85a3:8d3:1319:8a2e:370:7348]").error ==
               R"(failed to parse connection string (column: 47, trailer: ":7348]"))");
-        CHECK(couchbase::utils::parse_connection_string("couchbase://2001:db8:85a3:8d3:1319:8a2e:370:7348").error.value() ==
+        CHECK(couchbase::core::utils::parse_connection_string("couchbase://2001:db8:85a3:8d3:1319:8a2e:370:7348").error.value() ==
               R"(failed to parse connection string (column: 18, trailer: "db8:85a3:8d3:1319:8a2e:370:7348"))");
     }
 }

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/test/test_unit_json_streaming_lexer.cxx

@@ -15,11 +15,12 @@
  *   limitations under the License.
  */
 
-#include "couchbase/logger/logger.hxx"
+#include "core/logger/logger.hxx"
+
+#include "test/utils/logger.hxx"
 #include "test_helper.hxx"
-#include "utils/logger.hxx"
 
-#include <couchbase/utils/json_streaming_lexer.hxx>
+#include "core/utils/json_streaming_lexer.hxx"
 
 struct query_result {
     std::error_code ec{};
@@ -45,11 +46,11 @@ null,1,false
 "status": "success"
 }
 )";
-    couchbase::utils::json::streaming_lexer lexer("/results/^", 4);
+    couchbase::core::utils::json::streaming_lexer lexer("/results/^", 4);
     query_result result{};
     lexer.on_row([&result](std::string&& row) {
         result.rows.emplace_back(std::move(row));
-        return couchbase::utils::json::stream_control::next_row;
+        return couchbase::core::utils::json::stream_control::next_row;
     });
     lexer.on_complete([&result](std::error_code ec, std::size_t number_of_rows, std::string&& meta) {
         result.ec = ec;
@@ -94,11 +95,11 @@ TEST_CASE("unit: json_streaming_lexer parse query result", "[unit]")
         R"(], "status": "success", "metrics": {"elapsedTime": "1.284307ms","executionTime": "1.231972ms","resultCount": 3,"resultSize": 1658,"serviceLoad": 3} })"
     };
 
-    couchbase::utils::json::streaming_lexer lexer("/results/^", 4);
+    couchbase::core::utils::json::streaming_lexer lexer("/results/^", 4);
     query_result result{};
     lexer.on_row([&result](std::string&& row) {
         result.rows.emplace_back(std::move(row));
-        return couchbase::utils::json::stream_control::next_row;
+        return couchbase::core::utils::json::stream_control::next_row;
     });
     lexer.on_complete([&result](std::error_code ec, std::size_t number_of_rows, std::string&& meta) {
         result.ec = ec;
@@ -125,11 +126,11 @@ TEST_CASE("unit: json_streaming_lexer parse query result in multiple chunks", "[
         R"(1,"#itemsOut":1,"#phaseSwitches":2,"execTime":"7.078µs"},"optimizer_estimates":{"cardinality":1,"cost":0.001,"fr_cost":0.001,"size":1}}]},"~versions":["7.1.0-N1QL","7.1.0-2534-enterprise"]},"optimizerEstimates": {"cardinality":1,"cost":0.001}}})"
     };
 
-    couchbase::utils::json::streaming_lexer lexer("/results/^", 4);
+    couchbase::core::utils::json::streaming_lexer lexer("/results/^", 4);
     query_result result{};
     lexer.on_row([&result](std::string&& row) {
         result.rows.emplace_back(std::move(row));
-        return couchbase::utils::json::stream_control::next_row;
+        return couchbase::core::utils::json::stream_control::next_row;
     });
     lexer.on_complete([&result](std::error_code ec, std::size_t number_of_rows, std::string&& meta) {
         result.ec = ec;
@@ -163,11 +164,11 @@ TEST_CASE("unit: json_streaming_lexer parse chunked metadata trailer", "[unit]")
         /* 3 */
         R"("status": "success"})",
     };
-    couchbase::utils::json::streaming_lexer lexer("/results/^", 4);
+    couchbase::core::utils::json::streaming_lexer lexer("/results/^", 4);
     query_result result{};
     lexer.on_row([&result](std::string&& row) {
         result.rows.emplace_back(std::move(row));
-        return couchbase::utils::json::stream_control::next_row;
+        return couchbase::core::utils::json::stream_control::next_row;
     });
     lexer.on_complete([&result](std::error_code ec, std::size_t number_of_rows, std::string&& meta) {
         result.ec = ec;
@@ -209,13 +210,13 @@ TEST_CASE("unit: json_streaming_lexer parse payload with missing results", "[uni
 	}
 }
 )";
-    couchbase::utils::json::streaming_lexer lexer("/results/^", 4);
+    couchbase::core::utils::json::streaming_lexer lexer("/results/^", 4);
     query_result result{};
     bool on_row_handler_executed = false;
     lexer.on_row([&result, &on_row_handler_executed](std::string&& row) {
         on_row_handler_executed = true;
         result.rows.emplace_back(std::move(row));
-        return couchbase::utils::json::stream_control::next_row;
+        return couchbase::core::utils::json::stream_control::next_row;
     });
     bool on_complete_handler_excecuted = false;
     lexer.on_complete([&result, &on_complete_handler_excecuted](std::error_code ec, std::size_t number_of_rows, std::string&& meta) {