Move bson files to core utils

realm · Nov 21, 2023 · c61c304 · c61c304
1 parent 6b63d4f
commit c61c304
Show file tree

Hide file tree

Showing 18 changed files with 25 additions and 26 deletions.
diff --git a/src/realm/CMakeLists.txt b/src/realm/CMakeLists.txt
@@ -101,6 +101,8 @@ set(UTIL_SOURCES
     util/random.cpp
     util/resource_limits.cpp
     util/uri.cpp
+    util/bson/bson.cpp
+    util/bson/regular_expression.cpp
 )
 
 set(REALM_INSTALL_HEADERS
@@ -272,6 +274,12 @@ set(REALM_NOINST_HEADERS
     util/timestamp_formatter.hpp
     util/timestamp_logger.hpp
     util/value_reset_guard.hpp
+    util/bson/bson.hpp
+    util/bson/min_key.hpp
+    util/bson/max_key.hpp
+    util/bson/regular_expression.hpp
+    util/bson/indexed_map.hpp
+    util/bson/mongo_timestamp.hpp
 ) # REALM_NOINST_HEADERS
 
 if(NOT MSVC)

diff --git a/src/realm/object-store/CMakeLists.txt b/src/realm/object-store/CMakeLists.txt
@@ -110,14 +110,7 @@ if(REALM_ENABLE_SYNC)
         sync/impl/sync_client.hpp
         sync/impl/sync_file.hpp
         sync/impl/sync_metadata.hpp
-        sync/impl/network_reachability.hpp
-
-        util/bson/bson.hpp
-        util/bson/min_key.hpp
-        util/bson/max_key.hpp
-        util/bson/regular_expression.hpp
-        util/bson/indexed_map.hpp
-        util/bson/mongo_timestamp.hpp)
+        sync/impl/network_reachability.hpp)
 
     list(APPEND SOURCES
         sync/app.cpp
@@ -133,9 +126,7 @@ if(REALM_ENABLE_SYNC)
         sync/mongo_database.cpp
         sync/push_client.cpp
         sync/impl/sync_file.cpp
-        sync/impl/sync_metadata.cpp
-        util/bson/bson.cpp
-        util/bson/regular_expression.cpp)
+        sync/impl/sync_metadata.cpp)
     if(APPLE)
         list(APPEND HEADERS
             sync/impl/apple/network_reachability_observer.hpp

diff --git a/src/realm/object-store/sync/app_credentials.cpp b/src/realm/object-store/sync/app_credentials.cpp
@@ -17,7 +17,7 @@
 ////////////////////////////////////////////////////////////////////////////
 
 #include <realm/object-store/sync/app_credentials.hpp>
-#include <realm/object-store/util/bson/bson.hpp>
+#include <realm/util/bson/bson.hpp>
 
 namespace realm::app {
 

diff --git a/src/realm/object-store/sync/app_service_client.hpp b/src/realm/object-store/sync/app_service_client.hpp
@@ -19,7 +19,7 @@
 #ifndef APP_SERVICE_CLIENT_HPP
 #define APP_SERVICE_CLIENT_HPP
 
-#include <realm/object-store/util/bson/bson.hpp>
+#include <realm/util/bson/bson.hpp>
 #include <realm/util/functional.hpp>
 #include <realm/util/optional.hpp>
 

diff --git a/src/realm/object-store/sync/mongo_collection.hpp b/src/realm/object-store/sync/mongo_collection.hpp
@@ -19,7 +19,7 @@
 #ifndef MONGO_COLLECTION_HPP
 #define MONGO_COLLECTION_HPP
 
-#include <realm/object-store/util/bson/bson.hpp>
+#include <realm/util/bson/bson.hpp>
 #include <realm/util/functional.hpp>
 #include <realm/util/optional.hpp>
 

diff --git a/src/realm/object-store/sync/push_client.cpp b/src/realm/object-store/sync/push_client.cpp
@@ -21,7 +21,7 @@
 #include <realm/object-store/sync/app_utils.hpp>
 #include <realm/object-store/sync/auth_request_client.hpp>
 #include <realm/object-store/sync/generic_network_transport.hpp>
-#include <realm/object-store/util/bson/bson.hpp>
+#include <realm/util/bson/bson.hpp>
 
 namespace realm::app {
 

diff --git a/src/realm/object-store/sync/sync_user.hpp b/src/realm/object-store/sync/sync_user.hpp
@@ -20,7 +20,7 @@
 #define REALM_OS_SYNC_USER_HPP
 
 #include <realm/object-store/util/atomic_shared_ptr.hpp>
-#include <realm/object-store/util/bson/bson.hpp>
+#include <realm/util/bson/bson.hpp>
 #include <realm/object-store/sync/subscribable.hpp>
 
 #include <realm/util/checked_mutex.hpp>

diff --git a/src/realm/sync/config.cpp b/src/realm/sync/config.cpp
@@ -20,7 +20,7 @@
 #include <realm/sync/client.hpp>
 #include <realm/sync/protocol.hpp>
 #include <realm/sync/network/network.hpp>
-#include <realm/object-store/util/bson/bson.hpp>
+#include <realm/util/bson/bson.hpp>
 
 #include <ostream>
 

diff --git a/src/realm/object-store/util/bson/bson.cpp → src/realm/util/bson/bson.cpp b/src/realm/object-store/util/bson/bson.cpp → src/realm/util/bson/bson.cpp
@@ -16,7 +16,7 @@
  *
  **************************************************************************/
 
-#include <realm/object-store/util/bson/bson.hpp>
+#include <realm/util/bson/bson.hpp>
 #include <realm/util/base64.hpp>
 #include <external/json/json.hpp>
 #include <sstream>

diff --git a/src/realm/object-store/util/bson/bson.hpp → src/realm/util/bson/bson.hpp b/src/realm/object-store/util/bson/bson.hpp → src/realm/util/bson/bson.hpp
@@ -19,11 +19,11 @@
 #ifndef REALM_BSON_HPP
 #define REALM_BSON_HPP
 
-#include <realm/object-store/util/bson/indexed_map.hpp>
-#include <realm/object-store/util/bson/regular_expression.hpp>
-#include <realm/object-store/util/bson/min_key.hpp>
-#include <realm/object-store/util/bson/max_key.hpp>
-#include <realm/object-store/util/bson/mongo_timestamp.hpp>
+#include <realm/util/bson/indexed_map.hpp>
+#include <realm/util/bson/regular_expression.hpp>
+#include <realm/util/bson/min_key.hpp>
+#include <realm/util/bson/max_key.hpp>
+#include <realm/util/bson/mongo_timestamp.hpp>
 
 #include <realm/binary_data.hpp>
 #include <realm/timestamp.hpp>

diff --git a/...lm/object-store/util/bson/indexed_map.hpp → src/realm/util/bson/indexed_map.hpp b/...lm/object-store/util/bson/indexed_map.hpp → src/realm/util/bson/indexed_map.hpp
diff --git a/src/realm/object-store/util/bson/max_key.hpp → src/realm/util/bson/max_key.hpp b/src/realm/object-store/util/bson/max_key.hpp → src/realm/util/bson/max_key.hpp
diff --git a/src/realm/object-store/util/bson/min_key.hpp → src/realm/util/bson/min_key.hpp b/src/realm/object-store/util/bson/min_key.hpp → src/realm/util/bson/min_key.hpp
diff --git a/...bject-store/util/bson/mongo_timestamp.hpp → src/realm/util/bson/mongo_timestamp.hpp b/...bject-store/util/bson/mongo_timestamp.hpp → src/realm/util/bson/mongo_timestamp.hpp
diff --git a/...ct-store/util/bson/regular_expression.cpp → src/realm/util/bson/regular_expression.cpp b/...ct-store/util/bson/regular_expression.cpp → src/realm/util/bson/regular_expression.cpp
@@ -16,7 +16,7 @@
  *
  **************************************************************************/
 
-#include <realm/object-store/util/bson/regular_expression.hpp>
+#include <realm/util/bson/regular_expression.hpp>
 #include <numeric>
 
 namespace realm {

diff --git a/...ct-store/util/bson/regular_expression.hpp → src/realm/util/bson/regular_expression.hpp b/...ct-store/util/bson/regular_expression.hpp → src/realm/util/bson/regular_expression.hpp
diff --git a/test/object-store/bson.cpp b/test/object-store/bson.cpp
@@ -23,7 +23,7 @@
 #include <catch2/catch_all.hpp>
 #include "util/test_utils.hpp"
 #include "util/test_file.hpp"
-#include <realm/object-store/util/bson/bson.hpp>
+#include <realm/util/bson/bson.hpp>
 
 using namespace nlohmann;
 using namespace realm;

diff --git a/test/object-store/sync/flx_sync.cpp b/test/object-store/sync/flx_sync.cpp
@@ -37,7 +37,7 @@
 #include <realm/object-store/sync/mongo_database.hpp>
 #include <realm/object-store/sync/mongo_collection.hpp>
 #include <realm/object-store/sync/async_open_task.hpp>
-#include <realm/object-store/util/bson/bson.hpp>
+#include <realm/util/bson/bson.hpp>
 #include <realm/object-store/sync/sync_session.hpp>
 
 #include <realm/sync/client_base.hpp>