-
-
Notifications
You must be signed in to change notification settings - Fork 1k
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
Support open generic metatypes #857
Open
Turnerj
wants to merge
2
commits into
protobuf-net:main
Choose a base branch
from
Turnerj:open-generic-metatype
base: main
Could not load branches
Branch not found: {{ refName }}
Could not load tags
Nothing to show
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
using ProtoBuf.Meta; | ||
using Xunit; | ||
|
||
namespace ProtoBuf.Test.Meta | ||
{ | ||
public class OpenGenericMetaTypeTests | ||
{ | ||
public class OpenGenericTarget<T> | ||
{ | ||
public T Value { get; set; } | ||
} | ||
|
||
[ProtoContract] | ||
public class OpenGenericSurrogate<T> | ||
{ | ||
[ProtoMember(1)] | ||
public T Value { get; set; } | ||
|
||
|
||
public static implicit operator OpenGenericTarget<T>(OpenGenericSurrogate<T> surrogate) | ||
{ | ||
return surrogate == null ? null : new OpenGenericTarget<T> | ||
{ | ||
Value = surrogate.Value | ||
}; | ||
} | ||
|
||
public static implicit operator OpenGenericSurrogate<T>(OpenGenericTarget<T> source) | ||
{ | ||
return source == null ? null : new OpenGenericSurrogate<T> | ||
{ | ||
Value = source.Value | ||
}; | ||
} | ||
} | ||
|
||
[Fact] | ||
public void OpenGenericMetaTypeSerialization() | ||
{ | ||
RuntimeTypeModel.Default.Add(typeof(OpenGenericTarget<>)).SetSurrogate(typeof(OpenGenericSurrogate<>)); | ||
|
||
var instance = new OpenGenericTarget<string> { Value = "XYZ!" }; | ||
var clone = RuntimeTypeModel.Default.DeepClone(instance); | ||
|
||
Assert.Equal(instance.Value, clone.Value); | ||
} | ||
} | ||
} |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -719,15 +719,34 @@ internal int FindOrAddAuto(Type type, bool demand, bool addWithContractOnly, boo | |
shouldAdd = addEvenIfAutoDisabled = true; // always add basic tuples, such as KeyValuePair | ||
} | ||
|
||
if (!shouldAdd || ( | ||
!type.IsEnum && addWithContractOnly && family == MetaType.AttributeFamily.None) | ||
) | ||
// for generic types, when no contract is set, see if a generic definition is registered and use that | ||
if (type.IsGenericType && !type.IsGenericTypeDefinition && family == MetaType.AttributeFamily.None) | ||
{ | ||
if (demand) ThrowUnexpectedType(type, this); | ||
return key; | ||
var genericTypeDefinition = type.GetGenericTypeDefinition(); | ||
key = types.IndexOf(MetaTypeFinder, genericTypeDefinition); | ||
if (key >= 0) | ||
{ | ||
var genericMetaType = (MetaType)types[key]; | ||
if (genericMetaType.Pending) | ||
{ | ||
WaitOnLock(); | ||
} | ||
metaType = genericMetaType.GenerateGenericType(type); | ||
} | ||
} | ||
|
||
metaType = Create(type); | ||
if (metaType is null) | ||
{ | ||
Comment on lines
+738
to
+739
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This additional check seemed like the best solution to avoid triggering the next block if a metatype was generated in the new code I wrote. In my head it was either this or a |
||
if (!shouldAdd || ( | ||
!type.IsEnum && addWithContractOnly && family == MetaType.AttributeFamily.None) | ||
) | ||
{ | ||
if (demand) ThrowUnexpectedType(type, this); | ||
return key; | ||
} | ||
|
||
metaType = Create(type); | ||
} | ||
} | ||
|
||
metaType.Pending = true; | ||
|
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 kinda winging this part here based on existing code further up in the method.