Update src/Microsoft.OpenApi/Extensions/OpenApiTypeMapper.cs

MaggieKimani1 · baywet · web-flow · commit a731be6202e9 · 2025-02-19T12:34:28.000+03:00
Co-authored-by: Vincent Biret &lt;vibiret@microsoft.com&gt;
diff --git a/src/Microsoft.OpenApi/Extensions/OpenApiTypeMapper.cs b/src/Microsoft.OpenApi/Extensions/OpenApiTypeMapper.cs
@@ -169,9 +169,8 @@ public static Type MapOpenApiPrimitiveTypeToSimpleType(this OpenApiSchema schema
             {
                 throw new ArgumentNullException(nameof(schema));
             }
-            var typeIdentifier = schema.Type.ToIdentifier();
-            var isNullable = typeIdentifier.Contains("null");
-            var nonNullable = typeIdentifier.FirstOrDefault(t => t != "null");
+            var isNullable = (schema.Type & JsonSchemaType.Null) == JsonSchemaType.Null;
+            var nonNullable = (schema.Type & ~JsonSchemaType.Null).ToIdentifier().FirstOrDefault();
 
             var type = (nonNullable, schema.Format?.ToLowerInvariant(), isNullable) switch
             {

Original file line number	Diff line number	Diff line change
`@@ -169,9 +169,8 @@ public static Type MapOpenApiPrimitiveTypeToSimpleType(this OpenApiSchema schema`
`169`	`169`	`{`
`170`	`170`	`throw new ArgumentNullException(nameof(schema));`
`171`	`171`	`}`
`172`		`- var typeIdentifier = schema.Type.ToIdentifier();`
`173`		`- var isNullable = typeIdentifier.Contains("null");`
`174`		`- var nonNullable = typeIdentifier.FirstOrDefault(t => t != "null");`
	`172`	`+ var isNullable = (schema.Type & JsonSchemaType.Null) == JsonSchemaType.Null;`
	`173`	`+ var nonNullable = (schema.Type & ~JsonSchemaType.Null).ToIdentifier().FirstOrDefault();`
`175`	`174`
`176`	`175`	`var type = (nonNullable, schema.Format?.ToLowerInvariant(), isNullable) switch`
`177`	`176`	`{`