Fixed MassTransit#4390 - MongoDB TryRegisterClassMap

RJSonnenberg · May 22, 2023 · 967a9d0 · 967a9d0
1 parent 40b24c8
commit 967a9d0
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 40 deletions.
diff --git a/...e/MassTransit.MongoDbIntegration/Configuration/Configuration/MongoDbOutboxConfigurator.cs b/...e/MassTransit.MongoDbIntegration/Configuration/Configuration/MongoDbOutboxConfigurator.cs
@@ -90,32 +90,23 @@ IMongoCollection<T> CollectionFactory(IServiceProvider provider)
 
         static void RegisterClassMaps()
         {
-            if (!BsonClassMap.IsClassMapRegistered(typeof(InboxState)))
+            BsonClassMap.TryRegisterClassMap(new BsonClassMap<InboxState>(cfg =>
             {
-                BsonClassMap.RegisterClassMap(new BsonClassMap<InboxState>(cfg =>
-                {
-                    cfg.AutoMap();
-                    cfg.MapIdProperty(x => x.Id);
-                }));
-            }
+                cfg.AutoMap();
+                cfg.MapIdProperty(x => x.Id);
+            }));
 
-            if (!BsonClassMap.IsClassMapRegistered(typeof(OutboxState)))
+            BsonClassMap.TryRegisterClassMap(new BsonClassMap<OutboxState>(cfg =>
             {
-                BsonClassMap.RegisterClassMap(new BsonClassMap<OutboxState>(cfg =>
-                {
-                    cfg.AutoMap();
-                    cfg.MapIdProperty(x => x.OutboxId);
-                }));
-            }
+                cfg.AutoMap();
+                cfg.MapIdProperty(x => x.OutboxId);
+            }));
 
-            if (!BsonClassMap.IsClassMapRegistered(typeof(OutboxMessage)))
+            BsonClassMap.TryRegisterClassMap(new BsonClassMap<OutboxMessage>(cfg =>
             {
-                BsonClassMap.RegisterClassMap(new BsonClassMap<OutboxMessage>(cfg =>
-                {
-                    cfg.AutoMap();
-                    cfg.MapIdProperty(x => x.Id);
-                }));
-            }
+                cfg.AutoMap();
+                cfg.MapIdProperty(x => x.Id);
+            }));
         }
     }
 }
diff --git a/...ansit.MongoDbIntegration/Configuration/Configuration/MongoDbSagaRepositoryConfigurator.cs b/...ansit.MongoDbIntegration/Configuration/Configuration/MongoDbSagaRepositoryConfigurator.cs
@@ -46,8 +46,7 @@ public void Register<T>(ISagaRepositoryRegistrationConfigurator<T> configurator)
         {
             IMongoCollection<TSaga> MongoDbCollectionFactory(IServiceProvider provider)
             {
-                if (!BsonClassMap.IsClassMapRegistered(typeof(TSaga)))
-                    BsonClassMap.RegisterClassMap(_classMapFactory(provider));
+                BsonClassMap.TryRegisterClassMap(_classMapFactory(provider));
 
                 var database = ProviderDatabaseFactory(provider);
                 var collectionNameFormatter = CollectionNameFormatterFactory(provider);

diff --git a/src/Persistence/MassTransit.MongoDbIntegration/MassTransitMongoDbConventions.cs b/src/Persistence/MassTransit.MongoDbIntegration/MassTransitMongoDbConventions.cs
@@ -46,7 +46,7 @@ public MassTransitMongoDbConventions(ConventionFilter filter = default)
 
         static bool IsMassTransitClass(Type type)
         {
-            return type.FullName.StartsWith("MassTransit") || IsSagaClass(type) && type != typeof(AuditDocument);
+            return type.FullName.StartsWith("MassTransit") || (IsSagaClass(type) && type != typeof(AuditDocument));
         }
 
         static bool IsSagaClass(Type type)
@@ -56,10 +56,7 @@ static bool IsSagaClass(Type type)
 
         public static void RegisterClass<T>(Expression<Func<T, Guid>> id)
         {
-            if (BsonClassMap.IsClassMapRegistered(typeof(T)))
-                return;
-
-            BsonClassMap.RegisterClassMap<T>(x =>
+            BsonClassMap.TryRegisterClassMap<T>(x =>
             {
                 x.AutoMap();
                 x.SetIdMember(x.GetMemberMap(id));
@@ -68,10 +65,7 @@ public static void RegisterClass<T>(Expression<Func<T, Guid>> id)
 
         public static void RegisterClass<T>()
         {
-            if (BsonClassMap.IsClassMapRegistered(typeof(T)))
-                return;
-
-            BsonClassMap.RegisterClassMap<T>(x =>
+            BsonClassMap.TryRegisterClassMap<T>(x =>
             {
                 x.AutoMap();
                 x.SetDiscriminatorIsRequired(true);

diff --git a/src/Persistence/MassTransit.MongoDbIntegration/MongoDbIntegration/Audit/MongoDbAuditStore.cs b/src/Persistence/MassTransit.MongoDbIntegration/MongoDbIntegration/Audit/MongoDbAuditStore.cs
@@ -8,7 +8,8 @@ namespace MassTransit.MongoDbIntegration.Audit
     using MongoDB.Driver;
 
 
-    public class MongoDbAuditStore : IMessageAuditStore
+    public class MongoDbAuditStore :
+        IMessageAuditStore
     {
         readonly IMongoCollection<AuditDocument> _collection;
 
@@ -17,14 +18,14 @@ static MongoDbAuditStore()
             if (BsonClassMap.IsClassMapRegistered(typeof(AuditDocument)))
                 return;
 
-            // easiest way to metadata since keys wont become element names, therefore subject to validation
-            // will allow keys like $correlationId to be kept
-            var headersSerializer = new DictionaryInterfaceImplementerSerializer<AuditHeaders, string, string>(
-                DictionaryRepresentation.ArrayOfDocuments
-            );
-
-            BsonClassMap.RegisterClassMap<AuditDocument>(x =>
+            BsonClassMap.TryRegisterClassMap<AuditDocument>(x =>
             {
+                // easiest way to metadata since keys wont become element names, therefore subject to validation
+                // will allow keys like $correlationId to be kept
+                var headersSerializer = new DictionaryInterfaceImplementerSerializer<AuditHeaders, string, string>(
+                    DictionaryRepresentation.ArrayOfDocuments
+                );
+
                 x.AutoMap();
                 x.MapIdMember(doc => doc.AuditId);
                 x.MapMember(doc => doc.Headers).SetSerializer(headersSerializer);