fix: 3.0 serialization when type is set to null

Signed-off-by: Vincent Biret <[email protected]>
microsoft · Jan 31, 2025 · 920a51a · 920a51a
1 parent 121bb48
commit 920a51a
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/Microsoft.OpenApi/Models/OpenApiSchema.cs b/src/Microsoft.OpenApi/Models/OpenApiSchema.cs
@@ -632,7 +632,8 @@ private void SerializeAsV2(
         private void SerializeTypeProperty(JsonSchemaType? type, IOpenApiWriter writer, OpenApiSpecVersion version)
         {
             // check whether nullable is true for upcasting purposes
-            var isNullable = Nullable || 
+            var isNullable = Nullable ||
+                            Type is JsonSchemaType.Null ||
                                 Extensions is not null &&
                                 Extensions.TryGetValue(OpenApiConstants.NullableExtension, out var nullExtRawValue) && 
                                 nullExtRawValue is OpenApiAny { Node: JsonNode jsonNode} &&
@@ -652,9 +653,14 @@ Extensions is not null &&
                     case OpenApiSpecVersion.OpenApi3_1 when isNullable:
                         UpCastSchemaTypeToV31(type.Value, writer);
                         break;
-                    case OpenApiSpecVersion.OpenApi3_0 when isNullable:
+                    case OpenApiSpecVersion.OpenApi3_0 when isNullable && type.Value == JsonSchemaType.Null:
                         writer.WriteProperty(OpenApiConstants.Nullable, true);
-                        goto default;
+                        writer.WriteProperty(OpenApiConstants.Type, JsonSchemaType.Object.ToIdentifier());
+                        break;
+                    case OpenApiSpecVersion.OpenApi3_0 when isNullable && type.Value != JsonSchemaType.Null:
+                        writer.WriteProperty(OpenApiConstants.Nullable, true);
+                        writer.WriteProperty(OpenApiConstants.Type, type.Value.ToIdentifier());
+                        break;
                     default:
                         writer.WriteProperty(OpenApiConstants.Type, type.Value.ToIdentifier());
                         break;