fix flaky behaviour with error responses

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

Author: baywet

src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiResponseGenerator.cs

@@ -3,6 +3,7 @@
 //  Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
 // ------------------------------------------------------------
 
+using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
@@ -21,25 +22,6 @@ namespace Microsoft.OpenApi.OData.Generator
     /// </summary>
     internal static class OpenApiResponseGenerator
     {
-        private static Dictionary<string, IOpenApiResponse> _responses;
-
-        private static Dictionary<string, IOpenApiResponse> GetResponses(OpenApiDocument openApiDocument)
-        {
-            _responses ??= new()
-                {
-                    { Constants.StatusCodeDefault,
-                        new OpenApiResponseReference(Constants.Error, openApiDocument)
-                    },
-
-                    { Constants.StatusCode204, new OpenApiResponse { Description = Constants.Success} },
-                    { Constants.StatusCode201, new OpenApiResponse { Description = Constants.Created} },
-                    { Constants.StatusCodeClass2XX, new OpenApiResponse { Description = Constants.Success} },
-                    { Constants.StatusCodeClass4XX, new OpenApiResponseReference(Constants.Error, openApiDocument)},
-                    { Constants.StatusCodeClass5XX, new OpenApiResponseReference(Constants.Error, openApiDocument)}
-                };
-            return _responses;
-        }
-
         /// <summary>
         /// Get the <see cref="IOpenApiResponse"/> for the build-in statusCode.
         /// </summary>
@@ -48,12 +30,15 @@ private static Dictionary<string, IOpenApiResponse> GetResponses(OpenApiDocument
         /// <returns>The created <see cref="IOpenApiResponse"/>.</returns>
         public static IOpenApiResponse GetResponse(this string statusCode, OpenApiDocument document)
         {
-            if (GetResponses(document).TryGetValue(statusCode, out var response))
-            {
-                return response;
-            }
-
-            return null;
+            return statusCode switch {
+                Constants.StatusCodeDefault => new OpenApiResponseReference(Constants.Error, document),
+                Constants.StatusCode204 => new OpenApiResponse { Description = Constants.Success},
+                Constants.StatusCode201 => new OpenApiResponse { Description = Constants.Created},
+                Constants.StatusCodeClass2XX => new OpenApiResponse { Description = Constants.Success},
+                Constants.StatusCodeClass4XX => new OpenApiResponseReference(Constants.Error, document),
+                Constants.StatusCodeClass5XX => new OpenApiResponseReference(Constants.Error, document),
+                _ => null,
+            };
         }
 
         /// <summary>

test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Basic.OpenApi.V2.yaml

@@ -122,6 +122,8 @@ paths:
       operationId: City.City.UpdateCity
       consumes:
         - application/json
+      produces:
+        - application/json
       parameters:
         - in: path
           name: Name
@@ -146,6 +148,8 @@ paths:
         - City.City
       summary: Delete entity from City
       operationId: City.City.DeleteCity
+      produces:
+        - application/json
       parameters:
         - in: path
           name: Name
@@ -172,6 +176,7 @@ paths:
       operationId: City.GetCount-8728
       produces:
         - text/plain
+        - application/json
       parameters:
         - $ref: '#/parameters/search'
         - $ref: '#/parameters/filter'
@@ -296,6 +301,8 @@ paths:
       operationId: CountryOrRegion.CountryOrRegion.UpdateCountryOrRegion
       consumes:
         - application/json
+      produces:
+        - application/json
       parameters:
         - in: path
           name: Name
@@ -320,6 +327,8 @@ paths:
         - CountryOrRegion.CountryOrRegion
       summary: Delete entity from CountryOrRegion
       operationId: CountryOrRegion.CountryOrRegion.DeleteCountryOrRegion
+      produces:
+        - application/json
       parameters:
         - in: path
           name: Name
@@ -346,6 +355,7 @@ paths:
       operationId: CountryOrRegion.GetCount-daf5
       produces:
         - text/plain
+        - application/json
       parameters:
         - $ref: '#/parameters/search'
         - $ref: '#/parameters/filter'
@@ -398,6 +408,8 @@ paths:
       operationId: Me.Person.UpdatePerson
       consumes:
         - application/json
+      produces:
+        - application/json
       parameters:
         - in: body
           name: body
@@ -540,6 +552,8 @@ paths:
       operationId: People.Person.UpdatePerson
       consumes:
         - application/json
+      produces:
+        - application/json
       parameters:
         - in: path
           name: UserName
@@ -564,6 +578,8 @@ paths:
         - People.Person
       summary: Delete entity from People
       operationId: People.Person.DeletePerson
+      produces:
+        - application/json
       parameters:
         - in: path
           name: UserName
@@ -590,6 +606,7 @@ paths:
       operationId: People.GetCount-dd8d
       produces:
         - text/plain
+        - application/json
       parameters:
         - $ref: '#/parameters/search'
         - $ref: '#/parameters/filter'