Correctly handle interfaces for derived types (#2826)

* Correctly respect interfaces in `GetInheritanceChain`.
domaindrivendev · Apr 23, 2024 · e60acef · e60acef
1 parent c936acb
commit e60acef
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/src/Swashbuckle.AspNetCore.SwaggerGen/SchemaGenerator/TypeExtensions.cs b/src/Swashbuckle.AspNetCore.SwaggerGen/SchemaGenerator/TypeExtensions.cs
@@ -45,6 +45,8 @@ public static object GetDefaultValue(this Type type)
 
         public static Type[] GetInheritanceChain(this Type type)
         {
+            if (type.IsInterface) { return type.GetInterfaces(); }
+
             var inheritanceChain = new List<Type>();
 
             var current = type;

diff --git a/...shbuckle.AspNetCore.SwaggerGen.Test/SchemaGenerator/JsonSerializerSchemaGeneratorTests.cs b/...shbuckle.AspNetCore.SwaggerGen.Test/SchemaGenerator/JsonSerializerSchemaGeneratorTests.cs
@@ -236,6 +236,17 @@ public void GenerateSchema_IncludesInheritedProperties_IfTypeIsAnInterfaceHierar
             Assert.Equal(expectedPropertyNames.OrderBy(n => n), schema.Properties.Keys.OrderBy(k => k));
         }
 
+        [Fact]
+        public void GenerateSchema_KeepMostDerivedType_IfTypeIsAnInterface()
+        {
+            var schemaRepository = new SchemaRepository();
+
+            var referenceSchema = Subject().GenerateSchema(typeof(INewBaseInterface), schemaRepository);
+
+            var schema = schemaRepository.Schemas[referenceSchema.Reference.Id];
+            Assert.Equal("integer", schema.Properties["BaseProperty"].Type);
+        }
+
         [Fact]
         public void GenerateSchema_ExcludesIndexerProperties_IfComplexTypeIsIndexed()
         {

diff --git a/test/Swashbuckle.AspNetCore.TestSupport/Fixtures/BaseInterface.cs b/test/Swashbuckle.AspNetCore.TestSupport/Fixtures/BaseInterface.cs
@@ -19,4 +19,9 @@ public interface IMultiSubInterface : ISubInterface1, ISubInterface2
     {
         public int Property3 { get; set; }
     }
+
+    public interface INewBaseInterface : IBaseInterface
+    {
+        public new int BaseProperty { get; set; }
+    }
 }