Skip to content

Commit 28f1513

Browse files
authored
CSHARP-5155: Avoid unnecessary null checks and null where necessary (Coverity Analysis Issues) (#1360)
1 parent bb1b636 commit 28f1513

File tree

3 files changed

+19
-22
lines changed

3 files changed

+19
-22
lines changed

src/MongoDB.Driver.Core/Core/Authentication/Oidc/OidcConfiguration.cs

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -39,27 +39,24 @@ public OidcConfiguration(
3939
EndPoints = Ensure.IsNotNullOrEmpty(endPoints, nameof(endPoints));
4040
Ensure.IsNotNull(authMechanismProperties, nameof(authMechanismProperties));
4141
PrincipalName = principalName;
42-
43-
if (authMechanismProperties != null)
42+
43+
foreach (var authorizationProperty in authMechanismProperties)
4444
{
45-
foreach (var authorizationProperty in authMechanismProperties)
45+
switch (authorizationProperty.Key)
4646
{
47-
switch (authorizationProperty.Key)
48-
{
49-
case CallbackMechanismPropertyName:
50-
Callback = GetProperty<IOidcCallback>(authorizationProperty);
51-
break;
52-
case EnvironmentMechanismPropertyName:
53-
Environment = GetProperty<string>(authorizationProperty);
54-
break;
55-
case TokenResourceMechanismPropertyName:
56-
TokenResource = GetProperty<string>(authorizationProperty);
57-
break;
58-
default:
59-
throw new ArgumentException(
60-
$"Unknown OIDC property '{authorizationProperty.Key}'.",
61-
authorizationProperty.Key);
62-
}
47+
case CallbackMechanismPropertyName:
48+
Callback = GetProperty<IOidcCallback>(authorizationProperty);
49+
break;
50+
case EnvironmentMechanismPropertyName:
51+
Environment = GetProperty<string>(authorizationProperty);
52+
break;
53+
case TokenResourceMechanismPropertyName:
54+
TokenResource = GetProperty<string>(authorizationProperty);
55+
break;
56+
default:
57+
throw new ArgumentException(
58+
$"Unknown OIDC property '{authorizationProperty.Key}'.",
59+
authorizationProperty.Key);
6360
}
6461
}
6562

src/MongoDB.Driver/Encryption/ExplicitEncryptionLibMongoCryptController.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ public BsonValue EncryptField(
232232
contentionFactor: encryptOptions.ContentionFactor,
233233
encryptOptions.Algorithm,
234234
wrappedValueBytes,
235-
ToBsonIfNotNull(encryptOptions?.RangeOptions?.CreateDocument()),
235+
ToBsonIfNotNull(encryptOptions.RangeOptions?.CreateDocument()),
236236
isExpressionMode);
237237

238238
using (context)
@@ -267,7 +267,7 @@ public async Task<BsonValue> EncryptFieldAsync(
267267
contentionFactor: encryptOptions.ContentionFactor,
268268
encryptOptions.Algorithm,
269269
wrappedValueBytes,
270-
ToBsonIfNotNull(encryptOptions?.RangeOptions?.CreateDocument()),
270+
ToBsonIfNotNull(encryptOptions.RangeOptions?.CreateDocument()),
271271
isExpressionMode);
272272

273273
using (context)

src/MongoDB.Driver/Linq/Linq2Implementation/Translators/AggregateLanguageTranslator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@ private BsonValue TranslateNewDateTime(NewExpression node)
505505

506506
return new BsonDocument("$dateFromParts", new BsonDocument
507507
{
508-
{ "year", year, year != null },
508+
{ "year", year },
509509
{ "month", month, month != null },
510510
{ "day", day, day != null },
511511
{ "hour", hour, hour != null },

0 commit comments

Comments
 (0)