Skip to content

Honor converters for underlying types of Nullable<T> specified with JsonConverterAttribute #32006

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

Merged
layomia merged 14 commits into from
Feb 29, 2020
Merged

Honor converters for underlying types of Nullable<T> specified with JsonConverterAttribute #32006

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
13a092b
FIxed exception being thrown when JsonConverterAttribute is used on N…
CodeBlanch Feb 10, 2020
e91a0b8
Expanded test coverage.
CodeBlanch Feb 10, 2020
947159d
Code review feedback.
CodeBlanch Feb 10, 2020
44d65eb
Code review feedback.
CodeBlanch Feb 10, 2020
e866c90
Syncing up with master.
CodeBlanch Feb 12, 2020
07348b2
Updated to use JsonValueConverterNullableFactory directly instead of …
CodeBlanch Feb 13, 2020
8251e33
Null response is no longer possible.
CodeBlanch Feb 13, 2020
ab723f5
Code review.
CodeBlanch Feb 13, 2020
5d7e4eb
Sync up with master.
CodeBlanch Feb 16, 2020
96857fe
Updated for refactoring.
CodeBlanch Feb 16, 2020
0f71de6
Merge branch 'master' into JsonConverterAttribute+NullableType
CodeBlanch Feb 27, 2020
1aee7fb
Code review.
CodeBlanch Feb 27, 2020
07d457e
Code review #2.
CodeBlanch Feb 27, 2020
d5fa634
Merge branch 'master' into JsonConverterAttribute+NullableType
CodeBlanch Feb 28, 2020
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
Prev Previous commit
Next Next commit
Updated for refactoring.
  • Loading branch information
@CodeBlanch
CodeBlanch committed Feb 16, 2020
commit 96857fef7a4084e80dd0ca425576f5e82ffdaf28
2 changes: 1 addition & 1 deletion ...s/System.Text.Json/src/System/Text/Json/Serialization/JsonSerializerOptions.Converters.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ private JsonConverter GetConverterFromAttribute(JsonConverterAttribute converter
if (underlyingType != null && converter.CanConvert(underlyingType))
{
// Allow nullable handling to forward to the underlying type's converter.
return JsonValueConverterNullableFactory.CreateValueConverter(underlyingType, converter);
return NullableConverterFactory.CreateValueConverter(underlyingType, converter);
}

ThrowHelper.ThrowInvalidOperationException_SerializationConverterOnAttributeNotCompatible(classTypeAttributeIsOn, propertyInfo, typeToConvert);
Expand Down