FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Fix PrimitiveObjectResolver's ability to read strings by AArnott · Pull Request #1575 · MessagePack-CSharp/MessagePack-CSharp · GitHub

  1. MessagePack-CSharp
  2. MessagePack-CSharp

Repository navigation

Fix PrimitiveObjectResolver's ability to read strings #1575

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
AArnott merged 3 commits into from
Mar 14, 2023
Conversation 0 Commits 3 Checks 0 Files changed
Merged

Fix PrimitiveObjectResolver's ability to read strings #1575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0e387c5
Add `PrimitiveObjectResolver` test for deserializing strings
AArnott Mar 14, 2023
641c87d
Merge remote-tracking branch 'upstream/master' into fix1574
AArnott Mar 14, 2023
aa8acaf
Fix `PrimitiveObjectResolver`'s ability to read strings
AArnott Mar 14, 2023
File filter

Filter by extension

Filter by extension .cs  (2) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
4 changes: 2 additions & 2 deletions ...MessagePack.UnityClient/Assets/Scripts/MessagePack/Formatters/PrimitiveObjectFormatter.cs
Show comments
View file
Open in desktop
This file contains hidden or 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
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -259,8 +259,8 @@ public void Serialize(ref MessagePackWriter writer, object? value, MessagePackSe
}

case MessagePackType.String:
var stringFormatter = options.Resolver.GetFormatterWithVerify<string?>();
return stringFormatter.Deserialize(ref reader, options);
IMessagePackFormatter<string?>? stringFormatter = options.Resolver.GetFormatter<string?>();
return stringFormatter is not null ? stringFormatter.Deserialize(ref reader, options) : reader.ReadString();
case MessagePackType.Binary:
// We must copy the sequence returned by ReadBytes since the reader's sequence is only valid during deserialization.
return reader.ReadBytes()?.ToArray();
Expand Down
7 changes: 7 additions & 0 deletions src/MessagePack.UnityClient/Assets/Scripts/Tests/ShareTests/PrimitiveObjectFormatterTests.cs
Show comments
View file
Open in desktop
This file contains hidden or 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
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,13 @@ public void CompressibleIntegersRetainTypeInfo<T>(T value)
Assert.Equal(value, result);
}

[Fact]
public void StringType()
{
byte[] msgpack = MessagePackSerializer.Serialize<object>("message", PrimitiveObjectResolver.Options);
string result = (string)MessagePackSerializer.Deserialize<object>(msgpack, PrimitiveObjectResolver.Options);
}

[Fact]
public void IL2CPPHint()
{
Expand Down
Back | FazBrowse Home | New Git URL