Merge branch 'dev' into fix/references-cleanup

microsoft · Jan 31, 2025 · 32a5ec5 · 32a5ec5
2 parents 14750dc + c637cc4
commit 32a5ec5
Showing 87 changed files with 181 additions and 135 deletions.
diff --git a/src/Microsoft.OpenApi.Workbench/MainModel.cs b/src/Microsoft.OpenApi.Workbench/MainModel.cs
@@ -219,7 +219,7 @@ internal async Task ParseDocumentAsync()
             {
                 if (!string.IsNullOrWhiteSpace(_inputFile))
                 {
-                    stream = _inputFile.StartsWith("http") ? await _httpClient.GetStreamAsync(_inputFile) 
+                    stream = _inputFile.StartsWith("http", StringComparison.OrdinalIgnoreCase) ? await _httpClient.GetStreamAsync(_inputFile) 
                         : new FileStream(_inputFile, FileMode.Open);
                 }
                 else
@@ -241,7 +241,7 @@ internal async Task ParseDocumentAsync()
                 };
                 if (ResolveExternal && !string.IsNullOrWhiteSpace(_inputFile))
                 {
-                    settings.BaseUrl = _inputFile.StartsWith("http") ? new(_inputFile) 
+                    settings.BaseUrl = _inputFile.StartsWith("http", StringComparison.OrdinalIgnoreCase) ? new(_inputFile) 
                         : new("file://" + Path.GetDirectoryName(_inputFile) + "/");
                 }
 

diff --git a/src/Microsoft.OpenApi/Expressions/RuntimeExpression.cs b/src/Microsoft.OpenApi/Expressions/RuntimeExpression.cs
@@ -31,39 +31,39 @@ public static RuntimeExpression Build(string expression)
         {
             Utils.CheckArgumentNullOrEmpty(expression);
 
-            if (!expression.StartsWith(Prefix))
+            if (!expression.StartsWith(Prefix, StringComparison.OrdinalIgnoreCase))
             {
                 return new CompositeExpression(expression);
             }
 
             // $url
-            if (expression == UrlExpression.Url)
+            if (expression.Equals(UrlExpression.Url, StringComparison.Ordinal))
             {
                 return new UrlExpression();
             }
 
             // $method
-            if (expression == MethodExpression.Method)
+            if (expression.Equals(MethodExpression.Method, StringComparison.Ordinal))
             {
                 return new MethodExpression();
             }
 
             // $statusCode
-            if (expression == StatusCodeExpression.StatusCode)
+            if (expression.Equals(StatusCodeExpression.StatusCode, StringComparison.Ordinal))
             {
                 return new StatusCodeExpression();
             }
 
             // $request.
-            if (expression.StartsWith(RequestExpression.Request))
+            if (expression.StartsWith(RequestExpression.Request, StringComparison.Ordinal))
             {
                 var subString = expression.Substring(RequestExpression.Request.Length);
                 var source = SourceExpression.Build(subString);
                 return new RequestExpression(source);
             }
 
             // $response.
-            if (expression.StartsWith(ResponseExpression.Response))
+            if (expression.StartsWith(ResponseExpression.Response, StringComparison.Ordinal))
             {
                 var subString = expression.Substring(ResponseExpression.Response.Length);
                 var source = SourceExpression.Build(subString);

diff --git a/src/Microsoft.OpenApi/Expressions/SourceExpression.cs b/src/Microsoft.OpenApi/Expressions/SourceExpression.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
+using System;
 using Microsoft.OpenApi.Exceptions;
 using Microsoft.OpenApi.Properties;
 
@@ -37,27 +38,27 @@ protected SourceExpression(string value)
                 var expressions = expression.Split('.');
                 if (expressions.Length == 2)
                 {
-                    if (expression.StartsWith(HeaderExpression.Header))
+                    if (expression.StartsWith(HeaderExpression.Header, StringComparison.Ordinal))
                     {
                         // header.
                         return new HeaderExpression(expressions[1]);
                     }
 
-                    if (expression.StartsWith(QueryExpression.Query))
+                    if (expression.StartsWith(QueryExpression.Query, StringComparison.Ordinal))
                     {
                         // query.
                         return new QueryExpression(expressions[1]);
                     }
 
-                    if (expression.StartsWith(PathExpression.Path))
+                    if (expression.StartsWith(PathExpression.Path, StringComparison.Ordinal))
                     {
                         // path.
                         return new PathExpression(expressions[1]);
                     }
                 }
 
                 // body
-                if (expression.StartsWith(BodyExpression.Body))
+                if (expression.StartsWith(BodyExpression.Body, StringComparison.Ordinal))
                 {
                     var subString = expression.Substring(BodyExpression.Body.Length);
                     if (string.IsNullOrEmpty(subString))

diff --git a/src/Microsoft.OpenApi/Extensions/OpenApiExtensibleExtensions.cs b/src/Microsoft.OpenApi/Extensions/OpenApiExtensibleExtensions.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
+using System;
 using Microsoft.OpenApi.Exceptions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
@@ -26,7 +27,7 @@ public static void AddExtension<T>(this T element, string name, IOpenApiExtensio
             Utils.CheckArgumentNull(element);
             Utils.CheckArgumentNullOrEmpty(name);
 
-            if (!name.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix))
+            if (!name.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase))
             {
                 throw new OpenApiException(string.Format(SRResource.ExtensionFieldNameMustBeginWithXDash, name));
             }

diff --git a/src/Microsoft.OpenApi/Models/OpenApiDocument.cs b/src/Microsoft.OpenApi/Models/OpenApiDocument.cs
@@ -389,7 +389,7 @@ private static void WriteHostInfoV2(IOpenApiWriter writer, IList<OpenApiServer>?
             else
             {
                 var relativeUrl = firstServerUrl.OriginalString;
-                if (relativeUrl.StartsWith("//"))
+                if (relativeUrl.StartsWith("//", StringComparison.OrdinalIgnoreCase))
                 {
                     var pathPosition = relativeUrl.IndexOf('/', 3);
                     writer.WriteProperty(OpenApiConstants.Host, relativeUrl.Substring(0, pathPosition));

diff --git a/src/Microsoft.OpenApi/Models/OpenApiReference.cs b/src/Microsoft.OpenApi/Models/OpenApiReference.cs
@@ -95,7 +95,7 @@ public string ReferenceV3
                 {
                     return Id;
                 }
-                if (Id.StartsWith("http"))
+                if (Id.StartsWith("http", StringComparison.OrdinalIgnoreCase))
                 {
                     return Id;
                 }
@@ -238,7 +238,7 @@ private string GetExternalReferenceV3()
                     return ExternalResource + "#" + Id;
                 }
 
-                if (Id.StartsWith("http"))
+                if (Id.StartsWith("http", StringComparison.OrdinalIgnoreCase))
                 {
                     return Id;
                 }

diff --git a/src/Microsoft.OpenApi/Reader/V2/OpenApiContactDeserializer.cs b/src/Microsoft.OpenApi/Reader/V2/OpenApiContactDeserializer.cs
@@ -32,7 +32,7 @@ internal static partial class OpenApiV2Deserializer
 
         private static readonly PatternFieldMap<OpenApiContact> _contactPatternFields = new()
         {
-            {s => s.StartsWith("x-"), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))}
+            {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))}
         };
 
         public static OpenApiContact LoadContact(ParseNode node, OpenApiDocument hostDocument)

diff --git a/src/Microsoft.OpenApi/Reader/V2/OpenApiDocumentDeserializer.cs b/src/Microsoft.OpenApi/Reader/V2/OpenApiDocumentDeserializer.cs
@@ -111,7 +111,7 @@ internal static partial class OpenApiV2Deserializer
         private static readonly PatternFieldMap<OpenApiDocument> _openApiPatternFields = new()
         {
             // We have no semantics to verify X- nodes, therefore treat them as just values.
-            {s => s.StartsWith("x-"), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))}
+            {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))}
         };
 
         private static void MakeServers(IList<OpenApiServer> servers, ParsingContext context, RootNode rootNode)

diff --git a/src/Microsoft.OpenApi/Reader/V2/OpenApiExternalDocsDeserializer.cs b/src/Microsoft.OpenApi/Reader/V2/OpenApiExternalDocsDeserializer.cs
@@ -30,7 +30,7 @@ internal static partial class OpenApiV2Deserializer
         private static readonly PatternFieldMap<OpenApiExternalDocs> _externalDocsPatternFields =
                 new()
                 {
-                    {s => s.StartsWith("x-"), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))}
+                    {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))}
                     };
 
         public static OpenApiExternalDocs LoadExternalDocs(ParseNode node, OpenApiDocument hostDocument)

diff --git a/src/Microsoft.OpenApi/Reader/V2/OpenApiHeaderDeserializer.cs b/src/Microsoft.OpenApi/Reader/V2/OpenApiHeaderDeserializer.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
 using System;
@@ -95,7 +95,7 @@ internal static partial class OpenApiV2Deserializer
 
         private static readonly PatternFieldMap<OpenApiHeader> _headerPatternFields = new()
         {
-            {s => s.StartsWith("x-", StringComparison.OrdinalIgnoreCase), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))}
+            {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))}
         };
 
         private static OpenApiSchema GetOrCreateSchema(OpenApiHeader p)

diff --git a/src/Microsoft.OpenApi/Reader/V2/OpenApiInfoDeserializer.cs b/src/Microsoft.OpenApi/Reader/V2/OpenApiInfoDeserializer.cs
@@ -44,7 +44,7 @@ internal static partial class OpenApiV2Deserializer
 
         private static readonly PatternFieldMap<OpenApiInfo> _infoPatternFields = new()
         {
-            {s => s.StartsWith("x-"), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))}
+            {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))}
         };
 
         public static OpenApiInfo LoadInfo(ParseNode node, OpenApiDocument hostDocument)

diff --git a/src/Microsoft.OpenApi/Reader/V2/OpenApiLicenseDeserializer.cs b/src/Microsoft.OpenApi/Reader/V2/OpenApiLicenseDeserializer.cs
@@ -28,7 +28,7 @@ internal static partial class OpenApiV2Deserializer
 
         private static readonly PatternFieldMap<OpenApiLicense> _licensePatternFields = new()
         {
-            {s => s.StartsWith("x-"), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))}
+            {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))}
         };
 
         public static OpenApiLicense LoadLicense(ParseNode node, OpenApiDocument hostDocument)

diff --git a/src/Microsoft.OpenApi/Reader/V2/OpenApiOperationDeserializer.cs b/src/Microsoft.OpenApi/Reader/V2/OpenApiOperationDeserializer.cs
@@ -81,16 +81,16 @@ internal static partial class OpenApiV2Deserializer
         private static readonly PatternFieldMap<OpenApiOperation> _operationPatternFields =
             new()
             {
-                {s => s.StartsWith("x-"), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))}
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))}
             };
 
         private static readonly FixedFieldMap<OpenApiResponses> _responsesFixedFields = new();
 
         private static readonly PatternFieldMap<OpenApiResponses> _responsesPatternFields =
             new()
             {
-                {s => !s.StartsWith("x-"), (o, p, n, t) => o.Add(p, LoadResponse(n, t))},
-                {s => s.StartsWith("x-"), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))}
+                {s => !s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, t) => o.Add(p, LoadResponse(n, t))},
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))}
             };
 
         internal static OpenApiOperation LoadOperation(ParseNode node, OpenApiDocument hostDocument)

diff --git a/src/Microsoft.OpenApi/Reader/V2/OpenApiParameterDeserializer.cs b/src/Microsoft.OpenApi/Reader/V2/OpenApiParameterDeserializer.cs
@@ -106,7 +106,7 @@ internal static partial class OpenApiV2Deserializer
         private static readonly PatternFieldMap<OpenApiParameter> _parameterPatternFields =
             new()
             {
-                {s => s.StartsWith("x-") && !s.Equals(OpenApiConstants.ExamplesExtension, StringComparison.OrdinalIgnoreCase),
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase) && !s.Equals(OpenApiConstants.ExamplesExtension, StringComparison.OrdinalIgnoreCase),
                     (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))} 
             };
 

diff --git a/src/Microsoft.OpenApi/Reader/V2/OpenApiPathItemDeserializer.cs b/src/Microsoft.OpenApi/Reader/V2/OpenApiPathItemDeserializer.cs
@@ -34,7 +34,7 @@ internal static partial class OpenApiV2Deserializer
         private static readonly PatternFieldMap<OpenApiPathItem> _pathItemPatternFields =
             new()
             {
-                {s => s.StartsWith("x-", StringComparison.OrdinalIgnoreCase), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))},
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))},
             };
 
         public static OpenApiPathItem LoadPathItem(ParseNode node, OpenApiDocument hostDocument)

diff --git a/src/Microsoft.OpenApi/Reader/V2/OpenApiPathsDeserializer.cs b/src/Microsoft.OpenApi/Reader/V2/OpenApiPathsDeserializer.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
+using System;
 using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Reader.ParseNodes;
@@ -17,8 +18,8 @@ internal static partial class OpenApiV2Deserializer
 
         private static readonly PatternFieldMap<OpenApiPaths> _pathsPatternFields = new()
         {
-            {s => s.StartsWith("/"), (o, k, n, t) => o.Add(k, LoadPathItem(n, t))},
-            {s => s.StartsWith("x-"), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))}
+            {s => s.StartsWith("/", StringComparison.OrdinalIgnoreCase), (o, k, n, t) => o.Add(k, LoadPathItem(n, t))},
+            {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))}
         };
 
         public static OpenApiPaths LoadPaths(ParseNode node, OpenApiDocument hostDocument)

diff --git a/src/Microsoft.OpenApi/Reader/V2/OpenApiResponseDeserializer.cs b/src/Microsoft.OpenApi/Reader/V2/OpenApiResponseDeserializer.cs
@@ -42,7 +42,7 @@ internal static partial class OpenApiV2Deserializer
         private static readonly PatternFieldMap<OpenApiResponse> _responsePatternFields =
             new()
             {
-                {s => s.StartsWith("x-") && !s.Equals(OpenApiConstants.ExamplesExtension, StringComparison.OrdinalIgnoreCase), 
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase) && !s.Equals(OpenApiConstants.ExamplesExtension, StringComparison.OrdinalIgnoreCase), 
                     (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))}
             };
 

diff --git a/src/Microsoft.OpenApi/Reader/V2/OpenApiSchemaDeserializer.cs b/src/Microsoft.OpenApi/Reader/V2/OpenApiSchemaDeserializer.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. 
 
 using System.Collections.Generic;
@@ -155,7 +155,7 @@ internal static partial class OpenApiV2Deserializer
 
         private static readonly PatternFieldMap<OpenApiSchema> _openApiSchemaPatternFields = new PatternFieldMap<OpenApiSchema>
         {
-            {s => s.StartsWith("x-", StringComparison.OrdinalIgnoreCase), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))}
+            {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))}
         };
 
         public static IOpenApiSchema LoadSchema(ParseNode node, OpenApiDocument hostDocument)

diff --git a/src/Microsoft.OpenApi/Reader/V2/OpenApiSecuritySchemeDeserializer.cs b/src/Microsoft.OpenApi/Reader/V2/OpenApiSecuritySchemeDeserializer.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
 using System;
@@ -78,7 +78,7 @@ internal static partial class OpenApiV2Deserializer
         private static readonly PatternFieldMap<OpenApiSecurityScheme> _securitySchemePatternFields =
             new()
             {
-                {s => s.StartsWith("x-", StringComparison.OrdinalIgnoreCase), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))}
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))}
             };
 
         public static IOpenApiSecurityScheme LoadSecurityScheme(ParseNode node, OpenApiDocument hostDocument)

diff --git a/src/Microsoft.OpenApi/Reader/V2/OpenApiTagDeserializer.cs b/src/Microsoft.OpenApi/Reader/V2/OpenApiTagDeserializer.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
+using System;
 using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Reader.ParseNodes;
@@ -31,7 +32,7 @@ internal static partial class OpenApiV2Deserializer
 
         private static readonly PatternFieldMap<OpenApiTag> _tagPatternFields = new()
         {
-            {s => s.StartsWith("x-"), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))}
+            {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))}
         };
 
         public static OpenApiTag LoadTag(ParseNode n, OpenApiDocument hostDocument)

diff --git a/src/Microsoft.OpenApi/Reader/V2/OpenApiV2Deserializer.cs b/src/Microsoft.OpenApi/Reader/V2/OpenApiV2Deserializer.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json.Nodes;
@@ -98,7 +99,7 @@ private static (string, string) GetReferenceIdAndExternalResource(string pointer
         {
             var refSegments = pointer.Split('/');
             var refId = refSegments.Last();
-            var isExternalResource = !refSegments.First().StartsWith("#");
+            var isExternalResource = !refSegments.First().StartsWith("#", StringComparison.OrdinalIgnoreCase);
 
             string externalResource = isExternalResource ? $"{refSegments.First()}/{refSegments[1].TrimEnd('#')}" : null;
 

diff --git a/src/Microsoft.OpenApi/Reader/V2/OpenApiV2VersionService.cs b/src/Microsoft.OpenApi/Reader/V2/OpenApiV2VersionService.cs
@@ -161,7 +161,7 @@ public OpenApiReference ConvertToOpenApiReference(string reference, ReferenceTyp
                 }
                 else if (segments.Length == 2)
                 {
-                    if (reference.StartsWith("#"))
+                    if (reference.StartsWith("#", StringComparison.OrdinalIgnoreCase))
                     {
                         // "$ref": "#/definitions/Pet"
                         try
@@ -178,7 +178,7 @@ public OpenApiReference ConvertToOpenApiReference(string reference, ReferenceTyp
                     // Where fragments point into a non-OpenAPI document, the id will be the complete fragment identifier
                     var id = segments[1];
                     // $ref: externalSource.yaml#/Pet
-                    if (id.StartsWith("/definitions/"))
+                    if (id.StartsWith("/definitions/", StringComparison.Ordinal))
                     {
                         var localSegments = id.Split('/');
                         var referencedType = GetReferenceTypeV2FromName(localSegments[1]);

diff --git a/src/Microsoft.OpenApi/Reader/V2/OpenApiXmlDeserializer.cs b/src/Microsoft.OpenApi/Reader/V2/OpenApiXmlDeserializer.cs
@@ -51,7 +51,7 @@ internal static partial class OpenApiV2Deserializer
         private static readonly PatternFieldMap<OpenApiXml> _xmlPatternFields =
             new()
             {
-                {s => s.StartsWith("x-"), (o, p, n, _) => o.AddExtension(p, LoadExtension(p,n))}
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _) => o.AddExtension(p, LoadExtension(p,n))}
             };
 
         public static OpenApiXml LoadXml(ParseNode node, OpenApiDocument hostDocument)

diff --git a/src/Microsoft.OpenApi/Reader/V3/OpenApiCallbackDeserializer.cs b/src/Microsoft.OpenApi/Reader/V3/OpenApiCallbackDeserializer.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
+using System;
 using Microsoft.OpenApi.Expressions;
 using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Models;
@@ -21,8 +22,8 @@ internal static partial class OpenApiV3Deserializer
         private static readonly PatternFieldMap<OpenApiCallback> _callbackPatternFields =
             new()
             {
-                {s => !s.StartsWith("x-"), (o, p, n, t) => o.AddPathItem(RuntimeExpression.Build(p), LoadPathItem(n, t))},
-                {s => s.StartsWith("x-"), (o, p, n, _) => o.AddExtension(p, LoadExtension(p,n))},
+                {s => !s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, t) => o.AddPathItem(RuntimeExpression.Build(p), LoadPathItem(n, t))},
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _) => o.AddExtension(p, LoadExtension(p,n))},
             };
 
         public static IOpenApiCallback LoadCallback(ParseNode node, OpenApiDocument hostDocument)