Change OpenApiByte & OpenApiBinary

src/Microsoft.OpenApi.Readers/ParseNodes/OpenApiAnyConverter.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Globalization;
 using System.Linq;
+using System.Text;
 using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Exceptions;
 using Microsoft.OpenApi.Models;
@@ -195,16 +196,23 @@ public static IOpenApiAny GetSpecificOpenApiAny(IOpenApiAny openApiAny, OpenApiS
 
             if (type == "string" && format == "byte")
             {
-                if (byte.TryParse(value, NumberStyles.Any, CultureInfo.InvariantCulture, out var byteValue))
+                try
                 {
-                    return new OpenApiByte(byteValue);
+                    return new OpenApiByte(Convert.FromBase64String(value));
                 }
+                catch(FormatException)
+                { }
             }
 
             // binary
             if (type == "string" && format == "binary")
             {
-                return new OpenApiBinary(Convert.FromBase64String(value));
+                try
+                {
+                    return new OpenApiBinary(Encoding.UTF8.GetBytes(value));
+                }
+                catch(EncoderFallbackException)
+                { }
             }
 
             if (type == "string" && format == "date")

src/Microsoft.OpenApi/Any/OpenApiByte.cs

@@ -6,12 +6,20 @@ namespace Microsoft.OpenApi.Any
     /// <summary>
     /// Open API Byte
     /// </summary>
-    public class OpenApiByte : OpenApiPrimitive<byte>
+    public class OpenApiByte : OpenApiPrimitive<byte[]>
     {
         /// <summary>
         /// Initializes the <see cref="OpenApiByte"/> class.
         /// </summary>
         public OpenApiByte(byte value)
+            : this(new byte[] { value })
+        {
+        }
+
+        /// <summary>
+        /// Initializes the <see cref="OpenApiByte"/> class.
+        /// </summary>
+        public OpenApiByte(byte[] value)
             : base(value)
         {
         }

src/Microsoft.OpenApi/Any/OpenApiPrimitive.cs

@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. 
 
+using System;
+using System.Text;
 using Microsoft.OpenApi.Exceptions;
 using Microsoft.OpenApi.Properties;
 using Microsoft.OpenApi.Writers;
@@ -73,12 +75,28 @@ public void Write(IOpenApiWriter writer, OpenApiSpecVersion specVersion)
 
                 case PrimitiveType.Byte:
                     var byteValue = (OpenApiByte)(IOpenApiPrimitive)this;
-                    writer.WriteValue(byteValue.Value);
+                    if (byteValue.Value == null)
+                    {
+                        writer.WriteNull();
+                    }
+                    else
+                    {
+                        writer.WriteValue(Convert.ToBase64String(byteValue.Value));
+                    }
+
                     break;
 
                 case PrimitiveType.Binary:
                     var binaryValue = (OpenApiBinary)(IOpenApiPrimitive)this;
-                    writer.WriteValue(binaryValue.Value);
+                    if (binaryValue.Value == null)
+                    {
+                        writer.WriteNull();
+                    }
+                    else
+                    {
+                        writer.WriteValue(Encoding.UTF8.GetString(binaryValue.Value));
+                    }
+
                     break;
 
                 case PrimitiveType.Boolean:

src/Microsoft.OpenApi/Writers/OpenApiWriterAnyExtensions.cs

@@ -1,12 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. 
 
-using System;
 using System.Collections.Generic;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Exceptions;
-using Microsoft.OpenApi.Properties;
 using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Interfaces;
 
 namespace Microsoft.OpenApi.Writers
 {
@@ -137,76 +134,8 @@ private static void WritePrimitive(this IOpenApiWriter writer, IOpenApiPrimitive
                 throw Error.ArgumentNull(nameof(primitive));
             }
 
-            switch (primitive.PrimitiveType)
-            {
-                case PrimitiveType.Integer:
-                    var intValue = (OpenApiInteger)primitive;
-                    writer.WriteValue(intValue.Value);
-                    break;
-
-                case PrimitiveType.Long:
-                    var longValue = (OpenApiLong)primitive;
-                    writer.WriteValue(longValue.Value);
-                    break;
-
-                case PrimitiveType.Float:
-                    var floatValue = (OpenApiFloat)primitive;
-                    writer.WriteValue(floatValue.Value);
-                    break;
-
-                case PrimitiveType.Double:
-                    var doubleValue = (OpenApiDouble)primitive;
-                    writer.WriteValue(doubleValue.Value);
-                    break;
-
-                case PrimitiveType.String:
-                    var stringValue = (OpenApiString)primitive;
-                    writer.WriteValue(stringValue.Value);
-                    break;
-
-                case PrimitiveType.Byte:
-                    var byteValue = (OpenApiByte)primitive;
-                    writer.WriteValue(byteValue.Value);
-                    break;
-
-                case PrimitiveType.Binary:
-                    var binaryValue = (OpenApiBinary)primitive;
-                    if (binaryValue == null)
-                    {
-                        writer.WriteNull();
-                    }
-                    else
-                    {
-                        writer.WriteValue(Convert.ToBase64String(binaryValue.Value));
-                    }
-                    break;
-
-                case PrimitiveType.Boolean:
-                    var boolValue = (OpenApiBoolean)primitive;
-                    writer.WriteValue(boolValue.Value);
-                    break;
-
-                case PrimitiveType.Date:
-                    var dateValue = (OpenApiDate)primitive;
-                    writer.WriteValue(dateValue.Value);
-                    break;
-
-                case PrimitiveType.DateTime:
-                    var dateTimeValue = (OpenApiDateTime)primitive;
-                    writer.WriteValue(dateTimeValue.Value);
-                    break;
-
-                case PrimitiveType.Password:
-                    var passwordValue = (OpenApiPassword)primitive;
-                    writer.WriteValue(passwordValue.Value);
-                    break;
-
-                default:
-                    throw new OpenApiWriterException(
-                        string.Format(
-                            SRResource.PrimitiveTypeNotSupported,
-                            primitive.PrimitiveType));
-            }
+            // The Spec version is meaning for the Any type, so it's ok to use the latest one.
+            primitive.Write(writer, OpenApiSpecVersion.OpenApi3_0);
         }
     }
 }

test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.cs

@@ -3,6 +3,7 @@
 
 using System.Globalization;
 using System.IO;
+using System.Text;
 using FluentAssertions;
 using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Models;
@@ -31,7 +32,8 @@ public class OpenApiExampleTests
                             {
                                 ["href"] = new OpenApiString("http://example.com/1"),
                                 ["rel"] = new OpenApiString("sampleRel1"),
-                                ["binary"] = new OpenApiBinary(new byte[] { 1, 2, 3 })
+                                ["bytes"] = new OpenApiByte(new byte[] { 1, 2, 3 }),
+                                ["binary"] = new OpenApiBinary(Encoding.UTF8.GetBytes("Ñ😻😑♮Í☛oƞ♑😲☇éNjžŁ♻😟¥a´Ī♃ƠąøƩ"))
                             }
                         }
                     },
@@ -119,7 +121,8 @@ public void SerializeAdvancedExampleAsV3JsonWorks()
           {
             ""href"": ""http://example.com/1"",
             ""rel"": ""sampleRel1"",
-            ""binary"": ""AQID""
+            ""bytes"": ""AQID"",
+            ""binary"": ""Ñ😻😑♮Í☛oƞ♑😲☇éNjžŁ♻😟¥a´Ī♃ƠąøƩ""
           }
         ]
       },