Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use NullabilityInfoContext to determine dictionary value nullability #3041

Merged
merged 3 commits into from
Aug 24, 2024
Merged

Use NullabilityInfoContext to determine dictionary value nullability #3041

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
575ddc6
Use NullabilityInfoContext to determine dictionary value nullability
patrikwlund Aug 23, 2024
2679cc1
More informative exception message
patrikwlund Aug 24, 2024
bf5c554
Additional comments in tests
patrikwlund Aug 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions src/Swashbuckle.AspNetCore.SwaggerGen/SchemaGenerator/MemberInfoExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,19 @@ public static bool IsNonNullableReferenceType(this MemberInfo memberInfo)

public static bool IsDictionaryValueNonNullable(this MemberInfo memberInfo)
{
#if NET6_0_OR_GREATER
var context = new NullabilityInfoContext();
var nullableInfo = memberInfo.MemberType == MemberTypes.Field
? context.Create((FieldInfo)memberInfo)
: context.Create((PropertyInfo)memberInfo);

if (nullableInfo.GenericTypeArguments.Length != 2)
{
throw new InvalidOperationException("Expected Dictionary to have two generic type arguments.");
martincostello marked this conversation as resolved.
Show resolved Hide resolved
}

return nullableInfo.GenericTypeArguments[1].ReadState == NullabilityState.NotNull;
#else
var memberType = memberInfo.MemberType == MemberTypes.Field
? ((FieldInfo)memberInfo).FieldType
: ((PropertyInfo)memberInfo).PropertyType;
Expand Down Expand Up @@ -104,6 +117,7 @@ public static bool IsDictionaryValueNonNullable(this MemberInfo memberInfo)
}

return false;
#endif
}

private static object GetNullableAttribute(this MemberInfo memberInfo)
Expand Down
Loading