Convert the JsonSchemaType helper methods to extensions

MaggieKimani1 · MaggieKimani1 · commit 3abe36c3d7c9 · 2024-10-30T18:17:39.000+03:00
diff --git a/src/Microsoft.OpenApi/Extensions/OpenApiTypeMapper.cs b/src/Microsoft.OpenApi/Extensions/OpenApiTypeMapper.cs
@@ -18,7 +18,7 @@ public static class OpenApiTypeMapper
         /// </summary>
         /// <param name="schemaType"></param>
         /// <returns></returns>
-        public static string ToIdentifier(JsonSchemaType? schemaType)
+        public static string ToIdentifier(this JsonSchemaType? schemaType)
         {
             return schemaType switch
             {
@@ -38,7 +38,7 @@ public static string ToIdentifier(JsonSchemaType? schemaType)
         /// </summary>
         /// <param name="identifier"></param>
         /// <returns></returns>
-        public static JsonSchemaType IdentifierToEnumType(string identifier)
+        public static JsonSchemaType ToJsonSchemaType(this string identifier)
         {
             return identifier switch
             {
@@ -137,7 +137,7 @@ public static Type MapOpenApiPrimitiveTypeToSimpleType(this OpenApiSchema schema
                 throw new ArgumentNullException(nameof(schema));
             }
 
-            var type = (ToIdentifier(schema.Type), schema.Format?.ToLowerInvariant(), schema.Nullable) switch
+            var type = (schema.Type.ToIdentifier(), schema.Format?.ToLowerInvariant(), schema.Nullable) switch
             {
                 ("boolean", null, false) => typeof(bool),
                 // integer is technically not valid with format, but we must provide some compatibility
diff --git a/src/Microsoft.OpenApi/Models/OpenApiRequestBody.cs b/src/Microsoft.OpenApi/Models/OpenApiRequestBody.cs
@@ -142,11 +142,11 @@ internal IEnumerable<OpenApiFormDataParameter> ConvertToFormDataParameters()
             foreach (var property in Content.First().Value.Schema.Properties)
             {
                 var paramSchema = property.Value;
-                if ("string".Equals(OpenApiTypeMapper.ToIdentifier(paramSchema.Type), StringComparison.OrdinalIgnoreCase)
+                if ("string".Equals(paramSchema.Type.ToIdentifier(), StringComparison.OrdinalIgnoreCase)
                     && ("binary".Equals(paramSchema.Format, StringComparison.OrdinalIgnoreCase)
                     || "base64".Equals(paramSchema.Format, StringComparison.OrdinalIgnoreCase)))
                 {
-                    paramSchema.Type = OpenApiTypeMapper.IdentifierToEnumType("file");
+                    paramSchema.Type = "file".ToJsonSchemaType();
                     paramSchema.Format = null;
                 }
                 yield return new()
diff --git a/src/Microsoft.OpenApi/Models/OpenApiSchema.cs b/src/Microsoft.OpenApi/Models/OpenApiSchema.cs
@@ -1,4 +1,4 @@
-﻿// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. 
 
 using System;
@@ -577,7 +577,7 @@ internal void WriteV31Properties(IOpenApiWriter writer)
         internal void WriteAsItemsProperties(IOpenApiWriter writer)
         {
             // type
-            writer.WriteProperty(OpenApiConstants.Type, OpenApiTypeMapper.ToIdentifier(Type));
+            writer.WriteProperty(OpenApiConstants.Type, Type.ToIdentifier());
 
             // format
             if (string.IsNullOrEmpty(Format))
@@ -798,7 +798,7 @@ private void SerializeTypeProperty(JsonSchemaType? type, IOpenApiWriter writer,
                 }
                 else
                 {
-                    writer.WriteProperty(OpenApiConstants.Type, OpenApiTypeMapper.ToIdentifier(type));
+                    writer.WriteProperty(OpenApiConstants.Type, type.ToIdentifier());
                 }
             }
             else if(flagsCount > 1)
diff --git a/src/Microsoft.OpenApi/Reader/V2/OpenApiHeaderDeserializer.cs b/src/Microsoft.OpenApi/Reader/V2/OpenApiHeaderDeserializer.cs
@@ -24,7 +24,7 @@ internal static partial class OpenApiV2Deserializer
             },
             {
                 "type",
-                (o, n, _) => GetOrCreateSchema(o).Type = OpenApiTypeMapper.IdentifierToEnumType(n.GetScalarValue())
+                (o, n, _) => GetOrCreateSchema(o).Type = n.GetScalarValue().ToJsonSchemaType()
             },
             {
                 "format",
diff --git a/src/Microsoft.OpenApi/Reader/V2/OpenApiParameterDeserializer.cs b/src/Microsoft.OpenApi/Reader/V2/OpenApiParameterDeserializer.cs
@@ -46,7 +46,7 @@ internal static partial class OpenApiV2Deserializer
                 },
                 {
                     "type",
-                    (o, n, t) => GetOrCreateSchema(o).Type = OpenApiTypeMapper.IdentifierToEnumType(n.GetScalarValue())
+                    (o, n, t) => GetOrCreateSchema(o).Type = n.GetScalarValue().ToJsonSchemaType()
                 },
                 {
                     "items",
diff --git a/src/Microsoft.OpenApi/Reader/V2/OpenApiSchemaDeserializer.cs b/src/Microsoft.OpenApi/Reader/V2/OpenApiSchemaDeserializer.cs
@@ -85,7 +85,7 @@ internal static partial class OpenApiV2Deserializer
 
             {
                 "type",
-                (o, n, _) => o.Type = OpenApiTypeMapper.IdentifierToEnumType(n.GetScalarValue())
+                (o, n, _) => o.Type = n.GetScalarValue().ToJsonSchemaType()
             },
             {
                 "allOf",
diff --git a/src/Microsoft.OpenApi/Reader/V3/OpenApiSchemaDeserializer.cs b/src/Microsoft.OpenApi/Reader/V3/OpenApiSchemaDeserializer.cs
@@ -84,7 +84,7 @@ internal static partial class OpenApiV3Deserializer
             },
             {
                 "type",
-                (o, n, _) => o.Type = OpenApiTypeMapper.IdentifierToEnumType(n.GetScalarValue())
+                (o, n, _) => o.Type = n.GetScalarValue().ToJsonSchemaType()
             },
             {
                 "allOf",
diff --git a/src/Microsoft.OpenApi/Reader/V31/OpenApiSchemaDeserializer.cs b/src/Microsoft.OpenApi/Reader/V31/OpenApiSchemaDeserializer.cs
@@ -116,15 +116,15 @@ internal static partial class OpenApiV31Deserializer
                 {
                     if (n is ValueNode)
                     {
-                        o.Type = OpenApiTypeMapper.IdentifierToEnumType(n.GetScalarValue());
+                        o.Type = n.GetScalarValue().ToJsonSchemaType();
                     }
                     else
                     {
                         var list = n.CreateSimpleList((n2, p) => n2.GetScalarValue());
                         JsonSchemaType combinedType = 0;
                         foreach(var type in list)
                         {
-                            var schemaType = OpenApiTypeMapper.IdentifierToEnumType(type);
+                            var schemaType = type.ToJsonSchemaType();
                             combinedType |= schemaType;
                         }
                         o.Type = combinedType;
diff --git a/src/Microsoft.OpenApi/Validations/Rules/RuleHelpers.cs b/src/Microsoft.OpenApi/Validations/Rules/RuleHelpers.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
 using System.Text.Json;
@@ -54,7 +54,7 @@ public static void ValidateDataTypeMismatch(
             // convert value to JsonElement and access the ValueKind property to determine the type.
             var jsonElement = JsonDocument.Parse(JsonSerializer.Serialize(value)).RootElement;
 
-            var type = OpenApiTypeMapper.ToIdentifier(schema.Type);
+            var type = schema.Type.ToIdentifier();
             var format = schema.Format;
             var nullable = schema.Nullable;
 

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public static class OpenApiTypeMapper`
`18`	`18`	`/// </summary>`
`19`	`19`	`/// <param name="schemaType"></param>`
`20`	`20`	`/// <returns></returns>`
`21`		`- public static string ToIdentifier(JsonSchemaType? schemaType)`
	`21`	`+ public static string ToIdentifier(this JsonSchemaType? schemaType)`
`22`	`22`	`{`
`23`	`23`	`return schemaType switch`
`24`	`24`	`{`
`@@ -38,7 +38,7 @@ public static string ToIdentifier(JsonSchemaType? schemaType)`
`38`	`38`	`/// </summary>`
`39`	`39`	`/// <param name="identifier"></param>`
`40`	`40`	`/// <returns></returns>`
`41`		`- public static JsonSchemaType IdentifierToEnumType(string identifier)`
	`41`	`+ public static JsonSchemaType ToJsonSchemaType(this string identifier)`
`42`	`42`	`{`
`43`	`43`	`return identifier switch`
`44`	`44`	`{`
`@@ -137,7 +137,7 @@ public static Type MapOpenApiPrimitiveTypeToSimpleType(this OpenApiSchema schema`
`137`	`137`	`throw new ArgumentNullException(nameof(schema));`
`138`	`138`	`}`
`139`	`139`
`140`		`- var type = (ToIdentifier(schema.Type), schema.Format?.ToLowerInvariant(), schema.Nullable) switch`
	`140`	`+ var type = (schema.Type.ToIdentifier(), schema.Format?.ToLowerInvariant(), schema.Nullable) switch`
`141`	`141`	`{`
`142`	`142`	`("boolean", null, false) => typeof(bool),`
`143`	`143`	`// integer is technically not valid with format, but we must provide some compatibility`
Original file line number	Diff line number	Diff line change
`@@ -142,11 +142,11 @@ internal IEnumerable<OpenApiFormDataParameter> ConvertToFormDataParameters()`
`142`	`142`	`foreach (var property in Content.First().Value.Schema.Properties)`
`143`	`143`	`{`
`144`	`144`	`var paramSchema = property.Value;`
`145`		`- if ("string".Equals(OpenApiTypeMapper.ToIdentifier(paramSchema.Type), StringComparison.OrdinalIgnoreCase)`
	`145`	`+ if ("string".Equals(paramSchema.Type.ToIdentifier(), StringComparison.OrdinalIgnoreCase)`
`146`	`146`	`&& ("binary".Equals(paramSchema.Format, StringComparison.OrdinalIgnoreCase)`
`147`	`147`	`\|\| "base64".Equals(paramSchema.Format, StringComparison.OrdinalIgnoreCase)))`
`148`	`148`	`{`
`149`		`- paramSchema.Type = OpenApiTypeMapper.IdentifierToEnumType("file");`
	`149`	`+ paramSchema.Type = "file".ToJsonSchemaType();`
`150`	`150`	`paramSchema.Format = null;`
`151`	`151`	`}`
`152`	`152`	`yield return new()`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright (c) Microsoft Corporation. All rights reserved.`
	`1`	`+// Copyright (c) Microsoft Corporation. All rights reserved.`
`2`	`2`	`// Licensed under the MIT license.`
`3`	`3`
`4`	`4`	`using System;`
`@@ -577,7 +577,7 @@ internal void WriteV31Properties(IOpenApiWriter writer)`
`577`	`577`	`internal void WriteAsItemsProperties(IOpenApiWriter writer)`
`578`	`578`	`{`
`579`	`579`	`// type`
`580`		`- writer.WriteProperty(OpenApiConstants.Type, OpenApiTypeMapper.ToIdentifier(Type));`
	`580`	`+ writer.WriteProperty(OpenApiConstants.Type, Type.ToIdentifier());`
`581`	`581`
`582`	`582`	`// format`
`583`	`583`	`if (string.IsNullOrEmpty(Format))`
`@@ -798,7 +798,7 @@ private void SerializeTypeProperty(JsonSchemaType? type, IOpenApiWriter writer,`
`798`	`798`	`}`
`799`	`799`	`else`
`800`	`800`	`{`
`801`		`- writer.WriteProperty(OpenApiConstants.Type, OpenApiTypeMapper.ToIdentifier(type));`
	`801`	`+ writer.WriteProperty(OpenApiConstants.Type, type.ToIdentifier());`
`802`	`802`	`}`
`803`	`803`	`}`
`804`	`804`	`else if(flagsCount > 1)`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ internal static partial class OpenApiV2Deserializer`
`24`	`24`	`},`
`25`	`25`	`{`
`26`	`26`	`"type",`
`27`		`- (o, n, _) => GetOrCreateSchema(o).Type = OpenApiTypeMapper.IdentifierToEnumType(n.GetScalarValue())`
	`27`	`+ (o, n, _) => GetOrCreateSchema(o).Type = n.GetScalarValue().ToJsonSchemaType()`
`28`	`28`	`},`
`29`	`29`	`{`
`30`	`30`	`"format",`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ internal static partial class OpenApiV2Deserializer`
`46`	`46`	`},`
`47`	`47`	`{`
`48`	`48`	`"type",`
`49`		`- (o, n, t) => GetOrCreateSchema(o).Type = OpenApiTypeMapper.IdentifierToEnumType(n.GetScalarValue())`
	`49`	`+ (o, n, t) => GetOrCreateSchema(o).Type = n.GetScalarValue().ToJsonSchemaType()`
`50`	`50`	`},`
`51`	`51`	`{`
`52`	`52`	`"items",`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ internal static partial class OpenApiV2Deserializer`
`85`	`85`
`86`	`86`	`{`
`87`	`87`	`"type",`
`88`		`- (o, n, _) => o.Type = OpenApiTypeMapper.IdentifierToEnumType(n.GetScalarValue())`
	`88`	`+ (o, n, _) => o.Type = n.GetScalarValue().ToJsonSchemaType()`
`89`	`89`	`},`
`90`	`90`	`{`
`91`	`91`	`"allOf",`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ internal static partial class OpenApiV3Deserializer`
`84`	`84`	`},`
`85`	`85`	`{`
`86`	`86`	`"type",`
`87`		`- (o, n, _) => o.Type = OpenApiTypeMapper.IdentifierToEnumType(n.GetScalarValue())`
	`87`	`+ (o, n, _) => o.Type = n.GetScalarValue().ToJsonSchemaType()`
`88`	`88`	`},`
`89`	`89`	`{`
`90`	`90`	`"allOf",`
Original file line number	Diff line number	Diff line change
`@@ -116,15 +116,15 @@ internal static partial class OpenApiV31Deserializer`
`116`	`116`	`{`
`117`	`117`	`if (n is ValueNode)`
`118`	`118`	`{`
`119`		`- o.Type = OpenApiTypeMapper.IdentifierToEnumType(n.GetScalarValue());`
	`119`	`+ o.Type = n.GetScalarValue().ToJsonSchemaType();`
`120`	`120`	`}`
`121`	`121`	`else`
`122`	`122`	`{`
`123`	`123`	`var list = n.CreateSimpleList((n2, p) => n2.GetScalarValue());`
`124`	`124`	`JsonSchemaType combinedType = 0;`
`125`	`125`	`foreach(var type in list)`
`126`	`126`	`{`
`127`		`- var schemaType = OpenApiTypeMapper.IdentifierToEnumType(type);`
	`127`	`+ var schemaType = type.ToJsonSchemaType();`
`128`	`128`	`combinedType \|= schemaType;`
`129`	`129`	`}`
`130`	`130`	`o.Type = combinedType;`