Visitar URL original
fix: refactor ToIdentifier() to normalize flaggable enums by MaggieKimani1 · Pull Request #2156 · microsoft/OpenAPI.NET · GitHub
Skip to content

fix: refactor ToIdentifier() to normalize flaggable enums #2156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Vincent Biret (baywet) merged 15 commits into from
Feb 20, 2025
Merged

fix: refactor ToIdentifier() to normalize flaggable enums #2156

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
f9f3a94
fix: refactor ToIdentifier() to normalize flaggable enums
MaggieKimani1 Feb 18, 2025
9ae9565
fix: add support for casting type array to a flaggable enum
MaggieKimani1 Feb 18, 2025
3c927e9
chore: add tests and update public API
MaggieKimani1 Feb 18, 2025
a731be6
Update src/Microsoft.OpenApi/Extensions/OpenApiTypeMapper.cs
MaggieKimani1 Feb 19, 2025
0f4a837
chore: address PR feedback
MaggieKimani1 Feb 19, 2025
b6b9f74
chore: make method internal; update public API
MaggieKimani1 Feb 19, 2025
63dca8a
Update src/Microsoft.OpenApi/Extensions/OpenApiTypeMapper.cs
MaggieKimani1 Feb 20, 2025
ff9f164
Update src/Microsoft.OpenApi/Extensions/OpenApiTypeMapper.cs
MaggieKimani1 Feb 20, 2025
b79d66f
fix: address more PR feedback, add and fix tests
MaggieKimani1 Feb 20, 2025
fe50da3
Update src/Microsoft.OpenApi/Extensions/OpenApiTypeMapper.cs
MaggieKimani1 Feb 20, 2025
cbb1407
Update src/Microsoft.OpenApi/Extensions/OpenApiTypeMapper.cs
MaggieKimani1 Feb 20, 2025
fe19bfb
Update src/Microsoft.OpenApi/Extensions/OpenApiTypeMapper.cs
MaggieKimani1 Feb 20, 2025
ee43027
chore: clean up
MaggieKimani1 Feb 20, 2025
844b9b1
chore: removes redundant check
baywet Feb 20, 2025
3d7aa58
chore: cleans up api surface
baywet Feb 20, 2025
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
Prev Previous commit
Next Next commit
Update src/Microsoft.OpenApi/Extensions/OpenApiTypeMapper.cs 
Co-authored-by: Vincent Biret <vibiret@microsoft.com>
  • Loading branch information
@MaggieKimani1 @baywet
MaggieKimani1 and baywet authored Feb 20, 2025
commit fe50da3a35c39423d6772401aabaf8d41f060e31
25 changes: 14 additions & 11 deletions src/Microsoft.OpenApi/Extensions/OpenApiTypeMapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,20 @@ public static class OpenApiTypeMapper
/// <returns></returns>
public static string[] ToIdentifiers(this JsonSchemaType schemaType)
{
var types = new List<string>();

if (schemaType.HasFlag(JsonSchemaType.Boolean)) types.Add("boolean");
if (schemaType.HasFlag(JsonSchemaType.Integer)) types.Add("integer");
if (schemaType.HasFlag(JsonSchemaType.Number)) types.Add("number");
if (schemaType.HasFlag(JsonSchemaType.String)) types.Add("string");
if (schemaType.HasFlag(JsonSchemaType.Object)) types.Add("object");
if (schemaType.HasFlag(JsonSchemaType.Array)) types.Add("array");
if (schemaType.HasFlag(JsonSchemaType.Null)) types.Add("null");

return types.ToArray();
return schemaType.ToIdentifiersInternal().ToArray();
}
private static readonly Dictionary<JsonSchemaType, string> allSchemaTypes = [
{ JsonSchemaType.Boolean, "boolean"},
{ JsonSchemaType.Integer, "integer" },
{ JsonSchemaType.Number, "number" },
{ JsonSchemaType.String, "string" },
{ JsonSchemaType.Object, "object" },
{ JsonSchemaType.Array, "array" },
{ JsonSchemaType.Null, "null" },
];
private static IEnumerable<string> ToIdentifiersInternal(this JsonSchemaType schemaType)
{
return allSchemaTypes.Where(kvp => schemaType.HasFlag(kvp.Key)).Select(static kvp => kvp.Value);
}

/// <summary>
Expand Down