chore: use linq where possible

baywet · baywet · commit 79b8df94519d · 2025-10-07T15:27:17.000-04:00
Signed-off-by: Vincent Biret &lt;vibiret@microsoft.com&gt;
diff --git a/src/Microsoft.OpenApi/Reader/V31/OpenApiSchemaDeserializer.cs b/src/Microsoft.OpenApi/Reader/V31/OpenApiSchemaDeserializer.cs
@@ -197,13 +197,10 @@ internal static partial class OpenApiV31Deserializer
                 {
                     var list = n.CreateSimpleList((n2, p) => n2.GetScalarValue(), doc);
                     JsonSchemaType combinedType = 0;
-                    foreach(var type in list)
+                    foreach(var type in list.Where(static t => t is not null))
                     {
-                        if (type is not null)
-                        {
-                            var schemaType = type.ToJsonSchemaType();
-                            combinedType |= schemaType;
-                        }                            
+                        var schemaType = type.ToJsonSchemaType();
+                        combinedType |= schemaType;
                     }
                     o.Type = combinedType;
                 }
diff --git a/src/Microsoft.OpenApi/Reader/V32/OpenApiSchemaDeserializer.cs b/src/Microsoft.OpenApi/Reader/V32/OpenApiSchemaDeserializer.cs
@@ -197,13 +197,10 @@ internal static partial class OpenApiV32Deserializer
                 {
                     var list = n.CreateSimpleList((n2, p) => n2.GetScalarValue(), doc);
                     JsonSchemaType combinedType = 0;
-                    foreach(var type in list)
+                    foreach(var type in list.Where(static t => t is not null))
                     {
-                        if (type is not null)
-                        {
-                            var schemaType = type.ToJsonSchemaType();
-                            combinedType |= schemaType;
-                        }                            
+                        var schemaType = type.ToJsonSchemaType();
+                        combinedType |= schemaType;
                     }
                     o.Type = combinedType;
                 }

Original file line number	Diff line number	Diff line change
`@@ -197,13 +197,10 @@ internal static partial class OpenApiV31Deserializer`
`197`	`197`	`{`
`198`	`198`	`var list = n.CreateSimpleList((n2, p) => n2.GetScalarValue(), doc);`
`199`	`199`	`JsonSchemaType combinedType = 0;`
`200`		`- foreach(var type in list)`
	`200`	`+ foreach(var type in list.Where(static t => t is not null))`
`201`	`201`	`{`
`202`		`- if (type is not null)`
`203`		`- {`
`204`		`- var schemaType = type.ToJsonSchemaType();`
`205`		`- combinedType \|= schemaType;`
`206`		`- }`
	`202`	`+ var schemaType = type.ToJsonSchemaType();`
	`203`	`+ combinedType \|= schemaType;`
`207`	`204`	`}`
`208`	`205`	`o.Type = combinedType;`
`209`	`206`	`}`