Remove JsonSchemaType.Any type

Author: MaggieKimani1

src/Microsoft.OpenApi/Extensions/OpenApiTypeMapper.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;
@@ -44,12 +44,12 @@ public static JsonSchemaType IdentifierToEnumType(string identifier)
                 "null" => JsonSchemaType.Null,
                 "boolean" => JsonSchemaType.Boolean,
                 "integer" or "int" => JsonSchemaType.Integer,
-                "number" or "double" => JsonSchemaType.Number,
+                "number" or "double" or "float" or "decimal"=> JsonSchemaType.Number,
                 "string" => JsonSchemaType.String,
                 "array" => JsonSchemaType.Array,
                 "object" => JsonSchemaType.Object,
                 "file" => JsonSchemaType.String, // File is treated as string
-                _ => JsonSchemaType.Any,
+                _ => throw new ArgumentException("Invalid schema type identifier", nameof(identifier))
             };
         }
 

src/Microsoft.OpenApi/Models/JsonSchemaType.cs

@@ -11,11 +11,6 @@ namespace Microsoft.OpenApi.Models
     [Flags]
     public enum JsonSchemaType
     {
-        /// <summary>
-        /// Represents any type.
-        /// </summary>
-        Any = 0,
-
         /// <summary>
         /// Represents a null type.
         /// </summary>

src/Microsoft.OpenApi/Models/OpenApiSchema.cs

@@ -831,7 +831,7 @@ private static int CountEnumSetFlags(JsonSchemaType? schemaType)
                 foreach (JsonSchemaType value in System.Enum.GetValues(typeof(JsonSchemaType)))
                 {
                     // Ignore the None flag and check if the flag is set
-                    if (value != JsonSchemaType.Any && (schemaType & value) == value)
+                    if ((schemaType & value) == value)
                     {
                         count++;
                     }
@@ -849,7 +849,7 @@ private void UpCastSchemaTypeToV31(JsonSchemaType? type, IOpenApiWriter writer)
             foreach (JsonSchemaType flag in System.Enum.GetValues(typeof(JsonSchemaType)))
             {
                 // Check if the flag is set in 'type' using a bitwise AND operation
-                if ((Type & flag) == flag && flag != JsonSchemaType.Any)
+                if ((Type & flag) == flag)
                 {
                     list.Add(OpenApiTypeMapper.ToIdentifier(flag));
                 }
@@ -886,7 +886,7 @@ private void DowncastTypeArrayToV2OrV3(JsonSchemaType? schemaType, IOpenApiWrite
                 foreach (JsonSchemaType flag in System.Enum.GetValues(typeof(JsonSchemaType)))
                 {
                     // Skip if the flag is not set or if it's the Null flag
-                    if ((schemaType & flag) == flag && flag != JsonSchemaType.Null && flag != JsonSchemaType.Any)
+                    if ((schemaType & flag) == flag && flag != JsonSchemaType.Null)
                     {
                         // Write the non-null flag value to the writer
                         writer.WriteProperty(OpenApiConstants.Type, OpenApiTypeMapper.ToIdentifier(flag));

src/Microsoft.OpenApi/Reader/V31/OpenApiSchemaDeserializer.cs

@@ -121,7 +121,7 @@ internal static partial class OpenApiV31Deserializer
                     else
                     {
                         var list = n.CreateSimpleList((n2, p) => n2.GetScalarValue());
-                        JsonSchemaType combinedType = JsonSchemaType.Any;
+                        JsonSchemaType combinedType = 0;
                         foreach(var type in list)
                         {
                             var schemaType = OpenApiTypeMapper.IdentifierToEnumType(type);

test/Microsoft.OpenApi.Tests/PublicApi/PublicApi.approved.txt

@@ -334,7 +334,6 @@ namespace Microsoft.OpenApi.Models
     [System.Flags]
     public enum JsonSchemaType
     {
-        Any = 0,
         Null = 1,
         Boolean = 2,
         Integer = 4,