Merge branch 'master' into dm/release-1.0.0-beta016

Author: darrelmiller

src/Microsoft.OpenApi/Models/OpenApiParameter.cs

@@ -257,6 +257,13 @@ public void SerializeAsV2WithoutReference(IOpenApiWriter writer)
             {
                 writer.WriteOptionalObject(OpenApiConstants.Schema, Schema, (w, s) => s.SerializeAsV2(w));
             }
+            // In V2 parameter's type can't be a reference to a custom object schema or can't be of type object
+            // So in that case map the type as string.
+            else 
+            if (Schema?.UnresolvedReference == true || Schema?.Type == "object")
+            {
+                writer.WriteProperty(OpenApiConstants.Type, "string");
+            }
             else
             {
                 // type
@@ -291,7 +298,7 @@ public void SerializeAsV2WithoutReference(IOpenApiWriter writer)
                     {
                         writer.WriteProperty("collectionFormat", "pipes");
                     }
-                    else if (this.Style == ParameterStyle.PipeDelimited)
+                    else if (this.Style == ParameterStyle.SpaceDelimited)
                     {
                         writer.WriteProperty("collectionFormat", "ssv");
                     }

src/Microsoft.OpenApi/Models/SecuritySchemeType.cs

@@ -29,6 +29,5 @@ public enum SecuritySchemeType
         /// Use OAuth2 with OpenId Connect URL to discover OAuth2 configuration value.
         /// </summary>
         [Display("openIdConnect")] OpenIdConnect
-
     }
 }

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

@@ -57,6 +57,59 @@ public class OpenApiParameterTests
             }
         };
 
+        public static OpenApiParameter AdvancedHeaderParameterWithSchemaReference = new OpenApiParameter
+        {
+            Name = "name1",
+            In = ParameterLocation.Header,
+            Description = "description1",
+            Required = true,
+            Deprecated = false,
+
+            Style = ParameterStyle.Simple,
+            Explode = true,
+            Schema = new OpenApiSchema
+            {
+                Reference = new OpenApiReference
+                {
+                    Type = ReferenceType.Schema,
+                    Id = "schemaObject1"
+                },
+                UnresolvedReference = true
+            },
+            Examples = new Dictionary<string, OpenApiExample>
+            {
+                ["test"] = new OpenApiExample
+                {
+                    Summary = "summary3",
+                    Description = "description3"
+                }
+            }
+        };
+
+        public static OpenApiParameter AdvancedHeaderParameterWithSchemaTypeObject = new OpenApiParameter
+        {
+            Name = "name1",
+            In = ParameterLocation.Header,
+            Description = "description1",
+            Required = true,
+            Deprecated = false,
+
+            Style = ParameterStyle.Simple,
+            Explode = true,
+            Schema = new OpenApiSchema
+            {
+                Type = "object"
+            },
+            Examples = new Dictionary<string, OpenApiExample>
+            {
+                ["test"] = new OpenApiExample
+                {
+                    Summary = "summary3",
+                    Description = "description3"
+                }
+            }
+        };
+
         private readonly ITestOutputHelper _output;
 
         public OpenApiParameterTests(ITestOutputHelper output)
@@ -203,5 +256,57 @@ public void SerializeReferencedParameterAsV2JsonWithoutReferenceWorks()
             expected = expected.MakeLineBreaksEnvironmentNeutral();
             actual.Should().Be(expected);
         }
+
+        [Fact]
+        public void SerializeParameterWithSchemaReferenceAsV2JsonWorks()
+        {
+            // Arrange
+            var outputStringWriter = new StringWriter();
+            var writer = new OpenApiJsonWriter(outputStringWriter);
+            var expected =
+                @"{
+  ""in"": ""header"",
+  ""name"": ""name1"",
+  ""description"": ""description1"",
+  ""required"": true,
+  ""type"": ""string""
+}";
+
+            // Act
+            AdvancedHeaderParameterWithSchemaReference.SerializeAsV2(writer);
+            writer.Flush();
+            var actual = outputStringWriter.GetStringBuilder().ToString();
+
+            // Assert
+            actual = actual.MakeLineBreaksEnvironmentNeutral();
+            expected = expected.MakeLineBreaksEnvironmentNeutral();
+            actual.Should().Be(expected);
+        }
+
+        [Fact]
+        public void SerializeParameterWithSchemaTypeObjectAsV2JsonWorks()
+        {
+            // Arrange
+            var outputStringWriter = new StringWriter();
+            var writer = new OpenApiJsonWriter(outputStringWriter);
+            var expected =
+                @"{
+  ""in"": ""header"",
+  ""name"": ""name1"",
+  ""description"": ""description1"",
+  ""required"": true,
+  ""type"": ""string""
+}";
+
+            // Act
+            AdvancedHeaderParameterWithSchemaTypeObject.SerializeAsV2(writer);
+            writer.Flush();
+            var actual = outputStringWriter.GetStringBuilder().ToString();
+
+            // Assert
+            actual = actual.MakeLineBreaksEnvironmentNeutral();
+            expected = expected.MakeLineBreaksEnvironmentNeutral();
+            actual.Should().Be(expected);
+        }
     }
 }