Merge branch 'vnext' into dm/commandline

Author: darrelmiller

README.md

@@ -19,6 +19,11 @@ Project Objectives
 - Provide OpenAPI description writers for both V2 and V3 specification formats.
 - Enable developers to create Readers that translate different data formats into OpenAPI descriptions. 
 
+# Installation
+
+- Install core Nuget package `Microsoft.OpenApi`
+- Install readers Nuget package `Microsoft.OpenApi.Readers`
+
 # Processors
 The OpenAPI.NET project holds the base object model for representing OpenAPI documents as .NET objects. Some developers have found the need to write processors that convert other data formats into this OpenAPI.NET object model. We'd like to curate that list of processors in this section of the readme. 
 

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

@@ -56,13 +56,61 @@ public static IOpenApiAny GetSpecificOpenApiAny(IOpenApiAny openApiAny, OpenApiS
             }
 
             var value = ((OpenApiString)openApiAny).Value;
+            var type = schema?.Type;
+            var format = schema?.Format;
 
-            // For explicit strings only try to guess if it's a DateTimeOffset
             if (((OpenApiString)openApiAny).IsExplicit())
             {
-                if (DateTimeOffset.TryParse(value, CultureInfo.InvariantCulture, DateTimeStyles.None, out var dateTimeValue))
+                // More narrow type detection for explicit strings, only check types that are passed as strings
+                if (schema == null)
                 {
-                    return new OpenApiDateTime(dateTimeValue);
+                    if (DateTimeOffset.TryParse(value, CultureInfo.InvariantCulture, DateTimeStyles.None, out var dateTimeValue))
+                    {
+                        return new OpenApiDateTime(dateTimeValue);
+                    }
+                }
+                else if (type == "string")
+                {
+                    if (format == "byte")
+                    {
+                        try
+                        {
+                            return new OpenApiByte(Convert.FromBase64String(value));
+                        }
+                        catch (FormatException)
+                        { }
+                    }
+
+                    if (format == "binary")
+                    {
+                        try
+                        {
+                            return new OpenApiBinary(Encoding.UTF8.GetBytes(value));
+                        }
+                        catch (EncoderFallbackException)
+                        { }
+                    }
+
+                    if (format == "date")
+                    {
+                        if (DateTimeOffset.TryParse(value, CultureInfo.InvariantCulture, DateTimeStyles.None, out var dateValue))
+                        {
+                            return new OpenApiDate(dateValue.Date);
+                        }
+                    }
+
+                    if (format == "date-time")
+                    {
+                        if (DateTimeOffset.TryParse(value, CultureInfo.InvariantCulture, DateTimeStyles.None, out var dateTimeValue))
+                        {
+                            return new OpenApiDateTime(dateTimeValue);
+                        }
+                    }
+
+                    if (format == "password")
+                    {
+                        return new OpenApiPassword(value);
+                    }
                 }
 
                 return openApiAny;
@@ -107,9 +155,6 @@ public static IOpenApiAny GetSpecificOpenApiAny(IOpenApiAny openApiAny, OpenApiS
             }
             else
             {
-                var type = schema.Type;
-                var format = schema.Format;
-
                 if (type == "integer" && format == "int32")
                 {
                     if (int.TryParse(value, NumberStyles.Integer, CultureInfo.InvariantCulture, out var intValue))
@@ -202,7 +247,7 @@ public static IOpenApiAny GetSpecificOpenApiAny(IOpenApiAny openApiAny, OpenApiS
 
                 if (type == "string")
                 {
-                    return new OpenApiString(value);
+                    return openApiAny;
                 }
 
                 if (type == "boolean")

src/Microsoft.OpenApi/Models/OpenApiParameter.cs

@@ -252,6 +252,8 @@ public void SerializeAsV2WithoutReference(IOpenApiWriter writer)
             // deprecated
             writer.WriteProperty(OpenApiConstants.Deprecated, Deprecated, false);
 
+            var extensionsClone = new Dictionary<string, IOpenApiExtension>(Extensions);
+
             // schema
             if (this is OpenApiBodyParameter)
             {
@@ -283,7 +285,20 @@ public void SerializeAsV2WithoutReference(IOpenApiWriter writer)
                 // uniqueItems
                 // enum
                 // multipleOf
-                Schema?.WriteAsItemsProperties(writer);
+                if (Schema != null)
+                {
+                    Schema.WriteAsItemsProperties(writer);
+
+                    if (Schema.Extensions != null)
+                    {
+                        foreach (var key in Schema.Extensions.Keys)
+                        {
+                            // The extension will already have been serialized as part of the call to WriteAsItemsProperties above,
+                            // so remove it from the cloned collection so we don't write it again.
+                            extensionsClone.Remove(key);
+                        }
+                    }
+                }
 
                 // allowEmptyValue
                 writer.WriteProperty(OpenApiConstants.AllowEmptyValue, AllowEmptyValue, false);
@@ -307,7 +322,7 @@ public void SerializeAsV2WithoutReference(IOpenApiWriter writer)
 
 
             // extensions
-            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi2_0);
+            writer.WriteExtensions(extensionsClone, OpenApiSpecVersion.OpenApi2_0);
 
             writer.WriteEndObject();
         }

src/Microsoft.OpenApi/Models/OpenApiResponse.cs

@@ -124,6 +124,8 @@ public void SerializeAsV2WithoutReference(IOpenApiWriter writer)
             // description
             writer.WriteRequiredProperty(OpenApiConstants.Description, Description);
 
+            var extensionsClone = new Dictionary<string, IOpenApiExtension>(Extensions);
+
             if (Content != null)
             {
                 var mediatype = Content.FirstOrDefault();
@@ -152,14 +154,23 @@ public void SerializeAsV2WithoutReference(IOpenApiWriter writer)
 
                         writer.WriteEndObject();
                     }
+
+                    writer.WriteExtensions(mediatype.Value.Extensions, OpenApiSpecVersion.OpenApi2_0);
+
+                    foreach (var key in mediatype.Value.Extensions.Keys)
+                    {
+                        // The extension will already have been serialized as part of the call above,
+                        // so remove it from the cloned collection so we don't write it again.
+                        extensionsClone.Remove(key);
+                    }
                 }
             }
 
             // headers
             writer.WriteOptionalMap(OpenApiConstants.Headers, Headers, (w, h) => h.SerializeAsV2(w));
 
             // extension
-            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi2_0);
+            writer.WriteExtensions(extensionsClone, OpenApiSpecVersion.OpenApi2_0);
 
             writer.WriteEndObject();
         }