Skip to content

Commit 67e66b9

Browse files
committed
More cleans for the DOM classes
1 parent cdd5fda commit 67e66b9

File tree

5 files changed

+22
-22
lines changed

5 files changed

+22
-22
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ internal static partial class OpenApiV3Deserializer
3232
{
3333
"value", (o, n) =>
3434
{
35-
o.Value = n.GetScalarValue();
35+
o.Value = n.CreateAny();
3636
}
3737
},
3838
};

src/Microsoft.OpenApi/Models/OpenApiEncoding.cs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,16 +77,10 @@ internal override void WriteAsV3(IOpenApiWriter writer)
7777
writer.WriteProperty(OpenApiConstants.Style, Style?.GetDisplayName());
7878

7979
// explode
80-
if (Explode != null)
81-
{
82-
writer.WriteProperty(OpenApiConstants.Explode, Explode.Value, false);
83-
}
80+
writer.WriteProperty(OpenApiConstants.Explode, Explode, false);
8481

8582
// allowReserved
86-
if (AllowReserved != null)
87-
{
88-
writer.WriteProperty(OpenApiConstants.AllowReserved, AllowReserved.Value, false);
89-
}
83+
writer.WriteProperty(OpenApiConstants.AllowReserved, AllowReserved, false);
9084

9185
// extensions
9286
writer.WriteExtensions(Extensions);

src/Microsoft.OpenApi/Models/OpenApiExample.cs

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class OpenApiExample : OpenApiElement, IOpenApiReference, IOpenApiExtensi
3131
/// exclusive. To represent examples of media types that cannot naturally represented
3232
/// in JSON or YAML, use a string value to contain the example, escaping where necessary.
3333
/// </summary>
34-
public string Value { get; set; }
34+
public IOpenApiAny Value { get; set; }
3535

3636
/// <summary>
3737
/// A URL that points to the literal example.
@@ -71,19 +71,22 @@ internal override void WriteAsV3(IOpenApiWriter writer)
7171
else
7272
{
7373
writer.WriteStartObject();
74-
writer.WriteProperty("summary", Summary);
75-
writer.WriteProperty("description", Description);
76-
77-
if (Value != null)
78-
{
79-
writer.WritePropertyName("value");
80-
writer.WriteRaw(Value);
81-
} else if (ExternalValue != null)
82-
{
83-
writer.WriteProperty("externalValue", ExternalValue);
84-
}
8574

75+
// summary
76+
writer.WriteProperty(OpenApiConstants.Summary, Summary);
77+
78+
// description
79+
writer.WriteProperty(OpenApiConstants.Description, Description);
80+
81+
// value
82+
writer.WriteOptionalObject(OpenApiConstants.Value, Value, (w, v) => w.WriteAny(v));
83+
84+
// externalValue
85+
writer.WriteProperty(OpenApiConstants.ExternalValue, ExternalValue);
86+
87+
// extensions
8688
writer.WriteExtensions(Extensions);
89+
8790
writer.WriteEndObject();
8891
}
8992
}

src/Microsoft.OpenApi/Models/OpenApiExternalDocs.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,13 @@ private void WriteInternal(IOpenApiWriter writer)
5656

5757
writer.WriteStartObject();
5858

59+
// description
5960
writer.WriteProperty(OpenApiConstants.Description, Description);
6061

62+
// url
6163
writer.WriteProperty(OpenApiConstants.Url, Url?.OriginalString);
6264

65+
// extensions
6366
writer.WriteExtensions(Extensions);
6467

6568
writer.WriteEndObject();

src/Microsoft.OpenApi/Models/OpenApiMediaType.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ internal override void WriteAsV3(IOpenApiWriter writer)
8080
/// </summary>
8181
internal override void WriteAsV2(IOpenApiWriter writer)
8282
{
83-
// nothing here
83+
// Media type does not exist in V2.
8484
}
8585
}
8686
}

0 commit comments

Comments
 (0)