Move bson files to core utils

Author: jedelbo

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)

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

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 {
 

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>
 

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>
 

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 {
 

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>

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>
 

src/realm/object-store/util/bson/bson.cpp renamed to 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>

src/realm/object-store/util/bson/bson.hpp renamed to 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>