Merge pull request #1388 from SimonCropp/cleanup-exception-handling

cleanup exception handling

Author: baywet

src/Microsoft.OpenApi/Attributes/DisplayAttribute.cs

@@ -17,12 +17,7 @@ public class DisplayAttribute : Attribute
         /// <param name="name">The display name.</param>
         public DisplayAttribute(string name)
         {
-            if (string.IsNullOrWhiteSpace(name))
-            {
-                throw Error.ArgumentNullOrWhiteSpace(nameof(name));
-            }
-
-            Name = name;
+            Name = Utils.CheckArgumentNullOrEmpty(name);
         }
 
         /// <summary>

src/Microsoft.OpenApi/CallerArgumentExpressionAttribute.cs

@@ -0,0 +1,18 @@
+#if !NETCOREAPP3_1_OR_GREATER
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+
+namespace System.Runtime.CompilerServices;
+
+[ExcludeFromCodeCoverage]
+[DebuggerNonUserCode]
+[AttributeUsage(AttributeTargets.Parameter)]
+sealed class CallerArgumentExpressionAttribute :
+    Attribute
+{
+    public CallerArgumentExpressionAttribute(string parameterName) =>
+        ParameterName = parameterName;
+
+    public string ParameterName { get; }
+}
+#endif

src/Microsoft.OpenApi/Error.cs

@@ -33,10 +33,7 @@ public BodyExpression()
         public BodyExpression(JsonPointer pointer)
             : base(pointer?.ToString())
         {
-            if (pointer == null)
-            {
-                throw Error.ArgumentNull(nameof(pointer));
-            }
+            Utils.CheckArgumentNull(pointer);
         }
 
         /// <summary>

src/Microsoft.OpenApi/Expressions/BodyExpression.cs

@@ -20,10 +20,7 @@ public class HeaderExpression : SourceExpression
         public HeaderExpression(string token)
             : base(token)
         {
-            if (string.IsNullOrWhiteSpace(token))
-            {
-                throw Error.ArgumentNullOrWhiteSpace(nameof(token));
-            }
+            Utils.CheckArgumentNullOrEmpty(token);
         }
 
         /// <summary>

src/Microsoft.OpenApi/Expressions/HeaderExpression.cs

@@ -20,10 +20,7 @@ public sealed class PathExpression : SourceExpression
         public PathExpression(string name)
             : base(name)
         {
-            if (string.IsNullOrWhiteSpace(name))
-            {
-                throw Error.ArgumentNullOrWhiteSpace(nameof(name));
-            }
+            Utils.CheckArgumentNullOrEmpty(name);
         }
 
         /// <summary>

src/Microsoft.OpenApi/Expressions/PathExpression.cs

@@ -20,10 +20,7 @@ public sealed class QueryExpression : SourceExpression
         public QueryExpression(string name)
             : base(name)
         {
-            if (string.IsNullOrWhiteSpace(name))
-            {
-                throw Error.ArgumentNullOrWhiteSpace(nameof(name));
-            }
+            Utils.CheckArgumentNullOrEmpty(name);
         }
 
         /// <summary>

src/Microsoft.OpenApi/Expressions/QueryExpression.cs

@@ -19,7 +19,7 @@ public sealed class RequestExpression : RuntimeExpression
         /// <param name="source">The source of the request.</param>
         public RequestExpression(SourceExpression source)
         {
-            Source = source ?? throw Error.ArgumentNull(nameof(source));
+            Source = Utils.CheckArgumentNull(source);
         }
 
         /// <summary>

src/Microsoft.OpenApi/Expressions/RequestExpression.cs

@@ -19,7 +19,7 @@ public sealed class ResponseExpression : RuntimeExpression
         /// <param name="source">The source of the response.</param>
         public ResponseExpression(SourceExpression source)
         {
-            Source = source ?? throw Error.ArgumentNull(nameof(source));
+            Source = Utils.CheckArgumentNull(source);
         }
 
         /// <summary>

src/Microsoft.OpenApi/Expressions/ResponseExpression.cs

@@ -29,10 +29,7 @@ public abstract class RuntimeExpression : IEquatable<RuntimeExpression>
         /// <returns>The built runtime expression object.</returns>
         public static RuntimeExpression Build(string expression)
         {
-            if (string.IsNullOrWhiteSpace(expression))
-            {
-                throw Error.ArgumentNullOrWhiteSpace(nameof(expression));
-            }
+            Utils.CheckArgumentNullOrEmpty(expression);
 
             if (!expression.StartsWith(Prefix))
             {