Use ArgumentNullException.ThrowIfNull and ObjectDisposedException.Thr…

…owIf in more places (#79096)

src/coreclr/System.Private.CoreLib/src/System/Threading/Monitor.CoreCLR.cs

@@ -150,8 +150,7 @@ public static bool IsEntered(object obj)
         [UnsupportedOSPlatform("browser")]
         public static bool Wait(object obj, int millisecondsTimeout)
         {
-            if (obj == null)
-                throw (new ArgumentNullException(nameof(obj)));
+            ArgumentNullException.ThrowIfNull(obj);
             if (millisecondsTimeout < -1)
                 throw new ArgumentOutOfRangeException(nameof(millisecondsTimeout), SR.ArgumentOutOfRange_NeedNonNegOrNegative1);
 

src/libraries/Common/src/System/Net/WebSockets/WebSocketValidate.cs

@@ -40,11 +40,7 @@ internal static void ThrowIfInvalidState(WebSocketState currentState, bool isDis
                     if (currentState == validState)
                     {
                         // Ordering is important to maintain .NET 4.5 WebSocket implementation exception behavior.
-                        if (isDisposed)
-                        {
-                            throw new ObjectDisposedException(nameof(WebSocket));
-                        }
-
+                        ObjectDisposedException.ThrowIf(isDisposed, typeof(WebSocket));
                         return;
                     }
                 }

src/libraries/System.Collections.Concurrent/src/Resources/Strings.resx

@@ -159,9 +159,6 @@
   <data name="Partitioner_DynamicPartitionsNotSupported" xml:space="preserve">
     <value>Dynamic partitions are not supported by this partitioner.</value>
   </data>
-  <data name="PartitionerStatic_CanNotCallGetEnumeratorAfterSourceHasBeenDisposed" xml:space="preserve">
-    <value>Can not call GetEnumerator on partitions after the source enumerable is disposed</value>
-  </data>
   <data name="PartitionerStatic_CurrentCalledBeforeMoveNext" xml:space="preserve">
     <value>MoveNext must be called at least once before calling Current.</value>
   </data>

src/libraries/System.Collections.Concurrent/src/System/Collections/Concurrent/PartitionerStatic.cs

@@ -605,15 +605,10 @@ internal InternalPartitionEnumerable(IEnumerator<TSource> sharedReader, bool use
 
                 public IEnumerator<KeyValuePair<long, TSource>> GetEnumerator()
                 {
-                    if (_disposed)
-                    {
-                        throw new ObjectDisposedException(SR.PartitionerStatic_CanNotCallGetEnumeratorAfterSourceHasBeenDisposed);
-                    }
-                    else
-                    {
-                        return new InternalPartitionEnumerator(_sharedReader, _sharedIndex,
-                            _hasNoElementsLeft, _activePartitionCount, this, _useSingleChunking);
-                    }
+                    ObjectDisposedException.ThrowIf(_disposed, this);
+
+                    return new InternalPartitionEnumerator(_sharedReader, _sharedIndex,
+                        _hasNoElementsLeft, _activePartitionCount, this, _useSingleChunking);
                 }
 
 

src/libraries/System.ComponentModel.TypeConverter/src/MS/Internal/Xml/Linq/ComponentModel/XComponentModel.cs

@@ -524,8 +524,7 @@ public IEnumerable<T> this[string expandedName]
         {
             get
             {
-                if (expandedName == null)
-                    throw new ArgumentNullException(nameof(expandedName));
+                ArgumentNullException.ThrowIfNull(expandedName);
                 if (name == null)
                 {
                     name = expandedName;
@@ -559,8 +558,7 @@ public T? this[string expandedName]
         {
             get
             {
-                if (expandedName == null)
-                    throw new ArgumentNullException(nameof(expandedName));
+                ArgumentNullException.ThrowIfNull(expandedName);
                 if (name == null)
                 {
                     name = expandedName;

src/libraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/Design/ServiceContainer.cs

@@ -78,8 +78,8 @@ public virtual void AddService(Type serviceType, object serviceInstance, bool pr
             // We're going to add this locally. Ensure that the service instance
             // is correct.
             //
-            if (serviceType == null) throw new ArgumentNullException(nameof(serviceType));
-            if (serviceInstance == null) throw new ArgumentNullException(nameof(serviceInstance));
+            ArgumentNullException.ThrowIfNull(serviceType);
+            ArgumentNullException.ThrowIfNull(serviceInstance);
             if (!(serviceInstance is ServiceCreatorCallback) && !serviceInstance.GetType().IsCOMObject && !serviceType.IsInstanceOfType(serviceInstance))
             {
                 throw new ArgumentException(SR.Format(SR.ErrorInvalidServiceInstance, serviceType.FullName));
@@ -119,8 +119,8 @@ public virtual void AddService(Type serviceType, ServiceCreatorCallback callback
             // We're going to add this locally. Ensure that the service instance
             // is correct.
             //
-            if (serviceType == null) throw new ArgumentNullException(nameof(serviceType));
-            if (callback == null) throw new ArgumentNullException(nameof(callback));
+            ArgumentNullException.ThrowIfNull(serviceType);
+            ArgumentNullException.ThrowIfNull(callback);
 
             if (Services.ContainsKey(serviceType))
             {

src/libraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/ReflectPropertyDescriptor.cs

@@ -956,14 +956,8 @@ protected override void OnValueChanged(object? component, EventArgs e)
         /// </summary>
         public override void RemoveValueChanged(object? component, EventHandler handler)
         {
-            if (component == null)
-            {
-                throw new ArgumentNullException(nameof(component));
-            }
-            if (handler == null)
-            {
-                throw new ArgumentNullException(nameof(handler));
-            }
+            ArgumentNullException.ThrowIfNull(component);
+            ArgumentNullException.ThrowIfNull(handler);
 
             // If there's an event called <propertyname>Changed, we hooked the caller's
             // handler directly up to that on the component, so remove it now.

src/libraries/System.Console/src/System/Console.cs

@@ -87,7 +87,7 @@ public static Encoding InputEncoding
             }
             set
             {
-                CheckNonNull(value, nameof(value));
+                ArgumentNullException.ThrowIfNull(value);
 
                 lock (s_syncObject)
                 {
@@ -127,7 +127,7 @@ public static Encoding OutputEncoding
             [UnsupportedOSPlatform("tvos")]
             set
             {
-                CheckNonNull(value, nameof(value));
+                ArgumentNullException.ThrowIfNull(value);
 
                 lock (s_syncObject)
                 {
@@ -705,7 +705,8 @@ public static Stream OpenStandardError(int bufferSize)
         [UnsupportedOSPlatform("tvos")]
         public static void SetIn(TextReader newIn)
         {
-            CheckNonNull(newIn, nameof(newIn));
+            ArgumentNullException.ThrowIfNull(newIn);
+
             newIn = SyncTextReader.GetSynchronizedTextReader(newIn);
             lock (s_syncObject)
             {
@@ -715,7 +716,8 @@ public static void SetIn(TextReader newIn)
 
         public static void SetOut(TextWriter newOut)
         {
-            CheckNonNull(newOut, nameof(newOut));
+            ArgumentNullException.ThrowIfNull(newOut);
+
             newOut = TextWriter.Synchronized(newOut);
             lock (s_syncObject)
             {
@@ -726,7 +728,8 @@ public static void SetOut(TextWriter newOut)
 
         public static void SetError(TextWriter newError)
         {
-            CheckNonNull(newError, nameof(newError));
+            ArgumentNullException.ThrowIfNull(newError);
+
             newError = TextWriter.Synchronized(newError);
             lock (s_syncObject)
             {
@@ -735,12 +738,6 @@ public static void SetError(TextWriter newError)
             }
         }
 
-        private static void CheckNonNull(object obj, string paramName)
-        {
-            if (obj == null)
-                throw new ArgumentNullException(paramName);
-        }
-
         //
         // Give a hint to the code generator to not inline the common console methods. The console methods are
         // not performance critical. It is unnecessary code bloat to have them inlined.

src/libraries/System.Data.Common/src/System/Data/SQLTypes/SQLBytes.cs

@@ -297,8 +297,7 @@ public long Read(long offset, byte[] buffer, int offsetInBuffer, int count)
                 throw new SqlNullValueException();
 
             // Validate the arguments
-            if (buffer == null)
-                throw new ArgumentNullException(nameof(buffer));
+            ArgumentNullException.ThrowIfNull(buffer);
 
             if (offset > Length || offset < 0)
                 throw new ArgumentOutOfRangeException(nameof(offset));
@@ -343,8 +342,7 @@ public void Write(long offset, byte[] buffer, int offsetInBuffer, int count)
             else
             {
                 // Validate the arguments
-                if (buffer == null)
-                    throw new ArgumentNullException(nameof(buffer));
+                ArgumentNullException.ThrowIfNull(buffer);
 
                 if (_rgbBuf == null)
                     throw new SqlTypeException(SR.SqlMisc_NoBufferMessage);

src/libraries/System.Data.Common/src/System/Data/SQLTypes/SQLChars.cs

@@ -294,8 +294,7 @@ public long Read(long offset, char[] buffer, int offsetInBuffer, int count)
                 throw new SqlNullValueException();
 
             // Validate the arguments
-            if (buffer == null)
-                throw new ArgumentNullException(nameof(buffer));
+            ArgumentNullException.ThrowIfNull(buffer);
 
             if (offset > Length || offset < 0)
                 throw new ArgumentOutOfRangeException(nameof(offset));
@@ -341,8 +340,7 @@ public void Write(long offset, char[] buffer, int offsetInBuffer, int count)
             else
             {
                 // Validate the arguments
-                if (buffer == null)
-                    throw new ArgumentNullException(nameof(buffer));
+                ArgumentNullException.ThrowIfNull(buffer);
 
                 if (_rgchBuf == null)
                     throw new SqlTypeException(SR.SqlMisc_NoBufferMessage);
@@ -650,8 +648,7 @@ public int Read(char[] buffer, int offset, int count)
         {
             CheckIfStreamClosed();
 
-            if (buffer == null)
-                throw new ArgumentNullException(nameof(buffer));
+            ArgumentNullException.ThrowIfNull(buffer);
             if (offset < 0 || offset > buffer.Length)
                 throw new ArgumentOutOfRangeException(nameof(offset));
             if (count < 0 || count > buffer.Length - offset)
@@ -667,8 +664,7 @@ public void Write(char[] buffer, int offset, int count)
         {
             CheckIfStreamClosed();
 
-            if (buffer == null)
-                throw new ArgumentNullException(nameof(buffer));
+            ArgumentNullException.ThrowIfNull(buffer);
             if (offset < 0 || offset > buffer.Length)
                 throw new ArgumentOutOfRangeException(nameof(offset));
             if (count < 0 || count > buffer.Length - offset)

src/libraries/System.Data.Common/src/System/Data/SQLTypes/SQLDecimal.cs

@@ -579,9 +579,8 @@ public SqlDecimal(long value)
         public SqlDecimal(byte bPrecision, byte bScale, bool fPositive, int[] bits)
         {
             CheckValidPrecScale(bPrecision, bScale);
-            if (bits == null)
-                throw new ArgumentNullException(nameof(bits));
-            else if (bits.Length != 4)
+            ArgumentNullException.ThrowIfNull(bits);
+            if (bits.Length != 4)
                 throw new ArgumentException(SQLResource.InvalidArraySizeMessage, nameof(bits));
 
             _bPrec = bPrecision;
@@ -987,8 +986,7 @@ public override string ToString()
 
         public static SqlDecimal Parse(string s)
         {
-            if (s == null)
-                throw new ArgumentNullException(nameof(s));
+            ArgumentNullException.ThrowIfNull(s);
 
             if (s == SQLResource.NullString)
                 return SqlDecimal.Null;

src/libraries/System.Data.Common/src/System/Data/SQLTypes/SqlXml.cs

@@ -395,8 +395,7 @@ public override int Read(byte[] buffer, int offset, int count)
             ThrowIfStreamClosed(nameof(Read));
             ThrowIfStreamCannotRead(nameof(Read));
 
-            if (buffer == null)
-                throw new ArgumentNullException(nameof(buffer));
+            ArgumentNullException.ThrowIfNull(buffer);
             if (offset < 0 || offset > buffer.Length)
                 throw new ArgumentOutOfRangeException(nameof(offset));
             if (count < 0 || count > buffer.Length - offset)
@@ -432,8 +431,7 @@ public override void Write(byte[] buffer, int offset, int count)
             ThrowIfStreamClosed(nameof(Write));
             ThrowIfStreamCannotWrite(nameof(Write));
 
-            if (buffer == null)
-                throw new ArgumentNullException(nameof(buffer));
+            ArgumentNullException.ThrowIfNull(buffer);
             if (offset < 0 || offset > buffer.Length)
                 throw new ArgumentOutOfRangeException(nameof(offset));
             if (count < 0 || count > buffer.Length - offset)

src/libraries/System.Diagnostics.TraceSource/src/System/Diagnostics/SourceFilter.cs

@@ -33,8 +33,7 @@ public string Source
             [MemberNotNull(nameof(_src))]
             set
             {
-                if (value == null)
-                    throw new ArgumentNullException(nameof(Source));
+                ArgumentNullException.ThrowIfNull(value, nameof(Source));
                 _src = value;
             }
         }

src/libraries/System.Diagnostics.TraceSource/src/System/Diagnostics/SwitchAttribute.cs

@@ -38,8 +38,7 @@ public Type SwitchType
             [MemberNotNull(nameof(_type))]
             set
             {
-                if (value == null)
-                    throw new ArgumentNullException(nameof(value));
+                ArgumentNullException.ThrowIfNull(value);
                 _type = value;
             }
         }
@@ -49,8 +48,7 @@ public Type SwitchType
         [RequiresUnreferencedCode("Types may be trimmed from the assembly.")]
         public static SwitchAttribute[] GetAll(Assembly assembly)
         {
-            if (assembly == null)
-                throw new ArgumentNullException(nameof(assembly));
+            ArgumentNullException.ThrowIfNull(assembly);
 
             List<object> switchAttribs = new List<object>();
             object[] attribs = assembly.GetCustomAttributes(typeof(SwitchAttribute), false);

src/libraries/System.Diagnostics.TraceSource/src/System/Diagnostics/SwitchLevelAttribute.cs

@@ -21,8 +21,7 @@ public Type SwitchLevelType
             [MemberNotNull(nameof(_type))]
             set
             {
-                if (value == null)
-                    throw new ArgumentNullException(nameof(value));
+                ArgumentNullException.ThrowIfNull(value);
 
                 _type = value;
             }

src/libraries/System.Diagnostics.TraceSource/src/System/Diagnostics/TraceSource.cs

@@ -534,8 +534,7 @@ public SourceSwitch Switch
             }
             set
             {
-                if (value == null)
-                    throw new ArgumentNullException(nameof(Switch));
+                ArgumentNullException.ThrowIfNull(value, nameof(Switch));
 
                 Initialize();
                 _internalSwitch = value;

src/libraries/System.Net.Http/src/System/Net/Http/HttpClientHandler.AnyMobile.cs

@@ -319,7 +319,7 @@ public long MaxRequestContentBufferSize
                         HttpContent.MaxBufferSize));
                 }
 
-                CheckDisposed();
+                ObjectDisposedException.ThrowIf(_disposed, this);
 
                 // No-op on property setter.
             }
@@ -751,14 +751,6 @@ private void ThrowForModifiedManagedSslOptionsIfStarted()
             _socketHandler!.SslOptions = _socketHandler!.SslOptions;
         }
 
-        private void CheckDisposed()
-        {
-            if (_disposed)
-            {
-                throw new ObjectDisposedException(GetType().ToString());
-            }
-        }
-
         private object InvokeNativeHandlerMethod(string name, params object?[] parameters)
         {
             MethodInfo? method;

src/libraries/System.Net.Http/src/System/Net/Http/HttpClientHandler.cs

@@ -196,7 +196,7 @@ public long MaxRequestContentBufferSize
                         HttpContent.MaxBufferSize));
                 }
 
-                CheckDisposed();
+                ObjectDisposedException.ThrowIf(_disposed, this);
 
                 // No-op on property setter.
             }
@@ -327,13 +327,5 @@ private void ThrowForModifiedManagedSslOptionsIfStarted()
             // SslOptions is changed, since SslOptions itself does not do any such checks.
             _underlyingHandler.SslOptions = _underlyingHandler.SslOptions;
         }
-
-        private void CheckDisposed()
-        {
-            if (_disposed)
-            {
-                throw new ObjectDisposedException(GetType().ToString());
-            }
-        }
     }
 }

src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/CreditManager.cs

@@ -160,10 +160,7 @@ private int TryRequestCreditNoLock(int amount)
         {
             Debug.Assert(Monitor.IsEntered(SyncObject), "Shouldn't be called outside lock.");
 
-            if (_disposed)
-            {
-                throw new ObjectDisposedException($"{nameof(CreditManager)}:{_owner.GetType().Name}:{_name}");
-            }
+            ObjectDisposedException.ThrowIf(_disposed, this);
 
             if (_current > 0)
             {

src/libraries/System.Net.WebSockets/src/System/Net/WebSockets/ManagedWebSocket.cs

@@ -1396,11 +1396,7 @@ private void ThrowEOFUnexpected()
             // The connection closed before we were able to read everything we needed.
             // If it was due to us being disposed, fail with the correct exception.
             // Otherwise, it was due to the connection being closed and it wasn't expected.
-            if (_disposed)
-            {
-                throw new ObjectDisposedException(nameof(WebSocket));
-            }
-
+            ObjectDisposedException.ThrowIf(_disposed, typeof(WebSocket));
             throw new WebSocketException(WebSocketError.ConnectionClosedPrematurely);
         }