@@ -60,7 +60,7 @@ private OpenApiSchema GenerateSchemaForMember(
60
60
61
61
var requiredAttribute = customAttributes . OfType < RequiredAttribute > ( ) . FirstOrDefault ( ) ;
62
62
63
- if ( ! IsNullable ( customAttributes , requiredAttribute , dataProperty , memberInfo ) )
63
+ if ( ! IsNullable ( requiredAttribute , dataProperty , memberInfo ) )
64
64
{
65
65
modelType = Nullable . GetUnderlyingType ( modelType ) ?? modelType ;
66
66
}
@@ -87,7 +87,7 @@ private OpenApiSchema GenerateSchemaForMember(
87
87
{
88
88
var requiredAttribute = customAttributes . OfType < RequiredAttribute > ( ) . FirstOrDefault ( ) ;
89
89
90
- schema . Nullable = IsNullable ( customAttributes , requiredAttribute , dataProperty , memberInfo ) ;
90
+ schema . Nullable = IsNullable ( requiredAttribute , dataProperty , memberInfo ) ;
91
91
92
92
schema . ReadOnly = dataProperty . IsReadOnly ;
93
93
schema . WriteOnly = dataProperty . IsWriteOnly ;
@@ -137,11 +137,16 @@ private OpenApiSchema GenerateSchemaForMember(
137
137
return schema ;
138
138
}
139
139
140
- private bool IsNullable ( IEnumerable < object > customAttributes , RequiredAttribute requiredAttribute , DataProperty dataProperty , MemberInfo memberInfo )
140
+ private bool IsNullable ( RequiredAttribute requiredAttribute , DataProperty dataProperty , MemberInfo memberInfo )
141
141
{
142
- return _generatorOptions . SupportNonNullableReferenceTypes
143
- ? dataProperty . IsNullable && requiredAttribute == null && ! memberInfo . IsNonNullableReferenceType ( )
144
- : dataProperty . IsNullable && requiredAttribute == null ;
142
+ var nullable = dataProperty . IsNullable && requiredAttribute == null ;
143
+
144
+ if ( _generatorOptions . SupportNonNullableReferenceTypes )
145
+ {
146
+ nullable &= ! memberInfo . IsNonNullableReferenceType ( ) ;
147
+ }
148
+
149
+ return nullable ;
145
150
}
146
151
147
152
private OpenApiSchema GenerateSchemaForParameter (
0 commit comments