Skip to content

Commit 73c3353

Browse files
authored
Apply suggestions from code review
1 parent af42279 commit 73c3353

File tree

2 files changed

+4
-11
lines changed

2 files changed

+4
-11
lines changed

src/Microsoft.OpenApi/Models/OpenApiMediaType.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,7 @@ private void SerializeInternal(IOpenApiWriter writer, OpenApiSpecVersion version
111111
else if (version < OpenApiSpecVersion.OpenApi3_2 && ItemSchema != null)
112112
{
113113
// For v3.1 and earlier, serialize as x-oai-itemSchema extension
114-
writer.WritePropertyName(OpenApiConstants.ExtensionFieldNamePrefix + "oai-" + OpenApiConstants.ItemSchema);
115-
callback(writer, ItemSchema);
114+
writer.WriteOptionalObject(OpenApiConstants.ExtensionFieldNamePrefix + "oai-" + OpenApiConstants.ItemSchema, ItemSchema, callback);
116115
}
117116

118117
// example

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

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -478,9 +478,7 @@ public async Task SerializeMediaTypeWithItemSchemaAsV32JsonWorks()
478478
var actual = await mediaType.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_2);
479479

480480
// Assert
481-
actual = actual.MakeLineBreaksEnvironmentNeutral();
482-
expected = expected.MakeLineBreaksEnvironmentNeutral();
483-
Assert.Equal(expected, actual);
481+
Assert.True(JsonNode.DeepEquals(JsonNode.Parse(actual), JsonNode.Parse(expected)));
484482
}
485483

486484
[Fact]
@@ -517,9 +515,7 @@ public async Task SerializeMediaTypeWithItemSchemaAsV31JsonWorks()
517515
var actual = await mediaType.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_1);
518516

519517
// Assert
520-
actual = actual.MakeLineBreaksEnvironmentNeutral();
521-
expected = expected.MakeLineBreaksEnvironmentNeutral();
522-
Assert.Equal(expected, actual);
518+
Assert.True(JsonNode.DeepEquals(JsonNode.Parse(actual), JsonNode.Parse(expected)));
523519
}
524520

525521
[Fact]
@@ -556,9 +552,7 @@ public async Task SerializeMediaTypeWithItemSchemaAsV3JsonWorks()
556552
var actual = await mediaType.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0);
557553

558554
// Assert
559-
actual = actual.MakeLineBreaksEnvironmentNeutral();
560-
expected = expected.MakeLineBreaksEnvironmentNeutral();
561-
Assert.Equal(expected, actual);
555+
Assert.True(JsonNode.DeepEquals(JsonNode.Parse(actual), JsonNode.Parse(expected)));
562556
}
563557

564558
[Fact]

0 commit comments

Comments
 (0)