Skip to content

Commit 81d9726

Browse files
craiggwilsoncraiggwilson
committed
changed Ensure second parameter to use nameof operator.
1 parent ddba60e commit 81d9726

File tree

215 files changed

+767
-767
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

215 files changed

+767
-767
lines changed

‎src/MongoDB.Driver.Core/BatchTransformingAsyncCursor.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ internal sealed class BatchTransformingAsyncCursor<TFromDocument, TToDocument> :
3232

3333
public BatchTransformingAsyncCursor(IAsyncCursor<TFromDocument> wrapped, Func<IEnumerable<TFromDocument>, IEnumerable<TToDocument>> transformer)
3434
{
35-
_wrapped = Ensure.IsNotNull(wrapped, "wrapped");
36-
_transformer = Ensure.IsNotNull(transformer, "transformer");
35+
_wrapped = Ensure.IsNotNull(wrapped, nameof(wrapped));
36+
_transformer = Ensure.IsNotNull(transformer, nameof(transformer));
3737
}
3838

3939
public IEnumerable<TToDocument> Current

‎src/MongoDB.Driver.Core/CollectionNamespace.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public sealed class CollectionNamespace : IEquatable<CollectionNamespace>
3636
/// <returns>A CollectionNamespace.</returns>
3737
public static CollectionNamespace FromFullName(string fullName)
3838
{
39-
Ensure.IsNotNull(fullName, "fullName");
39+
Ensure.IsNotNull(fullName, nameof(fullName));
4040

4141
var index = fullName.IndexOf('.');
4242
if (index > -1)
@@ -90,8 +90,8 @@ public CollectionNamespace(string databaseName, string collectionName)
9090
/// <param name="collectionName">The name of the collection.</param>
9191
public CollectionNamespace(DatabaseNamespace databaseNamespace, string collectionName)
9292
{
93-
_databaseNamespace = Ensure.IsNotNull(databaseNamespace, "databaseNamespace");
94-
_collectionName = Ensure.That(collectionName, IsValid, "collectionName", "Collection names must be non-empty and not contain the null character.");
93+
_databaseNamespace = Ensure.IsNotNull(databaseNamespace, nameof(databaseNamespace));
94+
_collectionName = Ensure.That(collectionName, IsValid, nameof(collectionName), "Collection names must be non-empty and not contain the null character.");
9595
_fullName = _databaseNamespace.DatabaseName + "." + _collectionName;
9696
}
9797

@@ -133,7 +133,7 @@ public string FullName
133133
/// <inheritdoc/>
134134
public bool Equals(CollectionNamespace other)
135135
{
136-
if(other == null)
136+
if (other == null)
137137
{
138138
return false;
139139
}

‎src/MongoDB.Driver.Core/Core/Authentication/AuthenticationHelper.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright 2013-2014 MongoDB Inc.
1+
/* Copyright 2013-2015 MongoDB Inc.
22
*
33
* Licensed under the Apache License, Version 2.0 (the "License");
44
* you may not use this file except in compliance with the License.
@@ -31,8 +31,8 @@ internal static class AuthenticationHelper
3131
{
3232
public static async Task AuthenticateAsync(IConnection connection, ConnectionDescription description, CancellationToken cancellationToken)
3333
{
34-
Ensure.IsNotNull(connection, "connection");
35-
Ensure.IsNotNull(description, "description");
34+
Ensure.IsNotNull(connection, nameof(connection));
35+
Ensure.IsNotNull(description, nameof(description));
3636

3737
// authentication is currently broken on arbiters
3838
if (!description.IsMasterResult.IsArbiter)

‎src/MongoDB.Driver.Core/Core/Authentication/DefaultAuthenticator.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ public DefaultAuthenticator(UsernamePasswordCredential credential)
4545

4646
internal DefaultAuthenticator(UsernamePasswordCredential credential, IRandomStringGenerator randomStringGenerator)
4747
{
48-
_credential = Ensure.IsNotNull(credential, "credential");
49-
_randomStringGenerator = Ensure.IsNotNull(randomStringGenerator, "randomStringGenerator");
48+
_credential = Ensure.IsNotNull(credential, nameof(credential));
49+
_randomStringGenerator = Ensure.IsNotNull(randomStringGenerator, nameof(randomStringGenerator));
5050
}
5151

5252
// properties
@@ -60,8 +60,8 @@ public string Name
6060
/// <inheritdoc/>
6161
public Task AuthenticateAsync(IConnection connection, ConnectionDescription description, CancellationToken cancellationToken)
6262
{
63-
Ensure.IsNotNull(connection, "connection");
64-
Ensure.IsNotNull(description, "description");
63+
Ensure.IsNotNull(connection, nameof(connection));
64+
Ensure.IsNotNull(description, nameof(description));
6565

6666
IAuthenticator authenticator;
6767
if (description.BuildInfoResult.ServerVersion >= __scramVersionRequirement)

‎src/MongoDB.Driver.Core/Core/Authentication/GssapiAuthenticator.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ public GssapiMechanism(string serviceName, bool canonicalizeHostName, string rea
173173
_serviceName = serviceName;
174174
_canonicalizeHostName = canonicalizeHostName;
175175
_realm = realm;
176-
_username = Ensure.IsNotNullOrEmpty(username, "username");
176+
_username = Ensure.IsNotNullOrEmpty(username, nameof(username));
177177
_password = password;
178178
}
179179

@@ -184,8 +184,8 @@ public string Name
184184

185185
public ISaslStep Initialize(IConnection connection, ConnectionDescription description)
186186
{
187-
Ensure.IsNotNull(connection, "connection");
188-
Ensure.IsNotNull(description, "description");
187+
Ensure.IsNotNull(connection, nameof(connection));
188+
Ensure.IsNotNull(description, nameof(description));
189189

190190
string hostName;
191191
var dnsEndPoint = connection.EndPoint as DnsEndPoint;

‎src/MongoDB.Driver.Core/Core/Authentication/MongoDBCRAuthenticator.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public static string MechanismName
5555
/// <param name="credential">The credential.</param>
5656
public MongoDBCRAuthenticator(UsernamePasswordCredential credential)
5757
{
58-
_credential = Ensure.IsNotNull(credential, "credential");
58+
_credential = Ensure.IsNotNull(credential, nameof(credential));
5959
}
6060

6161
// properties
@@ -69,15 +69,15 @@ public string Name
6969
/// <inheritdoc/>
7070
public async Task AuthenticateAsync(IConnection connection, ConnectionDescription description, CancellationToken cancellationToken)
7171
{
72-
Ensure.IsNotNull(connection, "connection");
73-
Ensure.IsNotNull(description, "description");
72+
Ensure.IsNotNull(connection, nameof(connection));
73+
Ensure.IsNotNull(description, nameof(description));
7474

7575
try
7676
{
7777
var nonce = await GetNonceAsync(connection, cancellationToken).ConfigureAwait(false);
7878
await AuthenticateAsync(connection, nonce, cancellationToken).ConfigureAwait(false);
7979
}
80-
catch(MongoCommandException ex)
80+
catch (MongoCommandException ex)
8181
{
8282
var message = string.Format("Unable to authenticate username '{0}' on database '{1}'.", _credential.Username, _credential.Source);
8383
throw new MongoAuthenticationException(connection.ConnectionId, message, ex);

‎src/MongoDB.Driver.Core/Core/Authentication/MongoDBX509Authenticator.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public static string MechanismName
5151
/// <param name="username">The username.</param>
5252
public MongoDBX509Authenticator(string username)
5353
{
54-
_username = Ensure.IsNotNullOrEmpty(username, "username");
54+
_username = Ensure.IsNotNullOrEmpty(username, nameof(username));
5555
}
5656

5757
// properties
@@ -65,8 +65,8 @@ public string Name
6565
/// <inheritdoc/>
6666
public async Task AuthenticateAsync(IConnection connection, ConnectionDescription description, CancellationToken cancellationToken)
6767
{
68-
Ensure.IsNotNull(connection, "connection");
69-
Ensure.IsNotNull(description, "description");
68+
Ensure.IsNotNull(connection, nameof(connection));
69+
Ensure.IsNotNull(description, nameof(description));
7070

7171
try
7272
{

‎src/MongoDB.Driver.Core/Core/Authentication/PlainAuthenticator.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ private class PlainMechanism : ISaslMechanism
6767
// constructors
6868
public PlainMechanism(UsernamePasswordCredential credential)
6969
{
70-
_credential = Ensure.IsNotNull(credential, "credential");
70+
_credential = Ensure.IsNotNull(credential, nameof(credential));
7171
}
7272

7373
// properties
@@ -79,8 +79,8 @@ public string Name
7979
// methods
8080
public ISaslStep Initialize(IConnection connection, ConnectionDescription description)
8181
{
82-
Ensure.IsNotNull(connection, "connection");
83-
Ensure.IsNotNull(description, "description");
82+
Ensure.IsNotNull(connection, nameof(connection));
83+
Ensure.IsNotNull(description, nameof(description));
8484

8585
var dataString = string.Format("\0{0}\0{1}",
8686
_credential.Username,

‎src/MongoDB.Driver.Core/Core/Authentication/SaslAuthenticator.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public abstract class SaslAuthenticator : IAuthenticator
4040
/// <param name="mechanism">The mechanism.</param>
4141
protected SaslAuthenticator(ISaslMechanism mechanism)
4242
{
43-
_mechanism = Ensure.IsNotNull(mechanism, "mechanism");
43+
_mechanism = Ensure.IsNotNull(mechanism, nameof(mechanism));
4444
}
4545

4646
// properties
@@ -62,8 +62,8 @@ public string Name
6262
/// <inheritdoc/>
6363
public async Task AuthenticateAsync(IConnection connection, ConnectionDescription description, CancellationToken cancellationToken)
6464
{
65-
Ensure.IsNotNull(connection, "connection");
66-
Ensure.IsNotNull(description, "description");
65+
Ensure.IsNotNull(connection, nameof(connection));
66+
Ensure.IsNotNull(description, nameof(description));
6767

6868
using (var conversation = new SaslConversation(description.ConnectionId))
6969
{
@@ -89,7 +89,7 @@ public async Task AuthenticateAsync(IConnection connection, ConnectionDescriptio
8989
null);
9090
result = await protocol.ExecuteAsync(connection, cancellationToken).ConfigureAwait(false);
9191
}
92-
catch(MongoCommandException ex)
92+
catch (MongoCommandException ex)
9393
{
9494
var message = string.Format("Unable to authenticate using sasl protocol mechanism {0}.", Name);
9595
throw new MongoAuthenticationException(connection.ConnectionId, message, ex);

‎src/MongoDB.Driver.Core/Core/Authentication/ScramSha1Authenticator.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ private class ScramSha1Mechanism : ISaslMechanism
7575

7676
public ScramSha1Mechanism(UsernamePasswordCredential credential, IRandomStringGenerator randomStringGenerator)
7777
{
78-
_credential = Ensure.IsNotNull(credential, "credential");
79-
_randomStringGenerator = Ensure.IsNotNull(randomStringGenerator, "randomStringGenerator");
78+
_credential = Ensure.IsNotNull(credential, nameof(credential));
79+
_randomStringGenerator = Ensure.IsNotNull(randomStringGenerator, nameof(randomStringGenerator));
8080
}
8181

8282
public string Name
@@ -86,8 +86,8 @@ public string Name
8686

8787
public ISaslStep Initialize(IConnection connection, ConnectionDescription description)
8888
{
89-
Ensure.IsNotNull(connection, "connection");
90-
Ensure.IsNotNull(description, "description");
89+
Ensure.IsNotNull(connection, nameof(connection));
90+
Ensure.IsNotNull(description, nameof(description));
9191

9292
const string gs2Header = "n,,";
9393
var username = "n=" + PrepUsername(_credential.Username);

‎src/MongoDB.Driver.Core/Core/Authentication/UsernamePasswordCredential.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ public UsernamePasswordCredential(string source, string username, string passwor
5050
/// <param name="password">The password.</param>
5151
public UsernamePasswordCredential(string source, string username, SecureString password)
5252
{
53-
_source = Ensure.IsNotNullOrEmpty(source, "source");
54-
_username = Ensure.IsNotNullOrEmpty(username, "username");
55-
_password = Ensure.IsNotNull(password, "password");
53+
_source = Ensure.IsNotNullOrEmpty(source, nameof(source));
54+
_username = Ensure.IsNotNullOrEmpty(username, nameof(username));
55+
_password = Ensure.IsNotNull(password, nameof(password));
5656
}
5757

5858
// properties

‎src/MongoDB.Driver.Core/Core/Bindings/ChannelChannelSource.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright 2013-2014 MongoDB Inc.
1+
/* Copyright 2013-2015 MongoDB Inc.
22
*
33
* Licensed under the Apache License, Version 2.0 (the "License");
44
* you may not use this file except in compliance with the License.
@@ -32,8 +32,8 @@ internal sealed class ChannelChannelSource : IChannelSource
3232
// constructors
3333
public ChannelChannelSource(IServer server, IChannelHandle channel)
3434
{
35-
_server = Ensure.IsNotNull(server, "server");
36-
_channel = Ensure.IsNotNull(channel, "channel");
35+
_server = Ensure.IsNotNull(server, nameof(server));
36+
_channel = Ensure.IsNotNull(channel, nameof(channel));
3737
}
3838

3939
// properties

‎src/MongoDB.Driver.Core/Core/Bindings/ChannelReadBinding.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ public sealed class ChannelReadBinding : IReadBinding
4343
/// <param name="readPreference">The read preference.</param>
4444
public ChannelReadBinding(IServer server, IChannelHandle channel, ReadPreference readPreference)
4545
{
46-
_server = Ensure.IsNotNull(server, "server");
47-
_channel = Ensure.IsNotNull(channel, "channel");
48-
_readPreference = Ensure.IsNotNull(readPreference, "readPreference");
46+
_server = Ensure.IsNotNull(server, nameof(server));
47+
_channel = Ensure.IsNotNull(channel, nameof(channel));
48+
_readPreference = Ensure.IsNotNull(readPreference, nameof(readPreference));
4949
}
5050

5151
// properties

‎src/MongoDB.Driver.Core/Core/Bindings/ChannelReadWriteBinding.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ public sealed class ChannelReadWriteBinding : IReadWriteBinding
4141
/// <param name="channel">The channel.</param>
4242
public ChannelReadWriteBinding(IServer server, IChannelHandle channel)
4343
{
44-
_server = Ensure.IsNotNull(server, "server");
45-
_channel = Ensure.IsNotNull(channel, "channel");
44+
_server = Ensure.IsNotNull(server, nameof(server));
45+
_channel = Ensure.IsNotNull(channel, nameof(channel));
4646
}
4747

4848
// properties

‎src/MongoDB.Driver.Core/Core/Bindings/ChannelSourceReadWriteBinding.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ public sealed class ChannelSourceReadWriteBinding : IReadWriteBinding
3939
/// <param name="readPreference">The read preference.</param>
4040
public ChannelSourceReadWriteBinding(IChannelSourceHandle channelSource, ReadPreference readPreference)
4141
{
42-
_channelSource = Ensure.IsNotNull(channelSource, "channelSource");
43-
_readPreference = Ensure.IsNotNull(readPreference, "readPreference");
42+
_channelSource = Ensure.IsNotNull(channelSource, nameof(channelSource));
43+
_readPreference = Ensure.IsNotNull(readPreference, nameof(readPreference));
4444
}
4545

4646
// properties
@@ -78,7 +78,7 @@ public void Dispose()
7878

7979
private void ThrowIfDisposed()
8080
{
81-
if(_disposed)
81+
if (_disposed)
8282
{
8383
throw new ObjectDisposedException(GetType().Name);
8484
}

‎src/MongoDB.Driver.Core/Core/Bindings/ReadPreferenceBinding.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ public sealed class ReadPreferenceBinding : IReadBinding
4141
/// <param name="readPreference">The read preference.</param>
4242
public ReadPreferenceBinding(ICluster cluster, ReadPreference readPreference)
4343
{
44-
_cluster = Ensure.IsNotNull(cluster, "cluster");
45-
_readPreference = Ensure.IsNotNull(readPreference, "readPreference");
44+
_cluster = Ensure.IsNotNull(cluster, nameof(cluster));
45+
_readPreference = Ensure.IsNotNull(readPreference, nameof(readPreference));
4646
_serverSelector = new ReadPreferenceServerSelector(readPreference);
4747
}
4848

‎src/MongoDB.Driver.Core/Core/Bindings/ServerChannelSource.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public sealed class ServerChannelSource : IChannelSource
3838
/// <param name="server">The server.</param>
3939
public ServerChannelSource(IServer server)
4040
{
41-
_server = Ensure.IsNotNull(server, "server");
41+
_server = Ensure.IsNotNull(server, nameof(server));
4242
}
4343

4444
// properties

‎src/MongoDB.Driver.Core/Core/Bindings/SingleServerReadBinding.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ public sealed class SingleServerReadBinding : IReadBinding
3939
/// <param name="readPreference">The read preference.</param>
4040
public SingleServerReadBinding(IServer server, ReadPreference readPreference)
4141
{
42-
_server = Ensure.IsNotNull(server, "server");
43-
_readPreference = Ensure.IsNotNull(readPreference, "readPreference");
42+
_server = Ensure.IsNotNull(server, nameof(server));
43+
_readPreference = Ensure.IsNotNull(readPreference, nameof(readPreference));
4444
}
4545

4646
// properties

‎src/MongoDB.Driver.Core/Core/Bindings/SingleServerReadWriteBinding.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public sealed class SingleServerReadWriteBinding : IReadWriteBinding
3737
/// <param name="server">The server.</param>
3838
public SingleServerReadWriteBinding(IServer server)
3939
{
40-
_server = Ensure.IsNotNull(server, "server");
40+
_server = Ensure.IsNotNull(server, nameof(server));
4141
}
4242

4343
// properties

‎src/MongoDB.Driver.Core/Core/Bindings/SplitReadWriteBinding.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ public sealed class SplitReadWriteBinding : IReadWriteBinding
3939
/// <param name="writeBinding">The write binding.</param>
4040
public SplitReadWriteBinding(IReadBinding readBinding, IWriteBinding writeBinding)
4141
{
42-
_readBinding = Ensure.IsNotNull(readBinding, "readBinding");
43-
_writeBinding = Ensure.IsNotNull(writeBinding, "writeBinding");
42+
_readBinding = Ensure.IsNotNull(readBinding, nameof(readBinding));
43+
_writeBinding = Ensure.IsNotNull(writeBinding, nameof(writeBinding));
4444
}
4545

4646
/// <summary>

‎src/MongoDB.Driver.Core/Core/Bindings/WritableServerBinding.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public sealed class WritableServerBinding : IReadWriteBinding
3838
/// <param name="cluster">The cluster.</param>
3939
public WritableServerBinding(ICluster cluster)
4040
{
41-
_cluster = Ensure.IsNotNull(cluster, "cluster");
41+
_cluster = Ensure.IsNotNull(cluster, nameof(cluster));
4242
}
4343

4444
// properties

‎src/MongoDB.Driver.Core/Core/Clusters/Cluster.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ internal abstract class Cluster : ICluster
6262
// constructors
6363
protected Cluster(ClusterSettings settings, IClusterableServerFactory serverFactory, IEventSubscriber eventSubscriber)
6464
{
65-
_settings = Ensure.IsNotNull(settings, "settings");
66-
_serverFactory = Ensure.IsNotNull(serverFactory, "serverFactory");
67-
Ensure.IsNotNull(eventSubscriber, "eventSubscriber");
65+
_settings = Ensure.IsNotNull(settings, nameof(settings));
66+
_serverFactory = Ensure.IsNotNull(serverFactory, nameof(serverFactory));
67+
Ensure.IsNotNull(eventSubscriber, nameof(eventSubscriber));
6868
_state = new InterlockedInt32(State.Initial);
6969

7070
_clusterId = new ClusterId();
@@ -199,7 +199,7 @@ protected void OnDescriptionChanged(ClusterDescription oldDescription, ClusterDe
199199
public async Task<IServer> SelectServerAsync(IServerSelector selector, CancellationToken cancellationToken)
200200
{
201201
ThrowIfDisposedOrNotOpen();
202-
Ensure.IsNotNull(selector, "selector");
202+
Ensure.IsNotNull(selector, nameof(selector));
203203

204204
var timeoutAt = DateTime.UtcNow + _settings.ServerSelectionTimeout;
205205

‎src/MongoDB.Driver.Core/Core/Clusters/ClusterDescription.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public ClusterDescription(
6060
ClusterType type,
6161
IEnumerable<ServerDescription> servers)
6262
{
63-
_clusterId = Ensure.IsNotNull(clusterId, "clusterId");
63+
_clusterId = Ensure.IsNotNull(clusterId, nameof(clusterId));
6464
_connectionMode = connectionMode;
6565
_type = type;
6666
_servers = (servers ?? new ServerDescription[0]).OrderBy(n => n.EndPoint, new ToStringComparer<EndPoint>()).ToList();
@@ -161,7 +161,7 @@ public override string ToString()
161161
/// <returns>A ClusterDescription.</returns>
162162
public ClusterDescription WithServerDescription(ServerDescription value)
163163
{
164-
Ensure.IsNotNull(value, "value");
164+
Ensure.IsNotNull(value, nameof(value));
165165

166166
IEnumerable<ServerDescription> replacementServers;
167167

0 commit comments

Comments
 (0)