Skip to content

Commit df91f8d

Browse files
committed
chore: use constant for extension mechanism
Signed-off-by: Vincent Biret <[email protected]>
1 parent 8ff367b commit df91f8d

File tree

71 files changed

+78
-77
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+78
-77
lines changed

src/Microsoft.OpenApi/Reader/V2/OpenApiContactDeserializer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ internal static partial class OpenApiV2Deserializer
3232

3333
private static readonly PatternFieldMap<OpenApiContact> _contactPatternFields = new()
3434
{
35-
{s => s.StartsWith("x-", StringComparison.OrdinalIgnoreCase), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))}
35+
{s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))}
3636
};
3737

3838
public static OpenApiContact LoadContact(ParseNode node, OpenApiDocument hostDocument)

src/Microsoft.OpenApi/Reader/V2/OpenApiDocumentDeserializer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ internal static partial class OpenApiV2Deserializer
111111
private static readonly PatternFieldMap<OpenApiDocument> _openApiPatternFields = new()
112112
{
113113
// We have no semantics to verify X- nodes, therefore treat them as just values.
114-
{s => s.StartsWith("x-", StringComparison.OrdinalIgnoreCase), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))}
114+
{s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))}
115115
};
116116

117117
private static void MakeServers(IList<OpenApiServer> servers, ParsingContext context, RootNode rootNode)

src/Microsoft.OpenApi/Reader/V2/OpenApiExternalDocsDeserializer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ internal static partial class OpenApiV2Deserializer
3030
private static readonly PatternFieldMap<OpenApiExternalDocs> _externalDocsPatternFields =
3131
new()
3232
{
33-
{s => s.StartsWith("x-", StringComparison.OrdinalIgnoreCase), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))}
33+
{s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))}
3434
};
3535

3636
public static OpenApiExternalDocs LoadExternalDocs(ParseNode node, OpenApiDocument hostDocument)

src/Microsoft.OpenApi/Reader/V2/OpenApiHeaderDeserializer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ internal static partial class OpenApiV2Deserializer
9595

9696
private static readonly PatternFieldMap<OpenApiHeader> _headerPatternFields = new()
9797
{
98-
{s => s.StartsWith("x-"), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))}
98+
{s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))}
9999
};
100100

101101
private static OpenApiSchema GetOrCreateSchema(OpenApiHeader p)

src/Microsoft.OpenApi/Reader/V2/OpenApiInfoDeserializer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ internal static partial class OpenApiV2Deserializer
4444

4545
private static readonly PatternFieldMap<OpenApiInfo> _infoPatternFields = new()
4646
{
47-
{s => s.StartsWith("x-", StringComparison.OrdinalIgnoreCase), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))}
47+
{s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))}
4848
};
4949

5050
public static OpenApiInfo LoadInfo(ParseNode node, OpenApiDocument hostDocument)

src/Microsoft.OpenApi/Reader/V2/OpenApiLicenseDeserializer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ internal static partial class OpenApiV2Deserializer
2828

2929
private static readonly PatternFieldMap<OpenApiLicense> _licensePatternFields = new()
3030
{
31-
{s => s.StartsWith("x-", StringComparison.OrdinalIgnoreCase), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))}
31+
{s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))}
3232
};
3333

3434
public static OpenApiLicense LoadLicense(ParseNode node, OpenApiDocument hostDocument)

src/Microsoft.OpenApi/Reader/V2/OpenApiOperationDeserializer.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,16 +81,16 @@ internal static partial class OpenApiV2Deserializer
8181
private static readonly PatternFieldMap<OpenApiOperation> _operationPatternFields =
8282
new()
8383
{
84-
{s => s.StartsWith("x-", StringComparison.OrdinalIgnoreCase), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))}
84+
{s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))}
8585
};
8686

8787
private static readonly FixedFieldMap<OpenApiResponses> _responsesFixedFields = new();
8888

8989
private static readonly PatternFieldMap<OpenApiResponses> _responsesPatternFields =
9090
new()
9191
{
92-
{s => !s.StartsWith("x-", StringComparison.OrdinalIgnoreCase), (o, p, n, t) => o.Add(p, LoadResponse(n, t))},
93-
{s => s.StartsWith("x-", StringComparison.OrdinalIgnoreCase), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))}
92+
{s => !s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, t) => o.Add(p, LoadResponse(n, t))},
93+
{s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))}
9494
};
9595

9696
internal static OpenApiOperation LoadOperation(ParseNode node, OpenApiDocument hostDocument)

src/Microsoft.OpenApi/Reader/V2/OpenApiParameterDeserializer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ internal static partial class OpenApiV2Deserializer
106106
private static readonly PatternFieldMap<OpenApiParameter> _parameterPatternFields =
107107
new()
108108
{
109-
{s => s.StartsWith("x-", StringComparison.OrdinalIgnoreCase) && !s.Equals(OpenApiConstants.ExamplesExtension, StringComparison.OrdinalIgnoreCase),
109+
{s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase) && !s.Equals(OpenApiConstants.ExamplesExtension, StringComparison.OrdinalIgnoreCase),
110110
(o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))}
111111
};
112112

src/Microsoft.OpenApi/Reader/V2/OpenApiPathItemDeserializer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ internal static partial class OpenApiV2Deserializer
3434
private static readonly PatternFieldMap<OpenApiPathItem> _pathItemPatternFields =
3535
new()
3636
{
37-
{s => s.StartsWith("x-", StringComparison.OrdinalIgnoreCase), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))},
37+
{s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))},
3838
};
3939

4040
public static OpenApiPathItem LoadPathItem(ParseNode node, OpenApiDocument hostDocument)

src/Microsoft.OpenApi/Reader/V2/OpenApiPathsDeserializer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ internal static partial class OpenApiV2Deserializer
1919
private static readonly PatternFieldMap<OpenApiPaths> _pathsPatternFields = new()
2020
{
2121
{s => s.StartsWith("/", StringComparison.OrdinalIgnoreCase), (o, k, n, t) => o.Add(k, LoadPathItem(n, t))},
22-
{s => s.StartsWith("x-", StringComparison.OrdinalIgnoreCase), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))}
22+
{s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))}
2323
};
2424

2525
public static OpenApiPaths LoadPaths(ParseNode node, OpenApiDocument hostDocument)

0 commit comments

Comments
 (0)