Merge pull request #281 from Microsoft/dm/read-extension-with-version

Added spec version to signature of custom extension parsers

Author: darrelmiller

src/Microsoft.OpenApi.Readers/OpenApiReaderSettings.cs

@@ -42,7 +42,7 @@ public class OpenApiReaderSettings
         /// <summary>
         /// Dictionary of parsers for converting extensions into strongly typed classes
         /// </summary>
-        public Dictionary<string, Func<IOpenApiAny , IOpenApiExtension>> ExtensionParsers { get; set; } = new Dictionary<string, Func<IOpenApiAny, IOpenApiExtension>>();
+        public Dictionary<string, Func<IOpenApiAny , OpenApiSpecVersion, IOpenApiExtension>> ExtensionParsers { get; set; } = new Dictionary<string, Func<IOpenApiAny, OpenApiSpecVersion, IOpenApiExtension>>();
 
         /// <summary>
         /// Rules to use for validating OpenAPI specification.  If none are provided a default set of rules are applied.

src/Microsoft.OpenApi.Readers/ParsingContext.cs

@@ -25,7 +25,7 @@ public class ParsingContext
         private readonly Dictionary<string, object> _tempStorage = new Dictionary<string, object>();
         private IOpenApiVersionService _versionService;
         private readonly Dictionary<string, Stack<string>> _loopStacks = new Dictionary<string, Stack<string>>();        
-        internal Dictionary<string, Func<IOpenApiAny, IOpenApiExtension>> ExtensionParsers { get; set; }  = new Dictionary<string, Func<IOpenApiAny, IOpenApiExtension>>();
+        internal Dictionary<string, Func<IOpenApiAny, OpenApiSpecVersion, IOpenApiExtension>> ExtensionParsers { get; set; }  = new Dictionary<string, Func<IOpenApiAny, OpenApiSpecVersion, IOpenApiExtension>>();
         internal RootNode RootNode { get; set; }
         internal List<OpenApiTag> Tags { get; private set; } = new List<OpenApiTag>();
         internal Uri BaseUrl { get; set; }

src/Microsoft.OpenApi.Readers/V2/OpenApiV2Deserializer.cs

@@ -43,7 +43,7 @@ private static IOpenApiExtension LoadExtension(string name, ParseNode node)
         {
             if (node.Context.ExtensionParsers.TryGetValue(name, out var parser))
             {
-                return parser(node.CreateAny());
+                return parser(node.CreateAny(), OpenApiSpecVersion.OpenApi2_0);
             }
             else
             {

src/Microsoft.OpenApi.Readers/V3/OpenApiV3Deserializer.cs

@@ -68,7 +68,7 @@ private static IOpenApiExtension LoadExtension(string name, ParseNode node)
         {
             if (node.Context.ExtensionParsers.TryGetValue(name, out var parser))
             {
-                return parser(node.CreateAny());
+                return parser(node.CreateAny(), OpenApiSpecVersion.OpenApi3_0);
             }
             else
             {

test/Microsoft.OpenApi.Readers.Tests/TestCustomExtension.cs

@@ -26,7 +26,7 @@ public void ParseCustomExtension()
 ";
             var settings = new OpenApiReaderSettings()
             {
-                ExtensionParsers = { { "x-foo", (a) => {
+                ExtensionParsers = { { "x-foo", (a,v) => {
                         var fooNode = (OpenApiObject)a;
                         return new FooExtension() {
                               Bar = (fooNode["bar"] as OpenApiString)?.Value,