Update JsonObjectHandler to handle JsonExtensionData correctly

domaindrivendev · Jan 14, 2020 · c47d3b7 · c47d3b7
1 parent 89a78db
commit c47d3b7
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/src/Swashbuckle.AspNetCore.SwaggerGen/SchemaGenerator/JsonObjectHandler.cs b/src/Swashbuckle.AspNetCore.SwaggerGen/SchemaGenerator/JsonObjectHandler.cs
@@ -84,6 +84,13 @@ private OpenApiSchema CreateObjectSchema(Type type, SchemaRepository schemaRepos
 
             foreach (var property in serializableProperties)
             {
+                if (property.HasAttribute<JsonExtensionDataAttribute>() && property.PropertyType.IsDictionary(out Type keyType, out Type valueType))
+                {
+                    schema.AdditionalPropertiesAllowed = true;
+                    schema.AdditionalProperties = _schemaGenerator.GenerateSchema(valueType, schemaRepository);
+                    continue;
+                }
+
                 var customAttributes = property.GetInlineOrMetadataTypeAttributes();
 
                 if (_generatorOptions.IgnoreObsoleteProperties && customAttributes.OfType<ObsoleteAttribute>().Any()) continue;
@@ -95,12 +102,6 @@ private OpenApiSchema CreateObjectSchema(Type type, SchemaRepository schemaRepos
 
                 if (customAttributes.OfType<RequiredAttribute>().Any())
                     schema.Required.Add(name);
-
-                if (property.HasAttribute<JsonExtensionDataAttribute>() && property.PropertyType.IsDictionary(out Type keyType, out Type valueType))
-                {
-                    schema.AdditionalPropertiesAllowed = true;
-                    schema.AdditionalProperties = _schemaGenerator.GenerateSchema(valueType, schemaRepository);
-                }
             }
 
 

diff --git a/.../Swashbuckle.AspNetCore.Newtonsoft.Test/SchemaGenerator/NewtonsoftSchemaGeneratorTests.cs b/.../Swashbuckle.AspNetCore.Newtonsoft.Test/SchemaGenerator/NewtonsoftSchemaGeneratorTests.cs
@@ -568,6 +568,7 @@ public void GenerateSchema_HonorsSerializerAttribute_JsonExtensionData()
 
             var schema = schemaRepository.Schemas[referenceSchema.Reference.Id];
             Assert.NotNull(schema.AdditionalProperties);
+            Assert.Equal(new[] { "Property1" }, schema.Properties.Keys.ToArray());
             Assert.Equal("object", schema.AdditionalProperties.Type);
         }
 

diff --git a/test/Swashbuckle.AspNetCore.SwaggerGen.Test/SchemaGenerator/JsonSchemaGeneratorTests.cs b/test/Swashbuckle.AspNetCore.SwaggerGen.Test/SchemaGenerator/JsonSchemaGeneratorTests.cs
@@ -544,6 +544,7 @@ public void GenerateSchema_HonorsSerializerAttribute_JsonExtensionData()
 
             var schema = schemaRepository.Schemas[referenceSchema.Reference.Id];
             Assert.NotNull(schema.AdditionalProperties);
+            Assert.Equal(new[] { "Property1" }, schema.Properties.Keys.ToArray());
             Assert.Equal("object", schema.AdditionalProperties.Type);
         }
 

diff --git a/test/WebSites/Basic/Controllers/FromFormParamsController.cs b/test/WebSites/Basic/Controllers/FromFormParamsController.cs
@@ -1,6 +1,5 @@
 using Microsoft.AspNetCore.Mvc;
 using System.Collections.Generic;
-using System.ComponentModel;
 
 namespace Basic.Controllers
 {