Skip to content

Use ArgumentException.ThrowIfNullOrEmpty part 1 #19215

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
daxian-dbw merged 3 commits into from
Feb 28, 2023
Merged

Use ArgumentException.ThrowIfNullOrEmpty part 1 #19215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
304173a
Use `ArgumentException.ThrowIfNullOrEmpty` in `Microsoft.PowerShell.C…
xtqqczze Feb 24, 2023
608186d
`IsNullOrWhiteSpace` control flow refactoring
xtqqczze Feb 24, 2023
6794357
Remove empty line between argument checks
daxian-dbw Feb 27, 2023
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
6 changes: 1 addition & 5 deletions src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimQuery.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,11 +314,7 @@ public override void FilterByAssociatedInstance(object associatedInstance, strin
/// <param name="optionValue"></param>
public override void AddQueryOption(string optionName, object optionValue)
{
if (string.IsNullOrEmpty(optionName))
{
throw new ArgumentNullException(nameof(optionName));
}

ArgumentException.ThrowIfNullOrEmpty(optionName);
ArgumentNullException.ThrowIfNull(optionValue);

this.queryOptions[optionName] = optionValue;
Expand Down
8 changes: 3 additions & 5 deletions src/Microsoft.PowerShell.Commands.Management/commands/management/CIMHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,7 @@ internal static string WqlQueryAll(string from)
/// </remarks>
internal static T GetFirst<T>(CimSession session, string nameSpace, string wmiClassName) where T : class, new()
{
if (string.IsNullOrEmpty(wmiClassName))
throw new ArgumentException("String argument may not be null or empty", nameof(wmiClassName));
ArgumentException.ThrowIfNullOrEmpty(wmiClassName);

try
{
Expand Down Expand Up @@ -132,9 +131,8 @@ internal static string WqlQueryAll(string from)
/// </remarks>
internal static T[] GetAll<T>(CimSession session, string nameSpace, string wmiClassName) where T : class, new()
{
if (string.IsNullOrEmpty(wmiClassName))
throw new ArgumentException("String argument may not be null or empty", nameof(wmiClassName));

ArgumentException.ThrowIfNullOrEmpty(wmiClassName);

var rv = new List<T>();

try
Expand Down
24 changes: 13 additions & 11 deletions src/Microsoft.PowerShell.Commands.Management/commands/management/PingPathCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,19 +186,21 @@ protected override void ProcessRecord()
{
bool result = false;

if (path == null)
{
WriteError(new ErrorRecord(
new ArgumentNullException(TestPathResources.PathIsNullOrEmptyCollection),
"NullPathNotPermitted",
ErrorCategory.InvalidArgument,
Path));
continue;
}

if (string.IsNullOrWhiteSpace(path))
{
WriteObject(result);
if (path is null)
{
WriteError(new ErrorRecord(
new ArgumentNullException(TestPathResources.PathIsNullOrEmptyCollection),
"NullPathNotPermitted",
ErrorCategory.InvalidArgument,
Path));
}
else
{
WriteObject(result);
}

continue;
}

Expand Down