Merge pull request #1887 from microsoft/mk/simplify-null-check

MaggieKimani1 · web-flow · commit c3373af45b6c · 2024-10-23T13:11:22.000+03:00
Simplify null/empty string checks
diff --git a/src/Microsoft.OpenApi/Models/References/OpenApiCallbackReference.cs b/src/Microsoft.OpenApi/Models/References/OpenApiCallbackReference.cs
@@ -38,10 +38,7 @@ private OpenApiCallback Target
         /// </param>
         public OpenApiCallbackReference(string referenceId, OpenApiDocument hostDocument, string externalResource = null)
         {
-            if (string.IsNullOrEmpty(referenceId))
-            {
-                Utils.CheckArgumentNullOrEmpty(referenceId);
-            }
+            Utils.CheckArgumentNullOrEmpty(referenceId);
 
             _reference = new OpenApiReference()
             {                
diff --git a/src/Microsoft.OpenApi/Models/References/OpenApiExampleReference.cs b/src/Microsoft.OpenApi/Models/References/OpenApiExampleReference.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Text.Json.Nodes;
-using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Writers;
 
@@ -44,10 +43,7 @@ private OpenApiExample Target
         /// </param>
         public OpenApiExampleReference(string referenceId, OpenApiDocument hostDocument, string externalResource = null)
         {
-            if (string.IsNullOrEmpty(referenceId))
-            {
-                Utils.CheckArgumentNullOrEmpty(referenceId);
-            }
+            Utils.CheckArgumentNullOrEmpty(referenceId);
 
             _reference = new OpenApiReference()
             {
diff --git a/src/Microsoft.OpenApi/Models/References/OpenApiHeaderReference.cs b/src/Microsoft.OpenApi/Models/References/OpenApiHeaderReference.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Text.Json.Nodes;
-using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Writers;
 
@@ -41,11 +40,8 @@ private OpenApiHeader Target
         /// 2. a Url, for example: http://localhost/pet.json
         /// </param>
         public OpenApiHeaderReference(string referenceId, OpenApiDocument hostDocument, string externalResource = null)
-        {            
-            if (string.IsNullOrEmpty(referenceId))
-            {
-                Utils.CheckArgumentNullOrEmpty(referenceId);
-            }
+        {
+            Utils.CheckArgumentNullOrEmpty(referenceId);
 
             _reference = new OpenApiReference()
             {
diff --git a/src/Microsoft.OpenApi/Models/References/OpenApiLinkReference.cs b/src/Microsoft.OpenApi/Models/References/OpenApiLinkReference.cs
@@ -40,10 +40,7 @@ private OpenApiLink Target
         /// </param>
         public OpenApiLinkReference(string referenceId, OpenApiDocument hostDocument, string externalResource = null)
         {
-            if (string.IsNullOrEmpty(referenceId))
-            {
-                Utils.CheckArgumentNullOrEmpty(referenceId);
-            }
+            Utils.CheckArgumentNullOrEmpty(referenceId);
 
             _reference = new OpenApiReference()
             {
diff --git a/src/Microsoft.OpenApi/Models/References/OpenApiParameterReference.cs b/src/Microsoft.OpenApi/Models/References/OpenApiParameterReference.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Text.Json.Nodes;
-using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Writers;
 
@@ -44,10 +43,7 @@ private OpenApiParameter Target
         /// </param>
         public OpenApiParameterReference(string referenceId, OpenApiDocument hostDocument, string externalResource = null)
         {
-            if (string.IsNullOrEmpty(referenceId))
-            {
-                Utils.CheckArgumentNullOrEmpty(referenceId);
-            }
+            Utils.CheckArgumentNullOrEmpty(referenceId);
 
             _reference = new OpenApiReference()
             {
diff --git a/src/Microsoft.OpenApi/Models/References/OpenApiPathItemReference.cs b/src/Microsoft.OpenApi/Models/References/OpenApiPathItemReference.cs
@@ -42,10 +42,7 @@ private OpenApiPathItem Target
         /// </param>
         public OpenApiPathItemReference(string referenceId, OpenApiDocument hostDocument, string externalResource = null)
         {
-            if (string.IsNullOrEmpty(referenceId))
-            {
-                Utils.CheckArgumentNullOrEmpty(referenceId);
-            }
+            Utils.CheckArgumentNullOrEmpty(referenceId);
 
             _reference = new OpenApiReference()
             {
diff --git a/src/Microsoft.OpenApi/Models/References/OpenApiRequestBodyReference.cs b/src/Microsoft.OpenApi/Models/References/OpenApiRequestBodyReference.cs
@@ -40,10 +40,7 @@ private OpenApiRequestBody Target
         /// </param>
         public OpenApiRequestBodyReference(string referenceId, OpenApiDocument hostDocument, string externalResource = null)
         {
-            if (string.IsNullOrEmpty(referenceId))
-            {
-                Utils.CheckArgumentNullOrEmpty(referenceId);
-            }
+            Utils.CheckArgumentNullOrEmpty(referenceId);
 
             _reference = new OpenApiReference()
             {
diff --git a/src/Microsoft.OpenApi/Models/References/OpenApiResponseReference.cs b/src/Microsoft.OpenApi/Models/References/OpenApiResponseReference.cs
@@ -40,10 +40,7 @@ private OpenApiResponse Target
         /// </param>
         public OpenApiResponseReference(string referenceId, OpenApiDocument hostDocument, string externalResource = null)
         {
-            if (string.IsNullOrEmpty(referenceId))
-            {
-                Utils.CheckArgumentNullOrEmpty(referenceId);
-            }
+            Utils.CheckArgumentNullOrEmpty(referenceId);
 
             _reference = new OpenApiReference()
             {
diff --git a/src/Microsoft.OpenApi/Models/References/OpenApiSchemaReference.cs b/src/Microsoft.OpenApi/Models/References/OpenApiSchemaReference.cs
@@ -41,10 +41,7 @@ private OpenApiSchema Target
         /// </param>
         public OpenApiSchemaReference(string referenceId, OpenApiDocument hostDocument, string externalResource = null)
         {
-            if (string.IsNullOrEmpty(referenceId))
-            {
-                Utils.CheckArgumentNullOrEmpty(referenceId);
-            }
+            Utils.CheckArgumentNullOrEmpty(referenceId);
 
             _reference = new OpenApiReference()
             {
diff --git a/src/Microsoft.OpenApi/Models/References/OpenApiSecuritySchemeReference.cs b/src/Microsoft.OpenApi/Models/References/OpenApiSecuritySchemeReference.cs
@@ -36,10 +36,7 @@ private OpenApiSecurityScheme Target
         /// <param name="externalResource">The externally referenced file.</param>
         public OpenApiSecuritySchemeReference(string referenceId, OpenApiDocument hostDocument, string externalResource = null)
         {
-            if (string.IsNullOrEmpty(referenceId))
-            {
-                Utils.CheckArgumentNullOrEmpty(referenceId);
-            }
+            Utils.CheckArgumentNullOrEmpty(referenceId);
 
             _reference = new OpenApiReference()
             {
diff --git a/src/Microsoft.OpenApi/Models/References/OpenApiTagReference.cs b/src/Microsoft.OpenApi/Models/References/OpenApiTagReference.cs
@@ -35,10 +35,7 @@ private OpenApiTag Target
         /// <param name="hostDocument">The host OpenAPI document.</param>
         public OpenApiTagReference(string referenceId, OpenApiDocument hostDocument)
         {
-            if (string.IsNullOrEmpty(referenceId))
-            {
-                Utils.CheckArgumentNullOrEmpty(referenceId);
-            }
+            Utils.CheckArgumentNullOrEmpty(referenceId);
 
             _reference = new OpenApiReference()
             {

Original file line number	Diff line number	Diff line change
`@@ -38,10 +38,7 @@ private OpenApiCallback Target`
`38`	`38`	`/// </param>`
`39`	`39`	`public OpenApiCallbackReference(string referenceId, OpenApiDocument hostDocument, string externalResource = null)`
`40`	`40`	`{`
`41`		`- if (string.IsNullOrEmpty(referenceId))`
`42`		`- {`
`43`		`- Utils.CheckArgumentNullOrEmpty(referenceId);`
`44`		`- }`
	`41`	`+ Utils.CheckArgumentNullOrEmpty(referenceId);`
`45`	`42`
`46`	`43`	`_reference = new OpenApiReference()`
`47`	`44`	`{`
Original file line number	Diff line number	Diff line change
`@@ -40,10 +40,7 @@ private OpenApiLink Target`
`40`	`40`	`/// </param>`
`41`	`41`	`public OpenApiLinkReference(string referenceId, OpenApiDocument hostDocument, string externalResource = null)`
`42`	`42`	`{`
`43`		`- if (string.IsNullOrEmpty(referenceId))`
`44`		`- {`
`45`		`- Utils.CheckArgumentNullOrEmpty(referenceId);`
`46`		`- }`
	`43`	`+ Utils.CheckArgumentNullOrEmpty(referenceId);`
`47`	`44`
`48`	`45`	`_reference = new OpenApiReference()`
`49`	`46`	`{`
Original file line number	Diff line number	Diff line change
`@@ -42,10 +42,7 @@ private OpenApiPathItem Target`
`42`	`42`	`/// </param>`
`43`	`43`	`public OpenApiPathItemReference(string referenceId, OpenApiDocument hostDocument, string externalResource = null)`
`44`	`44`	`{`
`45`		`- if (string.IsNullOrEmpty(referenceId))`
`46`		`- {`
`47`		`- Utils.CheckArgumentNullOrEmpty(referenceId);`
`48`		`- }`
	`45`	`+ Utils.CheckArgumentNullOrEmpty(referenceId);`
`49`	`46`
`50`	`47`	`_reference = new OpenApiReference()`
`51`	`48`	`{`
Original file line number	Diff line number	Diff line change
`@@ -40,10 +40,7 @@ private OpenApiRequestBody Target`
`40`	`40`	`/// </param>`
`41`	`41`	`public OpenApiRequestBodyReference(string referenceId, OpenApiDocument hostDocument, string externalResource = null)`
`42`	`42`	`{`
`43`		`- if (string.IsNullOrEmpty(referenceId))`
`44`		`- {`
`45`		`- Utils.CheckArgumentNullOrEmpty(referenceId);`
`46`		`- }`
	`43`	`+ Utils.CheckArgumentNullOrEmpty(referenceId);`
`47`	`44`
`48`	`45`	`_reference = new OpenApiReference()`
`49`	`46`	`{`
Original file line number	Diff line number	Diff line change
`@@ -40,10 +40,7 @@ private OpenApiResponse Target`
`40`	`40`	`/// </param>`
`41`	`41`	`public OpenApiResponseReference(string referenceId, OpenApiDocument hostDocument, string externalResource = null)`
`42`	`42`	`{`
`43`		`- if (string.IsNullOrEmpty(referenceId))`
`44`		`- {`
`45`		`- Utils.CheckArgumentNullOrEmpty(referenceId);`
`46`		`- }`
	`43`	`+ Utils.CheckArgumentNullOrEmpty(referenceId);`
`47`	`44`
`48`	`45`	`_reference = new OpenApiReference()`
`49`	`46`	`{`
Original file line number	Diff line number	Diff line change
`@@ -41,10 +41,7 @@ private OpenApiSchema Target`
`41`	`41`	`/// </param>`
`42`	`42`	`public OpenApiSchemaReference(string referenceId, OpenApiDocument hostDocument, string externalResource = null)`
`43`	`43`	`{`
`44`		`- if (string.IsNullOrEmpty(referenceId))`
`45`		`- {`
`46`		`- Utils.CheckArgumentNullOrEmpty(referenceId);`
`47`		`- }`
	`44`	`+ Utils.CheckArgumentNullOrEmpty(referenceId);`
`48`	`45`
`49`	`46`	`_reference = new OpenApiReference()`
`50`	`47`	`{`
Original file line number	Diff line number	Diff line change
`@@ -36,10 +36,7 @@ private OpenApiSecurityScheme Target`
`36`	`36`	`/// <param name="externalResource">The externally referenced file.</param>`
`37`	`37`	`public OpenApiSecuritySchemeReference(string referenceId, OpenApiDocument hostDocument, string externalResource = null)`
`38`	`38`	`{`
`39`		`- if (string.IsNullOrEmpty(referenceId))`
`40`		`- {`
`41`		`- Utils.CheckArgumentNullOrEmpty(referenceId);`
`42`		`- }`
	`39`	`+ Utils.CheckArgumentNullOrEmpty(referenceId);`
`43`	`40`
`44`	`41`	`_reference = new OpenApiReference()`
`45`	`42`	`{`