Skip to content

Rename Extended to Extension #264

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
xerial merged 1 commit into from
Jun 30, 2015
Merged

Rename Extended to Extension #264

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
4 changes: 2 additions & 2 deletions msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/MessagePackExtensionType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ public void serialize(MessagePackExtensionType value, JsonGenerator gen, Seriali
throws IOException, JsonProcessingException
{
if (gen instanceof MessagePackGenerator) {
MessagePackGenerator msgpackGenerator = (MessagePackGenerator)gen;
msgpackGenerator.writeExtendedType(value);
MessagePackGenerator msgpackGenerator = (MessagePackGenerator) gen;
msgpackGenerator.writeExtensionType(value);
}
else {
throw new IllegalStateException("'gen' is expected to be MessagePackGenerator but it's " + gen.getClass());
Expand Down
12 changes: 7 additions & 5 deletions msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/MessagePackGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,9 +214,9 @@ else if (v instanceof Boolean) {
messagePacker.packBoolean((Boolean) v);
}
else if (v instanceof MessagePackExtensionType) {
MessagePackExtensionType extendedType = (MessagePackExtensionType) v;
byte[] extData = extendedType.getData();
messagePacker.packExtensionTypeHeader((byte)extendedType.getType(), extData.length);
MessagePackExtensionType extensionType = (MessagePackExtensionType) v;
byte[] extData = extensionType.getData();
messagePacker.packExtensionTypeHeader(extensionType.getType(), extData.length);
messagePacker.writePayload(extData);
}
else {
Expand Down Expand Up @@ -414,8 +414,10 @@ public void writeNull()
addValueToStackTop(null);
}

public void writeExtendedType(MessagePackExtensionType extendedType) throws IOException {
addValueToStackTop(extendedType);
public void writeExtensionType(MessagePackExtensionType extensionType)
throws IOException
{
addValueToStackTop(extensionType);
}

@Override
Expand Down