CSHARP-3763: Default directConnection to false and remove ConnectMode logic (#1472)

Author: BorisDog

src/MongoDB.Driver/ClusterKey.cs

@@ -16,28 +16,23 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using MongoDB.Driver.Core.Clusters;
 using MongoDB.Driver.Core.Configuration;
 using MongoDB.Driver.Core.Servers;
 using MongoDB.Shared;
 
 namespace MongoDB.Driver
 {
-    internal class ClusterKey
+    internal sealed class ClusterKey
     {
         // fields
         private readonly bool _allowInsecureTls;
         private readonly string _applicationName;
         private readonly Action<ClusterBuilder> _clusterConfigurator;
         private readonly IReadOnlyList<CompressorConfiguration> _compressors;
-#pragma warning disable CS0618 // Type or member is obsolete
-        private readonly ConnectionMode _connectionMode;
-        private readonly ConnectionModeSwitch _connectionModeSwitch;
-#pragma warning restore CS0618 // Type or member is obsolete
         private readonly TimeSpan _connectTimeout;
         private readonly MongoCredential _credential;
         private readonly CryptClientSettings _cryptClientSettings;
-        private readonly bool? _directConnection;
+        private readonly bool _directConnection;
         private readonly int _hashCode;
         private readonly TimeSpan _heartbeatInterval;
         private readonly TimeSpan _heartbeatTimeout;
@@ -73,14 +68,10 @@ public ClusterKey(
             string applicationName,
             Action<ClusterBuilder> clusterConfigurator,
             IReadOnlyList<CompressorConfiguration> compressors,
-#pragma warning disable CS0618 // Type or member is obsolete
-            ConnectionMode connectionMode,
-            ConnectionModeSwitch connectionModeSwitch,
-#pragma warning restore CS0618 // Type or member is obsolete
             TimeSpan connectTimeout,
             MongoCredential credential,
             CryptClientSettings cryptClientSettings,
-            bool? directConnection,
+            bool directConnection,
             TimeSpan heartbeatInterval,
             TimeSpan heartbeatTimeout,
             bool ipv6,
@@ -109,14 +100,10 @@ public ClusterKey(
             int waitQueueSize,
             TimeSpan waitQueueTimeout)
         {
-            ConnectionModeHelper.EnsureConnectionModeValuesAreValid(connectionMode, connectionModeSwitch, directConnection);
-
             _allowInsecureTls = allowInsecureTls;
             _applicationName = applicationName;
             _clusterConfigurator = clusterConfigurator;
             _compressors = compressors;
-            _connectionMode = connectionMode;
-            _connectionModeSwitch = connectionModeSwitch;
             _connectTimeout = connectTimeout;
             _credential = credential;
             _cryptClientSettings = cryptClientSettings;
@@ -157,36 +144,10 @@ public ClusterKey(
         public string ApplicationName { get { return _applicationName; } }
         public Action<ClusterBuilder> ClusterConfigurator { get { return _clusterConfigurator; } }
         public IReadOnlyList<CompressorConfiguration> Compressors { get { return _compressors; } }
-        [Obsolete("Use DirectConnection instead.")]
-        public ConnectionMode ConnectionMode
-        {
-            get
-            {
-                if (_connectionModeSwitch == ConnectionModeSwitch.UseDirectConnection)
-                {
-                    throw new InvalidOperationException("ConnectionMode cannot be used when ConnectionModeSwitch is set to UseDirectConnection.");
-                }
-                return _connectionMode;
-            }
-        }
-        [Obsolete("This property will be removed in a later release.")]
-        public ConnectionModeSwitch ConnectionModeSwitch => _connectionModeSwitch;
         public TimeSpan ConnectTimeout { get { return _connectTimeout; } }
         public MongoCredential Credential { get { return _credential; } }
         public CryptClientSettings CryptClientSettings { get { return _cryptClientSettings; } }
-        public bool? DirectConnection
-        {
-            get
-            {
-#pragma warning disable CS0618 // Type or member is obsolete
-                if (_connectionModeSwitch == ConnectionModeSwitch.UseConnectionMode)
-#pragma warning restore CS0618 // Type or member is obsolete
-                {
-                    throw new InvalidOperationException("DirectConnection cannot be used when ConnectionModeSwitch is set to UseConnectionMode.");
-                }
-                return _directConnection;
-            }
-        }
+        public bool DirectConnection { get { return _directConnection; } }
         public TimeSpan HeartbeatInterval { get { return _heartbeatInterval; } }
         public TimeSpan HeartbeatTimeout { get { return _heartbeatTimeout; } }
         public bool IPv6 { get { return _ipv6; } }
@@ -238,8 +199,6 @@ public override bool Equals(object obj)
                 _applicationName == rhs._applicationName &&
                 object.ReferenceEquals(_clusterConfigurator, rhs._clusterConfigurator) &&
                 _compressors.SequenceEqual(rhs._compressors) &&
-                _connectionMode == rhs._connectionMode &&
-                _connectionModeSwitch == rhs._connectionModeSwitch &&
                 _connectTimeout == rhs._connectTimeout &&
                 _credential == rhs._credential &&
                 object.Equals(_cryptClientSettings, rhs._cryptClientSettings) &&

src/MongoDB.Driver/ClusterRegistry.cs

@@ -83,15 +83,9 @@ private IClusterInternal CreateCluster(ClusterKey clusterKey)
 
         private ClusterSettings ConfigureCluster(ClusterSettings settings, ClusterKey clusterKey)
         {
-#pragma warning disable CS0618 // Type or member is obsolete
             var endPoints = clusterKey.Servers.Select(s => EndPointHelper.Parse(s.ToString()));
-            var connectionModeSwitch = clusterKey.ConnectionModeSwitch;
-            Optional<ClusterConnectionMode> connectionMode = connectionModeSwitch == ConnectionModeSwitch.UseConnectionMode ? clusterKey.ConnectionMode.ToCore() : default;
-            Optional<bool?> directConnection = connectionModeSwitch == ConnectionModeSwitch.UseDirectConnection ? clusterKey.DirectConnection : default;
             return settings.With(
-                connectionMode: connectionMode,
-                connectionModeSwitch: connectionModeSwitch,
-                directConnection: directConnection,
+                directConnection: clusterKey.DirectConnection,
                 cryptClientSettings: clusterKey.CryptClientSettings,
                 endPoints: Optional.Enumerable(endPoints),
                 loadBalanced: clusterKey.LoadBalanced,
@@ -101,7 +95,6 @@ private ClusterSettings ConfigureCluster(ClusterSettings settings, ClusterKey cl
                 serverApi: clusterKey.ServerApi,
                 serverSelectionTimeout: clusterKey.ServerSelectionTimeout,
                 scheme: clusterKey.Scheme);
-#pragma warning restore CS0618 // Type or member is obsolete
         }
 
         private ConnectionPoolSettings ConfigureConnectionPool(ConnectionPoolSettings settings, ClusterKey clusterKey)

src/MongoDB.Driver/ConnectionMode.cs

@@ -72,7 +72,7 @@ protected Cluster(ClusterSettings settings, IClusterableServerFactory serverFact
             _rapidHeartbeatTimerCallbackState = new InterlockedInt32(RapidHeartbeatTimerCallbackState.NotRunning);
 
             _clusterId = new ClusterId();
-            _description = CreateInitialDescription();
+            _description = ClusterDescription.CreateInitial(_clusterId, _settings.DirectConnection);
             _descriptionChangedTaskCompletionSource = new TaskCompletionSource<bool>();
             _latencyLimitingServerSelector = new LatencyLimitingServerSelector(settings.LocalThreshold);
 
@@ -82,16 +82,6 @@ protected Cluster(ClusterSettings settings, IClusterableServerFactory serverFact
 
             _clusterEventLogger = loggerFactory.CreateEventLogger<LogCategories.SDAM>(eventSubscriber);
             _serverSelectionEventLogger = loggerFactory.CreateEventLogger<LogCategories.ServerSelection>(eventSubscriber);
-
-            ClusterDescription CreateInitialDescription()
-            {
-#pragma warning disable CS0618 // Type or member is obsolete
-                var connectionModeSwitch = _settings.ConnectionModeSwitch;
-                var clusterConnectionMode = connectionModeSwitch == ConnectionModeSwitch.UseConnectionMode ? _settings.ConnectionMode : default;
-                var directConnection = connectionModeSwitch == ConnectionModeSwitch.UseDirectConnection ? _settings.DirectConnection : default;
-                return ClusterDescription.CreateInitial(_clusterId, clusterConnectionMode, _settings.ConnectionModeSwitch, directConnection);
-#pragma warning restore CS0618 // Type or member is obsolete
-            }
         }
 
         // events
@@ -142,20 +132,12 @@ protected virtual void Dispose(bool disposing)
             {
                 _clusterEventLogger.Logger?.LogTrace(_clusterId, "Cluster disposing");
 
-#pragma warning disable CS0618 // Type or member is obsolete
-                var connectionModeSwitch = _description.ConnectionModeSwitch;
-                var connectionMode = connectionModeSwitch == ConnectionModeSwitch.UseConnectionMode ? _description.ConnectionMode : default;
-                var directConnection = connectionModeSwitch == ConnectionModeSwitch.UseDirectConnection ? _description.DirectConnection : default;
-
                 var newClusterDescription = new ClusterDescription(
                     _clusterId,
-                    connectionMode,
-                    connectionModeSwitch,
-                    directConnection,
+                    _description.DirectConnection,
                     dnsMonitorException: null,
                     ClusterType.Unknown,
                     Enumerable.Empty<ServerDescription>());
-#pragma warning restore CS0618 // Type or member is obsolete
 
                 UpdateClusterDescription(newClusterDescription);