-
Notifications
You must be signed in to change notification settings - Fork 4.7k
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.
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
Implement JsonTypeInfoResolver.WithAddedModifier #88255
Merged
eiriktsarpalis
merged 1 commit into
dotnet:main
from
eiriktsarpalis:typeinforesolver-added-modifier
Jul 5, 2023
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
44 changes: 44 additions & 0 deletions
44
...son/src/System/Text/Json/Serialization/Metadata/JsonTypeInfoResolverWithAddedModifiers.cs
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
// Licensed to the .NET Foundation under one or more agreements. | ||
// The .NET Foundation licenses this file to you under the MIT license. | ||
|
||
using System.Diagnostics; | ||
|
||
namespace System.Text.Json.Serialization.Metadata | ||
{ | ||
internal sealed class JsonTypeInfoResolverWithAddedModifiers : IJsonTypeInfoResolver | ||
{ | ||
private readonly IJsonTypeInfoResolver _source; | ||
private readonly Action<JsonTypeInfo>[] _modifiers; | ||
|
||
public JsonTypeInfoResolverWithAddedModifiers(IJsonTypeInfoResolver source, Action<JsonTypeInfo>[] modifiers) | ||
{ | ||
Debug.Assert(modifiers.Length > 0); | ||
krwq marked this conversation as resolved.
Show resolved
Hide resolved
|
||
_source = source; | ||
_modifiers = modifiers; | ||
} | ||
|
||
public JsonTypeInfoResolverWithAddedModifiers WithAddedModifier(Action<JsonTypeInfo> modifier) | ||
krwq marked this conversation as resolved.
Show resolved
Hide resolved
|
||
{ | ||
var newModifiers = new Action<JsonTypeInfo>[_modifiers.Length + 1]; | ||
_modifiers.CopyTo(newModifiers, 0); | ||
newModifiers[_modifiers.Length] = modifier; | ||
|
||
return new JsonTypeInfoResolverWithAddedModifiers(_source, newModifiers); | ||
} | ||
|
||
public JsonTypeInfo? GetTypeInfo(Type type, JsonSerializerOptions options) | ||
{ | ||
JsonTypeInfo? typeInfo = _source.GetTypeInfo(type, options); | ||
|
||
if (typeInfo != null) | ||
{ | ||
foreach (Action<JsonTypeInfo> modifier in _modifiers) | ||
{ | ||
modifier(typeInfo); | ||
} | ||
} | ||
|
||
return typeInfo; | ||
} | ||
} | ||
} |
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm curious if you could support it by List and count (you always append so technically you could reuse same instance) or ImmutableArray/List - not a big deal - this is not in a hot path
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We want the resolver instances to be immutable -- if we reused the same
List<T>
then callingvar bar = foo.WithAddedModifiers(...);
thenfoo
would be mutated.