- add handling for V3

- add handling for compelx type

Author: PerthCharern

src/Microsoft.OpenApi.Readers/ParseNodes/IOpenApiAnyExtensions.cs

@@ -10,6 +10,29 @@ internal static class OpenApiStringConverter
     {
         public static IOpenApiAny GetSpecificOpenApiAny(IOpenApiAny openApiAny)
         {
+            if (openApiAny is OpenApiArray openApiArray)
+            {
+                var newArray = new OpenApiArray();
+                foreach (var element in openApiArray)
+                {
+                    newArray.Add(GetSpecificOpenApiAny(element));
+                }
+
+                return newArray;
+            }
+
+            if (openApiAny is OpenApiObject openApiObject)
+            {
+                var newObject = new OpenApiObject();
+
+                foreach (var key in openApiObject.Keys.ToList())
+                {
+                    newObject[key] = GetSpecificOpenApiAny(openApiObject[key]);
+                }
+
+                return newObject;
+            }
+
             if ( !(openApiAny is OpenApiString))
             {
                 return openApiAny;
@@ -58,15 +81,12 @@ public static IOpenApiAny GetSpecificOpenApiAny(IOpenApiAny openApiAny)
 
         public static IOpenApiAny GetSpecificOpenApiAny(IOpenApiAny openApiAny, OpenApiSchema schema)
         {
-            var type = schema.Type;
-            var format = schema.Format;
-
             if (openApiAny is OpenApiArray openApiArray)
             {
                 var newArray = new OpenApiArray();
                 foreach (var element in openApiArray)
                 {
-                    newArray.Add(GetSpecificOpenApiAny(element, schema.Items));
+                    newArray.Add(GetSpecificOpenApiAny(element, schema?.Items));
                 }
 
                 return newArray;
@@ -78,7 +98,14 @@ public static IOpenApiAny GetSpecificOpenApiAny(IOpenApiAny openApiAny, OpenApiS
 
                 foreach (var key in openApiObject.Keys.ToList())
                 {
-                    newObject[key] = GetSpecificOpenApiAny(openApiObject[key], schema.AdditionalProperties);
+                    if ( schema != null && schema.Properties != null && schema.Properties.ContainsKey(key) )
+                    {
+                        newObject[key] = GetSpecificOpenApiAny(openApiObject[key], schema.Properties[key]);
+                    }
+                    else
+                    {
+                        newObject[key] = GetSpecificOpenApiAny(openApiObject[key], schema?.AdditionalProperties);
+                    }
                 }
 
                 return newObject;
@@ -89,11 +116,14 @@ public static IOpenApiAny GetSpecificOpenApiAny(IOpenApiAny openApiAny, OpenApiS
                 return openApiAny;
             }
 
-            if (type == null && format == null)
+            if (schema?.Type == null)
             {
-                GetSpecificOpenApiAny(openApiAny);
+                return GetSpecificOpenApiAny(openApiAny);
             }
 
+            var type = schema.Type;
+            var format = schema.Format;
+
             var value = ((OpenApiString)openApiAny).Value;
 
             if (value == null || value == "null")

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

@@ -134,6 +134,31 @@ internal static partial class OpenApiV2Deserializer
             {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}
         };
 
+        private static readonly AnyFieldMap<OpenApiHeader> _headerAnyFields =
+            new AnyFieldMap<OpenApiHeader>
+            {
+                {
+                    "default",
+                    new AnyFieldMapParameter<OpenApiHeader>(
+                        p => p.Schema.Default,
+                        (p, v) => p.Schema.Default = v,
+                        p => p.Schema)
+                }
+            };
+
+        private static readonly AnyListFieldMap<OpenApiHeader> _headerAnyListFields =
+            new AnyListFieldMap<OpenApiHeader>
+            {
+                {
+                    "enum",
+                    new AnyListFieldMapParameter<OpenApiHeader>(
+                        p => p.Schema.Enum,
+                        (p, v) => p.Schema.Enum = v,
+                        p => p.Schema)
+                },
+            };
+
+
         public static OpenApiHeader LoadHeader(ParseNode node)
         {
             var mapNode = node.CheckMapNode("header");
@@ -150,6 +175,9 @@ public static OpenApiHeader LoadHeader(ParseNode node)
                 node.Context.SetTempStorage("schema", null);
             }
 
+            ProcessAnyFields(mapNode, header, _headerAnyFields);
+            ProcessAnyListFields(mapNode, header, _headerAnyListFields);
+
             return header;
         }
 

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

@@ -83,7 +83,7 @@ private static void LoadExamples(OpenApiResponse response, ParseNode node)
 
         private static void LoadExample(OpenApiResponse response, string mediaType, ParseNode node)
         {
-            var exampleNode = node.CreateAny();
+            var exampleNode = OpenApiStringConverter.GetSpecificOpenApiAny(node.CreateAny());
 
             if (response.Content == null)
             {

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

@@ -103,7 +103,7 @@ private static void ProcessAnyListFields<T>(
 
         public static IOpenApiAny LoadAny(ParseNode node)
         {
-            return node.CreateAny();
+            return OpenApiStringConverter.GetSpecificOpenApiAny(node.CreateAny());
         }
 
         private static IOpenApiExtension LoadExtension(string name, ParseNode node)

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

@@ -276,6 +276,9 @@ public static OpenApiSchema LoadSchema(ParseNode node)
                 propertyNode.ParseField(domainObject, _schemaFixedFields, _schemaPatternFields);
             }
 
+            ProcessAnyFields(mapNode, domainObject, _schemaAnyFields);
+            ProcessAnyListFields(mapNode, domainObject, _schemaAnyListFields);
+
             return domainObject;
         }
     }

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

@@ -126,7 +126,7 @@ private static RuntimeExpressionAnyWrapper LoadRuntimeExpressionAnyWrapper(Parse
 
         public static IOpenApiAny LoadAny(ParseNode node)
         {
-            return node.CreateAny();
+            return OpenApiStringConverter.GetSpecificOpenApiAny(node.CreateAny());
         }
 
         private static IOpenApiExtension LoadExtension(string name, ParseNode node)

test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiSchemaTests.cs

@@ -94,7 +94,7 @@ public void ParsePrimitiveStringSchemaFragmentShouldSucceed()
                 {
                     Type = "integer",
                     Format = "int64",
-                    Default = new OpenApiInteger(88)
+                    Default = new OpenApiLong(88)
                 });
         }
 
@@ -120,8 +120,8 @@ public void ParseExampleStringFragmentShouldSucceed()
                 {
                     ["foo"] = new OpenApiString("bar"),
                     ["baz"] = new OpenApiArray() { 
-                    new OpenApiInteger(1),
-                    new OpenApiInteger(2)
+                        new OpenApiInteger(1),
+                        new OpenApiInteger(2)
                     }
                 });
         }
@@ -314,7 +314,7 @@ public void ParseBasicSchemaWithExampleShouldSucceed()
                         Example = new OpenApiObject
                         {
                             ["name"] = new OpenApiString("Puma"),
-                            ["id"] = new OpenApiInteger(1)
+                            ["id"] = new OpenApiLong(1)
                         }
                     });
             }