From ba834064d5d55483abc8cb99e05769a2cc46f69e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C4=B5=20=CE=9D=CE=B9=CE=93=CE=9E=CE=97=CE=9B=CF=88=CE=9A?=
 <djnitehawk83@gmail.com>
Date: Fri, 1 Mar 2024 18:13:25 +0530
Subject: [PATCH] upgrade dependencies & cleanups

---
 Benchmark/Benchmark.csproj               |  4 ++--
 MongoDB.Entities/DB/DB.Watcher.cs        | 17 ++++++-----------
 MongoDB.Entities/MongoDB.Entities.csproj |  4 ++--
 Tests/Tests.csproj                       | 10 +++++-----
 changelog.md                             |  3 ++-
 5 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/Benchmark/Benchmark.csproj b/Benchmark/Benchmark.csproj
index dd763482..c0a6a7cd 100644
--- a/Benchmark/Benchmark.csproj
+++ b/Benchmark/Benchmark.csproj
@@ -13,8 +13,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="BenchmarkDotNet" Version="0.13.11"/>
-        <PackageReference Include="MongoDB.Driver.GridFS" Version="2.23.0"/>
+        <PackageReference Include="BenchmarkDotNet" Version="0.13.12"/>
+        <PackageReference Include="MongoDB.Driver.GridFS" Version="2.24.0"/>
     </ItemGroup>
 
     <ItemGroup>
diff --git a/MongoDB.Entities/DB/DB.Watcher.cs b/MongoDB.Entities/DB/DB.Watcher.cs
index eff2d0b2..192e87d7 100644
--- a/MongoDB.Entities/DB/DB.Watcher.cs
+++ b/MongoDB.Entities/DB/DB.Watcher.cs
@@ -5,24 +5,19 @@ namespace MongoDB.Entities;
 public static partial class DB
 {
     /// <summary>
-    /// Retrieves the 'change-stream' watcher instance for a given unique name. 
-    /// If an instance for the name does not exist, it will return a new instance. 
+    /// Retrieves the 'change-stream' watcher instance for a given unique name.
+    /// If an instance for the name does not exist, it will return a new instance.
     /// If an instance already exists, that instance will be returned.
     /// </summary>
     /// <typeparam name="T">The entity type to get a watcher for</typeparam>
     /// <param name="name">A unique name for the watcher of this entity type. Names can be duplicate among different entity types.</param>
     public static Watcher<T> Watcher<T>(string name) where T : IEntity
-    {
-        // Normalize the name once
-        var normalizedName = name.ToLower().Trim();
-
-        // Use GetOrAdd to ensure thread-safe retrieval or addition of the watcher.
-        return Cache<T>.Watchers.GetOrAdd(normalizedName, newName => new Watcher<T>(newName));
-    }
+        => Cache<T>.Watchers.GetOrAdd(name.ToLower().Trim(), newName => new(newName));
 
     /// <summary>
     /// Returns all the watchers for a given entity type
     /// </summary>
     /// <typeparam name="T">The entity type to get the watcher of</typeparam>
-    public static IEnumerable<Watcher<T>> Watchers<T>() where T : IEntity => Cache<T>.Watchers.Values;
-}
+    public static IEnumerable<Watcher<T>> Watchers<T>() where T : IEntity
+        => Cache<T>.Watchers.Values;
+}
\ No newline at end of file
diff --git a/MongoDB.Entities/MongoDB.Entities.csproj b/MongoDB.Entities/MongoDB.Entities.csproj
index 840bb38d..92b98524 100644
--- a/MongoDB.Entities/MongoDB.Entities.csproj
+++ b/MongoDB.Entities/MongoDB.Entities.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
 
-        <Version>23.0.1</Version>
+        <Version>23.1.0</Version>
 
         <TargetFramework>netstandard2.1</TargetFramework>
         <RootNamespace>MongoDB.Entities</RootNamespace>
@@ -31,7 +31,7 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.CSharp" Version="4.7.0"/>
-        <PackageReference Include="MongoDB.Driver" Version="2.23.0"/>
+        <PackageReference Include="MongoDB.Driver" Version="2.24.0"/>
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
     </ItemGroup>
 
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
index 752f635b..9c71a06e 100644
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -10,11 +10,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Medo.Uuid7" Version="1.8.2"/>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
-        <PackageReference Include="MSTest.TestAdapter" Version="3.1.1"/>
-        <PackageReference Include="MSTest.TestFramework" Version="3.1.1"/>
-        <PackageReference Include="coverlet.collector" Version="6.0.0">
+        <PackageReference Include="Medo.Uuid7" Version="1.9.1"/>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0"/>
+        <PackageReference Include="MSTest.TestAdapter" Version="3.2.2"/>
+        <PackageReference Include="MSTest.TestFramework" Version="3.2.2"/>
+        <PackageReference Include="coverlet.collector" Version="6.0.1">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/changelog.md b/changelog.md
index 0a48e2e6..61ec4bcc 100644
--- a/changelog.md
+++ b/changelog.md
@@ -2,6 +2,7 @@
 
 ### IMPROVEMENTS
 
-- upgrade mongodb driver to v2.23
+- upgrade mongodb driver to v2.24
+- minor internal refactors
 
 [//]: # (### BREAKING CHANGES)
\ No newline at end of file