Skip to content

Move ExtendedTypeHeader to the upper level #84

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
May 13, 2014
Merged

Move ExtendedTypeHeader to the upper level #84

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
21 changes: 21 additions & 0 deletions msgpack-core/src/main/java/org/msgpack/core/ExtendedTypeHeader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package org.msgpack.core;

/**
* Header of extended type
*/
public class ExtendedTypeHeader {
private final int type;
private final int length;
ExtendedTypeHeader(int type, int length) {
this.type = type;
this.length = length;
}

public int getType() {
return type;
}

public int getLength() {
return length;
}
}
20 changes: 0 additions & 20 deletions msgpack-core/src/main/java/org/msgpack/core/MessagePack.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,26 +93,6 @@ public static final boolean isFixedRaw(byte b) {
}


/**
* Header of extended type
*/
public static class ExtendedTypeHeader {
private final int type;
private final int length;
ExtendedTypeHeader(int type, int length) {
this.type = type;
this.length = length;
}

public int getType() {
return type;
}

public int getLength() {
return length;
}
}

/**
* Create a new MessagePacker that writes the message packed data to a file
* @param outputFile
Expand Down
18 changes: 9 additions & 9 deletions msgpack-core/src/main/java/org/msgpack/core/MessageUnpacker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -741,33 +741,33 @@ public int unpackMapHeader() throws IOException {
throw unexpected("Map", b);
}

public MessagePack.ExtendedTypeHeader unpackExtendedTypeHeader() throws IOException {
public ExtendedTypeHeader unpackExtendedTypeHeader() throws IOException {
byte b = consume();
switch(b) {
case Code.FIXEXT1:
return new MessagePack.ExtendedTypeHeader(readByte(), 1);
return new ExtendedTypeHeader(readByte(), 1);
case Code.FIXEXT2:
return new MessagePack.ExtendedTypeHeader(readByte(), 2);
return new ExtendedTypeHeader(readByte(), 2);
case Code.FIXEXT4:
return new MessagePack.ExtendedTypeHeader(readByte(), 4);
return new ExtendedTypeHeader(readByte(), 4);
case Code.FIXEXT8:
return new MessagePack.ExtendedTypeHeader(readByte(), 8);
return new ExtendedTypeHeader(readByte(), 8);
case Code.FIXEXT16:
return new MessagePack.ExtendedTypeHeader(readByte(), 16);
return new ExtendedTypeHeader(readByte(), 16);
case Code.EXT8: {
int len = readNextLength8();
int t = readByte();
return new MessagePack.ExtendedTypeHeader(len, t);
return new ExtendedTypeHeader(len, t);
}
case Code.EXT16: {
int len = readNextLength16();
int t = readByte();
return new MessagePack.ExtendedTypeHeader(len, t);
return new ExtendedTypeHeader(len, t);
}
case Code.EXT32: {
int len = readNextLength32();
int t = readByte();
return new MessagePack.ExtendedTypeHeader(len, t);
return new ExtendedTypeHeader(len, t);
}
}

Expand Down