Added Optional.Enumerable helper method.

rstam · rstam · commit 3a97459f3178 · 2015-03-16T12:55:26.000-04:00
diff --git a/src/MongoDB.Driver.Core.Tests/Specifications/server-discovery-and-monitoring/TestRunner.cs b/src/MongoDB.Driver.Core.Tests/Specifications/server-discovery-and-monitoring/TestRunner.cs
@@ -175,7 +175,7 @@ private ICluster BuildCluster(BsonDocument definition)
         {
             var connectionString = new ConnectionString((string)definition["uri"]);
             var settings = new ClusterSettings(
-                endPoints: Optional.Create<IEnumerable<EndPoint>>(connectionString.Hosts),
+                endPoints: Optional.Enumerable(connectionString.Hosts),
                 connectionMode: connectionString.Connect,
                 replicaSetName: connectionString.ReplicaSet);
 
diff --git a/src/MongoDB.Driver.Core.Tests/Specifications/server-selection/ServerSelectionTestRunner.cs b/src/MongoDB.Driver.Core.Tests/Specifications/server-selection/ServerSelectionTestRunner.cs
@@ -99,7 +99,7 @@ private ReadPreference BuildReadPreference(BsonDocument readPreferenceDescriptio
                     throw new NotSupportedException("Unknown read preference mode: " + readPreferenceDescription["mode"]);
             }
 
-            return readPreference.With(tagSets: Optional.Create(tagSets));
+            return readPreference.With(tagSets: Optional.Enumerable(tagSets));
         }
 
         private ClusterDescription BuildClusterDescription(BsonDocument topologyDescription)
diff --git a/src/MongoDB.Driver.Core/Core/Configuration/ClusterBuilderExtensions.cs b/src/MongoDB.Driver.Core/Core/Configuration/ClusterBuilderExtensions.cs
@@ -134,7 +134,7 @@ public static ClusterBuilder ConfigureWithConnectionString(this ClusterBuilder b
             // Cluster
             if (connectionString.Hosts.Count > 0)
             {
-                builder = builder.ConfigureCluster(s => s.With(endPoints: Optional.Create<IEnumerable<EndPoint>>(connectionString.Hosts)));
+                builder = builder.ConfigureCluster(s => s.With(endPoints: Optional.Enumerable(connectionString.Hosts)));
             }
             if (connectionString.ReplicaSet != null)
             {
diff --git a/src/MongoDB.Driver.Core/Core/Configuration/ClusterSettings.cs b/src/MongoDB.Driver.Core/Core/Configuration/ClusterSettings.cs
@@ -172,7 +172,7 @@ public ClusterSettings With(
         {
             return new ClusterSettings(
                 connectionMode: connectionMode.WithDefault(_connectionMode),
-                endPoints: Optional.Create(endPoints.WithDefault(_endPoints)),
+                endPoints: Optional.Enumerable(endPoints.WithDefault(_endPoints)),
                 maxServerSelectionWaitQueueSize: maxServerSelectionWaitQueueSize.WithDefault(_maxServerSelectionWaitQueueSize),
                 replicaSetName: replicaSetName.WithDefault(_replicaSetName),
                 serverSelectionTimeout: serverSelectionTimeout.WithDefault(_serverSelectionTimeout),
diff --git a/src/MongoDB.Driver.Core/Core/Configuration/ConnectionSettings.cs b/src/MongoDB.Driver.Core/Core/Configuration/ConnectionSettings.cs
@@ -101,7 +101,7 @@ public ConnectionSettings With(
             Optional<TimeSpan> maxLifeTime = default(Optional<TimeSpan>))
         {
             return new ConnectionSettings(
-                authenticators: Optional.Create(authenticators.WithDefault(_authenticators)),
+                authenticators: Optional.Enumerable(authenticators.WithDefault(_authenticators)),
                 maxIdleTime: maxIdleTime.WithDefault(_maxIdleTime),
                 maxLifeTime: maxLifeTime.WithDefault(_maxLifeTime));
         }
diff --git a/src/MongoDB.Driver.Core/Core/Configuration/SslStreamSettings.cs b/src/MongoDB.Driver.Core/Core/Configuration/SslStreamSettings.cs
@@ -132,7 +132,7 @@ public SslStreamSettings With(
         {
             return new SslStreamSettings(
                 checkCertificateRevocation: checkCertificateRevocation.WithDefault(_checkCertificateRevocation),
-                clientCertificates: Optional.Create(clientCertificates.WithDefault(_clientCertificates)),
+                clientCertificates: Optional.Enumerable(clientCertificates.WithDefault(_clientCertificates)),
                 clientCertificateSelectionCallback: clientCertificateSelectionCallback.WithDefault(_clientCertificateSelectionCallback),
                 enabledProtocols: enabledProtocols.WithDefault(_enabledSslProtocols),
                 serverCertificateValidationCallback: serverCertificateValidationCallback.WithDefault(_serverCertificateValidationCallback));
diff --git a/src/MongoDB.Driver.Core/Core/Misc/Optional.cs b/src/MongoDB.Driver.Core/Core/Misc/Optional.cs
@@ -39,6 +39,17 @@ public static Optional<T> Create<T>(T value)
         {
             return new Optional<T>(value);
         }
+
+        /// <summary>
+        /// Creates an instance of an optional parameter with an enumerable value.
+        /// </summary>
+        /// <typeparam name="TItem">The type of the items of the optional paramater.</typeparam>
+        /// <param name="value">The value.</param>
+        /// <returns>An instance of an optional parameter with an enumerable value.</returns>
+        public static Optional<IEnumerable<TItem>> Enumerable<TItem>(IEnumerable<TItem> value)
+        {
+            return new Optional<IEnumerable<TItem>>(value);
+        }
     }
 
     /// <summary>
diff --git a/src/MongoDB.Driver.Core/ReadPreference.cs b/src/MongoDB.Driver.Core/ReadPreference.cs
@@ -184,7 +184,7 @@ public ReadPreference With(
         {
             return new ReadPreference(
                 mode.WithDefault(_mode),
-                Optional.Create(tagSets.WithDefault(_tagSets)));
+                Optional.Enumerable(tagSets.WithDefault(_tagSets)));
         }
     }
 }
diff --git a/src/MongoDB.Driver.Core/WriteConcern.cs b/src/MongoDB.Driver.Core/WriteConcern.cs
@@ -125,7 +125,7 @@ public WriteConcern(
             Optional<TimeSpan?> wTimeout = default(Optional<TimeSpan?>),
             Optional<bool?> fsync = default(Optional<bool?>),
             Optional<bool?> journal = default(Optional<bool?>))
-            : this(new Optional<WValue>(Ensure.IsGreaterThanOrEqualToZero(w, "w")), wTimeout, fsync, journal)
+            : this((WValue)Ensure.IsGreaterThanOrEqualToZero(w, "w"), wTimeout, fsync, journal)
         {
         }
 
@@ -141,7 +141,7 @@ public WriteConcern(
             Optional<TimeSpan?> wTimeout = default(Optional<TimeSpan?>),
             Optional<bool?> fsync = default(Optional<bool?>),
             Optional<bool?> journal = default(Optional<bool?>))
-            : this(new Optional<WValue>(Ensure.IsNotNullOrEmpty(mode, "mode")), wTimeout, fsync, journal)
+            : this((WValue)Ensure.IsNotNullOrEmpty(mode, "mode"), wTimeout, fsync, journal)
         {
         }
 
diff --git a/src/MongoDB.Driver/ClusterRegistry.cs b/src/MongoDB.Driver/ClusterRegistry.cs
@@ -82,7 +82,7 @@ private ClusterSettings ConfigureCluster(ClusterSettings settings, ClusterKey cl
             var endPoints = clusterKey.Servers.Select(s => (EndPoint)new DnsEndPoint(s.Host, s.Port));
             return settings.With(
                 connectionMode: clusterKey.ConnectionMode.ToCore(),
-                endPoints: Optional.Create(endPoints),
+                endPoints: Optional.Enumerable(endPoints),
                 replicaSetName: clusterKey.ReplicaSetName,
                 postServerSelector: new LatencyLimitingServerSelector(clusterKey.LocalThreshold));
         }
@@ -101,7 +101,7 @@ private ConnectionSettings ConfigureConnection(ConnectionSettings settings, Clus
         {
             var authenticators = clusterKey.Credentials.Select(c => c.ToAuthenticator());
             return settings.With(
-                authenticators: Optional.Create(authenticators),
+                authenticators: Optional.Enumerable(authenticators),
                 maxIdleTime: clusterKey.MaxConnectionIdleTime,
                 maxLifeTime: clusterKey.MaxConnectionLifeTime);
         }
@@ -126,7 +126,7 @@ private SslStreamSettings ConfigureSsl(SslStreamSettings settings, ClusterKey cl
                 }
 
                 return settings.With(
-                    clientCertificates: Optional.Create(sslSettings.ClientCertificates ?? Enumerable.Empty<X509Certificate>()),
+                    clientCertificates: Optional.Enumerable(sslSettings.ClientCertificates ?? Enumerable.Empty<X509Certificate>()),
                     checkCertificateRevocation: sslSettings.CheckCertificateRevocation,
                     clientCertificateSelectionCallback: sslSettings.ClientCertificateSelectionCallback,
                     enabledProtocols: sslSettings.EnabledSslProtocols,
diff --git a/src/MongoDB.Driver/MongoUrlBuilder.cs b/src/MongoDB.Driver/MongoUrlBuilder.cs
@@ -561,7 +561,7 @@ public void Parse(string url)
                 {
                     throw new MongoConfigurationException("ReadPreferenceMode is required when using tag sets.");
                 }
-                _readPreference = _readPreference.With(tagSets: Optional.Create<IEnumerable<TagSet>>(connectionString.ReadPreferenceTags));
+                _readPreference = _readPreference.With(tagSets: Optional.Enumerable(connectionString.ReadPreferenceTags));
             }
 
             _replicaSetName = connectionString.ReplicaSet;

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ private ICluster BuildCluster(BsonDocument definition)`
`175`	`175`	`{`
`176`	`176`	`var connectionString = new ConnectionString((string)definition["uri"]);`
`177`	`177`	`var settings = new ClusterSettings(`
`178`		`- endPoints: Optional.Create<IEnumerable<EndPoint>>(connectionString.Hosts),`
	`178`	`+ endPoints: Optional.Enumerable(connectionString.Hosts),`
`179`	`179`	`connectionMode: connectionString.Connect,`
`180`	`180`	`replicaSetName: connectionString.ReplicaSet);`
`181`	`181`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ private ReadPreference BuildReadPreference(BsonDocument readPreferenceDescriptio`
`99`	`99`	`throw new NotSupportedException("Unknown read preference mode: " + readPreferenceDescription["mode"]);`
`100`	`100`	`}`
`101`	`101`
`102`		`- return readPreference.With(tagSets: Optional.Create(tagSets));`
	`102`	`+ return readPreference.With(tagSets: Optional.Enumerable(tagSets));`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`private ClusterDescription BuildClusterDescription(BsonDocument topologyDescription)`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ public static ClusterBuilder ConfigureWithConnectionString(this ClusterBuilder b`
`134`	`134`	`// Cluster`
`135`	`135`	`if (connectionString.Hosts.Count > 0)`
`136`	`136`	`{`
`137`		`- builder = builder.ConfigureCluster(s => s.With(endPoints: Optional.Create<IEnumerable<EndPoint>>(connectionString.Hosts)));`
	`137`	`+ builder = builder.ConfigureCluster(s => s.With(endPoints: Optional.Enumerable(connectionString.Hosts)));`
`138`	`138`	`}`
`139`	`139`	`if (connectionString.ReplicaSet != null)`
`140`	`140`	`{`
Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ public ClusterSettings With(`
`172`	`172`	`{`
`173`	`173`	`return new ClusterSettings(`
`174`	`174`	`connectionMode: connectionMode.WithDefault(_connectionMode),`
`175`		`- endPoints: Optional.Create(endPoints.WithDefault(_endPoints)),`
	`175`	`+ endPoints: Optional.Enumerable(endPoints.WithDefault(_endPoints)),`
`176`	`176`	`maxServerSelectionWaitQueueSize: maxServerSelectionWaitQueueSize.WithDefault(_maxServerSelectionWaitQueueSize),`
`177`	`177`	`replicaSetName: replicaSetName.WithDefault(_replicaSetName),`
`178`	`178`	`serverSelectionTimeout: serverSelectionTimeout.WithDefault(_serverSelectionTimeout),`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ public ConnectionSettings With(`
`101`	`101`	`Optional<TimeSpan> maxLifeTime = default(Optional<TimeSpan>))`
`102`	`102`	`{`
`103`	`103`	`return new ConnectionSettings(`
`104`		`- authenticators: Optional.Create(authenticators.WithDefault(_authenticators)),`
	`104`	`+ authenticators: Optional.Enumerable(authenticators.WithDefault(_authenticators)),`
`105`	`105`	`maxIdleTime: maxIdleTime.WithDefault(_maxIdleTime),`
`106`	`106`	`maxLifeTime: maxLifeTime.WithDefault(_maxLifeTime));`
`107`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ public SslStreamSettings With(`
`132`	`132`	`{`
`133`	`133`	`return new SslStreamSettings(`
`134`	`134`	`checkCertificateRevocation: checkCertificateRevocation.WithDefault(_checkCertificateRevocation),`
`135`		`- clientCertificates: Optional.Create(clientCertificates.WithDefault(_clientCertificates)),`
	`135`	`+ clientCertificates: Optional.Enumerable(clientCertificates.WithDefault(_clientCertificates)),`
`136`	`136`	`clientCertificateSelectionCallback: clientCertificateSelectionCallback.WithDefault(_clientCertificateSelectionCallback),`
`137`	`137`	`enabledProtocols: enabledProtocols.WithDefault(_enabledSslProtocols),`
`138`	`138`	`serverCertificateValidationCallback: serverCertificateValidationCallback.WithDefault(_serverCertificateValidationCallback));`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,17 @@ public static Optional<T> Create<T>(T value)`
`39`	`39`	`{`
`40`	`40`	`return new Optional<T>(value);`
`41`	`41`	`}`
	`42`	`+`
	`43`	`+ /// <summary>`
	`44`	`+ /// Creates an instance of an optional parameter with an enumerable value.`
	`45`	`+ /// </summary>`
	`46`	`+ /// <typeparam name="TItem">The type of the items of the optional paramater.</typeparam>`
	`47`	`+ /// <param name="value">The value.</param>`
	`48`	`+ /// <returns>An instance of an optional parameter with an enumerable value.</returns>`
	`49`	`+ public static Optional<IEnumerable<TItem>> Enumerable<TItem>(IEnumerable<TItem> value)`
	`50`	`+ {`
	`51`	`+ return new Optional<IEnumerable<TItem>>(value);`
	`52`	`+ }`
`42`	`53`	`}`
`43`	`54`
`44`	`55`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ public ReadPreference With(`
`184`	`184`	`{`
`185`	`185`	`return new ReadPreference(`
`186`	`186`	`mode.WithDefault(_mode),`
`187`		`- Optional.Create(tagSets.WithDefault(_tagSets)));`
	`187`	`+ Optional.Enumerable(tagSets.WithDefault(_tagSets)));`
`188`	`188`	`}`
`189`	`189`	`}`
`190`	`190`	`}`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ public WriteConcern(`
`125`	`125`	`Optional<TimeSpan?> wTimeout = default(Optional<TimeSpan?>),`
`126`	`126`	`Optional<bool?> fsync = default(Optional<bool?>),`
`127`	`127`	`Optional<bool?> journal = default(Optional<bool?>))`
`128`		`- : this(new Optional<WValue>(Ensure.IsGreaterThanOrEqualToZero(w, "w")), wTimeout, fsync, journal)`
	`128`	`+ : this((WValue)Ensure.IsGreaterThanOrEqualToZero(w, "w"), wTimeout, fsync, journal)`
`129`	`129`	`{`
`130`	`130`	`}`
`131`	`131`
`@@ -141,7 +141,7 @@ public WriteConcern(`
`141`	`141`	`Optional<TimeSpan?> wTimeout = default(Optional<TimeSpan?>),`
`142`	`142`	`Optional<bool?> fsync = default(Optional<bool?>),`
`143`	`143`	`Optional<bool?> journal = default(Optional<bool?>))`
`144`		`- : this(new Optional<WValue>(Ensure.IsNotNullOrEmpty(mode, "mode")), wTimeout, fsync, journal)`
	`144`	`+ : this((WValue)Ensure.IsNotNullOrEmpty(mode, "mode"), wTimeout, fsync, journal)`
`145`	`145`	`{`
`146`	`146`	`}`
`147`	`147`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ private ClusterSettings ConfigureCluster(ClusterSettings settings, ClusterKey cl`
`82`	`82`	`var endPoints = clusterKey.Servers.Select(s => (EndPoint)new DnsEndPoint(s.Host, s.Port));`
`83`	`83`	`return settings.With(`
`84`	`84`	`connectionMode: clusterKey.ConnectionMode.ToCore(),`
`85`		`- endPoints: Optional.Create(endPoints),`
	`85`	`+ endPoints: Optional.Enumerable(endPoints),`
`86`	`86`	`replicaSetName: clusterKey.ReplicaSetName,`
`87`	`87`	`postServerSelector: new LatencyLimitingServerSelector(clusterKey.LocalThreshold));`
`88`	`88`	`}`
`@@ -101,7 +101,7 @@ private ConnectionSettings ConfigureConnection(ConnectionSettings settings, Clus`
`101`	`101`	`{`
`102`	`102`	`var authenticators = clusterKey.Credentials.Select(c => c.ToAuthenticator());`
`103`	`103`	`return settings.With(`
`104`		`- authenticators: Optional.Create(authenticators),`
	`104`	`+ authenticators: Optional.Enumerable(authenticators),`
`105`	`105`	`maxIdleTime: clusterKey.MaxConnectionIdleTime,`
`106`	`106`	`maxLifeTime: clusterKey.MaxConnectionLifeTime);`
`107`	`107`	`}`
`@@ -126,7 +126,7 @@ private SslStreamSettings ConfigureSsl(SslStreamSettings settings, ClusterKey cl`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`return settings.With(`
`129`		`- clientCertificates: Optional.Create(sslSettings.ClientCertificates ?? Enumerable.Empty<X509Certificate>()),`
	`129`	`+ clientCertificates: Optional.Enumerable(sslSettings.ClientCertificates ?? Enumerable.Empty<X509Certificate>()),`
`130`	`130`	`checkCertificateRevocation: sslSettings.CheckCertificateRevocation,`
`131`	`131`	`clientCertificateSelectionCallback: sslSettings.ClientCertificateSelectionCallback,`
`132`	`132`	`enabledProtocols: sslSettings.EnabledSslProtocols,`