Use exception throw helper (dotnet#2903)

Co-authored-by: Miha Zupan <[email protected]>

Author: WeihanLi

samples/ReverseProxy.Metrics.Sample/WebSocketsTelemetryConsumer.cs

@@ -13,7 +13,8 @@ public sealed class WebSocketsTelemetryConsumer : IWebSocketsTelemetryConsumer
 
         public WebSocketsTelemetryConsumer(ILogger<WebSocketsTelemetryConsumer> logger)
         {
-            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+            ArgumentNullException.ThrowIfNull(logger);
+            _logger = logger;
         }
 
         public void OnWebSocketClosed(DateTime timestamp, DateTime establishedTime, WebSocketCloseReason closeReason, long messagesRead, long messagesWritten)

src/Kubernetes.Controller/Caching/Endpoints.cs

@@ -14,10 +14,7 @@ public struct Endpoints
 {
     public Endpoints(V1Endpoints endpoints)
     {
-        if (endpoints is null)
-        {
-            throw new ArgumentNullException(nameof(endpoints));
-        }
+        ArgumentNullException.ThrowIfNull(endpoints);
 
         Name = endpoints.Name();
         Subsets = endpoints.Subsets;

src/Kubernetes.Controller/Caching/IngressCache.cs

@@ -32,18 +32,20 @@ public class IngressCache : ICache
 
     public IngressCache(IOptions<YarpOptions> options, IServerCertificateSelector certificateSelector, ICertificateHelper certificateHelper, ILogger<IngressCache> logger)
     {
-        _options = options?.Value ?? throw new ArgumentNullException(nameof(options));
-        _certificateSelector = certificateSelector ?? throw new ArgumentNullException(nameof(certificateSelector));
-        _certificateHelper = certificateHelper ?? throw new ArgumentNullException(nameof(certificateHelper));
-        _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+        ArgumentNullException.ThrowIfNull(options?.Value);
+        ArgumentNullException.ThrowIfNull(certificateSelector);
+        ArgumentNullException.ThrowIfNull(certificateHelper);
+        ArgumentNullException.ThrowIfNull(logger);
+
+        _options = options.Value;
+        _certificateSelector = certificateSelector;
+        _certificateHelper = certificateHelper;
+        _logger = logger;
     }
 
     public void Update(WatchEventType eventType, V1IngressClass ingressClass)
     {
-        if (ingressClass is null)
-        {
-            throw new ArgumentNullException(nameof(ingressClass));
-        }
+        ArgumentNullException.ThrowIfNull(ingressClass);
 
         if (!string.Equals(_options.ControllerClass, ingressClass.Spec.Controller, StringComparison.OrdinalIgnoreCase))
         {
@@ -72,10 +74,7 @@ public void Update(WatchEventType eventType, V1IngressClass ingressClass)
 
     public bool Update(WatchEventType eventType, V1Ingress ingress)
     {
-        if (ingress is null)
-        {
-            throw new ArgumentNullException(nameof(ingress));
-        }
+        ArgumentNullException.ThrowIfNull(ingress);
 
         Namespace(ingress.Namespace()).Update(eventType, ingress);
         return true;
@@ -84,10 +83,7 @@ public bool Update(WatchEventType eventType, V1Ingress ingress)
 
     public ImmutableList<string> Update(WatchEventType eventType, V1Service service)
     {
-        if (service is null)
-        {
-            throw new ArgumentNullException(nameof(service));
-        }
+        ArgumentNullException.ThrowIfNull(service);
 
         return Namespace(service.Namespace()).Update(eventType, service);
     }

src/Kubernetes.Controller/Caching/IngressClassData.cs

@@ -13,10 +13,7 @@ public struct IngressClassData
 {
     public IngressClassData(V1IngressClass ingressClass)
     {
-        if (ingressClass is null)
-        {
-            throw new ArgumentNullException(nameof(ingressClass));
-        }
+        ArgumentNullException.ThrowIfNull(ingressClass);
 
         IngressClass = ingressClass;
         IsDefault = GetDefaultAnnotation(ingressClass);

src/Kubernetes.Controller/Caching/IngressData.cs

@@ -13,10 +13,7 @@ public struct IngressData
 {
     public IngressData(V1Ingress ingress)
     {
-        if (ingress is null)
-        {
-            throw new ArgumentNullException(nameof(ingress));
-        }
+        ArgumentNullException.ThrowIfNull(ingress);
 
         Spec = ingress.Spec;
         Metadata = ingress.Metadata;

src/Kubernetes.Controller/Caching/NamespaceCache.cs

@@ -26,10 +26,7 @@ public class NamespaceCache
 
     public void Update(WatchEventType eventType, V1Ingress ingress)
     {
-        if (ingress is null)
-        {
-            throw new ArgumentNullException(nameof(ingress));
-        }
+        ArgumentNullException.ThrowIfNull(ingress);
 
         var serviceNames = ImmutableList<string>.Empty;
 
@@ -121,10 +118,7 @@ public void Update(WatchEventType eventType, V1Ingress ingress)
 
     public ImmutableList<string> Update(WatchEventType eventType, V1Service service)
     {
-        if (service is null)
-        {
-            throw new ArgumentNullException(nameof(service));
-        }
+        ArgumentNullException.ThrowIfNull(service);
 
         var serviceName = service.Name();
         lock (_sync)
@@ -151,10 +145,7 @@ public ImmutableList<string> Update(WatchEventType eventType, V1Service service)
 
     public void GetKeys(string ns, List<NamespacedName> keys)
     {
-        if (keys is null)
-        {
-            throw new ArgumentNullException(nameof(keys));
-        }
+        ArgumentNullException.ThrowIfNull(keys);
 
         lock (_sync)
         {
@@ -167,10 +158,7 @@ public void GetKeys(string ns, List<NamespacedName> keys)
 
     public ImmutableList<string> Update(WatchEventType eventType, V1Endpoints endpoints)
     {
-        if (endpoints is null)
-        {
-            throw new ArgumentNullException(nameof(endpoints));
-        }
+        ArgumentNullException.ThrowIfNull(endpoints);
 
         var serviceName = endpoints.Name();
         lock (_sync)

src/Kubernetes.Controller/Caching/ServiceData.cs

@@ -13,10 +13,7 @@ public struct ServiceData
 {
     public ServiceData(V1Service service)
     {
-        if (service is null)
-        {
-            throw new ArgumentNullException(nameof(service));
-        }
+        ArgumentNullException.ThrowIfNull(service);
 
         Spec = service.Spec;
         Metadata = service.Metadata;

src/Kubernetes.Controller/Certificates/CertificateHelper.cs

@@ -19,7 +19,8 @@ public class CertificateHelper : ICertificateHelper
 
     public CertificateHelper(ILogger<CertificateHelper> logger)
     {
-        _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+        ArgumentNullException.ThrowIfNull(logger);
+        _logger = logger;
     }
 
     public X509Certificate2 ConvertCertificate(NamespacedName namespacedName, V1Secret secret)

src/Kubernetes.Controller/Client/ResourceInformer.cs

@@ -54,8 +54,11 @@ public ResourceInformer(
         ILogger logger)
         : base(hostApplicationLifetime, logger)
     {
+        ArgumentNullException.ThrowIfNull(client);
+        ArgumentNullException.ThrowIfNull(selector);
+
         Client = client;
-        _selector = selector ?? throw new ArgumentNullException(nameof(selector));
+        _selector = selector;
         _names = GroupApiVersionKind.From<TResource>();
     }
 

src/Kubernetes.Controller/Client/V1IngressResourceStatusUpdater.cs

@@ -25,7 +25,8 @@ public V1IngressResourceStatusUpdater(
         ICache cache,
         ILogger<V1ServiceResourceInformer> logger)
     {
-        _options = options?.Value ?? throw new ArgumentNullException(nameof(options));
+        ArgumentNullException.ThrowIfNull(options?.Value);
+        _options = options.Value;
         _client = client;
         _cache = cache;
         _logger = logger;