Skip to content

Commit 60c0b8e

Browse files
committed
Remove check on HasMultipleTypes as WriteUnifiedType will do this check as well
1 parent 3673612 commit 60c0b8e

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

src/Microsoft.OpenApi/Models/OpenApiSchema.cs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -884,15 +884,7 @@ private static (IList<IOpenApiSchema>? effective, JsonSchemaType? inferredType,
884884
commonType |= schema.Type.GetValueOrDefault() & ~JsonSchemaType.Null;
885885
}
886886

887-
if (HasMultipleTypes(commonType) || commonType == 0)
888-
{
889-
return (nonNullSchemas, null, true);
890-
}
891-
else
892-
{
893-
// Single common type
894-
return (nonNullSchemas, commonType, true);
895-
}
887+
return (nonNullSchemas, commonType, true);
896888
}
897889
else
898890
{

test/Microsoft.OpenApi.Tests/Models/OpenApiSchemaTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -844,7 +844,7 @@ public async Task SerializeOneOfWithNullAndMultipleSchemasAsV3ShouldMarkItAsNull
844844
{
845845
new OpenApiSchema { Type = JsonSchemaType.Null },
846846
new OpenApiSchema { Type = JsonSchemaType.String },
847-
new OpenApiSchema { Type = JsonSchemaType.Number }
847+
new OpenApiSchema { Type = JsonSchemaType.Number },
848848
}
849849
};
850850

0 commit comments

Comments
 (0)