CSHARP-627: remove FireAndForget keyword.

Author: rstam

Driver/Core/CommandResults/SafeModeResult.cs

@@ -21,7 +21,7 @@
 namespace MongoDB.Driver
 {
     /// <summary>
-    /// Represents the results of an operation performed with a WriteConcern other than FireAndForget.
+    /// Represents the results of an operation performed with WriteConcern enabled.
     /// </summary>
     [Serializable]
     [Obsolete("Use WriteConcernResult instead.")]

Driver/Core/CommandResults/WriteConcernResult.cs

@@ -21,7 +21,7 @@
 namespace MongoDB.Driver
 {
     /// <summary>
-    /// Represents the results of an operation performed with a WriteConcern other than FireAndForget.
+    /// Represents the results of an operation performed with WriteConcern enabled.
     /// </summary>
     [Serializable]
 #pragma warning disable 618

Driver/Core/MongoClientSettings.cs

@@ -421,7 +421,7 @@ public static MongoClientSettings FromConnectionStringBuilder(MongoConnectionStr
             clientSettings.VerifySslCertificate = builder.VerifySslCertificate;
             clientSettings.WaitQueueSize = builder.ComputedWaitQueueSize;
             clientSettings.WaitQueueTimeout = builder.WaitQueueTimeout;
-            clientSettings.WriteConcern = builder.GetWriteConcern(false); // fireAndForget default for MongoClientSettings is false
+            clientSettings.WriteConcern = builder.GetWriteConcern(true); // WriteConcern is enabled by default for MongoClient
             return clientSettings;
         }
 
@@ -451,7 +451,7 @@ public static MongoClientSettings FromUrl(MongoUrl url)
             clientSettings.VerifySslCertificate = url.VerifySslCertificate;
             clientSettings.WaitQueueSize = url.ComputedWaitQueueSize;
             clientSettings.WaitQueueTimeout = url.WaitQueueTimeout;
-            clientSettings.WriteConcern = url.GetWriteConcern(false); // fireAndForget default for MongoClientSettings is false
+            clientSettings.WriteConcern = url.GetWriteConcern(true); // WriteConcern is enabled by default for MongoClient
             return clientSettings;
         }
 

Driver/Core/MongoCollection.cs

@@ -1132,7 +1132,7 @@ public virtual IEnumerable<WriteConcernResult> InsertBatch(
             {
                 var writeConcern = options.WriteConcern ?? _settings.WriteConcern;
 
-                List<WriteConcernResult> results = (writeConcern.FireAndForget) ? null : new List<WriteConcernResult>();
+                List<WriteConcernResult> results = (writeConcern.Enabled) ? new List<WriteConcernResult>() : null;
 
                 var writerSettings = GetWriterSettings(connection);
                 using (var message = new MongoInsertMessage(writerSettings, FullName, options.CheckElementNames, options.Flags))
@@ -1171,13 +1171,13 @@ public virtual IEnumerable<WriteConcernResult> InsertBatch(
                         {
                             byte[] lastDocument = message.RemoveLastDocument();
                             var intermediateResult = connection.SendMessage(message, writeConcern, _database.Name);
-                            if (!writeConcern.FireAndForget) { results.Add(intermediateResult); }
+                            if (writeConcern.Enabled) { results.Add(intermediateResult); }
                             message.ResetBatch(lastDocument);
                         }
                     }
 
                     var finalResult = connection.SendMessage(message, writeConcern, _database.Name);
-                    if (!writeConcern.FireAndForget) { results.Add(finalResult); }
+                    if (writeConcern.Enabled) { results.Add(finalResult); }
 
                     return results;
                 }

Driver/Core/MongoConnectionStringBuilder.cs

@@ -39,7 +39,6 @@ public class MongoConnectionStringBuilder : DbConnectionStringBuilder
             { "connecttimeout", "connectTimeout" },
             { "connecttimeoutms", "connectTimeout" },
             { "database", "database" },
-            { "fireandforget", "fireAndForget" },
             { "fsync", "fsync" },
             { "guids", "uuidRepresentation" },
             { "ipv6", "ipv6" },
@@ -81,7 +80,6 @@ public class MongoConnectionStringBuilder : DbConnectionStringBuilder
         private ConnectionMode _connectionMode;
         private TimeSpan _connectTimeout;
         private string _databaseName;
-        private bool? _fireAndForget;
         private bool? _fsync;
         private GuidRepresentation _guidRepresentation;
         private bool _ipv6;
@@ -187,30 +185,6 @@ public string DatabaseName
             }
         }
 
-        /// <summary>
-        /// Gets or sets the fireAndForget value.
-        /// </summary>
-        public bool? FireAndForget
-        {
-            get { return _fireAndForget; }
-            set
-            {
-                if (value != null)
-                {
-                    if (_safe != null)
-                    {
-                        throw new InvalidOperationException("FireAndForget and Safe are mutually exclusive.");
-                    }
-                    if (value.Value && AnyWriteConcernSettingsAreSet())
-                    {
-                        throw new InvalidOperationException("FireAndForget cannot be set to true if any other write concern values have been set.");
-                    }
-                }
-                _fireAndForget = value;
-                base["fireAndForget"] = (value == null) ? null : XmlConvert.ToString(value.Value);
-            }
-        }
-
         /// <summary>
         /// Gets or sets the FSync component of the write concern.
         /// </summary>
@@ -219,7 +193,6 @@ public bool? FSync
             get { return _fsync; }
             set
             {
-                if (value != null) { EnsureFireAndForgetIsNotTrue("FSync"); }
                 _fsync = value;
                 base["fsync"] = (value == null) ? null : XmlConvert.ToString(value.Value);
             }
@@ -259,7 +232,6 @@ public bool? Journal
             get { return _journal; }
             set
             {
-                if (value != null) { EnsureFireAndForgetIsNotTrue("Journal"); }
                 _journal = value;
                 base["journal"] = (value == null) ? null : XmlConvert.ToString(value.Value);
             }
@@ -407,18 +379,14 @@ public string ReplicaSetName
         /// <summary>
         /// Gets or sets the safe value.
         /// </summary>
-        [Obsolete("Use FireAndForget instead.")]
+        [Obsolete("Use W=0 or W=1 instead.")]
         public bool? Safe
         {
             get { return _safe; }
             set
             {
                 if (value != null)
                 {
-                    if (_fireAndForget != null)
-                    {
-                        throw new InvalidOperationException("FireAndForget and Safe are mutually exclusive.");
-                    }
                     if (!value.Value && AnyWriteConcernSettingsAreSet())
                     {
                         throw new InvalidOperationException("Safe cannot be set to false if any other write concern values have been set.");
@@ -432,12 +400,12 @@ public bool? Safe
         /// <summary>
         /// Gets or sets the SafeMode to use.
         /// </summary>
-        [Obsolete("Use FireAndForget, FSync, Journal, W and WTimeout instead.")]
+        [Obsolete("Use FSync, Journal, W and WTimeout instead.")]
         public SafeMode SafeMode
         {
             get
             {
-                if (_fireAndForget != null || _safe != null || AnyWriteConcernSettingsAreSet())
+                if (_safe != null || AnyWriteConcernSettingsAreSet())
                 {
 #pragma warning disable 618
                     return new SafeMode(GetWriteConcern(false));
@@ -450,7 +418,6 @@ public SafeMode SafeMode
             }
             set
             {
-                FireAndForget = null;
                 Safe = null;
                 FSync = null;
                 Journal = null;
@@ -607,7 +574,6 @@ public WriteConcern.WValue W
             get { return _w; }
             set
             {
-                if (value != null) { EnsureFireAndForgetIsNotTrue("W"); }
                 _w = value;
                 base["w"] = (value == null) ? null : value.ToString();
             }
@@ -676,7 +642,6 @@ public TimeSpan? WTimeout
             get { return _wTimeout; }
             set
             {
-                if (value != null) { EnsureFireAndForgetIsNotTrue("WTimeout"); }
                 if (value != null && value.Value < TimeSpan.Zero)
                 {
                     throw new ArgumentOutOfRangeException("value", "WTimeout must be greater than or equal to zero.");
@@ -722,9 +687,6 @@ public override object this[string keyword]
                     case "database":
                         DatabaseName = (string)value;
                         break;
-                    case "fireandforget":
-                        FireAndForget = Convert.ToBoolean(value);
-                        break;
                     case "fsync":
                         FSync = Convert.ToBoolean(value);
                         break;
@@ -870,23 +832,13 @@ public override bool ContainsKey(string keyword)
         }
 
         /// <summary>
-        /// Returns a WriteConcern value based on this instance's settings and a fire and forget default.
+        /// Returns a WriteConcern value based on this instance's settings and a default enabled value.
         /// </summary>
-        /// <param name="fireAndForgetDefault">The fire and forget default.</param>
+        /// <param name="enabledDefault">The default enabled value.</param>
         /// <returns>A WriteConcern.</returns>
-        public WriteConcern GetWriteConcern(bool fireAndForgetDefault)
+        public WriteConcern GetWriteConcern(bool enabledDefault)
         {
-            var fireAndForget = fireAndForgetDefault;
-            if (_fireAndForget != null) { fireAndForget = _fireAndForget.Value; }
-            else if (_safe != null) { fireAndForget = !_safe.Value; }
-            else if (AnyWriteConcernSettingsAreSet()) { fireAndForget = false; }
-
-            var writeConcern = new WriteConcern { FireAndForget = fireAndForget };
-            if (_fsync != null) { writeConcern.FSync = _fsync.Value; }
-            if (_journal != null) { writeConcern.Journal = _journal.Value; }
-            if (_w != null) { writeConcern.W = _w; }
-            if (_wTimeout != null) { writeConcern.WTimeout = _wTimeout.Value; }
-            return writeConcern;
+            return WriteConcern.Create(enabledDefault, _safe, _fsync, _journal, _w, _wTimeout);
         }
 
         /// <summary>
@@ -905,20 +857,6 @@ private bool AnyWriteConcernSettingsAreSet()
             return _fsync != null || _journal != null || _w != null || _wTimeout != null;
         }
 
-        private void EnsureFireAndForgetIsNotTrue(string propertyName)
-        {
-            if (_fireAndForget != null && _fireAndForget.Value)
-            {
-                var message = string.Format("{0} cannot be set when FireAndForget is true.", propertyName);
-                throw new InvalidOperationException(message);
-            }
-            if (_safe != null && !_safe.Value)
-            {
-                var message = string.Format("{0} cannot be set when Safe is false.", propertyName);
-                throw new InvalidOperationException(message);
-            }
-        }
-
         private string GetServersString(IEnumerable<MongoServerAddress> servers)
         {
             var sb = new StringBuilder();
@@ -990,7 +928,6 @@ private void ResetValues()
             _connectionMode = ConnectionMode.Automatic;
             _connectTimeout = MongoDefaults.ConnectTimeout;
             _databaseName = null;
-            _fireAndForget = null;
             _fsync = null;
             _guidRepresentation = MongoDefaults.GuidRepresentation;
             _ipv6 = false;

Driver/Core/MongoServerSettings.cs

@@ -580,7 +580,7 @@ public static MongoServerSettings FromConnectionStringBuilder(MongoConnectionStr
             serverSettings.WaitQueueSize = builder.ComputedWaitQueueSize;
             serverSettings.WaitQueueTimeout = builder.WaitQueueTimeout;
 #pragma warning disable 618
-            serverSettings.WriteConcern = builder.GetWriteConcern(!MongoDefaults.SafeMode.Enabled);
+            serverSettings.WriteConcern = builder.GetWriteConcern(MongoDefaults.SafeMode.Enabled);
 #pragma warning restore
             return serverSettings;
         }
@@ -612,7 +612,7 @@ public static MongoServerSettings FromUrl(MongoUrl url)
             serverSettings.WaitQueueSize = url.ComputedWaitQueueSize;
             serverSettings.WaitQueueTimeout = url.WaitQueueTimeout;
 #pragma warning disable 618
-            serverSettings.WriteConcern = url.GetWriteConcern(!MongoDefaults.SafeMode.Enabled);
+            serverSettings.WriteConcern = url.GetWriteConcern(MongoDefaults.SafeMode.Enabled);
 #pragma warning restore
             return serverSettings;
         }

Driver/Core/MongoUrl.cs

@@ -63,7 +63,6 @@ public class MongoUrl : IEquatable<MongoUrl>
         private readonly TimeSpan _connectTimeout;
         private readonly string _databaseName;
         private readonly MongoCredentials _defaultCredentials;
-        private readonly bool? _fireAndForget;
         private readonly bool? _fsync;
         private readonly GuidRepresentation _guidRepresentation;
         private readonly bool _ipv6;
@@ -100,7 +99,6 @@ public MongoUrl(string url)
             _connectTimeout = builder.ConnectTimeout;
             _databaseName = builder.DatabaseName;
             _defaultCredentials = builder.DefaultCredentials;
-            _fireAndForget = builder.FireAndForget;
             _fsync = builder.FSync;
             _guidRepresentation = builder.GuidRepresentation;
             _ipv6 = builder.IPv6;
@@ -181,14 +179,6 @@ public MongoCredentials DefaultCredentials
             get { return _defaultCredentials; }
         }
 
-        /// <summary>
-        /// Gets the fireAndForget value.
-        /// </summary>
-        public bool? FireAndForget
-        {
-            get { return _fireAndForget; }
-        }
-
         /// <summary>
         /// Gets the FSync component of the write concern.
         /// </summary>
@@ -272,6 +262,7 @@ public string ReplicaSetName
         /// <summary>
         /// Gets the safe value.
         /// </summary>
+        [Obsolete("Use W=0 or W=1 instead.")]
         public bool? Safe
         {
             get { return _safe; }
@@ -280,12 +271,12 @@ public bool? Safe
         /// <summary>
         /// Gets the SafeMode to use.
         /// </summary>
-        [Obsolete("Use FireAndForget, FSync, Journal, W and WTimeout instead.")]
+        [Obsolete("Use FSync, Journal, W and WTimeout instead.")]
         public SafeMode SafeMode
         {
             get
             {
-                if (_fireAndForget != null || _safe != null || AnyWriteConcernSettingsAreSet())
+                if (_safe != null || AnyWriteConcernSettingsAreSet())
                 {
 #pragma warning disable 618
                     return new SafeMode(GetWriteConcern(false));
@@ -503,23 +494,13 @@ public override int GetHashCode()
         }
 
         /// <summary>
-        /// Returns a WriteConcern value based on this instance's settings and a fire and forget default.
+        /// Returns a WriteConcern value based on this instance's settings and a default enabled value.
         /// </summary>
-        /// <param name="fireAndForgetDefault">The fire and forget default.</param>
+        /// <param name="enabledDefault">The default enabled value.</param>
         /// <returns>A WriteConcern.</returns>
-        public WriteConcern GetWriteConcern(bool fireAndForgetDefault)
-        {
-            var fireAndForget = fireAndForgetDefault;
-            if (_fireAndForget != null) { fireAndForget = _fireAndForget.Value; }
-            else if (_safe != null) { fireAndForget = !_safe.Value; }
-            else if (AnyWriteConcernSettingsAreSet()) { fireAndForget = false; }
-
-            var writeConcern = new WriteConcern { FireAndForget = fireAndForget };
-            if (_fsync != null) { writeConcern.FSync = _fsync.Value; }
-            if (_journal != null) { writeConcern.Journal = _journal.Value; }
-            if (_w != null) { writeConcern.W = _w; }
-            if (_wTimeout != null) { writeConcern.WTimeout = _wTimeout.Value; }
-            return writeConcern;
+        public WriteConcern GetWriteConcern(bool enabledDefault)
+        {
+            return WriteConcern.Create(enabledDefault, _safe, _fsync, _journal, _w, _wTimeout);
         }
 
         /// <summary>