Skip to content

Use ArgumentException.ThrowIfNullOrEmpty() in more places #19213

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 9 commits into from
Feb 27, 2023
Merged

Use ArgumentException.ThrowIfNullOrEmpty() in more places #19213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e2c0848
5 files
CarloToso Feb 24, 2023
532b7d7
8 files
CarloToso Feb 24, 2023
d30aa17
6 files
CarloToso Feb 24, 2023
4eef59d
1 file
CarloToso Feb 24, 2023
bdd6754
Rebase cimQuery.cs @xtqqczze
CarloToso Feb 24, 2023
8cbe758
separate the method calls with a blank line
CarloToso Feb 24, 2023
69cefdd
use nameof
CarloToso Feb 25, 2023
e7efc17
remove empty lines as suggested
CarloToso Feb 27, 2023
13699ab
Fix test
CarloToso 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
5 changes: 1 addition & 4 deletions src/Microsoft.Management.UI.Internal/ManagementList/Common/WpfHelp.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,10 +419,7 @@ public static T GetOptionalTemplateChild<T>(Control templateParent, string child
{
ArgumentNullException.ThrowIfNull(templateParent);

if (string.IsNullOrEmpty(childName))
{
throw new ArgumentNullException("childName");
}
ArgumentException.ThrowIfNullOrEmpty(childName);
Copy link
Collaborator

@iSazonov iSazonov Feb 28, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Extra blank line 😄

Copy link
Member

@daxian-dbw daxian-dbw Feb 28, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@CarloToso you and I both missed this one ...

Copy link
Contributor Author

@CarloToso CarloToso Feb 28, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😅 (I fixed it in #19241)

Copy link
Member

@daxian-dbw daxian-dbw Feb 28, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you! 😄


object templatePart = templateParent.Template.FindName(childName, templateParent);
T item = templatePart as T;
Expand Down
11 changes: 2 additions & 9 deletions ...ment.UI.Internal/ManagementList/FilterCore/FilterRules/PropertyValueSelectorFilterRule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,8 @@ public PropertyValueSelectorFilterRule(string propertyName, string propertyDispl
/// </param>
public PropertyValueSelectorFilterRule(string propertyName, string propertyDisplayName, IEnumerable<FilterRule> rules)
{
if (string.IsNullOrEmpty(propertyName))
{
throw new ArgumentNullException("propertyName");
}

if (string.IsNullOrEmpty(propertyDisplayName))
{
throw new ArgumentNullException("propertyDisplayName");
}
ArgumentException.ThrowIfNullOrEmpty(propertyName);
ArgumentException.ThrowIfNullOrEmpty(propertyDisplayName);

ArgumentNullException.ThrowIfNull(rules);

Expand Down
5 changes: 1 addition & 4 deletions src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/ValidatingValueBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,7 @@ public string this[string columnName]
{
get
{
if (string.IsNullOrEmpty(columnName))
{
throw new ArgumentNullException("columnName");
}
ArgumentException.ThrowIfNullOrEmpty(columnName);

this.UpdateValidationResult(columnName);
return this.GetValidationResult().ErrorMessage;
Expand Down
6 changes: 1 addition & 5 deletions src/Microsoft.Management.UI.Internal/ManagementList/FilterProviders/FilterRulePanelItem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,7 @@ protected internal set
public FilterRulePanelItem(FilterRule rule, string groupId)
{
ArgumentNullException.ThrowIfNull(rule);

if (string.IsNullOrEmpty(groupId))
{
throw new ArgumentNullException("groupId");
}
ArgumentException.ThrowIfNullOrEmpty(groupId);

this.Rule = rule;
this.GroupId = groupId;
Expand Down
1 change: 0 additions & 1 deletion src/Microsoft.PowerShell.Commands.Utility/commands/utility/CsvCommands.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1274,7 +1274,6 @@ internal class ImportCsvHelper
internal ImportCsvHelper(PSCmdlet cmdlet, char delimiter, IList<string> header, string typeName, StreamReader streamReader)
{
ArgumentNullException.ThrowIfNull(cmdlet);

ArgumentNullException.ThrowIfNull(streamReader);

_cmdlet = cmdlet;
Expand Down
3 changes: 1 addition & 2 deletions src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceExpressionCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,8 +330,7 @@ internal TracePipelineWriter(
bool writeError,
Collection<PSTraceSource> matchingSources)
{
ArgumentNullException.ThrowIfNull(cmdlet);

ArgumentNullException.ThrowIfNull(cmdlet);
ArgumentNullException.ThrowIfNull(matchingSources);

_cmdlet = cmdlet;
Expand Down
5 changes: 1 addition & 4 deletions src/Microsoft.WSMan.Management/ConfigProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3413,10 +3413,7 @@ private static string NormalizePath(string path, string host)
/// </exception>
private PSObject GetItemValue(string path)
{
if (string.IsNullOrEmpty(path))
{
throw new ArgumentNullException(path);
}
ArgumentException.ThrowIfNullOrEmpty(path);

// if endswith '\', removes it.
if (path.EndsWith(WSManStringLiterals.DefaultPathSeparator.ToString(), StringComparison.OrdinalIgnoreCase))
Expand Down
17 changes: 3 additions & 14 deletions src/Microsoft.WSMan.Management/CurrentConfigurations.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,7 @@ public CurrentConfigurations(IWSManSession serverSession)
/// <returns>False, if operation failed.</returns>
public bool RefreshCurrentConfiguration(string responseOfGet)
{
if (string.IsNullOrEmpty(responseOfGet))
{
throw new ArgumentNullException(nameof(responseOfGet));
}
ArgumentException.ThrowIfNullOrEmpty(responseOfGet);

this.rootDocument.LoadXml(responseOfGet);
this.documentElement = this.rootDocument.DocumentElement;
Expand All @@ -98,10 +95,7 @@ public bool RefreshCurrentConfiguration(string responseOfGet)
/// <returns>False, if operation is not successful.</returns>
public void PutConfigurationOnServer(string resourceUri)
{
if (string.IsNullOrEmpty(resourceUri))
{
throw new ArgumentNullException(nameof(resourceUri));
}
ArgumentException.ThrowIfNullOrEmpty(resourceUri);

this.serverSession.Put(resourceUri, this.rootDocument.InnerXml, 0);
}
Expand Down Expand Up @@ -145,12 +139,7 @@ public void RemoveOneConfiguration(string pathToNodeFromRoot)
public void UpdateOneConfiguration(string pathToNodeFromRoot, string configurationName, string configurationValue)
{
ArgumentNullException.ThrowIfNull(pathToNodeFromRoot);

if (string.IsNullOrEmpty(configurationName))
{
throw new ArgumentNullException(nameof(configurationName));
}

ArgumentException.ThrowIfNullOrEmpty(configurationName);
ArgumentNullException.ThrowIfNull(configurationValue);

XmlNode nodeToUpdate =
Expand Down
6 changes: 1 addition & 5 deletions src/Microsoft.WSMan.Management/WsManHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,11 +179,7 @@ private static string FormatResourceMsgFromResourcetextS(
object[] args)
{
ArgumentNullException.ThrowIfNull(resourceManager);

if (string.IsNullOrEmpty(resourceName))
{
throw new ArgumentNullException(nameof(resourceName));
}
ArgumentException.ThrowIfNullOrEmpty(resourceName);

string template = resourceManager.GetString(resourceName);

Expand Down
5 changes: 1 addition & 4 deletions src/System.Management.Automation/CoreCLR/CorePsAssemblyLoadContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,10 +579,7 @@ public static class PowerShellAssemblyLoadContextInitializer
/// </param>
public static void SetPowerShellAssemblyLoadContext([MarshalAs(UnmanagedType.LPWStr)] string basePaths)
{
if (string.IsNullOrEmpty(basePaths))
{
throw new ArgumentNullException(nameof(basePaths));
}
ArgumentException.ThrowIfNullOrEmpty(basePaths);

PowerShellAssemblyLoadContext.InitializeSingleton(basePaths);
}
Expand Down
7 changes: 1 addition & 6 deletions src/System.Management.Automation/cimSupport/cmdletization/ObjectModelWrapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,10 @@ public abstract class CmdletAdapter<TObjectInstance>
internal void Initialize(PSCmdlet cmdlet, string className, string classVersion, IDictionary<string, string> privateData)
{
ArgumentNullException.ThrowIfNull(cmdlet);

if (string.IsNullOrEmpty(className))
{
throw new ArgumentNullException(nameof(className));
}
ArgumentException.ThrowIfNullOrEmpty(className);

// possible and ok to have classVersion==string.Empty
ArgumentNullException.ThrowIfNull(classVersion);

ArgumentNullException.ThrowIfNull(privateData);

_cmdlet = cmdlet;
Expand Down
5 changes: 1 addition & 4 deletions src/System.Management.Automation/engine/CommandInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,10 +285,7 @@ internal void SetCommandType(CommandTypes newType)
/// </exception>
internal void Rename(string newName)
{
if (string.IsNullOrEmpty(newName))
{
throw new ArgumentNullException(nameof(newName));
}
ArgumentException.ThrowIfNullOrEmpty(newName);

Name = newName;
}
Expand Down
6 changes: 2 additions & 4 deletions src/System.Management.Automation/engine/Modules/ModuleSpecification.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,10 @@ public ModuleSpecification()
/// <param name="moduleName">The module name.</param>
public ModuleSpecification(string moduleName)
{
if (string.IsNullOrEmpty(moduleName))
{
throw new ArgumentNullException(nameof(moduleName));
}
ArgumentException.ThrowIfNullOrEmpty(moduleName);

this.Name = moduleName;

// Alias name of miniumVersion
this.Version = null;
this.RequiredVersion = null;
Expand Down
5 changes: 1 addition & 4 deletions src/System.Management.Automation/engine/Modules/PSModuleInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1302,10 +1302,7 @@ public object Invoke(ScriptBlock sb, params object[] args)
/// <returns></returns>
public PSVariable GetVariableFromCallersModule(string variableName)
{
if (string.IsNullOrEmpty(variableName))
{
throw new ArgumentNullException(nameof(variableName));
}
ArgumentException.ThrowIfNullOrEmpty(variableName);

var context = LocalPipeline.GetExecutionContextFromTLS();
SessionState callersSessionState = null;
Expand Down
5 changes: 1 addition & 4 deletions src/System.Management.Automation/engine/PSClassInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,7 @@ public sealed class PSClassMemberInfo
/// </summary>
internal PSClassMemberInfo(string name, string memberType, string defaultValue)
{
if (string.IsNullOrEmpty(name))
{
throw new ArgumentNullException(nameof(name));
}
ArgumentException.ThrowIfNullOrEmpty(name);

this.Name = name;
this.TypeName = memberType;
Expand Down
5 changes: 1 addition & 4 deletions src/System.Management.Automation/engine/remoting/commands/InvokeCommandCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2167,10 +2167,7 @@ public void StartProgress(
return;
}

if (string.IsNullOrEmpty(computerName))
{
throw new ArgumentNullException(nameof(computerName));
}
ArgumentException.ThrowIfNullOrEmpty(computerName);

lock (_syncObject)
{
Expand Down
11 changes: 2 additions & 9 deletions src/System.Management.Automation/namespaces/FileSystemProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7960,15 +7960,8 @@ internal static bool CreateJunction(string path, string target)
#if UNIX
return false;
#else
if (string.IsNullOrEmpty(path))
{
throw new ArgumentNullException(nameof(path));
}

if (string.IsNullOrEmpty(target))
{
throw new ArgumentNullException(nameof(target));
}
ArgumentException.ThrowIfNullOrEmpty(path);
ArgumentException.ThrowIfNullOrEmpty(target);

using (SafeHandle handle = WinOpenReparsePoint(path, FileAccess.Write))
{
Expand Down
34 changes: 8 additions & 26 deletions src/System.Management.Automation/utils/MshTraceSource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,7 @@ internal static PSTraceSource GetTracer(
string description,
bool traceHeaders)
{
if (string.IsNullOrEmpty(name))
{
// 2005/04/13-JonN In theory this should be ArgumentException,
// but I don't want to deal with loading the string in this
// low-level code.
throw new ArgumentNullException(nameof(name));
}
ArgumentException.ThrowIfNullOrEmpty(name);

lock (PSTraceSource.s_getTracerLock)
{
Expand Down Expand Up @@ -182,13 +176,9 @@ internal static PSTraceSource GetNewTraceSource(
string description,
bool traceHeaders)
{
if (string.IsNullOrEmpty(name))
{
// Note, all callers should have already verified the name before calling this
// API, so this exception should never be exposed to an end-user.

throw new ArgumentException("name");
}
// Note, all callers should have already verified the name before calling this
// API, so this exception should never be exposed to an end-user.
ArgumentException.ThrowIfNullOrEmpty(name);

// Keep the fullName as it was passed, but truncate or pad
// the category name to 16 characters. This allows for
Expand Down Expand Up @@ -228,10 +218,7 @@ internal static PSTraceSource GetNewTraceSource(
/// <returns>Exception instance ready to throw.</returns>
internal static PSArgumentNullException NewArgumentNullException(string paramName)
{
if (string.IsNullOrEmpty(paramName))
{
throw new ArgumentNullException(nameof(paramName));
}
ArgumentException.ThrowIfNullOrEmpty(paramName);

string message = StringUtil.Format(AutomationExceptions.ArgumentNull, paramName);
var e = new PSArgumentNullException(paramName, message);
Expand Down Expand Up @@ -287,12 +274,10 @@ internal static PSArgumentNullException NewArgumentNullException(
/// <returns>Exception instance ready to throw.</returns>
internal static PSArgumentException NewArgumentException(string paramName)
{
if (string.IsNullOrEmpty(paramName))
{
throw new ArgumentNullException(nameof(paramName));
}
ArgumentException.ThrowIfNullOrEmpty(paramName);

string message = StringUtil.Format(AutomationExceptions.Argument, paramName);

// Note that the message param comes first
var e = new PSArgumentException(message, paramName);

Expand Down Expand Up @@ -477,10 +462,7 @@ internal static PSNotImplementedException NewNotImplementedException()
/// <returns>Exception instance ready to throw.</returns>
internal static PSArgumentOutOfRangeException NewArgumentOutOfRangeException(string paramName, object actualValue)
{
if (string.IsNullOrEmpty(paramName))
{
throw new ArgumentNullException(nameof(paramName));
}
ArgumentException.ThrowIfNullOrEmpty(paramName);

string message = StringUtil.Format(AutomationExceptions.ArgumentOutOfRange, paramName);
var e = new PSArgumentOutOfRangeException(paramName, actualValue, message);
Expand Down
8 changes: 1 addition & 7 deletions src/System.Management.Automation/utils/StructuredTraceSource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,13 +269,7 @@ public partial class PSTraceSource
/// </param>
internal PSTraceSource(string fullName, string name, string description, bool traceHeaders)
{
if (string.IsNullOrEmpty(fullName))
{
// 2005/04/13-JonN In theory this should be ArgumentException,
// but I don't want to deal with loading the string in this
// low-level code.
throw new ArgumentNullException(nameof(fullName));
}
ArgumentException.ThrowIfNullOrEmpty(fullName);

try
{
Expand Down
14 changes: 5 additions & 9 deletions src/System.Management.Automation/utils/perfCounters/PSPerfCountersMgr.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public bool IsCounterSetRegistered(string counterSetName, out Guid counterSetId)
counterSetId = new Guid();
if (counterSetName == null)
{
ArgumentNullException argNullException = new ArgumentNullException("counterSetName");
ArgumentNullException argNullException = new ArgumentNullException(nameof(counterSetName));
_tracer.TraceException(argNullException);
return false;
}
Expand Down Expand Up @@ -233,8 +233,7 @@ public bool UpdateCounterByValue(
{
if (counterSetName == null)
{
ArgumentNullException argNullException =
new ArgumentNullException("counterSetName");
ArgumentNullException argNullException = new ArgumentNullException(nameof(counterSetName));
_tracer.TraceException(argNullException);
return false;
}
Expand Down Expand Up @@ -275,8 +274,7 @@ public bool UpdateCounterByValue(
Guid counterSetId;
if (counterSetName == null)
{
ArgumentNullException argNullException =
new ArgumentNullException("counterSetName");
ArgumentNullException argNullException = new ArgumentNullException(nameof(counterSetName));
_tracer.TraceException(argNullException);
return false;
}
Expand Down Expand Up @@ -376,8 +374,7 @@ public bool SetCounterValue(
{
if (counterSetName == null)
{
ArgumentNullException argNullException =
new ArgumentNullException("counterSetName");
ArgumentNullException argNullException = new ArgumentNullException(nameof(counterSetName));
_tracer.TraceException(argNullException);
return false;
}
Expand Down Expand Up @@ -416,8 +413,7 @@ public bool SetCounterValue(
{
if (counterSetName == null)
{
ArgumentNullException argNullException =
new ArgumentNullException("counterSetName");
ArgumentNullException argNullException = new ArgumentNullException(nameof(counterSetName));
_tracer.TraceException(argNullException);
return false;
}
Expand Down
2 changes: 1 addition & 1 deletion test/xUnit/csharp/test_FileSystemProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public void TestCreateJunctionFails()
}
else
{
Assert.Throws<System.ArgumentNullException>(delegate { InternalSymbolicLinkLinkCodeMethods.CreateJunction(string.Empty, string.Empty); });
Assert.Throws<System.ArgumentException>(delegate { InternalSymbolicLinkLinkCodeMethods.CreateJunction(string.Empty, string.Empty); });
}
}

Expand Down