CSHARP-1146: Add IsAcknowledged to WriteConcern and deprecate Enabled.

rstam · rstam · commit 71107b6096ea · 2014-12-15T12:30:25.000-05:00
diff --git a/MongoDB.Driver/MongoConnectionStringBuilder.cs b/MongoDB.Driver/MongoConnectionStringBuilder.cs
@@ -446,7 +446,7 @@ public SafeMode SafeMode
                     var writeConcern = value.WriteConcern;
                     FSync = writeConcern.FSync;
                     Journal = writeConcern.Journal;
-                    W = writeConcern.W ?? (writeConcern.Enabled ? 1 : 0);
+                    W = writeConcern.W ?? (writeConcern.IsAcknowledged ? 1 : 0);
                     WTimeout = writeConcern.WTimeout;
                 }
             }
diff --git a/MongoDB.Driver/MongoUrlBuilder.cs b/MongoDB.Driver/MongoUrlBuilder.cs
@@ -402,7 +402,7 @@ public SafeMode SafeMode
                     var writeConcern = value.WriteConcern;
                     FSync = writeConcern.FSync;
                     Journal = writeConcern.Journal;
-                    W = writeConcern.W ?? (writeConcern.Enabled ? 1 : 0);
+                    W = writeConcern.W ?? (writeConcern.IsAcknowledged ? 1 : 0);
                     WTimeout = writeConcern.WTimeout;
                 }
             }
diff --git a/MongoDB.Driver/Operations/BulkMixedWriteOperation.cs b/MongoDB.Driver/Operations/BulkMixedWriteOperation.cs
@@ -101,7 +101,7 @@ public BulkWriteResult Execute(MongoConnection connection)
                 throw new InvalidOperationException("Bulk write operation is empty.");
             }
 
-            var combiner = new BulkWriteBatchResultCombiner(batchResults, _writeConcern.Enabled);
+            var combiner = new BulkWriteBatchResultCombiner(batchResults, _writeConcern.IsAcknowledged);
             return combiner.CreateResultOrThrowIfHasErrors(remainingRequests);
         }
 
diff --git a/MongoDB.Driver/Operations/BulkUnmixedWriteOperationBase.cs b/MongoDB.Driver/Operations/BulkUnmixedWriteOperationBase.cs
@@ -71,7 +71,7 @@ public virtual BulkWriteResult Execute(MongoConnection connection)
                 }
             }
 
-            var combiner = new BulkWriteBatchResultCombiner(batchResults, _args.WriteConcern.Enabled);
+            var combiner = new BulkWriteBatchResultCombiner(batchResults, _args.WriteConcern.IsAcknowledged);
             return combiner.CreateResultOrThrowIfHasErrors(remainingRequests);
         }
 
diff --git a/MongoDB.Driver/Operations/BulkUnmixedWriteOperationEmulatorBase.cs b/MongoDB.Driver/Operations/BulkUnmixedWriteOperationEmulatorBase.cs
@@ -59,7 +59,7 @@ public BulkWriteResult Execute(MongoConnection connection)
                 originalIndex++;
             }
 
-            var combiner = new BulkWriteBatchResultCombiner(batchResults, _args.WriteConcern.Enabled);
+            var combiner = new BulkWriteBatchResultCombiner(batchResults, _args.WriteConcern.IsAcknowledged);
             return combiner.CreateResultOrThrowIfHasErrors(remainingRequests);
         }
 
diff --git a/MongoDB.Driver/Operations/DeleteOpcodeOperation.cs b/MongoDB.Driver/Operations/DeleteOpcodeOperation.cs
@@ -36,7 +36,7 @@ public DeleteOpcodeOperation(BulkDeleteOperationArgs args)
         public WriteConcernResult Execute(MongoConnection connection)
         {
             var serverInstance = connection.ServerInstance;
-            if (serverInstance.Supports(FeatureId.WriteCommands) && _args.WriteConcern.Enabled)
+            if (serverInstance.Supports(FeatureId.WriteCommands) && _args.WriteConcern.IsAcknowledged)
             {
                 var emulator = new DeleteOpcodeOperationEmulator(_args);
                 return emulator.Execute(connection);
@@ -68,7 +68,7 @@ public WriteConcernResult Execute(MongoConnection connection)
                 sendMessageResult = SendMessageWithWriteConcern(connection, buffer, message.RequestId, ReaderSettings, WriterSettings, WriteConcern);
             }
 
-            return WriteConcern.Enabled ? ReadWriteConcernResult(connection, sendMessageResult) : null;
+            return WriteConcern.IsAcknowledged ? ReadWriteConcernResult(connection, sendMessageResult) : null;
         }
     }
 }
diff --git a/MongoDB.Driver/Operations/DeleteOpcodeOperationEmulator.cs b/MongoDB.Driver/Operations/DeleteOpcodeOperationEmulator.cs
@@ -62,7 +62,7 @@ public WriteConcernResult Execute(MongoConnection connection)
             }
             else
             {
-                if (_args.WriteConcern.Enabled)
+                if (_args.WriteConcern.IsAcknowledged)
                 {
                     return converter.ToWriteConcernResult(bulkWriteResult);
                 }
diff --git a/MongoDB.Driver/Operations/InsertOpcodeOperation.cs b/MongoDB.Driver/Operations/InsertOpcodeOperation.cs
@@ -40,13 +40,13 @@ public InsertOpcodeOperation(BulkInsertOperationArgs args)
         public IEnumerable<WriteConcernResult> Execute(MongoConnection connection)
         {
             var serverInstance = connection.ServerInstance;
-            if (serverInstance.Supports(FeatureId.WriteCommands) && _args.WriteConcern.Enabled)
+            if (serverInstance.Supports(FeatureId.WriteCommands) && _args.WriteConcern.IsAcknowledged)
             {
                 var emulator = new InsertOpcodeOperationEmulator(_args);
                 return emulator.Execute(connection);
             }
 
-            var results = WriteConcern.Enabled ? new List<WriteConcernResult>() : null;
+            var results = WriteConcern.IsAcknowledged ? new List<WriteConcernResult>() : null;
             var finalException = (Exception)null;
 
             var requests = _args.Requests.Cast<InsertRequest>();
@@ -100,7 +100,7 @@ public IEnumerable<WriteConcernResult> Execute(MongoConnection connection)
                             {
                                 finalException = ex;
                             }
-                            else if (WriteConcern.Enabled)
+                            else if (WriteConcern.IsAcknowledged)
                             {
                                 results.Add(writeConcernResult);
                                 ex.Data["results"] = results;
@@ -122,7 +122,7 @@ public IEnumerable<WriteConcernResult> Execute(MongoConnection connection)
                 }
             }
 
-            if (WriteConcern.Enabled && finalException != null)
+            if (WriteConcern.IsAcknowledged && finalException != null)
             {
                 finalException.Data["results"] = results;
                 throw finalException;
@@ -135,7 +135,7 @@ public IEnumerable<WriteConcernResult> Execute(MongoConnection connection)
         private SendMessageWithWriteConcernResult SendBatch(MongoConnection connection, BsonBuffer buffer, int requestId, bool isLast)
         {
             var writeConcern = WriteConcern;
-            if (!writeConcern.Enabled && !_continueOnError && !isLast)
+            if (!writeConcern.IsAcknowledged && !_continueOnError && !isLast)
             {
                 writeConcern = WriteConcern.Acknowledged;
             }
diff --git a/MongoDB.Driver/Operations/InsertOpcodeOperationEmulator.cs b/MongoDB.Driver/Operations/InsertOpcodeOperationEmulator.cs
@@ -65,7 +65,7 @@ public IEnumerable<WriteConcernResult> Execute(MongoConnection connection)
             }
             else
             {
-                if (_args.WriteConcern.Enabled)
+                if (_args.WriteConcern.IsAcknowledged)
                 {
                     return new[] { converter.ToWriteConcernResult(bulkWriteResult) };
                 }
diff --git a/MongoDB.Driver/Operations/UpdateOpcodeOperation.cs b/MongoDB.Driver/Operations/UpdateOpcodeOperation.cs
@@ -36,7 +36,7 @@ public UpdateOpcodeOperation(BulkUpdateOperationArgs args)
         public WriteConcernResult Execute(MongoConnection connection)
         {
             var serverInstance = connection.ServerInstance;
-            if (serverInstance.Supports(FeatureId.WriteCommands) && _args.WriteConcern.Enabled)
+            if (serverInstance.Supports(FeatureId.WriteCommands) && _args.WriteConcern.IsAcknowledged)
             {
                 var emulator = new UpdateOpcodeOperationEmulator(_args);
                 return emulator.Execute(connection);
@@ -65,7 +65,7 @@ public WriteConcernResult Execute(MongoConnection connection)
                 sendMessageResult =  SendMessageWithWriteConcern(connection, buffer, message.RequestId, ReaderSettings, WriterSettings, WriteConcern);
             }
 
-            return WriteConcern.Enabled ? ReadWriteConcernResult(connection, sendMessageResult) : null;
+            return WriteConcern.IsAcknowledged ? ReadWriteConcernResult(connection, sendMessageResult) : null;
         }
     }
 }
diff --git a/MongoDB.Driver/Operations/UpdateOpcodeOperationEmulator.cs b/MongoDB.Driver/Operations/UpdateOpcodeOperationEmulator.cs
@@ -62,7 +62,7 @@ public WriteConcernResult Execute(MongoConnection connection)
             }
             else
             {
-                if (_args.WriteConcern.Enabled)
+                if (_args.WriteConcern.IsAcknowledged)
                 {
                     return converter.ToWriteConcernResult(bulkWriteResult);
                 }
diff --git a/MongoDB.Driver/Operations/WriteOpcodeOperationBase.cs b/MongoDB.Driver/Operations/WriteOpcodeOperationBase.cs
@@ -72,7 +72,7 @@ protected SendMessageWithWriteConcernResult SendMessageWithWriteConcern(
         {
             var result = new SendMessageWithWriteConcernResult();
 
-            if (writeConcern.Enabled)
+            if (writeConcern.IsAcknowledged)
             {
                 var maxDocumentSize = connection.ServerInstance.MaxDocumentSize;
 
diff --git a/MongoDB.Driver/SafeMode.cs b/MongoDB.Driver/SafeMode.cs
@@ -195,13 +195,13 @@ public static SafeMode W4
         /// </summary>
         public bool Enabled
         {
-            get { return _writeConcern.Enabled; }
+            get { return _writeConcern.IsAcknowledged; }
             set
             {
                 if (IsFrozen) { ThrowFrozenException(); }
                 if (value)
                 {
-                    if (!_writeConcern.Enabled)
+                    if (!_writeConcern.IsAcknowledged)
                     {
                         _writeConcern.W = 1;
                     }
diff --git a/MongoDB.Driver/WriteConcern.cs b/MongoDB.Driver/WriteConcern.cs
@@ -118,9 +118,31 @@ public static WriteConcern WMajority
 
         // public properties
         /// <summary>
-        /// Gets or sets whether WriteConcern is enabled.
+        /// Gets whether WriteConcern is enabled.
         /// </summary>
+        [Obsolete("Use IsAcknowledged instead.")]
         public bool Enabled
+        {
+            get { return IsAcknowledged; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether the write concern includes { fsync : true }.
+        /// </summary>
+        public bool? FSync
+        {
+            get { return _fsync; }
+            set
+            {
+                if (_isFrozen) { ThrowFrozenException(); }
+                _fsync = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether this WriteConcern is acknowledged.
+        /// </summary>
+        public bool IsAcknowledged
         {
             get
             {
@@ -150,19 +172,6 @@ public bool Enabled
             }
         }
 
-        /// <summary>
-        /// Gets or sets whether the write concern includes { fsync : true }.
-        /// </summary>
-        public bool? FSync
-        {
-            get { return _fsync; }
-            set
-            {
-                if (_isFrozen) { ThrowFrozenException(); }
-                _fsync = value;
-            }
-        }
-
         /// <summary>
         /// Gets whether this instance is frozen.
         /// </summary>
@@ -396,7 +405,7 @@ public override string ToString()
 
             if (parts.Count == 0)
             {
-                return Enabled ? "Acknowledged" : "w=0";
+                return IsAcknowledged ? "Acknowledged" : "w=0";
             }
             else
             {
diff --git a/MongoDB.DriverUnitTests/Configuration.cs b/MongoDB.DriverUnitTests/Configuration.cs
@@ -39,9 +39,9 @@ static Configuration()
 
             var mongoUrl = new MongoUrl(connectionString);
             var clientSettings = MongoClientSettings.FromUrl(mongoUrl);
-            if (!clientSettings.WriteConcern.Enabled)
+            if (!clientSettings.WriteConcern.IsAcknowledged)
             {
-                clientSettings.WriteConcern.W = 1; // ensure WriteConcern is enabled regardless of what the URL says
+                clientSettings.WriteConcern.W = 1; // ensure WriteConcern is acknowledged regardless of what the URL says
             }
 
             __testClient = new MongoClient(clientSettings);
diff --git a/MongoDB.DriverUnitTests/Jira/CSharp330Tests.cs b/MongoDB.DriverUnitTests/Jira/CSharp330Tests.cs
@@ -35,7 +35,7 @@ public void TestFixtureSetup()
         public void TestMongoGridFSSettingsInheritsSafeModeFromDatabase()
         {
             var gridFS = _database.GridFS;
-            Assert.AreEqual(true, gridFS.Settings.WriteConcern.Enabled);
+            Assert.AreEqual(true, gridFS.Settings.WriteConcern.IsAcknowledged);
         }
     }
 }
diff --git a/MongoDB.DriverUnitTests/MongoConnectionStringBuilderTests.cs b/MongoDB.DriverUnitTests/MongoConnectionStringBuilderTests.cs
@@ -339,7 +339,7 @@ public void TestGetWriteConcern_Enabled(bool enabledDefault, bool enabled, strin
         {
             var builder = new MongoConnectionStringBuilder(connectionString);
             var writeConcern = builder.GetWriteConcern(enabledDefault);
-            Assert.AreEqual(enabled, writeConcern.Enabled);
+            Assert.AreEqual(enabled, writeConcern.IsAcknowledged);
         }
 
         [Test]
@@ -384,7 +384,7 @@ public void TestGetWriteConcern_W(bool enabledDefault, bool enabled, object wobj
             var w = (wobj == null) ? null : (wobj is int) ? (WriteConcern.WValue)new WriteConcern.WCount((int)wobj) : new WriteConcern.WMode((string)wobj);
             var builder = new MongoConnectionStringBuilder(connectionString);
             var writeConcern = builder.GetWriteConcern(enabledDefault);
-            Assert.AreEqual(enabled, writeConcern.Enabled);
+            Assert.AreEqual(enabled, writeConcern.IsAcknowledged);
             Assert.AreEqual(w, writeConcern.W);
         }
 
@@ -1125,7 +1125,7 @@ public void TestW(bool enabledDefault, bool enabled, object wobj, string connect
             foreach (var builder in EnumerateBuiltAndParsedBuilders(built, connectionString))
             {
                 var writeConcern = builder.GetWriteConcern(enabledDefault);
-                Assert.AreEqual(enabled, writeConcern.Enabled);
+                Assert.AreEqual(enabled, writeConcern.IsAcknowledged);
                 Assert.AreEqual(w, writeConcern.W);
                 Assert.AreEqual(connectionString, builder.ToString());
             }
diff --git a/MongoDB.DriverUnitTests/MongoUrlBuilderTests.cs b/MongoDB.DriverUnitTests/MongoUrlBuilderTests.cs
@@ -367,7 +367,7 @@ public void TestGetWriteConcern_Enabled(bool enabledDefault, bool enabled, strin
         {
             var builder = new MongoUrlBuilder(connectionString);
             var writeConcern = builder.GetWriteConcern(enabledDefault);
-            Assert.AreEqual(enabled, writeConcern.Enabled);
+            Assert.AreEqual(enabled, writeConcern.IsAcknowledged);
         }
 
         [Test]
@@ -412,7 +412,7 @@ public void TestGetWriteConcern_W(bool enabledDefault, bool enabled, object wobj
             var w = (wobj == null) ? null : (wobj is int) ? (WriteConcern.WValue)new WriteConcern.WCount((int)wobj) : new WriteConcern.WMode((string)wobj);
             var builder = new MongoUrlBuilder(connectionString);
             var writeConcern = builder.GetWriteConcern(enabledDefault);
-            Assert.AreEqual(enabled, writeConcern.Enabled);
+            Assert.AreEqual(enabled, writeConcern.IsAcknowledged);
             Assert.AreEqual(w, writeConcern.W);
         }
 
@@ -1093,7 +1093,7 @@ public void TestW(bool enabledDefault, bool enabled, object wobj, string connect
             foreach (var builder in EnumerateBuiltAndParsedBuilders(built, connectionString))
             {
                 var writeConcern = builder.GetWriteConcern(enabledDefault);
-                Assert.AreEqual(enabled, writeConcern.Enabled);
+                Assert.AreEqual(enabled, writeConcern.IsAcknowledged);
                 Assert.AreEqual(w, writeConcern.W);
                 Assert.AreEqual(connectionString, builder.ToString());
             }
diff --git a/MongoDB.DriverUnitTests/WriteConcernTests.cs b/MongoDB.DriverUnitTests/WriteConcernTests.cs
@@ -29,7 +29,7 @@ public void TestAcknowledgedWriteConcern()
         {
             var acknowledgedWriteConcern = WriteConcern.Acknowledged;
             Assert.IsTrue(acknowledgedWriteConcern.IsFrozen);
-            Assert.IsTrue(acknowledgedWriteConcern.Enabled);
+            Assert.IsTrue(acknowledgedWriteConcern.IsAcknowledged);
             Assert.IsNull(acknowledgedWriteConcern.FSync);
             Assert.IsNull(acknowledgedWriteConcern.Journal);
             Assert.IsNull(acknowledgedWriteConcern.W);
@@ -41,7 +41,7 @@ public void TestW1WriteConcern()
         {
             var acknowledgedWriteConcern = WriteConcern.W1;
             Assert.IsTrue(acknowledgedWriteConcern.IsFrozen);
-            Assert.IsTrue(acknowledgedWriteConcern.Enabled);
+            Assert.IsTrue(acknowledgedWriteConcern.IsAcknowledged);
             Assert.IsNull(acknowledgedWriteConcern.FSync);
             Assert.IsNull(acknowledgedWriteConcern.Journal);
             Assert.IsTrue(1 == acknowledgedWriteConcern.W);
@@ -61,7 +61,7 @@ public void TestMongoServerDefaultWriteConcern()
 #pragma warning disable 618 // about obsolete MongoServer.Create
             var server = MongoServer.Create();
 #pragma warning restore 618 
-            Assert.IsFalse(server.Settings.WriteConcern.Enabled);
+            Assert.IsFalse(server.Settings.WriteConcern.IsAcknowledged);
         }
 
         [Test]
@@ -77,7 +77,7 @@ public void TestMongoServer_ConnectionString_No_W()
 #pragma warning disable 618 // about obsolete MongoServer.Create
             var server = MongoServer.Create(__noWriteConcernConnectionUri);
 #pragma warning restore 618
-            Assert.IsFalse(server.Settings.WriteConcern.Enabled);
+            Assert.IsFalse(server.Settings.WriteConcern.IsAcknowledged);
         }
 
         [Test]
@@ -101,7 +101,7 @@ private bool TestWriteConcernIsW1Only(WriteConcern writeConcern)
             if (writeConcern == null) { return false; }
             return
                 writeConcern.IsFrozen &&
-                writeConcern.Enabled &&
+                writeConcern.IsAcknowledged &&
                 (writeConcern.FSync == null) &&
                 (writeConcern.Journal == null) &&
                 (writeConcern.WTimeout == null) &&

Original file line number	Diff line number	Diff line change
`@@ -446,7 +446,7 @@ public SafeMode SafeMode`
`446`	`446`	`var writeConcern = value.WriteConcern;`
`447`	`447`	`FSync = writeConcern.FSync;`
`448`	`448`	`Journal = writeConcern.Journal;`
`449`		`- W = writeConcern.W ?? (writeConcern.Enabled ? 1 : 0);`
	`449`	`+ W = writeConcern.W ?? (writeConcern.IsAcknowledged ? 1 : 0);`
`450`	`450`	`WTimeout = writeConcern.WTimeout;`
`451`	`451`	`}`
`452`	`452`	`}`
Original file line number	Diff line number	Diff line change
`@@ -402,7 +402,7 @@ public SafeMode SafeMode`
`402`	`402`	`var writeConcern = value.WriteConcern;`
`403`	`403`	`FSync = writeConcern.FSync;`
`404`	`404`	`Journal = writeConcern.Journal;`
`405`		`- W = writeConcern.W ?? (writeConcern.Enabled ? 1 : 0);`
	`405`	`+ W = writeConcern.W ?? (writeConcern.IsAcknowledged ? 1 : 0);`
`406`	`406`	`WTimeout = writeConcern.WTimeout;`
`407`	`407`	`}`
`408`	`408`	`}`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ public BulkWriteResult Execute(MongoConnection connection)`
`101`	`101`	`throw new InvalidOperationException("Bulk write operation is empty.");`
`102`	`102`	`}`
`103`	`103`
`104`		`- var combiner = new BulkWriteBatchResultCombiner(batchResults, _writeConcern.Enabled);`
	`104`	`+ var combiner = new BulkWriteBatchResultCombiner(batchResults, _writeConcern.IsAcknowledged);`
`105`	`105`	`return combiner.CreateResultOrThrowIfHasErrors(remainingRequests);`
`106`	`106`	`}`
`107`	`107`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public virtual BulkWriteResult Execute(MongoConnection connection)`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`
`74`		`- var combiner = new BulkWriteBatchResultCombiner(batchResults, _args.WriteConcern.Enabled);`
	`74`	`+ var combiner = new BulkWriteBatchResultCombiner(batchResults, _args.WriteConcern.IsAcknowledged);`
`75`	`75`	`return combiner.CreateResultOrThrowIfHasErrors(remainingRequests);`
`76`	`76`	`}`
`77`	`77`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public BulkWriteResult Execute(MongoConnection connection)`
`59`	`59`	`originalIndex++;`
`60`	`60`	`}`
`61`	`61`
`62`		`- var combiner = new BulkWriteBatchResultCombiner(batchResults, _args.WriteConcern.Enabled);`
	`62`	`+ var combiner = new BulkWriteBatchResultCombiner(batchResults, _args.WriteConcern.IsAcknowledged);`
`63`	`63`	`return combiner.CreateResultOrThrowIfHasErrors(remainingRequests);`
`64`	`64`	`}`
`65`	`65`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public DeleteOpcodeOperation(BulkDeleteOperationArgs args)`
`36`	`36`	`public WriteConcernResult Execute(MongoConnection connection)`
`37`	`37`	`{`
`38`	`38`	`var serverInstance = connection.ServerInstance;`
`39`		`- if (serverInstance.Supports(FeatureId.WriteCommands) && _args.WriteConcern.Enabled)`
	`39`	`+ if (serverInstance.Supports(FeatureId.WriteCommands) && _args.WriteConcern.IsAcknowledged)`
`40`	`40`	`{`
`41`	`41`	`var emulator = new DeleteOpcodeOperationEmulator(_args);`
`42`	`42`	`return emulator.Execute(connection);`
`@@ -68,7 +68,7 @@ public WriteConcernResult Execute(MongoConnection connection)`
`68`	`68`	`sendMessageResult = SendMessageWithWriteConcern(connection, buffer, message.RequestId, ReaderSettings, WriterSettings, WriteConcern);`
`69`	`69`	`}`
`70`	`70`
`71`		`- return WriteConcern.Enabled ? ReadWriteConcernResult(connection, sendMessageResult) : null;`
	`71`	`+ return WriteConcern.IsAcknowledged ? ReadWriteConcernResult(connection, sendMessageResult) : null;`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public WriteConcernResult Execute(MongoConnection connection)`
`62`	`62`	`}`
`63`	`63`	`else`
`64`	`64`	`{`
`65`		`- if (_args.WriteConcern.Enabled)`
	`65`	`+ if (_args.WriteConcern.IsAcknowledged)`
`66`	`66`	`{`
`67`	`67`	`return converter.ToWriteConcernResult(bulkWriteResult);`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,13 +40,13 @@ public InsertOpcodeOperation(BulkInsertOperationArgs args)`
`40`	`40`	`public IEnumerable<WriteConcernResult> Execute(MongoConnection connection)`
`41`	`41`	`{`
`42`	`42`	`var serverInstance = connection.ServerInstance;`
`43`		`- if (serverInstance.Supports(FeatureId.WriteCommands) && _args.WriteConcern.Enabled)`
	`43`	`+ if (serverInstance.Supports(FeatureId.WriteCommands) && _args.WriteConcern.IsAcknowledged)`
`44`	`44`	`{`
`45`	`45`	`var emulator = new InsertOpcodeOperationEmulator(_args);`
`46`	`46`	`return emulator.Execute(connection);`
`47`	`47`	`}`
`48`	`48`
`49`		`- var results = WriteConcern.Enabled ? new List<WriteConcernResult>() : null;`
	`49`	`+ var results = WriteConcern.IsAcknowledged ? new List<WriteConcernResult>() : null;`
`50`	`50`	`var finalException = (Exception)null;`
`51`	`51`
`52`	`52`	`var requests = _args.Requests.Cast<InsertRequest>();`
`@@ -100,7 +100,7 @@ public IEnumerable<WriteConcernResult> Execute(MongoConnection connection)`
`100`	`100`	`{`
`101`	`101`	`finalException = ex;`
`102`	`102`	`}`
`103`		`- else if (WriteConcern.Enabled)`
	`103`	`+ else if (WriteConcern.IsAcknowledged)`
`104`	`104`	`{`
`105`	`105`	`results.Add(writeConcernResult);`
`106`	`106`	`ex.Data["results"] = results;`
`@@ -122,7 +122,7 @@ public IEnumerable<WriteConcernResult> Execute(MongoConnection connection)`
`122`	`122`	`}`
`123`	`123`	`}`
`124`	`124`
`125`		`- if (WriteConcern.Enabled && finalException != null)`
	`125`	`+ if (WriteConcern.IsAcknowledged && finalException != null)`
`126`	`126`	`{`
`127`	`127`	`finalException.Data["results"] = results;`
`128`	`128`	`throw finalException;`
`@@ -135,7 +135,7 @@ public IEnumerable<WriteConcernResult> Execute(MongoConnection connection)`
`135`	`135`	`private SendMessageWithWriteConcernResult SendBatch(MongoConnection connection, BsonBuffer buffer, int requestId, bool isLast)`
`136`	`136`	`{`
`137`	`137`	`var writeConcern = WriteConcern;`
`138`		`- if (!writeConcern.Enabled && !_continueOnError && !isLast)`
	`138`	`+ if (!writeConcern.IsAcknowledged && !_continueOnError && !isLast)`
`139`	`139`	`{`
`140`	`140`	`writeConcern = WriteConcern.Acknowledged;`
`141`	`141`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public IEnumerable<WriteConcernResult> Execute(MongoConnection connection)`
`65`	`65`	`}`
`66`	`66`	`else`
`67`	`67`	`{`
`68`		`- if (_args.WriteConcern.Enabled)`
	`68`	`+ if (_args.WriteConcern.IsAcknowledged)`
`69`	`69`	`{`
`70`	`70`	`return new[] { converter.ToWriteConcernResult(bulkWriteResult) };`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public UpdateOpcodeOperation(BulkUpdateOperationArgs args)`
`36`	`36`	`public WriteConcernResult Execute(MongoConnection connection)`
`37`	`37`	`{`
`38`	`38`	`var serverInstance = connection.ServerInstance;`
`39`		`- if (serverInstance.Supports(FeatureId.WriteCommands) && _args.WriteConcern.Enabled)`
	`39`	`+ if (serverInstance.Supports(FeatureId.WriteCommands) && _args.WriteConcern.IsAcknowledged)`
`40`	`40`	`{`
`41`	`41`	`var emulator = new UpdateOpcodeOperationEmulator(_args);`
`42`	`42`	`return emulator.Execute(connection);`
`@@ -65,7 +65,7 @@ public WriteConcernResult Execute(MongoConnection connection)`
`65`	`65`	`sendMessageResult = SendMessageWithWriteConcern(connection, buffer, message.RequestId, ReaderSettings, WriterSettings, WriteConcern);`
`66`	`66`	`}`
`67`	`67`
`68`		`- return WriteConcern.Enabled ? ReadWriteConcernResult(connection, sendMessageResult) : null;`
	`68`	`+ return WriteConcern.IsAcknowledged ? ReadWriteConcernResult(connection, sendMessageResult) : null;`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`	`}`