Merge pull request #1421 from SimonCropp/only-null-check-on-public-apis

baywet · web-flow · commit 7ca97308b4df · 2023-10-10T08:29:33.000-04:00
only null check on public apis
diff --git a/src/Microsoft.OpenApi/Extensions/OpenApiSerializableExtensions.cs b/src/Microsoft.OpenApi/Extensions/OpenApiSerializableExtensions.cs
@@ -98,7 +98,6 @@ public static void Serialize<T>(
         /// <param name="element">The Open API element.</param>
         /// <param name="writer">The output writer.</param>
         /// <param name="specVersion">Version of the specification the output should conform to</param>
-
         public static void Serialize<T>(this T element, IOpenApiWriter writer, OpenApiSpecVersion specVersion)
             where T : IOpenApiSerializable
         {
diff --git a/src/Microsoft.OpenApi/Models/OpenApiContact.cs b/src/Microsoft.OpenApi/Models/OpenApiContact.cs
@@ -68,8 +68,6 @@ public void SerializeAsV2(IOpenApiWriter writer)
 
         private void WriteInternal(IOpenApiWriter writer, OpenApiSpecVersion specVersion)
         {
-            Utils.CheckArgumentNull(writer);
-
             writer.WriteStartObject();
 
             // name
diff --git a/src/Microsoft.OpenApi/Models/OpenApiExternalDocs.cs b/src/Microsoft.OpenApi/Models/OpenApiExternalDocs.cs
@@ -61,8 +61,6 @@ public void SerializeAsV2(IOpenApiWriter writer)
 
         private void WriteInternal(IOpenApiWriter writer, OpenApiSpecVersion specVersion)
         {
-            Utils.CheckArgumentNull(writer);
-
             writer.WriteStartObject();
 
             // description
diff --git a/src/Microsoft.OpenApi/Models/OpenApiLicense.cs b/src/Microsoft.OpenApi/Models/OpenApiLicense.cs
@@ -61,8 +61,6 @@ public void SerializeAsV2(IOpenApiWriter writer)
 
         private void WriteInternal(IOpenApiWriter writer, OpenApiSpecVersion specVersion)
         {
-            Utils.CheckArgumentNull(writer);
-
             writer.WriteStartObject();
 
             // name
diff --git a/src/Microsoft.OpenApi/Models/OpenApiSchema.cs b/src/Microsoft.OpenApi/Models/OpenApiSchema.cs
@@ -493,8 +493,6 @@ internal void SerializeAsV2(
             ISet<string> parentRequiredProperties,
             string propertyName)
         {
-            Utils.CheckArgumentNull(writer);
-
             var settings = writer.GetSettings();
             var target = this;
 
@@ -554,8 +552,6 @@ internal void SerializeAsV2WithoutReference(
 
         internal void WriteAsItemsProperties(IOpenApiWriter writer)
         {
-            Utils.CheckArgumentNull(writer);
-
             // type
             writer.WriteProperty(OpenApiConstants.Type, Type);
 
@@ -625,8 +621,6 @@ internal void WriteAsSchemaProperties(
             ISet<string> parentRequiredProperties,
             string propertyName)
         {
-            Utils.CheckArgumentNull(writer);
-
             // format
             if (string.IsNullOrEmpty(Format))
             {
diff --git a/src/Microsoft.OpenApi/Models/OpenApiXml.cs b/src/Microsoft.OpenApi/Models/OpenApiXml.cs
@@ -81,8 +81,6 @@ public void SerializeAsV2(IOpenApiWriter writer)
 
         private void Write(IOpenApiWriter writer, OpenApiSpecVersion specVersion)
         {
-            Utils.CheckArgumentNull(writer);
-
             writer.WriteStartObject();
 
             // name
diff --git a/src/Microsoft.OpenApi/Validations/ValidationRule.cs b/src/Microsoft.OpenApi/Validations/ValidationRule.cs
@@ -50,8 +50,6 @@ internal override Type ElementType
 
         internal override void Evaluate(IValidationContext context, object item)
         {
-            Utils.CheckArgumentNull(context);
-
             if (item == null)
             {
                 return;
diff --git a/src/Microsoft.OpenApi/Writers/OpenApiWriterAnyExtensions.cs b/src/Microsoft.OpenApi/Writers/OpenApiWriterAnyExtensions.cs
@@ -73,9 +73,6 @@ public static void WriteAny<T>(this IOpenApiWriter writer, T any) where T : IOpe
 
         private static void WriteArray(this IOpenApiWriter writer, OpenApiArray array)
         {
-            Utils.CheckArgumentNull(writer);
-            Utils.CheckArgumentNull(array);
-
             writer.WriteStartArray();
 
             foreach (var item in array)
@@ -88,9 +85,6 @@ private static void WriteArray(this IOpenApiWriter writer, OpenApiArray array)
 
         private static void WriteObject(this IOpenApiWriter writer, OpenApiObject entity)
         {
-            Utils.CheckArgumentNull(writer);
-            Utils.CheckArgumentNull(entity);
-
             writer.WriteStartObject();
 
             foreach (var item in entity)
@@ -104,9 +98,6 @@ private static void WriteObject(this IOpenApiWriter writer, OpenApiObject entity
 
         private static void WritePrimitive(this IOpenApiWriter writer, IOpenApiPrimitive primitive)
         {
-            Utils.CheckArgumentNull(writer);
-            Utils.CheckArgumentNull(primitive);
-
             // The Spec version is meaning for the Any type, so it's ok to use the latest one.
             primitive.Write(writer, OpenApiSpecVersion.OpenApi3_0);
         }
diff --git a/src/Microsoft.OpenApi/Writers/OpenApiWriterExtensions.cs b/src/Microsoft.OpenApi/Writers/OpenApiWriterExtensions.cs
@@ -402,22 +402,16 @@ private static void WriteMapInternal<T>(
 
         private static void CheckArguments<T>(IOpenApiWriter writer, string name, Action<IOpenApiWriter, T> action)
         {
-            CheckArguments(writer, name);
-
             Utils.CheckArgumentNull(action);
         }
 
         private static void CheckArguments<T>(IOpenApiWriter writer, string name, Action<IOpenApiWriter, string, T> action)
         {
-            CheckArguments(writer, name);
-
             Utils.CheckArgumentNull(action);
         }
 
         private static void CheckArguments(IOpenApiWriter writer, string name)
         {
-            Utils.CheckArgumentNull(writer);
-
             Utils.CheckArgumentNullOrEmpty(name);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,6 @@ public static void Serialize<T>(`
`98`	`98`	`/// <param name="element">The Open API element.</param>`
`99`	`99`	`/// <param name="writer">The output writer.</param>`
`100`	`100`	`/// <param name="specVersion">Version of the specification the output should conform to</param>`
`101`		`-`
`102`	`101`	`public static void Serialize<T>(this T element, IOpenApiWriter writer, OpenApiSpecVersion specVersion)`
`103`	`102`	`where T : IOpenApiSerializable`
`104`	`103`	`{`
Original file line number	Diff line number	Diff line change
`@@ -68,8 +68,6 @@ public void SerializeAsV2(IOpenApiWriter writer)`
`68`	`68`
`69`	`69`	`private void WriteInternal(IOpenApiWriter writer, OpenApiSpecVersion specVersion)`
`70`	`70`	`{`
`71`		`- Utils.CheckArgumentNull(writer);`
`72`		`-`
`73`	`71`	`writer.WriteStartObject();`
`74`	`72`
`75`	`73`	`// name`
Original file line number	Diff line number	Diff line change
`@@ -61,8 +61,6 @@ public void SerializeAsV2(IOpenApiWriter writer)`
`61`	`61`
`62`	`62`	`private void WriteInternal(IOpenApiWriter writer, OpenApiSpecVersion specVersion)`
`63`	`63`	`{`
`64`		`- Utils.CheckArgumentNull(writer);`
`65`		`-`
`66`	`64`	`writer.WriteStartObject();`
`67`	`65`
`68`	`66`	`// description`
Original file line number	Diff line number	Diff line change
`@@ -493,8 +493,6 @@ internal void SerializeAsV2(`
`493`	`493`	`ISet<string> parentRequiredProperties,`
`494`	`494`	`string propertyName)`
`495`	`495`	`{`
`496`		`- Utils.CheckArgumentNull(writer);`
`497`		`-`
`498`	`496`	`var settings = writer.GetSettings();`
`499`	`497`	`var target = this;`
`500`	`498`
`@@ -554,8 +552,6 @@ internal void SerializeAsV2WithoutReference(`
`554`	`552`
`555`	`553`	`internal void WriteAsItemsProperties(IOpenApiWriter writer)`
`556`	`554`	`{`
`557`		`- Utils.CheckArgumentNull(writer);`
`558`		`-`
`559`	`555`	`// type`
`560`	`556`	`writer.WriteProperty(OpenApiConstants.Type, Type);`
`561`	`557`
`@@ -625,8 +621,6 @@ internal void WriteAsSchemaProperties(`
`625`	`621`	`ISet<string> parentRequiredProperties,`
`626`	`622`	`string propertyName)`
`627`	`623`	`{`
`628`		`- Utils.CheckArgumentNull(writer);`
`629`		`-`
`630`	`624`	`// format`
`631`	`625`	`if (string.IsNullOrEmpty(Format))`
`632`	`626`	`{`
Original file line number	Diff line number	Diff line change
`@@ -81,8 +81,6 @@ public void SerializeAsV2(IOpenApiWriter writer)`
`81`	`81`
`82`	`82`	`private void Write(IOpenApiWriter writer, OpenApiSpecVersion specVersion)`
`83`	`83`	`{`
`84`		`- Utils.CheckArgumentNull(writer);`
`85`		`-`
`86`	`84`	`writer.WriteStartObject();`
`87`	`85`
`88`	`86`	`// name`
Original file line number	Diff line number	Diff line change
`@@ -50,8 +50,6 @@ internal override Type ElementType`
`50`	`50`
`51`	`51`	`internal override void Evaluate(IValidationContext context, object item)`
`52`	`52`	`{`
`53`		`- Utils.CheckArgumentNull(context);`
`54`		`-`
`55`	`53`	`if (item == null)`
`56`	`54`	`{`
`57`	`55`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -73,9 +73,6 @@ public static void WriteAny<T>(this IOpenApiWriter writer, T any) where T : IOpe`
`73`	`73`
`74`	`74`	`private static void WriteArray(this IOpenApiWriter writer, OpenApiArray array)`
`75`	`75`	`{`
`76`		`- Utils.CheckArgumentNull(writer);`
`77`		`- Utils.CheckArgumentNull(array);`
`78`		`-`
`79`	`76`	`writer.WriteStartArray();`
`80`	`77`
`81`	`78`	`foreach (var item in array)`
`@@ -88,9 +85,6 @@ private static void WriteArray(this IOpenApiWriter writer, OpenApiArray array)`
`88`	`85`
`89`	`86`	`private static void WriteObject(this IOpenApiWriter writer, OpenApiObject entity)`
`90`	`87`	`{`
`91`		`- Utils.CheckArgumentNull(writer);`
`92`		`- Utils.CheckArgumentNull(entity);`
`93`		`-`
`94`	`88`	`writer.WriteStartObject();`
`95`	`89`
`96`	`90`	`foreach (var item in entity)`
`@@ -104,9 +98,6 @@ private static void WriteObject(this IOpenApiWriter writer, OpenApiObject entity`
`104`	`98`
`105`	`99`	`private static void WritePrimitive(this IOpenApiWriter writer, IOpenApiPrimitive primitive)`
`106`	`100`	`{`
`107`		`- Utils.CheckArgumentNull(writer);`
`108`		`- Utils.CheckArgumentNull(primitive);`
`109`		`-`
`110`	`101`	`// The Spec version is meaning for the Any type, so it's ok to use the latest one.`
`111`	`102`	`primitive.Write(writer, OpenApiSpecVersion.OpenApi3_0);`
`112`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -402,22 +402,16 @@ private static void WriteMapInternal<T>(`
`402`	`402`
`403`	`403`	`private static void CheckArguments<T>(IOpenApiWriter writer, string name, Action<IOpenApiWriter, T> action)`
`404`	`404`	`{`
`405`		`- CheckArguments(writer, name);`
`406`		`-`
`407`	`405`	`Utils.CheckArgumentNull(action);`
`408`	`406`	`}`
`409`	`407`
`410`	`408`	`private static void CheckArguments<T>(IOpenApiWriter writer, string name, Action<IOpenApiWriter, string, T> action)`
`411`	`409`	`{`
`412`		`- CheckArguments(writer, name);`
`413`		`-`
`414`	`410`	`Utils.CheckArgumentNull(action);`
`415`	`411`	`}`
`416`	`412`
`417`	`413`	`private static void CheckArguments(IOpenApiWriter writer, string name)`
`418`	`414`	`{`
`419`		`- Utils.CheckArgumentNull(writer);`
`420`		`-`
`421`	`415`	`Utils.CheckArgumentNullOrEmpty(name);`
`422`	`416`	`}`
`423`	`417`	`}`