Changed the extension type interface to use byte

xerial · xerial · commit 33f9ccf11916 · 2015-06-15T14:41:50.000+09:00
diff --git a/msgpack-core/src/main/java/org/msgpack/core/MessagePacker.java b/msgpack-core/src/main/java/org/msgpack/core/MessagePacker.java
@@ -477,41 +477,41 @@ public MessagePacker packValue(Value v) throws IOException {
         return this;
     }
 
-    public MessagePacker packExtensionTypeHeader(int extType, int payloadLen) throws IOException {
+    public MessagePacker packExtensionTypeHeader(byte extType, int payloadLen) throws IOException {
         if(payloadLen < (1 << 8)) {
             if(payloadLen > 0 && (payloadLen & (payloadLen - 1)) == 0) { // check whether dataLen == 2^x
                 if(payloadLen == 1) {
-                    writeByteAndByte(FIXEXT1, (byte) extType);
+                    writeByteAndByte(FIXEXT1, extType);
                 }
                 else if(payloadLen == 2) {
-                    writeByteAndByte(FIXEXT2, (byte) extType);
+                    writeByteAndByte(FIXEXT2, extType);
                 }
                 else if(payloadLen == 4) {
-                    writeByteAndByte(FIXEXT4, (byte) extType);
+                    writeByteAndByte(FIXEXT4, extType);
                 }
                 else if(payloadLen == 8) {
-                    writeByteAndByte(FIXEXT8, (byte) extType);
+                    writeByteAndByte(FIXEXT8, extType);
                 }
                 else if(payloadLen == 16) {
-                    writeByteAndByte(FIXEXT16, (byte) extType);
+                    writeByteAndByte(FIXEXT16, extType);
                 }
                 else {
                     writeByteAndByte(EXT8, (byte) payloadLen);
-                    writeByte((byte) extType);
+                    writeByte(extType);
                 }
             }
             else {
                 writeByteAndByte(EXT8, (byte) payloadLen);
-                writeByte((byte) extType);
+                writeByte(extType);
             }
         }
         else if(payloadLen < (1 << 16)) {
             writeByteAndShort(EXT16, (short) payloadLen);
-            writeByte((byte) extType);
+            writeByte(extType);
         }
         else {
             writeByteAndInt(EXT32, payloadLen);
-            writeByte((byte) extType);
+            writeByte(extType);
 
             // TODO support dataLen > 2^31 - 1
         }
diff --git a/msgpack-core/src/main/java/org/msgpack/core/example/MessagePackExample.java b/msgpack-core/src/main/java/org/msgpack/core/example/MessagePackExample.java
@@ -125,7 +125,7 @@ public static void packer() throws IOException {
 
         // Write ext type data: https://github.com/msgpack/msgpack/blob/master/spec.md#ext-format-family
         byte[] extData = "custom data type".getBytes(MessagePack.UTF8);
-        packer.packExtensionTypeHeader(1, 10);  // type number [0, 127], data byte length
+        packer.packExtensionTypeHeader((byte) 1, 10);  // type number [0, 127], data byte length
         packer.writePayload(extData);
 
         // Succinct syntax for packing
diff --git a/msgpack-jackson/src/test/java/org/msgpack/jackson/dataformat/MessagePackParserTest.java b/msgpack-jackson/src/test/java/org/msgpack/jackson/dataformat/MessagePackParserTest.java
@@ -67,7 +67,7 @@ public void testParserShouldReadObject() throws IOException {
         // #9
         byte[] extPayload = {-80, -50, -25, -114, -25, 16, 60, 68};
         packer.packString("ext");
-        packer.packExtensionTypeHeader(0, extPayload.length);
+        packer.packExtensionTypeHeader((byte) 0, extPayload.length);
         packer.writePayload(extPayload);
 
         packer.flush();
@@ -191,7 +191,7 @@ public void testParserShouldReadArray() throws IOException {
         packer.packBoolean(true);
         // #11
         byte[] extPayload = {-80, -50, -25, -114, -25, 16, 60, 68};
-        packer.packExtensionTypeHeader(-1, extPayload.length);
+        packer.packExtensionTypeHeader((byte) -1, extPayload.length);
         packer.writePayload(extPayload);
 
         packer.flush();

Original file line number	Diff line number	Diff line change
`@@ -477,41 +477,41 @@ public MessagePacker packValue(Value v) throws IOException {`
`477`	`477`	`return this;`
`478`	`478`	`}`
`479`	`479`
`480`		`- public MessagePacker packExtensionTypeHeader(int extType, int payloadLen) throws IOException {`
	`480`	`+ public MessagePacker packExtensionTypeHeader(byte extType, int payloadLen) throws IOException {`
`481`	`481`	`if(payloadLen < (1 << 8)) {`
`482`	`482`	`if(payloadLen > 0 && (payloadLen & (payloadLen - 1)) == 0) { // check whether dataLen == 2^x`
`483`	`483`	`if(payloadLen == 1) {`
`484`		`- writeByteAndByte(FIXEXT1, (byte) extType);`
	`484`	`+ writeByteAndByte(FIXEXT1, extType);`
`485`	`485`	`}`
`486`	`486`	`else if(payloadLen == 2) {`
`487`		`- writeByteAndByte(FIXEXT2, (byte) extType);`
	`487`	`+ writeByteAndByte(FIXEXT2, extType);`
`488`	`488`	`}`
`489`	`489`	`else if(payloadLen == 4) {`
`490`		`- writeByteAndByte(FIXEXT4, (byte) extType);`
	`490`	`+ writeByteAndByte(FIXEXT4, extType);`
`491`	`491`	`}`
`492`	`492`	`else if(payloadLen == 8) {`
`493`		`- writeByteAndByte(FIXEXT8, (byte) extType);`
	`493`	`+ writeByteAndByte(FIXEXT8, extType);`
`494`	`494`	`}`
`495`	`495`	`else if(payloadLen == 16) {`
`496`		`- writeByteAndByte(FIXEXT16, (byte) extType);`
	`496`	`+ writeByteAndByte(FIXEXT16, extType);`
`497`	`497`	`}`
`498`	`498`	`else {`
`499`	`499`	`writeByteAndByte(EXT8, (byte) payloadLen);`
`500`		`- writeByte((byte) extType);`
	`500`	`+ writeByte(extType);`
`501`	`501`	`}`
`502`	`502`	`}`
`503`	`503`	`else {`
`504`	`504`	`writeByteAndByte(EXT8, (byte) payloadLen);`
`505`		`- writeByte((byte) extType);`
	`505`	`+ writeByte(extType);`
`506`	`506`	`}`
`507`	`507`	`}`
`508`	`508`	`else if(payloadLen < (1 << 16)) {`
`509`	`509`	`writeByteAndShort(EXT16, (short) payloadLen);`
`510`		`- writeByte((byte) extType);`
	`510`	`+ writeByte(extType);`
`511`	`511`	`}`
`512`	`512`	`else {`
`513`	`513`	`writeByteAndInt(EXT32, payloadLen);`
`514`		`- writeByte((byte) extType);`
	`514`	`+ writeByte(extType);`
`515`	`515`
`516`	`516`	`// TODO support dataLen > 2^31 - 1`
`517`	`517`	`}`