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

Make MessagePackParser accept a string as a byte array field by komamitsu · Pull Request #420 · msgpack/msgpack-java · GitHub

/ msgpack-java Public

Make MessagePackParser accept a string as a byte array field #420

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
komamitsu merged 1 commit into from
Apr 25, 2017
Conversation 0 Commits 1 Checks 0 Files changed
Merged

Make MessagePackParser accept a string as a byte array field #420

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 .java  (3) 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
11 changes: 8 additions & 3 deletions msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/MessagePackParser.java
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 @@ -32,7 +32,6 @@
import org.msgpack.core.MessageFormat;
import org.msgpack.core.MessagePack;
import org.msgpack.core.MessageUnpacker;
import org.msgpack.core.Preconditions;
import org.msgpack.core.buffer.ArrayBufferInput;
import org.msgpack.core.buffer.InputStreamBufferInput;
import org.msgpack.core.buffer.MessageBufferInput;
Expand Down Expand Up @@ -419,8 +418,14 @@ public int getTextOffset()
public byte[] getBinaryValue(Base64Variant b64variant)
throws IOException, JsonParseException
{
Preconditions.checkArgument(type == Type.BYTES);
return bytesValue;
switch (type) {
case BYTES:
return bytesValue;
case STRING:
return stringValue.getBytes(MessagePack.UTF8);
default:
throw new IllegalStateException("Invalid type=" + type);
}
}

@Override
Expand Down
6 changes: 6 additions & 0 deletions ...k-jackson/src/test/java/org/msgpack/jackson/dataformat/MessagePackDataformatTestBase.java
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 @@ -160,6 +160,12 @@ public void setS(String s)
}
}

public static class BinKeyPojo
{
public byte[] b;
public String s;
}

public static class UsingCustomConstructorPojo
{
final String name;
Expand Down
22 changes: 22 additions & 0 deletions msgpack-jackson/src/test/java/org/msgpack/jackson/dataformat/MessagePackParserTest.java
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 @@ -758,4 +758,26 @@ public Object deserialize(byte[] data)
}
assertThat((String) values.get(4), is("Java"));
}

@Test
public void parserShouldReadStrAsBin()
throws IOException
{
MessagePacker packer = MessagePack.newDefaultPacker(out);
packer.packMapHeader(2);
// #1
packer.packString("s");
packer.packString("foo");
// #2
packer.packString("b");
packer.packString("bar");

packer.flush();

byte[] bytes = out.toByteArray();

BinKeyPojo binKeyPojo = objectMapper.readValue(bytes, BinKeyPojo.class);
assertEquals("foo", binKeyPojo.s);
assertArrayEquals("bar".getBytes(), binKeyPojo.b);
}
}
Back | FazBrowse Home | New Git URL