Skip to content

Commit 777cc97

Browse files
committed
Merge remote-tracking branch 'origin/master' into dm/securityrefs
2 parents dab4ddb + a117990 commit 777cc97

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

src/Microsoft.OpenApi.Readers/V3/OpenApiParameterDeserializer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ internal static partial class OpenApiV3Deserializer
8787
{
8888
"examples", (o, n) =>
8989
{
90-
o.Examples = ((ListNode)n).Select(s => LoadExample(s)).ToList();
90+
o.Examples = n.CreateMap(LoadExample);
9191
}
9292
},
9393
{

src/Microsoft.OpenApi/Models/OpenApiParameter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public class OpenApiParameter : IOpenApiSerializable, IOpenApiReferenceable, IOp
101101
/// Furthermore, if referencing a schema which contains an example,
102102
/// the examples value SHALL override the example provided by the schema.
103103
/// </summary>
104-
public IList<OpenApiExample> Examples { get; set; } = new List<OpenApiExample>();
104+
public IDictionary<string,OpenApiExample> Examples { get; set; } = new Dictionary<string,OpenApiExample>();
105105

106106
/// <summary>
107107
/// Example of the media type. The example SHOULD match the specified schema and encoding properties
@@ -189,7 +189,7 @@ public void SerializeAsV3WithoutReference(IOpenApiWriter writer)
189189
writer.WriteOptionalObject(OpenApiConstants.Example, Example, (w, s) => w.WriteAny(s));
190190

191191
// examples
192-
writer.WriteOptionalCollection(OpenApiConstants.Examples, Examples, (w, e) => e.SerializeAsV3(w));
192+
writer.WriteOptionalMap(OpenApiConstants.Examples, Examples, (w, e) => e.SerializeAsV3(w));
193193

194194
// content
195195
writer.WriteOptionalMap(OpenApiConstants.Content, Content, (w, c) => c.SerializeAsV3(w));

src/Microsoft.OpenApi/Services/OpenApiWalker.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -532,6 +532,8 @@ internal void Walk(OpenApiParameter parameter)
532532
_visitor.Visit(parameter);
533533
Walk(OpenApiConstants.Schema, () => Walk(parameter.Schema));
534534
Walk(OpenApiConstants.Content, () => Walk(parameter.Content));
535+
Walk(OpenApiConstants.Examples, () => Walk(parameter.Examples));
536+
535537
Walk(parameter as IOpenApiExtensible);
536538
}
537539

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ public class OpenApiParameterTests
4747
Title = "title2",
4848
Description = "description2"
4949
},
50-
Examples = new List<OpenApiExample>
50+
Examples = new Dictionary<string,OpenApiExample>
5151
{
52-
new OpenApiExample
52+
["test"] = new OpenApiExample
5353
{
5454
Summary = "summary3",
5555
Description = "description3"
@@ -97,12 +97,12 @@ public void SerializeAdvancedParameterAsV3JsonWorks()
9797
""title"": ""title2"",
9898
""description"": ""description2""
9999
},
100-
""examples"": [
101-
{
100+
""examples"": {
101+
""test"": {
102102
""summary"": ""summary3"",
103103
""description"": ""description3""
104104
}
105-
]
105+
}
106106
}";
107107

108108
// Act

0 commit comments

Comments
 (0)