upgrade to v2.30 driver

dj-nitehawk · Oct 18, 2024 · 6d73cbd · 6d73cbd
1 parent 4b6a6bc
commit 6d73cbd
Show file tree

Hide file tree

Showing 10 changed files with 153 additions and 123 deletions.
diff --git a/Benchmark/Benchmark.csproj b/Benchmark/Benchmark.csproj
@@ -14,7 +14,7 @@
 
     <ItemGroup>
         <PackageReference Include="BenchmarkDotNet" Version="0.14.0"/>
-        <PackageReference Include="MongoDB.Driver.GridFS" Version="2.28.0"/>
+        <PackageReference Include="MongoDB.Driver.GridFS" Version="2.30.0"/>
     </ItemGroup>
 
     <ItemGroup>

diff --git a/MongoDB.Entities/Builders/Find.cs b/MongoDB.Entities/Builders/Find.cs
@@ -151,7 +151,11 @@ public Find<T, TProjection> Match(Template template)
     /// <param name="caseSensitive">Case sensitivity of the search (optional)</param>
     /// <param name="diacriticSensitive">Diacritic sensitivity of the search (optional)</param>
     /// <param name="language">The language for the search (optional)</param>
-    public Find<T, TProjection> Match(Search searchType, string searchTerm, bool caseSensitive = false, bool diacriticSensitive = false, string? language = null)
+    public Find<T, TProjection> Match(Search searchType,
+                                      string searchTerm,
+                                      bool caseSensitive = false,
+                                      bool diacriticSensitive = false,
+                                      string? language = null)
     {
         if (searchType != Search.Fuzzy)
         {
@@ -461,7 +465,7 @@ void AddTxtScoreToProjection(string propName)
 
         options.Projection =
             options.Projection
-                   .Render(BsonSerializer.SerializerRegistry.GetSerializer<T>(), BsonSerializer.SerializerRegistry, Driver.Linq.LinqProvider.V3)
+                   .Render(new(BsonSerializer.SerializerRegistry.GetSerializer<T>(), BsonSerializer.SerializerRegistry))
                    .Document.Add(propName, new BsonDocument { { "$meta", "textScore" } });
     }
 }

diff --git a/MongoDB.Entities/Builders/Update.cs b/MongoDB.Entities/Builders/Update.cs
@@ -179,7 +179,10 @@ public Update<T> Match(Search searchType, string searchTerm, bool caseSensitive
     /// <param name="nearCoordinates">The search point</param>
     /// <param name="maxDistance">Maximum distance in meters from the search point</param>
     /// <param name="minDistance">Minimum distance in meters from the search point</param>
-    public Update<T> Match(Expression<Func<T, object?>> coordinatesProperty, Coordinates2D nearCoordinates, double? maxDistance = null, double? minDistance = null)
+    public Update<T> Match(Expression<Func<T, object?>> coordinatesProperty,
+                           Coordinates2D nearCoordinates,
+                           double? maxDistance = null,
+                           double? minDistance = null)
     {
         return Match(f => f.Near(coordinatesProperty, nearCoordinates.ToGeoJsonPoint(), maxDistance, minDistance));
     }
@@ -503,7 +506,7 @@ bool ShouldSetModDate()
             Cache<T>.HasModifiedOn &&
             !Defs.Any(
                 d => d
-                     .Render(BsonSerializer.SerializerRegistry.GetSerializer<T>(), BsonSerializer.SerializerRegistry, Driver.Linq.LinqProvider.V3)
+                     .Render(new(BsonSerializer.SerializerRegistry.GetSerializer<T>(), BsonSerializer.SerializerRegistry))
                      .ToString()
                      .Contains($"\"{Cache<T>.ModifiedOnPropName}\""));
     }

diff --git a/MongoDB.Entities/Builders/UpdateAndGet.cs b/MongoDB.Entities/Builders/UpdateAndGet.cs
@@ -32,7 +32,7 @@ public class UpdateAndGet<T, TProjection> : UpdateBase<T> where T : IEntity
 {
     readonly List<PipelineStageDefinition<T, TProjection>> _stages = new();
     FilterDefinition<T> _filter = Builders<T>.Filter.Empty;
-    protected private readonly FindOneAndUpdateOptions<T, TProjection> options = new() { ReturnDocument = ReturnDocument.After };
+    private protected readonly FindOneAndUpdateOptions<T, TProjection> options = new() { ReturnDocument = ReturnDocument.After };
     readonly IClientSessionHandle? _session;
     readonly Dictionary<Type, (object filterDef, bool prepend)>? _globalFilters;
     readonly Action<UpdateBase<T>>? _onUpdateAction;
@@ -107,7 +107,11 @@ public UpdateAndGet<T, TProjection> Match(Template template)
     /// <param name="caseSensitive">Case sensitivity of the search (optional)</param>
     /// <param name="diacriticSensitive">Diacritic sensitivity of the search (optional)</param>
     /// <param name="language">The language for the search (optional)</param>
-    public UpdateAndGet<T, TProjection> Match(Search searchType, string searchTerm, bool caseSensitive = false, bool diacriticSensitive = false, string? language = null)
+    public UpdateAndGet<T, TProjection> Match(Search searchType,
+                                              string searchTerm,
+                                              bool caseSensitive = false,
+                                              bool diacriticSensitive = false,
+                                              string? language = null)
     {
         if (searchType != Search.Fuzzy)
         {
@@ -457,7 +461,7 @@ bool ShouldSetModDate()
             Cache<T>.HasModifiedOn &&
             !Defs.Any(
                 d => d
-                     .Render(BsonSerializer.SerializerRegistry.GetSerializer<T>(), BsonSerializer.SerializerRegistry, Driver.Linq.LinqProvider.V3)
+                     .Render(new(BsonSerializer.SerializerRegistry.GetSerializer<T>(), BsonSerializer.SerializerRegistry))
                      .ToString()
                      .Contains($"\"{Cache<T>.ModifiedOnPropName}\""));
     }

diff --git a/MongoDB.Entities/Core/Cache.cs b/MongoDB.Entities/Core/Cache.cs
@@ -53,7 +53,10 @@ static void Initialize()
             IdSetter = type.SetterForProp(IdPropName);
         }
         else
-            throw new InvalidOperationException($"Type {type.FullName} must specify an Identity property. '_id', 'Id', 'ID', or [BsonId] annotation expected!");
+        {
+            throw new InvalidOperationException(
+                $"Type {type.FullName} must specify an Identity property. '_id', 'Id', 'ID', or [BsonId] annotation expected!");
+        }
 
         Database = TypeMap.GetDatabase(type);
         DbName = Database.DatabaseNamespace.DatabaseName;
@@ -135,9 +138,7 @@ internal static ProjectionDefinition<T, TProjection> CombineWithRequiredProps<TP
         }
 
         ProjectionDefinition<T> userProj = userProjection.Render(
-            BsonSerializer.LookupSerializer<T>(),
-            BsonSerializer.SerializerRegistry,
-            LinqProvider.V3).Document;
+            new(BsonSerializer.SerializerRegistry.GetSerializer<T>(), BsonSerializer.SerializerRegistry)).Document;
 
         return Builders<T>.Projection.Combine(_requiredPropsProjection, userProj);
     }