Skip to content

fix/null type to v2 #2860

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
baywet merged 2 commits into from
May 26, 2026
+31 −8
Merged

fix/null type to v2 #2860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
288e95a
fix(reader): preserve nullable Null flag when type appears after null…
Copilot May 26, 2026
05a4d8f
test(reader): add nullable-before-type tests for V3.0 and V3.2
Copilot May 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions src/Microsoft.OpenApi/Reader/V31/OpenApiSchemaDeserializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
namespace Microsoft.OpenApi.Reader.V31;
internal static partial class OpenApiV31Deserializer
{
private static readonly FixedFieldMap<OpenApiSchema> _openApiSchemaFixedFields = new()

Check failure on line 13 in src/Microsoft.OpenApi/Reader/V31/OpenApiSchemaDeserializer.cs

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Refactor this field to reduce its Cognitive Complexity from 64 to the 15 allowed. 


See more on https://sonarcloud.io/project/issues?id=microsoft_OpenAPI.NET&issues=AZ5lM6JkmeMascLuyXZG&open=AZ5lM6JkmeMascLuyXZG&pullRequest=2860
{
{
"title",
Expand Down Expand Up @@ -198,21 +198,20 @@
"type",
(o, n, doc) =>
{
// Preserve any Null flag set by a preceding "nullable: true" handler
var preserveNull = o.Type.HasValue && o.Type.Value.HasFlag(JsonSchemaType.Null);
if (n is ValueNode)
{
o.Type = n.GetScalarValue()?.ToJsonSchemaType();
var parsedType = n.GetScalarValue()?.ToJsonSchemaType();
o.Type = preserveNull ? parsedType | JsonSchemaType.Null : parsedType;
}
else
{
var list = n.CreateSimpleList((n2, p) => n2.GetScalarValue(), doc);
JsonSchemaType combinedType = 0;
foreach(var type in list)
JsonSchemaType combinedType = preserveNull ? JsonSchemaType.Null : 0;
foreach(var type in list.Where(static t => t is not null).Select(static t => t!.ToJsonSchemaType()))
{
if (type is not null)
{
var schemaType = type.ToJsonSchemaType();
combinedType |= schemaType;
}
combinedType |= type;
}
o.Type = combinedType;
}
Expand Down
12 changes: 12 additions & 0 deletions test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiSchemaTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,18 @@ public void ParseSchemaWithTypeArrayWorks()
Assert.Equivalent(expected, actual);
}

[Theory]
[InlineData(@"{ ""nullable"": true, ""type"": ""string"" }")]
[InlineData(@"{ ""type"": ""string"", ""nullable"": true }")]
public void ParseSchemaWithNullableBeforeOrAfterTypePreservesNullFlag(string schemaJson)
{
// Act
var schema = OpenApiModelFactory.Parse<OpenApiSchema>(schemaJson, OpenApiSpecVersion.OpenApi3_1, new(), out _, "json", SettingsFixture.ReaderSettings);

// Assert
Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, schema.Type);
}

[Fact]
public void TestSchemaCopyConstructorWithTypeArrayWorks()
{
Expand Down
12 changes: 12 additions & 0 deletions test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiSchemaTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,18 @@ public void ParsePathFragmentShouldSucceed()
}, openApiAny);
}

[Theory]
[InlineData(@"{ ""nullable"": true, ""type"": ""string"" }")]
[InlineData(@"{ ""type"": ""string"", ""nullable"": true }")]
public void ParseSchemaWithNullableBeforeOrAfterTypePreservesNullFlag(string schemaJson)
{
// Act
var schema = OpenApiModelFactory.Parse<OpenApiSchema>(schemaJson, OpenApiSpecVersion.OpenApi3_0, new(), out _, "json", SettingsFixture.ReaderSettings);

// Assert
Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, schema.Type);
}

[Fact]
public void ParseDictionarySchemaShouldSucceed()
{
Expand Down
Loading