Refactor JsonPropertyInfo initialization infrastructure and implement JsonPropertyInfo.AttributeProvider #71514
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Tagging subscribers to this area: @dotnet/area-system-text-json, @gregsdennis Issue DetailsMakes the following changes:
Contributes to #63686.
|
eiriktsarpalis
commented
Jul 1, 2022
...ibraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/JsonPropertyInfoOfT.cs
Outdated
Show resolved
Hide resolved
eiriktsarpalis
commented
Jul 1, 2022
...ibraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/JsonPropertyInfoOfT.cs
Show resolved
Hide resolved
eiriktsarpalis
commented
Jul 1, 2022
src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/JsonTypeInfo.cs
Show resolved
Hide resolved
krwq
reviewed
Jul 1, 2022
src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/JsonPropertyInfo.cs
Outdated
Show resolved
Hide resolved
krwq
reviewed
Jul 1, 2022
src/libraries/System.Text.Json/src/System/Text/Json/Serialization/JsonConverter.cs
Show resolved
Hide resolved
eiriktsarpalis
commented
Jul 1, 2022
src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/JsonPropertyInfo.cs
Outdated
Show resolved
Hide resolved
eiriktsarpalis
commented
Jul 1, 2022
src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/JsonPropertyInfo.cs
Outdated
Show resolved
Hide resolved
krwq
reviewed
Jul 1, 2022
src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/JsonPropertyInfo.cs
Outdated
Show resolved
Hide resolved
…ion infrastructure
…ion/Metadata/JsonPropertyInfo.cs
…ion/Metadata/JsonPropertyInfo.cs
eiriktsarpalis
force-pushed
the
jsonextensiondata
branch
from
dd907ca to
c9cb9bd
Compare
krwq
reviewed
Jul 4, 2022
| @@ -43,5 +43,24 @@ public static bool IsAssignableFromInternal(this Type type, Type from) | |||
|
|
|||
| private static bool HasJsonConstructorAttribute(ConstructorInfo constructorInfo) | |||
| => constructorInfo.GetCustomAttribute<JsonConstructorAttribute>() != null; | |||
|
|
|||
| public static TAttribute? GetUniqueCustomAttribute<TAttribute>(this MemberInfo memberInfo, bool inherit) | |||
There was a problem hiding this comment.
nit: consider ICustomAttributeProvider rather than MemberInfo
krwq
reviewed
Jul 4, 2022
src/libraries/System.Text.Json/src/System/Text/Json/Serialization/JsonConverterOfT.cs
Show resolved
Hide resolved
krwq
reviewed
Jul 4, 2022
...raries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/CustomJsonTypeInfoOfT.cs
Show resolved
Hide resolved
krwq
reviewed
Jul 4, 2022
src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/JsonPropertyInfo.cs
Show resolved
Hide resolved
krwq
reviewed
Jul 4, 2022
| DeclaringType = declaringType; | ||
| PropertyType = propertyType; | ||
| Options = options; | ||
| ParentTypeInfo = parentTypeInfo; // null parentTypeInfo means it's not tied yet |
There was a problem hiding this comment.
should we debug assert that if parentTypeInfo is not null then declaringType == parentTypeInfo.Type?
There was a problem hiding this comment.
We could, I'll add in the next round of PRs
krwq
reviewed
Jul 4, 2022
| } | ||
|
|
||
| private JsonPropertyInfo? AddProperty( | ||
| Type typeToConvert, |
ghost
locked as resolved and limited conversation to collaborators
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Makes the following changes:
JsonPropertyInfoinitialization so that a minimal subset of required parameters are read-only and settable via constructors instead of property setters. Simplify initialization logic removing dead branches and unnecessary parameterization.JsonPropertyInfometadata initialization into a separate method explicitly invoked by ReflectionJsonTypeInfo.parentClassTypetodeclaringType,ClrNametoMemberNameandmemberTypetotypeToConvert. Remove unused parameters.JsonPropertyInfo.AttributeProviderandIsExtensionDataproperties as internal APIs.Contributes to #63686.