Use nameof to get parameter names when creating ArgumentNullException (#15604)

This commit is contained in:
Konstantin Gukov
2021-07-05 22:04:13 -07:00
committed by GitHub
parent 4c2d6dcfca
commit 8dcd5a2e1c
10 changed files with 15 additions and 30 deletions
@@ -151,7 +151,7 @@ namespace Microsoft.Management.Infrastructure.CimCmdlets
DebugHelper.WriteLogEx("queryDialect = '{0}'; queryExpression = '{1}'", 0, queryDialect, queryExpression);
if (cimSession == null)
{
throw new ArgumentNullException(string.Format(CultureInfo.CurrentUICulture, CimCmdletStrings.NullArgument, @"cimSession"));
throw new ArgumentNullException(string.Format(CultureInfo.CurrentUICulture, CimCmdletStrings.NullArgument, nameof(cimSession)));
}
this.TargetComputerName = cimSession.ComputerName;
@@ -82,12 +82,7 @@ namespace Microsoft.PowerShell.Cmdletization
set
{
if (value == null)
{
throw new ArgumentNullException("value");
}
_session = value;
_session = value ?? throw new ArgumentNullException(nameof(value));
_sessionWasSpecified = true;
}
}
@@ -1865,7 +1865,7 @@ namespace Microsoft.PowerShell.Commands
{
if (formData == null)
{
throw new ArgumentNullException("formDate");
throw new ArgumentNullException(nameof(formData));
}
// It is possible that the dictionary keys or values are PSObject wrapped depending on how the dictionary is defined and assigned.
@@ -510,7 +510,7 @@ namespace System.Diagnostics.Eventing
if (data == null)
{
throw new ArgumentNullException("dataString");
throw new ArgumentNullException(nameof(data));
}
if (IsEnabled(eventDescriptor.Level, eventDescriptor.Keywords))
@@ -42,7 +42,7 @@ namespace System.Diagnostics.Eventing
set
{
if (value == null)
throw new ArgumentNullException("Delimiter");
throw new ArgumentNullException(nameof(Delimiter));
if (value.Length == 0)
throw new ArgumentException(DotNetEventingStrings.Argument_NeedNonemptyDelimiter);
@@ -6680,7 +6680,7 @@ namespace Microsoft.PowerShell.Cmdletization.Xml
{
if (reader == null)
{
throw new ArgumentNullException("reader");
throw new ArgumentNullException(nameof(reader));
}
XmlSerializationReader1 cdxmlSerializationReader = new XmlSerializationReader1(reader);
@@ -287,12 +287,7 @@ namespace Microsoft.PowerShell.Commands
set
{
if (value == null)
{
throw new ArgumentNullException("value");
}
_parameterNames = value;
_parameterNames = value ?? throw new ArgumentNullException(nameof(value));
_parameterNameWildcards = SessionStateUtilities.CreateWildcardsFromStrings(
_parameterNames,
WildcardOptions.CultureInvariant | WildcardOptions.IgnoreCase);
@@ -319,7 +314,7 @@ namespace Microsoft.PowerShell.Commands
{
if (value == null)
{
throw new ArgumentNullException("value");
throw new ArgumentNullException(nameof(value));
}
// if '...CimInstance#Win32_Process' is specified, then exclude '...CimInstance'
@@ -70,12 +70,7 @@ namespace System.Management.Automation
// internal for unit testing only. Otherwise, would be private.
internal BackgroundDispatcher(IMethodInvoker etwActivityMethodInvoker)
{
if (etwActivityMethodInvoker == null)
{
throw new ArgumentNullException("etwActivityMethodInvoker");
}
_etwActivityMethodInvoker = etwActivityMethodInvoker;
_etwActivityMethodInvoker = etwActivityMethodInvoker ?? throw new ArgumentNullException(nameof(etwActivityMethodInvoker));
_invokerWaitCallback = DoInvoker;
}
@@ -400,7 +400,7 @@ namespace System.Management.Automation.PerformanceData
// retrieve counter id associated with the counter name
if (counterName == null)
{
ArgumentNullException argNullException = new ArgumentNullException("counterName");
ArgumentNullException argNullException = new ArgumentNullException(nameof(counterName));
_tracer.TraceException(argNullException);
return false;
}
@@ -484,7 +484,7 @@ namespace System.Management.Automation.PerformanceData
// retrieve counter id associated with the counter name
if (counterName == null)
{
ArgumentNullException argNullException = new ArgumentNullException("counterName");
ArgumentNullException argNullException = new ArgumentNullException(nameof(counterName));
_tracer.TraceException(argNullException);
return false;
}
@@ -568,7 +568,7 @@ namespace System.Management.Automation.PerformanceData
// retrieve counter id associated with the counter name
if (counterName == null)
{
ArgumentNullException argNullException = new ArgumentNullException("counterName");
ArgumentNullException argNullException = new ArgumentNullException(nameof(counterName));
_tracer.TraceException(argNullException);
return false;
}
@@ -110,7 +110,7 @@ namespace System.Management.Automation.PerformanceData
if ((counterInfoArray == null)
|| (counterInfoArray.Length == 0))
{
throw new ArgumentNullException("counterInfoArray");
throw new ArgumentNullException(nameof(counterInfoArray));
}
CounterInfoArray = new CounterInfo[counterInfoArray.Length];
@@ -136,7 +136,7 @@ namespace System.Management.Automation.PerformanceData
{
if (srcCounterSetRegistrarBase == null)
{
throw new ArgumentNullException("srcCounterSetRegistrarBase");
throw new ArgumentNullException(nameof(srcCounterSetRegistrarBase));
}
ProviderId = srcCounterSetRegistrarBase.ProviderId;
@@ -243,7 +243,7 @@ namespace System.Management.Automation.PerformanceData
{
if (srcPSCounterSetRegistrar == null)
{
throw new ArgumentNullException("srcPSCounterSetRegistrar");
throw new ArgumentNullException(nameof(srcPSCounterSetRegistrar));
}
}