Skip to content

CSHARP-5155: Avoid unnecessary null checks and null where necessary (Coverity Analysis Issues) #1360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 20, 2024
Merged

CSHARP-5155: Avoid unnecessary null checks and null where necessary (Coverity Analysis Issues) #1360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 16 additions & 19 deletions src/MongoDB.Driver.Core/Core/Authentication/Oidc/OidcConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,27 +39,24 @@ public OidcConfiguration(
EndPoints = Ensure.IsNotNullOrEmpty(endPoints, nameof(endPoints));
Ensure.IsNotNull(authMechanismProperties, nameof(authMechanismProperties));
PrincipalName = principalName;

if (authMechanismProperties != null)
foreach (var authorizationProperty in authMechanismProperties)
{
foreach (var authorizationProperty in authMechanismProperties)
switch (authorizationProperty.Key)
{
switch (authorizationProperty.Key)
{
case CallbackMechanismPropertyName:
Callback = GetProperty<IOidcCallback>(authorizationProperty);
break;
case EnvironmentMechanismPropertyName:
Environment = GetProperty<string>(authorizationProperty);
break;
case TokenResourceMechanismPropertyName:
TokenResource = GetProperty<string>(authorizationProperty);
break;
default:
throw new ArgumentException(
$"Unknown OIDC property '{authorizationProperty.Key}'.",
authorizationProperty.Key);
}
case CallbackMechanismPropertyName:
Callback = GetProperty<IOidcCallback>(authorizationProperty);
break;
case EnvironmentMechanismPropertyName:
Environment = GetProperty<string>(authorizationProperty);
break;
case TokenResourceMechanismPropertyName:
TokenResource = GetProperty<string>(authorizationProperty);
break;
default:
throw new ArgumentException(
$"Unknown OIDC property '{authorizationProperty.Key}'.",
authorizationProperty.Key);
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/MongoDB.Driver/Encryption/ExplicitEncryptionLibMongoCryptController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ public BsonValue EncryptField(
contentionFactor: encryptOptions.ContentionFactor,
encryptOptions.Algorithm,
wrappedValueBytes,
ToBsonIfNotNull(encryptOptions?.RangeOptions?.CreateDocument()),
ToBsonIfNotNull(encryptOptions.RangeOptions?.CreateDocument()),
isExpressionMode);

using (context)
Expand Down Expand Up @@ -267,7 +267,7 @@ public async Task<BsonValue> EncryptFieldAsync(
contentionFactor: encryptOptions.ContentionFactor,
encryptOptions.Algorithm,
wrappedValueBytes,
ToBsonIfNotNull(encryptOptions?.RangeOptions?.CreateDocument()),
ToBsonIfNotNull(encryptOptions.RangeOptions?.CreateDocument()),
isExpressionMode);

using (context)
Expand Down
2 changes: 1 addition & 1 deletion src/MongoDB.Driver/Linq/Linq2Implementation/Translators/AggregateLanguageTranslator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,7 @@ private BsonValue TranslateNewDateTime(NewExpression node)

return new BsonDocument("$dateFromParts", new BsonDocument
{
{ "year", year, year != null },
{ "year", year },
{ "month", month, month != null },
{ "day", day, day != null },
{ "hour", hour, hour != null },
Expand Down