CSHARP-801: The container parameter to GenerateId should be a MongoCollection (not an InsertOperation).

Author: rstam

MongoDB.Driver/MongoCollection.cs

@@ -1139,7 +1139,8 @@ public virtual IEnumerable<WriteConcernResult> InsertBatch(
                 options.CheckElementNames,
                 nominalType,
                 documents,
-                options.Flags);
+                options.Flags,
+                this);
 
             var connection = _server.AcquireConnection(ReadPreference.Primary);
             try

MongoDB.Driver/Operations/InsertOperation.cs

@@ -29,6 +29,7 @@ internal class InsertOperation : WriteOperation
         private readonly Type _documentType;
         private readonly IEnumerable _documents;
         private readonly InsertFlags _flags;
+        private readonly object _idGeneratorContainer;
 
         public InsertOperation(
             string databaseName,
@@ -40,14 +41,16 @@ public InsertOperation(
             bool checkElementNames,
             Type documentType,
             IEnumerable documents,
-            InsertFlags flags)
+            InsertFlags flags,
+            object idGeneratorContainer)
             : base(databaseName, collectionName, readerSettings, writerSettings, writeConcern)
         {
             _assignIdOnInsert = assignIdOnInsert;
             _checkElementNames = checkElementNames;
             _documentType = documentType;
             _documents = documents;
             _flags = flags;
+            _idGeneratorContainer = idGeneratorContainer;
         }
 
         public IEnumerable<WriteConcernResult> Execute(MongoConnection connection)
@@ -85,7 +88,7 @@ public IEnumerable<WriteConcernResult> Execute(MongoConnection connection)
                             {
                                 if (idGenerator != null && idGenerator.IsEmpty(id))
                                 {
-                                    id = idGenerator.GenerateId(this, document);
+                                    id = idGenerator.GenerateId(_idGeneratorContainer, document);
                                     idProvider.SetDocumentId(document, id);
                                 }
                             }

MongoDB.DriverUnitTests/Jira/CSharp801Tests.cs

@@ -0,0 +1,74 @@
+/* Copyright 2010-2013 10gen Inc.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+using MongoDB.Bson.Serialization;
+using MongoDB.Bson.Serialization.Attributes;
+using MongoDB.Driver;
+using NUnit.Framework;
+
+namespace MongoDB.DriverUnitTests.Jira
+{
+    [TestFixture]
+    public class CSharp801
+    {
+        private MongoCollection<C> _collection;
+
+        [SetUp]
+        public void SetUp()
+        {
+            _collection = Configuration.GetTestCollection<C>();
+            if (_collection.Exists()) { _collection.Drop(); }
+        }
+
+        [Test]
+        public void GenerateIdCalledFromInsert()
+        {
+            _collection.RemoveAll();
+            _collection.Insert(new C());
+            var c = _collection.FindOne();
+            Assert.AreEqual(1, c.Id);
+        }
+
+        [Test]
+        public void GenerateIdCalledFromSave()
+        {
+            _collection.RemoveAll();
+            _collection.Save(new C());
+            var c = _collection.FindOne();
+            Assert.AreEqual(1, c.Id);
+        }
+
+        // nested classes
+        public class C
+        {
+            [BsonId(IdGenerator = typeof(MyIdGenerator))]
+            public int Id { get; set; }
+        }
+
+        public class MyIdGenerator : IIdGenerator
+        {
+            public object GenerateId(object container, object document)
+            {
+                var collection = (MongoCollection<C>)container; // should not throw an InvalidCastException
+                return 1;
+            }
+
+            public bool IsEmpty(object id)
+            {
+                return (int)id == 0;
+            }
+        }
+    }
+}

MongoDB.DriverUnitTests/MongoDB.DriverUnitTests.csproj

@@ -122,6 +122,7 @@
     <Compile Include="Jira\CSharp714Tests.cs" />
     <Compile Include="Jira\CSharp718Tests.cs" />
     <Compile Include="Jira\CSharp779Tests.cs" />
+    <Compile Include="Jira\CSharp801Tests.cs" />
     <Compile Include="MongoClientSettingsTests.cs" />
     <Compile Include="ReadPreferenceTests.cs" />
     <Compile Include="MongoCollectionSettingsTests.cs" />