Added AddBsonClassMap without parameters. (#18)

SwissLife-OSS · Jan 13, 2020 · f0c3925 · f0c3925
1 parent b95486c
commit f0c3925
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 2 deletions.
diff --git a/src/Context.Tests/MongoCollectionBuilderTests.cs b/src/Context.Tests/MongoCollectionBuilderTests.cs
@@ -121,12 +121,33 @@ public void AddBsonClassMap_AddNewBsonClassMapSeveralTimes_BsonClassMapIsRegiste
             // Assert
             Assert.True(BsonClassMap.IsClassMapRegistered(typeof(Order)));
         }
-
+
+        [Fact]
+        public void AddBsonClassMap_AddNewBsonClassMapWithoutParameter_BsonClassMapIsRegistered()
+        {
+            // Arrange
+            var mongoCollectionBuilder = 
+                new MongoCollectionBuilder<ItemWithoutSpecificClassMap>(_mongoDatabase);
+
+            // Act
+            mongoCollectionBuilder.AddBsonClassMap<ItemWithoutSpecificClassMap>();
+            IMongoCollection<ItemWithoutSpecificClassMap> result = mongoCollectionBuilder.Build();
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.True(BsonClassMap.IsClassMapRegistered(typeof(ItemWithoutSpecificClassMap)));
+        }
+
         private class ItemClassMapNotRegistered
         {
             public int Id { get; set; }
         }
 
+        private class ItemWithoutSpecificClassMap
+        {
+            public int Name { get; set; }
+        }
+
         #endregion
 
         #region WithMongoCollectionSettings Tests

diff --git a/src/Context/Internal/MongoCollectionBuilder.cs b/src/Context/Internal/MongoCollectionBuilder.cs
@@ -40,7 +40,17 @@ public IMongoCollectionBuilder<TDocument> WithCollectionName(string collectionNa
         public IMongoCollectionBuilder<TDocument> AddBsonClassMap<TMapDocument>(
             Action<BsonClassMap<TMapDocument>> bsonClassMapAction) where TMapDocument : class
         {
-            _classMapActions.Add(() => RegisterClassMapSync(bsonClassMapAction));
+            _classMapActions.Add(() => 
+                RegisterClassMapSync<TMapDocument>(bsonClassMapAction));
+
+            return this;
+        }
+
+        public IMongoCollectionBuilder<TDocument> AddBsonClassMap<TMapDocument>() 
+            where TMapDocument : class
+        {
+            _classMapActions.Add(() => 
+                RegisterClassMapSync<TMapDocument>());
 
             return this;
         }
@@ -94,5 +104,17 @@ private void RegisterClassMapSync<TMapDocument>(
                 }
             }
         }
+
+        private void RegisterClassMapSync<TMapDocument>()
+            where TMapDocument : class
+        {
+            lock (_lockObject)
+            {
+                if (!BsonClassMap.IsClassMapRegistered(typeof(TMapDocument)))
+                {
+                    BsonClassMap.RegisterClassMap<TMapDocument>();
+                }
+            }
+        }
     }
 }