Skip to content

Commit 8a4fcc2

Browse files
committed
chore: address more PR feedback
1 parent ad59b9c commit 8a4fcc2

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

src/Microsoft.OpenApi/Extensions/OpenApiSerializableExtensions.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public static Task SerializeAsync<T>(
8282
Stream stream,
8383
OpenApiSpecVersion specVersion,
8484
OpenApiFormat format,
85-
OpenApiWriterSettings? settings,
85+
OpenApiWriterSettings? settings = null,
8686
CancellationToken cancellationToken = default)
8787
where T : IOpenApiSerializable
8888
{
@@ -107,7 +107,7 @@ public static Task SerializeAsync<T>(
107107
/// <param name="writer">The output writer.</param>
108108
/// <param name="specVersion">Version of the specification the output should conform to</param>
109109
/// <param name="cancellationToken">The cancellation token.</param>
110-
public static Task SerializeAsync<T>(this T? element, IOpenApiWriter writer, OpenApiSpecVersion specVersion, CancellationToken cancellationToken = default)
110+
public static Task SerializeAsync<T>(this T element, IOpenApiWriter writer, OpenApiSpecVersion specVersion, CancellationToken cancellationToken = default)
111111
where T : IOpenApiSerializable
112112
{
113113
Utils.CheckArgumentNull(element);
@@ -116,15 +116,15 @@ public static Task SerializeAsync<T>(this T? element, IOpenApiWriter writer, Ope
116116
switch (specVersion)
117117
{
118118
case OpenApiSpecVersion.OpenApi3_1:
119-
element?.SerializeAsV31(writer);
119+
element.SerializeAsV31(writer);
120120
break;
121121

122122
case OpenApiSpecVersion.OpenApi3_0:
123-
element?.SerializeAsV3(writer);
123+
element.SerializeAsV3(writer);
124124
break;
125125

126126
case OpenApiSpecVersion.OpenApi2_0:
127-
element?.SerializeAsV2(writer);
127+
element.SerializeAsV2(writer);
128128
break;
129129

130130
default:

src/Microsoft.OpenApi/Extensions/StringExtensions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ internal static class StringExtensions
3030
return false;
3131

3232
}
33-
internal static bool TryGetEnumFromDisplayName<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicFields)] T>(this string? displayName, out T result) where T : Enum
33+
internal static bool TryGetEnumFromDisplayName<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicFields)] T>(this string? displayName, out T? result) where T : Enum
3434
{
3535
var type = typeof(T);
3636

@@ -42,7 +42,7 @@ internal static class StringExtensions
4242
return true;
4343
}
4444

45-
result = default!;
45+
result = default;
4646
return false;
4747
}
4848
private static ReadOnlyDictionary<string, object> GetEnumValues<T>([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicFields)] Type enumType) where T : Enum

src/Microsoft.OpenApi/Reader/OpenApiJsonReader.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,9 @@ public ReadResult Read(JsonNode jsonNode,
8888
}
8989

9090
// Validate the document
91-
if (settings.RuleSet != null && settings.RuleSet.Rules.Any())
91+
if (document is not null && settings.RuleSet is not null && settings.RuleSet.Rules.Any())
9292
{
93-
var openApiErrors = document?.Validate(settings.RuleSet);
93+
var openApiErrors = document.Validate(settings.RuleSet);
9494
if(openApiErrors is not null)
9595
{
9696
foreach (var item in openApiErrors.OfType<OpenApiValidatorError>())
@@ -200,9 +200,9 @@ public async Task<ReadResult> ReadAsync(Stream input,
200200
}
201201

202202
// Validate the element
203-
if (settings.RuleSet != null && settings.RuleSet.Rules.Any())
203+
if (element is not null && settings.RuleSet is not null && settings.RuleSet.Rules.Any())
204204
{
205-
var errors = element?.Validate(settings.RuleSet);
205+
var errors = element.Validate(settings.RuleSet);
206206
if (errors is not null)
207207
{
208208
foreach (var item in errors)

0 commit comments

Comments
 (0)