Fix of documentation generation for aggregation (#184)

* Fix generating aggregation documentation when downstrem docs doesnot contain content * new version
Burgyn · Aug 24, 2021 · 7eb6ee2 · 7eb6ee2
1 parent 16eb92d
commit 7eb6ee2
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 13 deletions.
diff --git a/src/MMLib.SwaggerForOcelot/Aggregates/RouteDocs.cs b/src/MMLib.SwaggerForOcelot/Aggregates/RouteDocs.cs
@@ -123,7 +123,7 @@ public string GetSummary()
         /// </summary>
         public OpenApiResponse GetResponse()
         {
-            var response = Docs[PathKey].SelectToken("responses.200")?.ToObject(typeof(Response), _serializer) as Response;
+            var response = Docs[PathKey]?.SelectToken("responses.200")?.ToObject(typeof(Response), _serializer) as Response;
 
             return new OpenApiResponse()
             {
@@ -134,22 +134,28 @@ public OpenApiResponse GetResponse()
 
         private Dictionary<string, OpenApiMediaType> CreateContent(Response response)
         {
-            OpenApiMediaTypeEx content = response?.Content[MediaTypeNames.Application.Json];
             var ret = new Dictionary<string, OpenApiMediaType>();
+            if (response?.Content is null)
+            {
+                return ret;
+            }
 
-            if (content != null)
+            OpenApiMediaTypeEx content = response.Content[MediaTypeNames.Application.Json];
+            if (content == null)
             {
-                if (!content.SchemaExt.IsReference)
-                {
-                    content.SetSchema();
-                }
-                else
-                {
-                    FindSchema(content);
-                }
+                return ret;
+            }
 
-                ret.Add(MediaTypeNames.Application.Json, content);
+            if (!content.SchemaExt.IsReference)
+            {
+                content.SetSchema();
             }
+            else
+            {
+                FindSchema(content);
+            }
+
+            ret.Add(MediaTypeNames.Application.Json, content);
 
             return ret;
         }

diff --git a/src/MMLib.SwaggerForOcelot/MMLib.SwaggerForOcelot.csproj b/src/MMLib.SwaggerForOcelot/MMLib.SwaggerForOcelot.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
-    <Version>4.4.1</Version>
+    <Version>4.4.2</Version>
     <Authors>Milan Martiniak</Authors>
     <Company>MMLib</Company>
     <Description>Swagger generator for Ocelot downstream services.</Description>

diff --git a/tests/MMLib.SwaggerForOcelot.Tests/Aggregates/RoutesDocumentationProviderShould.cs b/tests/MMLib.SwaggerForOcelot.Tests/Aggregates/RoutesDocumentationProviderShould.cs
@@ -20,6 +20,7 @@ public class RoutesDocumentationProviderShould
         [InlineData("serviceWithMoreSimpleParameter1", "serviceWithMoreSimpleParameter2", "/{id}/{message}")]
         [InlineData("serviceWithMoreSimpleParameter1", "serviceWithMoreSimpleParameterAnotherNames", "/{id}/{message}", "{id}-{idcko};{message}-{sprava}")]
         [InlineData("moreMethod1", "moreMethod2")]
+        [InlineData("withoutcontent1", "withoutcontent2")]
         public async Task GetDocs(string firstService, string secondService, string parameters = null, string paramsMap = null)
         {
             RoutesDocumentationProvider provider = await CreateProviderAsync();

diff --git a/tests/MMLib.SwaggerForOcelot.Tests/Resources/AggregatesOpenApiResource.json b/tests/MMLib.SwaggerForOcelot.Tests/Resources/AggregatesOpenApiResource.json
@@ -125,6 +125,32 @@
         }
       }
     },
+    "/api/withoutcontent1/endpoint1": {
+      "get": {
+        "tags": [
+          "withoutcontent1"
+        ],
+        "summary": "withoutcontent1 - endpoint 1",
+        "responses": {
+          "200": {
+            "description": "Success"
+          }
+        }
+      }
+    },
+    "/api/withoutcontent2/endpoint1": {
+      "get": {
+        "tags": [
+          "withoutcontent2"
+        ],
+        "summary": "withoutcontent2 - endpoint 1",
+        "responses": {
+          "200": {
+            "description": "Success"
+          }
+        }
+      }
+    },
     "/api/serviceWithSimpleParameter1/endpoint1/{id}": {
       "get": {
         "tags": [