Updated reading of properties typed Any

Author: darrelmiller

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

@@ -54,6 +54,20 @@ public override IOpenApiAny CreateAny()
                 return new OpenApiBoolean(false);
             }
 
+            if (int.TryParse(value, out var intValue))
+            {
+                return new OpenApiInteger(intValue);
+            }
+
+            if (Double.TryParse(value, out var dblValue))
+            {
+                return new OpenApiDouble(dblValue);
+            }
+
+            if (DateTime.TryParse(value, out var datetimeValue))
+            {
+                return new OpenApiDateTime(datetimeValue);
+            }
             // TODO: add more codes to identify each primitive types
 
 

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

@@ -3,9 +3,10 @@
 //  Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
 // ------------------------------------------------------------
 
-using Microsoft.OpenApi.Extensions;
+
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Readers.ParseNodes;
+using System.Collections.Generic;
 
 namespace Microsoft.OpenApi.Readers.V2
 {
@@ -15,24 +16,35 @@ namespace Microsoft.OpenApi.Readers.V2
     /// </summary>
     internal static partial class OpenApiV2Deserializer
     {
-        private static readonly FixedFieldMap<OpenApiExample> ExampleFixedFields = new FixedFieldMap<OpenApiExample>();
-
-        private static readonly PatternFieldMap<OpenApiExample> ExamplePatternFields =
-            new PatternFieldMap<OpenApiExample>
+        public static void LoadExamples(OpenApiResponse response, ParseNode node)
+        {
+            var mapNode = node.CheckMapNode("examples");
+            foreach (var mediaTypeNode in mapNode)
             {
-                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, n.CreateAny())}
-            };
+                LoadExample(response, mediaTypeNode.Name, mediaTypeNode.Value);
+            }
+        }
 
-        public static OpenApiExample LoadExample(ParseNode node)
+            public static void LoadExample(OpenApiResponse response, string mediaType, ParseNode node)
         {
-            var mapNode = node.CheckMapNode("Example");
-            var example = new OpenApiExample();
-            foreach (var property in mapNode)
+            var exampleNode = node.CreateAny();
+
+            if (response.Content == null)
+            {
+                response.Content = new Dictionary<string, OpenApiMediaType>();
+            }
+            OpenApiMediaType mediaTypeObject;
+            if (response.Content.ContainsKey(mediaType))
+            {
+                mediaTypeObject = response.Content[mediaType];
+            }
+            else
             {
-                property.ParseField(example, ExampleFixedFields, ExamplePatternFields);
+                mediaTypeObject = new OpenApiMediaType();
+                response.Content.Add(mediaType, mediaTypeObject);
             }
+            mediaTypeObject.Example = exampleNode;
 
-            return example;
         }
     }
 }

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

@@ -33,7 +33,7 @@ internal static partial class OpenApiV2Deserializer
             {
                 "examples", (o, n) =>
                 {
-                    /*o.Examples = ((ListNode)n).Select(s=> new AnyNode(s)).ToList();*/
+                    OpenApiV2Deserializer.LoadExamples(o,n);
                 }
             },
             {

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

@@ -181,7 +181,7 @@ internal static partial class OpenApiV2Deserializer
             {
                 "example", (o, n) =>
                 {
-                    o.Example = new OpenApiString(n.GetScalarValue());
+                    o.Example = n.CreateAny();
                 }
             },
         };

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

@@ -35,7 +35,7 @@ internal static partial class OpenApiV3Deserializer
                 {
                     "example", (o, n) =>
                     {
-                        o.Example = new OpenApiString(n.GetScalarValue());
+                        o.Example = n.CreateAny();
                     }
                 },
                 //Encoding

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

@@ -210,7 +210,7 @@ internal static partial class OpenApiV3Deserializer
             {
                 "example", (o, n) =>
                 {
-                    o.Example = new OpenApiString(n.GetScalarValue());
+                    o.Example = n.CreateAny();
                 }
             },
             {

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

@@ -66,7 +66,7 @@ public void ParseCompleteHeaderOpenApi()
             info.Extensions["x-list"].Should().BeOfType<OpenApiArray>();
             var arrayValue = (OpenApiArray)(info.Extensions["x-list"]);
             arrayValue.Count.Should().Be(2);
-            arrayValue.Select(e => ((OpenApiString)e).Value).Should().Equal("1", "2");
+            arrayValue.Select(e => ((OpenApiInteger)e).Value).Should().Equal(1, 2);
         }
     }
 }