Corrected API

Author: papafe

src/MongoDB.Driver/Core/Configuration/TcpStreamSettings.cs

@@ -196,10 +196,40 @@ public TimeSpan? WriteTimeout
         /// <param name="receiveBufferSize">Size of the receive buffer.</param>
         /// <param name="sendBufferSize">Size of the send buffer.</param>
         /// <param name="socketConfigurator">The socket configurator.</param>
-        /// <param name="socks5ProxySettings">The SOCKS5 proxy settings.</param>
         /// <param name="writeTimeout">The write timeout.</param>
         /// <returns>A new TcpStreamSettings instance.</returns>
         public TcpStreamSettings With(
+            Optional<AddressFamily> addressFamily = default(Optional<AddressFamily>),
+            Optional<TimeSpan> connectTimeout = default(Optional<TimeSpan>),
+            Optional<TimeSpan?> readTimeout = default(Optional<TimeSpan?>),
+            Optional<int> receiveBufferSize = default(Optional<int>),
+            Optional<int> sendBufferSize = default(Optional<int>),
+            Optional<Action<Socket>> socketConfigurator = default(Optional<Action<Socket>>),
+            Optional<TimeSpan?> writeTimeout = default(Optional<TimeSpan?>))
+        {
+            return new TcpStreamSettings(
+                addressFamily: addressFamily.WithDefault(_addressFamily),
+                connectTimeout: connectTimeout.WithDefault(_connectTimeout),
+                readTimeout: readTimeout.WithDefault(_readTimeout),
+                receiveBufferSize: receiveBufferSize.WithDefault(_receiveBufferSize),
+                sendBufferSize: sendBufferSize.WithDefault(_sendBufferSize),
+                socketConfigurator: socketConfigurator.WithDefault(_socketConfigurator),
+                writeTimeout: writeTimeout.WithDefault(_writeTimeout));
+        }
+
+        /// <summary>
+        /// Returns a new TcpStreamSettings instance with some settings changed.
+        /// </summary>
+        /// <param name="addressFamily">The address family.</param>
+        /// <param name="connectTimeout">The connect timeout.</param>
+        /// <param name="readTimeout">The read timeout.</param>
+        /// <param name="receiveBufferSize">Size of the receive buffer.</param>
+        /// <param name="sendBufferSize">Size of the send buffer.</param>
+        /// <param name="socketConfigurator">The socket configurator.</param>
+        /// <param name="socks5ProxySettings">The SOCKS5 proxy settings.</param>
+        /// <param name="writeTimeout">The write timeout.</param>
+        /// <returns>A new TcpStreamSettings instance.</returns>
+        public TcpStreamSettings WithSocks5Settings(
             Optional<AddressFamily> addressFamily = default(Optional<AddressFamily>),
             Optional<TimeSpan> connectTimeout = default(Optional<TimeSpan>),
             Optional<TimeSpan?> readTimeout = default(Optional<TimeSpan?>),

tests/MongoDB.Driver.Tests/Specifications/socks5-support/Socks5SupportProseTests.cs

@@ -21,6 +21,8 @@
 using MongoDB.Driver.Core.Events;
 using MongoDB.Driver.Core.Misc;
 using MongoDB.Driver.Core.TestHelpers.Logging;
+using MongoDB.Driver.Core.TestHelpers.XunitExtensions;
+using MongoDB.TestHelpers.XunitExtensions;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -62,13 +64,6 @@ public static IEnumerable<object[]> GetTestCombinations()
         }
     }
 
-    /* TODO:
-     * - check if apiCompat is ok
-     * - Drivers MUST verify for at least one of the connection strings marked (succeeds)
-     * that command monitoring events do not reference the SOCKS5 proxy host where the MongoDB service server/port are referenced.
-     *
-     */
-
     [Theory]
     [MemberData(nameof(GetTestCombinations))]
     public async Task TestConnectionStrings(string id, string connectionString, bool expectedResult, bool useTls, bool async)
@@ -103,8 +98,8 @@ public async Task TestConnectionStrings(string id, string connectionString, bool
         };
 
         var client = new MongoClient(mongoClientSettings);
-
         var database = client.GetDatabase("admin");
+
         var command = new BsonDocument("hello", 1);
 
         if (expectedResult)