Merge remote-tracking branch 'origin/vnext' into dm/vnext/fix272

darrelmiller · darrelmiller · commit d4c1795efb87 · 2018-06-12T19:50:53.000-04:00
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiContactDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiContactDeserializer.cs
@@ -38,7 +38,7 @@ internal static partial class OpenApiV2Deserializer
 
         private static PatternFieldMap<OpenApiContact> _contactPatternFields = new PatternFieldMap<OpenApiContact>
         {
-            {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, n.CreateAny())}
+            {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}
         };
 
         public static OpenApiContact LoadContact(ParseNode node)
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiDocumentDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiDocumentDeserializer.cs
@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.OpenApi.Extensions;
+using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Readers.ParseNodes;
 using Microsoft.OpenApi.Services;
@@ -116,7 +117,7 @@ internal static partial class OpenApiV2Deserializer
         private static PatternFieldMap<OpenApiDocument> _openApiPatternFields = new PatternFieldMap<OpenApiDocument>
         {
             // We have no semantics to verify X- nodes, therefore treat them as just values.
-            {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, n.CreateAny())}
+            {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}
         };
 
         private static void MakeServers(IList<OpenApiServer> servers, ParsingContext context, Uri defaultUrl)
@@ -228,7 +229,6 @@ private static void FixRequestBodyReferences(OpenApiDocument doc)
                 var walker = new OpenApiWalker(fixer);
                 walker.Walk(doc);
             }
-
         }
     }
 
@@ -258,5 +258,7 @@ public override void Visit(OpenApiOperation operation)
                 };
             }
         }
+
+      
     }
 }
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiHeaderDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiHeaderDeserializer.cs
@@ -130,7 +130,7 @@ internal static partial class OpenApiV2Deserializer
 
         private static readonly PatternFieldMap<OpenApiHeader> _headerPatternFields = new PatternFieldMap<OpenApiHeader>
         {
-            {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, n.CreateAny())}
+            {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}
         };
 
         public static OpenApiHeader LoadHeader(ParseNode node)
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiInfoDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiInfoDeserializer.cs
@@ -57,7 +57,7 @@ internal static partial class OpenApiV2Deserializer
 
         private static PatternFieldMap<OpenApiInfo> _infoPatternFields = new PatternFieldMap<OpenApiInfo>
         {
-            {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, n.CreateAny())}
+            {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}
         };
 
         public static OpenApiInfo LoadInfo(ParseNode node)
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiLicenseDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiLicenseDeserializer.cs
@@ -32,7 +32,7 @@ internal static partial class OpenApiV2Deserializer
 
         private static PatternFieldMap<OpenApiLicense> _licensePatternFields = new PatternFieldMap<OpenApiLicense>
         {
-            {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, n.CreateAny())}
+            {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}
         };
 
         public static OpenApiLicense LoadLicense(ParseNode node)
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiOperationDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiOperationDeserializer.cs
@@ -90,7 +90,7 @@ internal static partial class OpenApiV2Deserializer
         private static readonly PatternFieldMap<OpenApiOperation> _operationPatternFields =
             new PatternFieldMap<OpenApiOperation>
             {
-                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, n.CreateAny())}
+                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}
             };
 
         private static readonly FixedFieldMap<OpenApiResponses> _responsesFixedFields =
@@ -100,7 +100,7 @@ internal static partial class OpenApiV2Deserializer
             new PatternFieldMap<OpenApiResponses>
             {
                 {s => !s.StartsWith("x-"), (o, p, n) => o.Add(p, LoadResponse(n))},
-                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, n.CreateAny())}
+                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}
             };
 
         internal static OpenApiOperation LoadOperation(ParseNode node)
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiParameterDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiParameterDeserializer.cs
@@ -146,7 +146,7 @@ internal static partial class OpenApiV2Deserializer
         private static readonly PatternFieldMap<OpenApiParameter> _parameterPatternFields =
             new PatternFieldMap<OpenApiParameter>
             {
-                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, n.CreateAny())}
+                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}
             };
 
         private static void LoadStyle(OpenApiParameter p, string v)
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiPathItemDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiPathItemDeserializer.cs
@@ -39,7 +39,7 @@ internal static partial class OpenApiV2Deserializer
         private static readonly PatternFieldMap<OpenApiPathItem> _pathItemPatternFields =
             new PatternFieldMap<OpenApiPathItem>
             {
-                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, n.CreateAny())},
+                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))},
             };
 
         public static OpenApiPathItem LoadPathItem(ParseNode node)
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiPathsDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiPathsDeserializer.cs
@@ -18,7 +18,7 @@ internal static partial class OpenApiV2Deserializer
         private static PatternFieldMap<OpenApiPaths> _pathsPatternFields = new PatternFieldMap<OpenApiPaths>
         {
             {s => s.StartsWith("/"), (o, k, n) => o.Add(k, LoadPathItem(n))},
-            {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, n.CreateAny())}
+            {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}
         };
 
         public static OpenApiPaths LoadPaths(ParseNode node)
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiResponseDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiResponseDeserializer.cs
@@ -45,7 +45,7 @@ internal static partial class OpenApiV2Deserializer
         private static readonly PatternFieldMap<OpenApiResponse> _responsePatternFields =
             new PatternFieldMap<OpenApiResponse>
             {
-                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, n.CreateAny())}
+                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}
             };
 
         private static void ProcessProduces(OpenApiResponse response, ParsingContext context)
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiSchemaDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiSchemaDeserializer.cs
@@ -206,7 +206,7 @@ internal static partial class OpenApiV2Deserializer
 
         private static readonly PatternFieldMap<OpenApiSchema> _schemaPatternFields = new PatternFieldMap<OpenApiSchema>
         {
-            {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, n.CreateAny())}
+            {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}
         };
 
         public static OpenApiSchema LoadSchema(ParseNode node)
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiSecuritySchemeDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiSecuritySchemeDeserializer.cs
@@ -77,7 +77,7 @@ internal static partial class OpenApiV2Deserializer
         private static readonly PatternFieldMap<OpenApiSecurityScheme> _securitySchemePatternFields =
             new PatternFieldMap<OpenApiSecurityScheme>
             {
-                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, n.CreateAny())}
+                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}
             };
 
         public static OpenApiSecurityScheme LoadSecurityScheme(ParseNode node)
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiTagDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiTagDeserializer.cs
@@ -37,7 +37,7 @@ internal static partial class OpenApiV2Deserializer
 
         private static readonly PatternFieldMap<OpenApiTag> _tagPatternFields = new PatternFieldMap<OpenApiTag>
         {
-            {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, n.CreateAny())}
+            {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}
         };
 
         public static OpenApiTag LoadTag(ParseNode n)
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiV2Deserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiV2Deserializer.cs
@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Readers.ParseNodes;
 
 namespace Microsoft.OpenApi.Readers.V2
@@ -38,6 +39,18 @@ public static IOpenApiAny LoadAny(ParseNode node)
             return node.CreateAny();
         }
 
+        private static IOpenApiExtension LoadExtension(string name, ParseNode node)
+        {
+            if (node.Context.ExtensionParsers.TryGetValue(name, out var parser))
+            {
+                return parser(node.CreateAny());
+            }
+            else
+            {
+                return node.CreateAny();
+            }
+        }
+
         private static string LoadString(ParseNode node)
         {
             return node.GetScalarValue();
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiV2VersionService.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiV2VersionService.cs
@@ -7,6 +7,7 @@
 using Microsoft.OpenApi.Exceptions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi.Readers.Exceptions;
 using Microsoft.OpenApi.Readers.Interface;
 using Microsoft.OpenApi.Readers.ParseNodes;
 using Microsoft.OpenApi.Readers.Properties;
@@ -90,7 +91,7 @@ private static ReferenceType ParseReferenceType(string referenceTypeName)
                     return ReferenceType.SecurityScheme;
 
                 default:
-                    throw new ArgumentException();
+                    throw new OpenApiReaderException($"Unknown reference type '{referenceTypeName}'");
             }
         }
 
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiXmlDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiXmlDeserializer.cs
@@ -60,7 +60,7 @@ internal static partial class OpenApiV2Deserializer
         private static readonly PatternFieldMap<OpenApiXml> _xmlPatternFields =
             new PatternFieldMap<OpenApiXml>
             {
-                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, n.CreateAny())}
+                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))}
             };
 
         public static OpenApiXml LoadXml(ParseNode node)
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiCallbackDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiCallbackDeserializer.cs
@@ -21,7 +21,7 @@ internal static partial class OpenApiV3Deserializer
             new PatternFieldMap<OpenApiCallback>
             {
                 {s => s.StartsWith("$"), (o, p, n) => o.AddPathItem(RuntimeExpression.Build(p), LoadPathItem(n))},
-                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, n.CreateAny())},
+                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))},
             };
 
         public static OpenApiCallback LoadCallback(ParseNode node)
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiComponentsDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiComponentsDeserializer.cs
@@ -34,7 +34,7 @@ internal static partial class OpenApiV3Deserializer
         private static PatternFieldMap<OpenApiComponents> _componentsPatternFields =
             new PatternFieldMap<OpenApiComponents>
             {
-                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, n.CreateAny())}
+                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}
             };
 
         public static OpenApiComponents LoadComponents(ParseNode node)
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiContactDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiContactDeserializer.cs
@@ -38,7 +38,7 @@ internal static partial class OpenApiV3Deserializer
 
         private static PatternFieldMap<OpenApiContact> _contactPatternFields = new PatternFieldMap<OpenApiContact>
         {
-            {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, n.CreateAny())}
+            {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))}
         };
 
         public static OpenApiContact LoadContact(ParseNode node)
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiDocumentDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiDocumentDeserializer.cs
@@ -44,7 +44,7 @@ internal static partial class OpenApiV3Deserializer
         private static PatternFieldMap<OpenApiDocument> _openApiPatternFields = new PatternFieldMap<OpenApiDocument>
         {
             // We have no semantics to verify X- nodes, therefore treat them as just values.
-            {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, n.CreateAny())}
+            {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}
         };
 
         public static OpenApiDocument LoadOpenApi(RootNode rootNode)
@@ -57,17 +57,5 @@ public static OpenApiDocument LoadOpenApi(RootNode rootNode)
 
             return openApidoc;
         }
-
-
-        public static IOpenApiExtension LoadExtension(string name, ParseNode node)
-        {
-            if (node.Context.ExtensionParsers.TryGetValue(name, out var parser)) {
-                return parser(node.CreateAny());
-            }
-            else
-            {
-                return node.CreateAny();
-            }
-        }
     }
 }
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiEncodingDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiEncodingDeserializer.cs
@@ -59,7 +59,7 @@ internal static partial class OpenApiV3Deserializer
         private static readonly PatternFieldMap<OpenApiEncoding> _encodingPatternFields =
             new PatternFieldMap<OpenApiEncoding>
             {
-                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, n.CreateAny())}
+                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))}
             };
 
         public static OpenApiEncoding LoadEncoding(ParseNode node)
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiExampleDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiExampleDeserializer.cs
@@ -45,7 +45,7 @@ internal static partial class OpenApiV3Deserializer
         private static readonly PatternFieldMap<OpenApiExample> _examplePatternFields =
             new PatternFieldMap<OpenApiExample>
             {
-                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, n.CreateAny())}
+                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))}
             };
 
         public static OpenApiExample LoadExample(ParseNode node)
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiHeaderDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiHeaderDeserializer.cs
@@ -55,7 +55,7 @@ internal static partial class OpenApiV3Deserializer
 
         private static readonly PatternFieldMap<OpenApiHeader> _headerPatternFields = new PatternFieldMap<OpenApiHeader>
         {
-            {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, n.CreateAny())}
+            {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))}
         };
 
         public static OpenApiHeader LoadHeader(ParseNode node)
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiInfoDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiInfoDeserializer.cs
@@ -57,7 +57,7 @@ internal static partial class OpenApiV3Deserializer
 
         public static PatternFieldMap<OpenApiInfo> InfoPatternFields = new PatternFieldMap<OpenApiInfo>
         {
-            {s => s.StartsWith("x-"), (o, k, n) => o.Extensions.Add(k,LoadExtension(k, n))}
+            {s => s.StartsWith("x-"), (o, k, n) => o.AddExtension(k,LoadExtension(k, n))}
         };
 
         public static OpenApiInfo LoadInfo(ParseNode node)
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiLicenseDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiLicenseDeserializer.cs
@@ -32,7 +32,7 @@ internal static partial class OpenApiV3Deserializer
 
         private static PatternFieldMap<OpenApiLicense> _licensePatternFields = new PatternFieldMap<OpenApiLicense>
         {
-            {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, n.CreateAny())}
+            {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))}
         };
 
         internal static OpenApiLicense LoadLicense(ParseNode node)
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiLinkDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiLinkDeserializer.cs
@@ -50,7 +50,7 @@ internal static partial class OpenApiV3Deserializer
 
         private static readonly PatternFieldMap<OpenApiLink> _linkPatternFields = new PatternFieldMap<OpenApiLink>
         {
-            {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, n.CreateAny())},
+            {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))},
         };
 
         public static OpenApiLink LoadLink(ParseNode node)
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiMediaTypeDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiMediaTypeDeserializer.cs
@@ -41,7 +41,7 @@ internal static partial class OpenApiV3Deserializer
         private static readonly PatternFieldMap<OpenApiMediaType> _mediaTypePatternFields =
             new PatternFieldMap<OpenApiMediaType>
             {
-                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, n.CreateAny())}
+                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))}
             };
 
         public static OpenApiMediaType LoadMediaType(ParseNode node)
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiOAuthFlowDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiOAuthFlowDeserializer.cs
@@ -41,7 +41,7 @@ internal static partial class OpenApiV3Deserializer
         private static readonly PatternFieldMap<OpenApiOAuthFlow> _oAuthFlowPatternFields =
             new PatternFieldMap<OpenApiOAuthFlow>
             {
-                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, n.CreateAny())}
+                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))}
             };
 
         public static OpenApiOAuthFlow LoadOAuthFlow(ParseNode node)
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiOAuthFlowsDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiOAuthFlowsDeserializer.cs
@@ -25,7 +25,7 @@ internal static partial class OpenApiV3Deserializer
         private static readonly PatternFieldMap<OpenApiOAuthFlows> _oAuthFlowsPatternFields =
             new PatternFieldMap<OpenApiOAuthFlows>
             {
-                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, n.CreateAny())}
+                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))}
             };
 
         public static OpenApiOAuthFlows LoadOAuthFlows(ParseNode node)
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiOperationDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiOperationDeserializer.cs
@@ -95,7 +95,7 @@ internal static partial class OpenApiV3Deserializer
         private static readonly PatternFieldMap<OpenApiOperation> _operationPatternFields =
             new PatternFieldMap<OpenApiOperation>
             {
-                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, n.CreateAny())},
+                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))},
             };
 
         internal static OpenApiOperation LoadOperation(ParseNode node)
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiParameterDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiParameterDeserializer.cs
@@ -101,7 +101,7 @@ internal static partial class OpenApiV3Deserializer
         private static readonly PatternFieldMap<OpenApiParameter> _parameterPatternFields =
             new PatternFieldMap<OpenApiParameter>
             {
-                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, n.CreateAny())}
+                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))}
             };
 
         public static OpenApiParameter LoadParameter(ParseNode node)
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiPathItemDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiPathItemDeserializer.cs
@@ -43,7 +43,7 @@ internal static partial class OpenApiV3Deserializer
         private static readonly PatternFieldMap<OpenApiPathItem> _pathItemPatternFields =
             new PatternFieldMap<OpenApiPathItem>
             {
-                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, n.CreateAny())}
+                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))}
             };
 
         public static OpenApiPathItem LoadPathItem(ParseNode node)
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiPathsDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiPathsDeserializer.cs
@@ -18,7 +18,7 @@ internal static partial class OpenApiV3Deserializer
         private static PatternFieldMap<OpenApiPaths> _pathsPatternFields = new PatternFieldMap<OpenApiPaths>
         {
             {s => s.StartsWith("/"), (o, k, n) => o.Add(k, LoadPathItem(n))},
-            {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, n.CreateAny())}
+            {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))}
         };
 
         public static OpenApiPaths LoadPaths(ParseNode node)
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiRequestBodyDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiRequestBodyDeserializer.cs
@@ -39,7 +39,7 @@ internal static partial class OpenApiV3Deserializer
         private static readonly PatternFieldMap<OpenApiRequestBody> _requestBodyPatternFields =
             new PatternFieldMap<OpenApiRequestBody>
             {
-                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, n.CreateAny())}
+                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))}
             };
 
         public static OpenApiRequestBody LoadRequestBody(ParseNode node)
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiResponseDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiResponseDeserializer.cs
@@ -45,7 +45,7 @@ internal static partial class OpenApiV3Deserializer
         private static readonly PatternFieldMap<OpenApiResponse> _responsePatternFields =
             new PatternFieldMap<OpenApiResponse>
             {
-                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, n.CreateAny())}
+                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))}
             };
 
         public static OpenApiResponse LoadResponse(ParseNode node)
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiResponsesDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiResponsesDeserializer.cs
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiSchemaDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiSchemaDeserializer.cs
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiSecuritySchemeDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiSecuritySchemeDeserializer.cs
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiServerDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiServerDeserializer.cs
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiServerVariableDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiServerVariableDeserializer.cs
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiTagDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiTagDeserializer.cs
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiV3Deserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiV3Deserializer.cs
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiXmlDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiXmlDeserializer.cs
diff --git a/src/Microsoft.OpenApi/Extensions/OpenApiExtensibleExtensions.cs b/src/Microsoft.OpenApi/Extensions/OpenApiExtensibleExtensions.cs
diff --git a/src/Microsoft.OpenApi/Models/OpenApiDocument.cs b/src/Microsoft.OpenApi/Models/OpenApiDocument.cs
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiDocumentTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiDocumentTests.cs
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.cs

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ internal static partial class OpenApiV2Deserializer`
`38`	`38`
`39`	`39`	`private static PatternFieldMap<OpenApiContact> _contactPatternFields = new PatternFieldMap<OpenApiContact>`
`40`	`40`	`{`
`41`		`- {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, n.CreateAny())}`
	`41`	`+ {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}`
`42`	`42`	`};`
`43`	`43`
`44`	`44`	`public static OpenApiContact LoadContact(ParseNode node)`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`using System.Collections.Generic;`
`6`	`6`	`using System.Linq;`
`7`	`7`	`using Microsoft.OpenApi.Extensions;`
	`8`	`+using Microsoft.OpenApi.Interfaces;`
`8`	`9`	`using Microsoft.OpenApi.Models;`
`9`	`10`	`using Microsoft.OpenApi.Readers.ParseNodes;`
`10`	`11`	`using Microsoft.OpenApi.Services;`
`@@ -116,7 +117,7 @@ internal static partial class OpenApiV2Deserializer`
`116`	`117`	`private static PatternFieldMap<OpenApiDocument> _openApiPatternFields = new PatternFieldMap<OpenApiDocument>`
`117`	`118`	`{`
`118`	`119`	`// We have no semantics to verify X- nodes, therefore treat them as just values.`
`119`		`- {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, n.CreateAny())}`
	`120`	`+ {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}`
`120`	`121`	`};`
`121`	`122`
`122`	`123`	`private static void MakeServers(IList<OpenApiServer> servers, ParsingContext context, Uri defaultUrl)`
`@@ -228,7 +229,6 @@ private static void FixRequestBodyReferences(OpenApiDocument doc)`
`228`	`229`	`var walker = new OpenApiWalker(fixer);`
`229`	`230`	`walker.Walk(doc);`
`230`	`231`	`}`
`231`		`-`
`232`	`232`	`}`
`233`	`233`	`}`
`234`	`234`
`@@ -258,5 +258,7 @@ public override void Visit(OpenApiOperation operation)`
`258`	`258`	`};`
`259`	`259`	`}`
`260`	`260`	`}`
	`261`	`+`
	`262`	`+`
`261`	`263`	`}`
`262`	`264`	`}`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ internal static partial class OpenApiV2Deserializer`
`130`	`130`
`131`	`131`	`private static readonly PatternFieldMap<OpenApiHeader> _headerPatternFields = new PatternFieldMap<OpenApiHeader>`
`132`	`132`	`{`
`133`		`- {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, n.CreateAny())}`
	`133`	`+ {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}`
`134`	`134`	`};`
`135`	`135`
`136`	`136`	`public static OpenApiHeader LoadHeader(ParseNode node)`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ internal static partial class OpenApiV2Deserializer`
`57`	`57`
`58`	`58`	`private static PatternFieldMap<OpenApiInfo> _infoPatternFields = new PatternFieldMap<OpenApiInfo>`
`59`	`59`	`{`
`60`		`- {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, n.CreateAny())}`
	`60`	`+ {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}`
`61`	`61`	`};`
`62`	`62`
`63`	`63`	`public static OpenApiInfo LoadInfo(ParseNode node)`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ internal static partial class OpenApiV2Deserializer`
`32`	`32`
`33`	`33`	`private static PatternFieldMap<OpenApiLicense> _licensePatternFields = new PatternFieldMap<OpenApiLicense>`
`34`	`34`	`{`
`35`		`- {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, n.CreateAny())}`
	`35`	`+ {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}`
`36`	`36`	`};`
`37`	`37`
`38`	`38`	`public static OpenApiLicense LoadLicense(ParseNode node)`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ internal static partial class OpenApiV2Deserializer`
`146`	`146`	`private static readonly PatternFieldMap<OpenApiParameter> _parameterPatternFields =`
`147`	`147`	`new PatternFieldMap<OpenApiParameter>`
`148`	`148`	`{`
`149`		`- {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, n.CreateAny())}`
	`149`	`+ {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}`
`150`	`150`	`};`
`151`	`151`
`152`	`152`	`private static void LoadStyle(OpenApiParameter p, string v)`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ internal static partial class OpenApiV2Deserializer`
`39`	`39`	`private static readonly PatternFieldMap<OpenApiPathItem> _pathItemPatternFields =`
`40`	`40`	`new PatternFieldMap<OpenApiPathItem>`
`41`	`41`	`{`
`42`		`- {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, n.CreateAny())},`
	`42`	`+ {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))},`
`43`	`43`	`};`
`44`	`44`
`45`	`45`	`public static OpenApiPathItem LoadPathItem(ParseNode node)`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ internal static partial class OpenApiV2Deserializer`
`18`	`18`	`private static PatternFieldMap<OpenApiPaths> _pathsPatternFields = new PatternFieldMap<OpenApiPaths>`
`19`	`19`	`{`
`20`	`20`	`{s => s.StartsWith("/"), (o, k, n) => o.Add(k, LoadPathItem(n))},`
`21`		`- {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, n.CreateAny())}`
	`21`	`+ {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}`
`22`	`22`	`};`
`23`	`23`
`24`	`24`	`public static OpenApiPaths LoadPaths(ParseNode node)`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ internal static partial class OpenApiV2Deserializer`
`45`	`45`	`private static readonly PatternFieldMap<OpenApiResponse> _responsePatternFields =`
`46`	`46`	`new PatternFieldMap<OpenApiResponse>`
`47`	`47`	`{`
`48`		`- {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, n.CreateAny())}`
	`48`	`+ {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}`
`49`	`49`	`};`
`50`	`50`
`51`	`51`	`private static void ProcessProduces(OpenApiResponse response, ParsingContext context)`