Skip to content

Commit 9ed37d2

Browse files
committed
chore: code cleanup
1 parent 8cc7d4e commit 9ed37d2

File tree

2 files changed

+23
-30
lines changed

2 files changed

+23
-30
lines changed

src/Microsoft.OpenApi/Writers/OpenApiWriterAnyExtensions.cs

Lines changed: 19 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT license.
33

4-
using System;
54
using System.Collections.Generic;
6-
using System.Globalization;
75
using System.Text.Json;
86
using System.Text.Json.Nodes;
97
using Microsoft.OpenApi.Any;
@@ -68,13 +66,13 @@ public static void WriteAny(this IOpenApiWriter writer, JsonNode node)
6866
writer.WriteObject(node as JsonObject);
6967
break;
7068
case JsonValueKind.String: // Primitive
71-
writer.WriteValue(node.GetValue<string>());
69+
writer.WritePrimitive(node.AsValue());
7270
break;
7371
case JsonValueKind.Number: // Primitive
74-
writer.WriteNumber(node);
72+
writer.WritePrimitive(node.AsValue());
7573
break;
7674
case JsonValueKind.True or JsonValueKind.False: // Primitive
77-
writer.WriteValue(node.GetValue<bool>());
75+
writer.WritePrimitive(node.AsValue());
7876
break;
7977
case JsonValueKind.Null: // null
8078
writer.WriteNull();
@@ -109,31 +107,23 @@ private static void WriteObject(this IOpenApiWriter writer, JsonObject entity)
109107
writer.WriteEndObject();
110108
}
111109

112-
private static void WriteNumber(this IOpenApiWriter writer, JsonNode number)
110+
private static void WritePrimitive(this IOpenApiWriter writer, JsonValue jsonValue)
113111
{
114-
if (number is JsonValue jsonValue)
115-
{
116-
if (jsonValue.TryGetValue<decimal>(out var decimalValue))
117-
{
118-
writer.WriteValue(decimalValue);
119-
}
120-
else if (jsonValue.TryGetValue<double>(out var doubleValue))
121-
{
122-
writer.WriteValue(doubleValue);
123-
}
124-
else if (jsonValue.TryGetValue<float>(out var floatValue))
125-
{
126-
writer.WriteValue(floatValue);
127-
}
128-
else if (jsonValue.TryGetValue<long>(out var longValue))
129-
{
130-
writer.WriteValue(longValue);
131-
}
132-
else if (jsonValue.TryGetValue<int>(out var intValue))
133-
{
134-
writer.WriteValue(intValue);
135-
}
136-
}
112+
if (jsonValue.TryGetValue(out string stringValue))
113+
writer.WriteValue(stringValue);
114+
else if (jsonValue.TryGetValue(out bool boolValue))
115+
writer.WriteValue(boolValue);
116+
// write number values
117+
else if (jsonValue.TryGetValue(out decimal decimalValue))
118+
writer.WriteValue(decimalValue);
119+
else if (jsonValue.TryGetValue(out double doubleValue))
120+
writer.WriteValue(doubleValue);
121+
else if (jsonValue.TryGetValue(out float floatValue))
122+
writer.WriteValue(floatValue);
123+
else if (jsonValue.TryGetValue(out long longValue))
124+
writer.WriteValue(longValue);
125+
else if (jsonValue.TryGetValue(out int intValue))
126+
writer.WriteValue(intValue);
137127
}
138128
}
139129
}

test/Microsoft.OpenApi.Tests/Writers/OpenApiWriterAnyExtensionsTests.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,10 @@ from shouldBeTerse in shouldProduceTerseOutputValues
164164
[MemberData(nameof(StringifiedDateTimes))]
165165
public async Task WriteOpenApiDateTimeAsJsonWorksAsync(string inputString, bool produceTerseOutput)
166166
{
167-
var json = await WriteAsJsonAsync(inputString, produceTerseOutput);
167+
// Arrange
168+
var dateTimeValue = JsonValue.Create(inputString);
169+
170+
var json = await WriteAsJsonAsync(dateTimeValue, produceTerseOutput);
168171
var expectedJson = "\"" + inputString + "\"";
169172

170173
// Assert

0 commit comments

Comments
 (0)