Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
113 changes: 101 additions & 12 deletions src/Microsoft.OpenApi.Readers/V2/OpenApiHeaderDeserializer.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
// 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.Exceptions;
using Microsoft.OpenApi.Readers.ParseNodes;

namespace Microsoft.OpenApi.Readers.V2
Expand All @@ -22,41 +25,107 @@ 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.CreateListOfAny();
}
}
};

private static readonly PatternFieldMap<OpenApiHeader> _headerPatternFields = new PatternFieldMap<OpenApiHeader>
Expand All @@ -82,5 +151,25 @@ public static OpenApiHeader LoadHeader(ParseNode node)

return header;
}

private static void LoadStyle(OpenApiHeader header, string style)
{
switch (style)
{
case "csv":
header.Style = ParameterStyle.Simple;
return;
case "ssv":
header.Style = ParameterStyle.SpaceDelimited;
return;
case "pipes":
header.Style = ParameterStyle.PipeDelimited;
return;
case "tsv":
throw new NotSupportedException();
default:
throw new OpenApiReaderException("Unrecognized header style: " + style);
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ internal static partial class OpenApiV2Deserializer
{
"default", (o, n) =>
{
GetOrCreateSchema(o).Default = new OpenApiString(n.GetScalarValue());
GetOrCreateSchema(o).Default = n.CreateAny();
}
},
{
Expand All @@ -132,8 +132,7 @@ internal static partial class OpenApiV2Deserializer
{
"enum", (o, n) =>
{
GetOrCreateSchema(o).Enum =
n.CreateSimpleList<IOpenApiAny>(l => new OpenApiString(l.GetScalarValue()));
GetOrCreateSchema(o).Enum = n.CreateListOfAny();
}
},
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license.

using System.Collections.Generic;
using System.IO;
using FluentAssertions;
using Microsoft.OpenApi.Any;
using Microsoft.OpenApi.Models;
using Microsoft.OpenApi.Readers.ParseNodes;
using Microsoft.OpenApi.Readers.V2;
Expand Down Expand Up @@ -137,13 +139,31 @@ 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"
Format = "int64",
Enum = new List<IOpenApiAny>
{
new OpenApiInteger(1),
new OpenApiInteger(2),
new OpenApiInteger(3),
new OpenApiInteger(4),
}
},
Default = new OpenApiArray() {
new OpenApiInteger(1),
new OpenApiInteger(2)
},
Enum = new List<IOpenApiAny>
{
new OpenApiArray() { new OpenApiInteger(1), new OpenApiInteger(2) },
new OpenApiArray() { new OpenApiInteger(2), new OpenApiInteger(3) },
new OpenApiArray() { new OpenApiInteger(3), new OpenApiInteger(4) }
}
}
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@ in: header
description: token to be passed as a header
required: true
type: array
default: [1,2]
items:
type: integer
format: int64
collectionFormat: csv
enum: [1,2,3,4]
collectionFormat: csv
enum:
- [1,2]
- [2,3]
- [3,4]