Fix schema deserialization

Author: darrelmiller

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

@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. 
 
+using System;
+using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Readers.ParseNodes;
@@ -22,41 +24,108 @@ internal static partial class OpenApiV2Deserializer
                 }
             },
             {
-                "required", (o, n) =>
+                "type", (o, n) =>
                 {
-                    o.Required = bool.Parse(n.GetScalarValue());
+                    GetOrCreateSchema(o).Type = n.GetScalarValue();
                 }
             },
             {
-                "deprecated", (o, n) =>
+                "format", (o, n) =>
                 {
-                    o.Deprecated = bool.Parse(n.GetScalarValue());
+                    GetOrCreateSchema(o).Format = n.GetScalarValue();
                 }
             },
             {
-                "allowReserved", (o, n) =>
+                "items", (o, n) =>
                 {
-                    o.AllowReserved = bool.Parse(n.GetScalarValue());
+                    GetOrCreateSchema(o).Items = LoadSchema(n);
                 }
             },
             {
-                "style", (o, n) =>
+                "collectionFormat", (o, n) =>
                 {
-                    o.Style = n.GetScalarValue().GetEnumFromDisplayName<ParameterStyle>();
+                    LoadStyle(o, n.GetScalarValue());
                 }
             },
             {
-                "type", (o, n) =>
+                "default", (o, n) =>
                 {
-                    GetOrCreateSchema(o).Type = n.GetScalarValue();
+                    GetOrCreateSchema(o).Default = n.CreateAny();
+                }
+            },
+                        {
+                "maximum", (o, n) =>
+                {
+                    GetOrCreateSchema(o).Maximum = decimal.Parse(n.GetScalarValue());
                 }
             },
             {
-                "format", (o, n) =>
+                "exclusiveMaximum", (o, n) =>
                 {
-                    GetOrCreateSchema(o).Format = n.GetScalarValue();
+                    GetOrCreateSchema(o).ExclusiveMaximum = bool.Parse(n.GetScalarValue());
+                }
+            },
+            {
+                "minimum", (o, n) =>
+                {
+                    GetOrCreateSchema(o).Minimum = decimal.Parse(n.GetScalarValue());
                 }
             },
+            {
+                "exclusiveMinimum", (o, n) =>
+                {
+                    GetOrCreateSchema(o).ExclusiveMinimum = bool.Parse(n.GetScalarValue());
+                }
+            },
+            {
+                "maxLength", (o, n) =>
+                {
+                    GetOrCreateSchema(o).MaxLength = int.Parse(n.GetScalarValue());
+                }
+            },
+            {
+                "minLength", (o, n) =>
+                {
+                    GetOrCreateSchema(o).MinLength = int.Parse(n.GetScalarValue());
+                }
+            },
+            {
+                "pattern", (o, n) =>
+                {
+                    GetOrCreateSchema(o).Pattern = n.GetScalarValue();
+                }
+            },
+            {
+                "maxItems", (o, n) =>
+                {
+                    GetOrCreateSchema(o).MaxItems = int.Parse(n.GetScalarValue());
+                }
+            },
+            {
+                "minItems", (o, n) =>
+                {
+                    GetOrCreateSchema(o).MinItems = int.Parse(n.GetScalarValue());
+                }
+            },
+            {
+                "uniqueItems", (o, n) =>
+                {
+                    GetOrCreateSchema(o).UniqueItems = bool.Parse(n.GetScalarValue());
+                }
+            },
+            {
+                "multipleOf", (o, n) =>
+                {
+                    GetOrCreateSchema(o).MultipleOf = decimal.Parse(n.GetScalarValue());
+                }
+            },
+            {
+                "enum", (o, n) =>
+                {
+                    GetOrCreateSchema(o).Enum =
+                        n.CreateSimpleList<IOpenApiAny>(l => new OpenApiString(l.GetScalarValue()));
+                }
+            }
         };
 
         private static readonly PatternFieldMap<OpenApiHeader> _headerPatternFields = new PatternFieldMap<OpenApiHeader>
@@ -82,5 +151,28 @@ public static OpenApiHeader LoadHeader(ParseNode node)
 
             return header;
         }
+
+
+        private static void LoadStyle(OpenApiHeader h, string v)
+        {
+            switch (v)
+            {
+                case "csv":
+                    h.Style = ParameterStyle.Simple;
+                    return;
+                case "ssv":
+                    h.Style = ParameterStyle.SpaceDelimited;
+                    return;
+                case "pipes":
+                    h.Style = ParameterStyle.PipeDelimited;
+                    return;
+                case "tsv":
+                    throw new NotSupportedException();
+                case "multi":
+                    h.Style = ParameterStyle.Form;
+                    h.Explode = true;
+                    return;
+            }
+        }
     }
 }

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

@@ -120,7 +120,7 @@ internal static partial class OpenApiV2Deserializer
                 {
                     "default", (o, n) =>
                     {
-                        GetOrCreateSchema(o).Default = new OpenApiString(n.GetScalarValue());
+                        GetOrCreateSchema(o).Default = n.CreateAny();
                     }
                 },
                 {

test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiParameterTests.cs

@@ -3,6 +3,7 @@
 
 using System.IO;
 using FluentAssertions;
+using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Readers.ParseNodes;
 using Microsoft.OpenApi.Readers.V2;
@@ -137,13 +138,18 @@ public void ParseHeaderParameterShouldSucceed()
                     Description = "token to be passed as a header",
                     Required = true,
                     Style = ParameterStyle.Simple,
+                   
                     Schema = new OpenApiSchema
                     {
                         Type = "array",
                         Items = new OpenApiSchema
                         {
                             Type = "integer",
                             Format = "int64"
+                        },
+                        Default = new OpenApiArray() {
+                            new OpenApiInteger(1),
+                            new OpenApiInteger(2)
                         }
                     }
                 });

test/Microsoft.OpenApi.Readers.Tests/V2Tests/Samples/OpenApiParameter/headerParameter.yaml

@@ -4,6 +4,7 @@ in: header
 description: token to be passed as a header
 required: true
 type: array
+default: [1,2]
 items:
   type: integer
   format: int64