Merge pull request #50 from BinkyLabs/chore/pr-automated-feedback

Chore/pr-automated-feedback

Author: baywet

src/Microsoft.OpenApi/Models/OpenApiPathItem.cs

@@ -170,10 +170,12 @@ internal virtual void SerializeInternal(IOpenApiWriter writer, OpenApiSpecVersio
 
             var standardMethodsNames = version switch
             {
-                OpenApiSpecVersion.OpenApi2_0 => _standardHttp2MethodsNames,
-                OpenApiSpecVersion.OpenApi3_0 => _standardHttp30MethodsNames,
+                OpenApiSpecVersion.OpenApi3_2 => _standardHttp32MethodsNames,
                 OpenApiSpecVersion.OpenApi3_1 => _standardHttp31MethodsNames,
-                OpenApiSpecVersion.OpenApi3_2 or _ => _standardHttp32MethodsNames,
+                OpenApiSpecVersion.OpenApi3_0 => _standardHttp30MethodsNames,
+                // OpenAPI 2.0 supports the fewest methods, so it's the safest default in case of an unknown version.
+                // This way the library will emit additional methods as extensions instead of producing a potentially invalid spec.
+                _ => _standardHttp2MethodsNames,
             };
 
             // operations

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;
                 }

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;
                 }