Skip to content

Commit 2c2f973

Browse files
committed
Merge remote-tracking branch 'origin/mk/integrate-json-schema-library' into mk/integrate-json-schema-library
2 parents 16c6251 + 585a5af commit 2c2f973

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

src/Microsoft.OpenApi.Readers/V31/JsonSchemaDeserializer.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ public static JsonSchema LoadSchema(ParseNode node)
2222
var builder = new JsonSchemaBuilder();
2323

2424
// check for a $ref and if present, add it to the builder as a Ref keyword
25-
var pointer = mapNode.GetReferencePointer();
26-
if (pointer != null)
25+
if (mapNode.GetReferencePointer() is {} pointer)
2726
{
2827
builder = builder.Ref(pointer);
2928

src/Microsoft.OpenApi.Readers/V31/OpenApiCallbackDeserializer.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,15 @@ internal static partial class OpenApiV31Deserializer
1717
private static readonly PatternFieldMap<OpenApiCallback> _callbackPatternFields =
1818
new PatternFieldMap<OpenApiCallback>
1919
{
20-
{s => !s.StartsWith("x-"), (o, p, n) => o.AddPathItem(RuntimeExpression.Build(p), LoadPathItem(n))},
21-
{s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))},
20+
{s => !s.StartsWith("x-", StringComparison.OrdinalIgnoreCase), (o, p, n) => o.AddPathItem(RuntimeExpression.Build(p), LoadPathItem(n))},
21+
{s => s.StartsWith("x-", StringComparison.OrdinalIgnoreCase), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))},
2222
};
2323

2424
public static OpenApiCallback LoadCallback(ParseNode node)
2525
{
2626
var mapNode = node.CheckMapNode("callback");
2727

28-
var pointer = mapNode.GetReferencePointer();
29-
if (pointer != null)
28+
if (mapNode.GetReferencePointer() is {} pointer)
3029
{
3130
return mapNode.GetReferencedObject<OpenApiCallback>(ReferenceType.Callback, pointer);
3231
}

src/Microsoft.OpenApi.Readers/V31/OpenApiComponentsDeserializer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ internal static partial class OpenApiV31Deserializer
3232
private static readonly PatternFieldMap<OpenApiComponents> _componentsPatternFields =
3333
new PatternFieldMap<OpenApiComponents>
3434
{
35-
{s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}
35+
{s => s.StartsWith("x-", StringComparison.OrdinalIgnoreCase), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}
3636
};
3737

3838
public static OpenApiComponents LoadComponents(ParseNode node)

0 commit comments

Comments
 (0)