Fix to properly assign schemas to content of all media types of all responses

Author: VitaliyKurokhtin

src/Microsoft.OpenApi.Readers/V2/OpenApiResponseDeserializer.cs

@@ -63,35 +63,39 @@ internal static partial class OpenApiV2Deserializer
         private static void ProcessProduces(MapNode mapNode, OpenApiResponse response, ParsingContext context)
         {
             var produces = context.GetFromTempStorage<List<string>>(TempStorageKeys.OperationProduces) ??
-                context.GetFromTempStorage<List<string>>(TempStorageKeys.GlobalProduces) ?? new List<string>();
+                context.GetFromTempStorage<List<string>>(TempStorageKeys.GlobalProduces);
 
             if (response.Content == null)
             {
                 response.Content = new Dictionary<string, OpenApiMediaType>();
             }
 
-            foreach (var produce in produces)
+            if (produces != null && produces.Count > 0)
             {
-                var schema = context.GetFromTempStorage<OpenApiSchema>(TempStorageKeys.ResponseSchema, response);
-                context.SetTempStorage(TempStorageKeys.ResponseSchema, null, response);
-
-                if (response.Content.ContainsKey(produce) && response.Content[produce] != null)
+                foreach (var produce in produces)
                 {
-                    if (schema != null)
+                    var schema = context.GetFromTempStorage<OpenApiSchema>(TempStorageKeys.ResponseSchema, response);
+
+                    if (response.Content.ContainsKey(produce) && response.Content[produce] != null)
                     {
-                        response.Content[produce].Schema = schema;
-                        ProcessAnyFields(mapNode, response.Content[produce], _mediaTypeAnyFields);
+                        if (schema != null)
+                        {
+                            response.Content[produce].Schema = schema;
+                            ProcessAnyFields(mapNode, response.Content[produce], _mediaTypeAnyFields);
+                        }
                     }
-                }
-                else
-                {
-                    var mediaType = new OpenApiMediaType
+                    else
                     {
-                        Schema = schema
-                    };
+                        var mediaType = new OpenApiMediaType
+                        {
+                            Schema = schema
+                        };
 
-                    response.Content.Add(produce, mediaType);
+                        response.Content.Add(produce, mediaType);
+                    }
                 }
+
+                context.SetTempStorage(TempStorageKeys.ResponseSchema, null, response);
             }
         }
 

test/Microsoft.OpenApi.Readers.Tests/Microsoft.OpenApi.Readers.Tests.csproj

@@ -12,6 +12,9 @@
         <SignAssembly>true</SignAssembly>
         <AssemblyOriginatorKeyFile>..\..\src\Microsoft.OpenApi.snk</AssemblyOriginatorKeyFile>
     </PropertyGroup>
+    <ItemGroup>
+      <None Remove="V2Tests\Samples\multipleProduces.json" />
+    </ItemGroup>
     <ItemGroup>
       <EmbeddedResource Include="OpenApiReaderTests\Samples\unsupported.v1.yaml">
         <CopyToOutputDirectory>Never</CopyToOutputDirectory>
@@ -97,6 +100,9 @@
       <EmbeddedResource Include="V2Tests\Samples\OpenApiSecurityScheme\oauth2PasswordSecurityScheme.yaml">
         <CopyToOutputDirectory>Never</CopyToOutputDirectory>
       </EmbeddedResource>
+      <EmbeddedResource Include="V2Tests\Samples\multipleProduces.json">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </EmbeddedResource>
       <EmbeddedResource Include="V2Tests\Samples\twoResponses.json">
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       </EmbeddedResource>

test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiDocumentTests.cs

@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
+using System.Linq;
 using System.Threading;
 using FluentAssertions;
 using Microsoft.OpenApi.Any;
@@ -238,5 +239,30 @@ public void ShouldParseProducesInAnyOrder()
                 }
             }
         }
+
+        [Fact]
+        public void ShouldAssignSchemaToAllResponses()
+        {
+            OpenApiDocument document;
+            OpenApiDiagnostic diagnostic;
+            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "multipleProduces.json")))
+            {
+                document = new OpenApiStreamReader().Read(stream, out diagnostic);
+            }
+
+            Assert.Equal(OpenApiSpecVersion.OpenApi2_0, diagnostic.SpecificationVersion);
+
+            var responses = document.Paths["/items"].Operations[OperationType.Get].Responses;
+            foreach (var content in responses.Values.Select(r => r.Content))
+            {
+                var json = content["application/json"];
+                Assert.NotNull(json);
+                Assert.NotNull(json.Schema);
+
+                var xml = content["application/xml"];
+                Assert.NotNull(xml);
+                Assert.NotNull(xml.Schema);
+            }
+        }
     }
 }

test/Microsoft.OpenApi.Readers.Tests/V2Tests/Samples/multipleProduces.json

@@ -0,0 +1,62 @@
+{
+    "swagger": "2.0",
+    "info": {
+        "title": "Multiple produces",
+        "version": "1.0.0"
+    },
+    "schemes": [
+        "https"
+    ],
+    "basePath": "/",
+    "paths": {
+        "/items": {
+            "get": {
+                "produces": [
+                    "application/json",
+                    "application/xml"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "An OK response",
+                        "schema": {
+                            "type": "array",
+                            "items": {
+                                "$ref": "#/definitions/Item"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "An error response",
+                        "schema": {
+                            "$ref": "#/definitions/Error"
+                        }
+                    }
+                }
+            }
+        }
+    },
+    "definitions": {
+        "Item": {
+            "properties": {
+                "id": {
+                    "type": "string",
+                    "description": "Item identifier."
+                }
+            }
+        },
+        "Error": {
+            "properties": {
+                "code": {
+                    "type": "integer",
+                    "format": "int32"
+                },
+                "message": {
+                    "type": "string"
+                },
+                "fields": {
+                    "type": "string"
+                }
+            }
+        }
+    }
+}