Skip to content

Move common tail of SetCreateObject method to non-generic base #117499

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

Closed
wants to merge 1 commit into from
Closed

Move common tail of SetCreateObject method to non-generic base #117499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 19 additions & 0 deletions src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/JsonTypeInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,25 @@ public Func<object>? CreateObject
private protected abstract void SetCreateObject(Delegate? createObject);
private protected Func<object>? _createObject;

private protected void AfterCreateObject()
{
// Clear any data related to the previously specified ctor
ConstructorAttributeProviderFactory = null;
ConstructorAttributeProvider = null;

if (CreateObjectWithArgs is not null)
{
_parameterInfoValuesIndex = null;
CreateObjectWithArgs = null;
ParameterCount = 0;

foreach (JsonPropertyInfo propertyInfo in PropertyList)
{
propertyInfo.AssociatedParameter = null;
}
}
}

internal Func<object>? CreateObjectForExtensionDataProperty { get; set; }

/// <summary>
Expand Down
16 changes: 1 addition & 15 deletions ...libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/JsonTypeInfoOfT.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,21 +98,7 @@ private protected override void SetCreateObject(Delegate? createObject)
_createObject = untypedCreateObject;
_typedCreateObject = typedCreateObject;

// Clear any data related to the previously specified ctor
ConstructorAttributeProviderFactory = null;
ConstructorAttributeProvider = null;

if (CreateObjectWithArgs is not null)
{
_parameterInfoValuesIndex = null;
CreateObjectWithArgs = null;
ParameterCount = 0;

foreach (JsonPropertyInfo propertyInfo in PropertyList)
{
propertyInfo.AssociatedParameter = null;
}
}
AfterCreateObject();
}

/// <summary>
Expand Down
Loading