Fix schemas for nullable properties

Fix incorrect handling of schemas for nullable properties. Resolves domaindrivendev#3013.
martincostello · Aug 8, 2024 · 581ac15 · 581ac15
1 parent b7161e6
commit 581ac15
Show file tree

Hide file tree

Showing 3 changed files with 107 additions and 1 deletion.
diff --git a/src/Swashbuckle.AspNetCore.SwaggerGen/SchemaGenerator/JsonSerializerDataContractResolver.cs b/src/Swashbuckle.AspNetCore.SwaggerGen/SchemaGenerator/JsonSerializerDataContractResolver.cs
@@ -96,7 +96,7 @@ public DataContract GetDataContractForType(Type type)
 
             return DataContract.ForObject(
                 underlyingType: effectiveType,
-                properties: GetDataPropertiesFor(type, out Type extensionDataType),
+                properties: GetDataPropertiesFor(effectiveType, out Type extensionDataType),
                 extensionDataType: extensionDataType,
                 jsonConverter: (value) => JsonConverterFunc(value, effectiveType));
         }

diff --git a/...VerifyIntegrationTest.SwaggerEndpoint_ReturnsValidSwaggerJson_Basic_DotNet_6.verified.txt b/...VerifyIntegrationTest.SwaggerEndpoint_ReturnsValidSwaggerJson_Basic_DotNet_6.verified.txt
@@ -726,6 +726,36 @@
         x-purpose: test
       }
     },
+    /Issue3013/Get: {
+      get: {
+        tags: [
+          Issue3013
+        ],
+        responses: {
+          200: {
+            description: OK,
+            content: {
+              text/plain: {
+                schema: {
+                  $ref: #/components/schemas/TestResponse
+                }
+              },
+              application/json: {
+                schema: {
+                  $ref: #/components/schemas/TestResponse
+                }
+              },
+              text/json: {
+                schema: {
+                  $ref: #/components/schemas/TestResponse
+                }
+              }
+            }
+          }
+        },
+        x-purpose: test
+      }
+    },
     /promotions: {
       get: {
         tags: [
@@ -1381,6 +1411,29 @@
         },
         additionalProperties: false
       },
+      TestResponse: {
+        type: object,
+        properties: {
+          foo: {
+            $ref: #/components/schemas/TestStruct
+          }
+        },
+        additionalProperties: false
+      },
+      TestStruct: {
+        type: object,
+        properties: {
+          a: {
+            type: integer,
+            format: int32
+          },
+          b: {
+            type: integer,
+            format: int32
+          }
+        },
+        additionalProperties: false
+      },
       Transaction: {
         required: [
           amount

diff --git a/...VerifyIntegrationTest.SwaggerEndpoint_ReturnsValidSwaggerJson_Basic_DotNet_8.verified.txt b/...VerifyIntegrationTest.SwaggerEndpoint_ReturnsValidSwaggerJson_Basic_DotNet_8.verified.txt
@@ -726,6 +726,36 @@
         x-purpose: test
       }
     },
+    /Issue3013/Get: {
+      get: {
+        tags: [
+          Issue3013
+        ],
+        responses: {
+          200: {
+            description: OK,
+            content: {
+              text/plain: {
+                schema: {
+                  $ref: #/components/schemas/TestResponse
+                }
+              },
+              application/json: {
+                schema: {
+                  $ref: #/components/schemas/TestResponse
+                }
+              },
+              text/json: {
+                schema: {
+                  $ref: #/components/schemas/TestResponse
+                }
+              }
+            }
+          }
+        },
+        x-purpose: test
+      }
+    },
     /promotions: {
       get: {
         tags: [
@@ -1381,6 +1411,29 @@
         },
         additionalProperties: false
       },
+      TestResponse: {
+        type: object,
+        properties: {
+          foo: {
+            $ref: #/components/schemas/TestStruct
+          }
+        },
+        additionalProperties: false
+      },
+      TestStruct: {
+        type: object,
+        properties: {
+          a: {
+            type: integer,
+            format: int32
+          },
+          b: {
+            type: integer,
+            format: int32
+          }
+        },
+        additionalProperties: false
+      },
       Transaction: {
         required: [
           amount