Merge pull request #5 from ZeVS777/master

add "x-enumNames" for schema properties no matter if the type is gene…
unchase · Feb 18, 2020 · 88365b7 · 88365b7
2 parents 14d6fb7 + 51ccdfa
commit 88365b7
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/Unchase.Swashbuckle.AspNetCore.Extensions/Filters/XEnumNamesSchemaFilter.cs b/src/Unchase.Swashbuckle.AspNetCore.Extensions/Filters/XEnumNamesSchemaFilter.cs
@@ -59,9 +59,11 @@ public void Apply(OpenApiSchema schema, SchemaFilterContext context)
                         schema.Extensions.Add("x-enumDescriptions", enumsDescriptionsArray);
                     }
                 }
+                return;
             }
+
             // add "x-enumNames" for schema with generic types
-            else if (typeInfo.IsGenericType && !schema.Extensions.ContainsKey("x-enumNames"))
+            if (typeInfo.IsGenericType && !schema.Extensions.ContainsKey("x-enumNames"))
             {
                 foreach (var genericArgumentType in typeInfo.GetGenericArguments())
                 {
@@ -98,7 +100,8 @@ public void Apply(OpenApiSchema schema, SchemaFilterContext context)
                     }
                 }
             }
-            else if (schema.Properties?.Count > 0)
+
+            if (schema.Properties?.Count > 0)
             {
                 foreach (var schemaProperty in schema.Properties)
                 {