chore: cleans up api surface

Signed-off-by: Vincent Biret <[email protected]>

src/Microsoft.OpenApi/Extensions/OpenApiTypeMapper.cs

@@ -70,7 +70,7 @@
         /// </summary>
         /// <param name="schemaType"></param>
         /// <returns></returns>
-        public static string ToSingleIdentifier(this JsonSchemaType schemaType)
+        internal static string ToSingleIdentifier(this JsonSchemaType schemaType)
         {
             return schemaType.ToIdentifiersInternal().Single();
         }
@@ -89,7 +89,7 @@
                 "null" => JsonSchemaType.Null,
                 "boolean" => JsonSchemaType.Boolean,
                 "integer" or "int" => JsonSchemaType.Integer,
                 "number" or "double" or "float" or "decimal"=> JsonSchemaType.Number,
                 "string" => JsonSchemaType.String,
                 "array" => JsonSchemaType.Array,
                 "object" => JsonSchemaType.Object,
@@ -122,14 +122,14 @@
         {
             [typeof(bool)] = () => new() { Type = JsonSchemaType.Boolean },
             [typeof(byte)] = () => new() { Type = JsonSchemaType.String, Format = "byte" },
             [typeof(int)] = () => new() { Type = JsonSchemaType.Integer, Format = "int32" },
             [typeof(uint)] = () => new() { Type = JsonSchemaType.Integer, Format = "int32" },
             [typeof(long)] = () => new() { Type = JsonSchemaType.Integer, Format = "int64" },
             [typeof(ulong)] = () => new() { Type = JsonSchemaType.Integer, Format = "int64" },
             [typeof(float)] = () => new() { Type = JsonSchemaType.Number, Format = "float" },
             [typeof(double)] = () => new() { Type = JsonSchemaType.Number, Format = "double" },
             [typeof(decimal)] = () => new() { Type = JsonSchemaType.Number, Format = "double" },
             [typeof(DateTime)] = () => new() { Type = JsonSchemaType.String, Format = "date-time" },
             [typeof(DateTimeOffset)] = () => new() { Type = JsonSchemaType.String, Format = "date-time" },
             [typeof(Guid)] = () => new() { Type = JsonSchemaType.String, Format = "uuid" },
             [typeof(char)] = () => new() { Type = JsonSchemaType.String },

test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiSchemaTests.cs

@@ -16,6 +16,7 @@
 using Microsoft.OpenApi.Writers;
 using Xunit;
 using Microsoft.OpenApi.Exceptions;
+using System;
 
 namespace Microsoft.OpenApi.Readers.Tests.V31Tests
 {
@@ -561,7 +562,7 @@ public void ReturnSingleIdentifierWorks()
             var types = JsonSchemaType.Integer | JsonSchemaType.Null;
 
             Assert.Equal("integer", type.ToSingleIdentifier());
-            Assert.Throws<OpenApiException>(() => types.ToSingleIdentifier());
+            Assert.Throws<InvalidOperationException>(() => types.ToSingleIdentifier());
         }
     }
 }

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

@@ -194,7 +194,6 @@ namespace Microsoft.OpenApi.Extensions
         public static string[]? ToIdentifiers(this Microsoft.OpenApi.Models.JsonSchemaType? schemaType) { }
         public static Microsoft.OpenApi.Models.JsonSchemaType ToJsonSchemaType(this string identifier) { }
         public static Microsoft.OpenApi.Models.JsonSchemaType? ToJsonSchemaType(this string[] identifier) { }
-        public static string ToSingleIdentifier(this Microsoft.OpenApi.Models.JsonSchemaType schemaType) { }
     }
 }
 namespace Microsoft.OpenApi.Interfaces