Fix compilation error of msgpack-jackson

xerial · xerial · commit 9db3537f6af1 · 2015-06-14T00:30:24.000+09:00
diff --git a/msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/MessagePackExtensionType.java b/msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/MessagePackExtensionType.java
@@ -0,0 +1,25 @@
+package org.msgpack.jackson.dataformat;
+
+    import java.nio.ByteBuffer;
+
+/**
+ * Created by komamitsu on 3/7/15.
+ */
+public class MessagePackExtensionType {
+    private final int extType;
+    private final ByteBuffer byteBuffer;
+
+    public MessagePackExtensionType(int extType, ByteBuffer byteBuffer) {
+        this.extType = extType;
+        this.byteBuffer = byteBuffer.isReadOnly() ?
+            byteBuffer : byteBuffer.asReadOnlyBuffer();
+    }
+
+    public int extType() {
+        return extType;
+    }
+
+    public ByteBuffer byteBuffer() {
+        return byteBuffer;
+    }
+}
diff --git a/msgpack-jackson/src/test/java/org/msgpack/jackson/dataformat/MessagePackExtensionTypeTest.java b/msgpack-jackson/src/test/java/org/msgpack/jackson/dataformat/MessagePackExtensionTypeTest.java
@@ -6,8 +6,8 @@
 
 import static org.junit.Assert.*;
 
-public class MessagePackextensionTypeTest {
-    private void assertextensionType(MessagePackextensionType x,
+public class MessagePackExtensionTypeTest {
+    private void assertExtensionType(MessagePackExtensionType x,
                                     int expectedExtType, ByteBuffer expectedByteBuffer) {
         assertEquals(expectedExtType, x.extType());
         assertEquals(expectedByteBuffer, x.byteBuffer());
@@ -20,41 +20,41 @@ public void testMessagePackextensionType() {
         ByteBuffer expectedByteBuffer = ByteBuffer.wrap(bs);
 
         int extType = 1;
-        MessagePackextensionType extensionType =
+        MessagePackExtensionType extensionType =
                 new MessagePackExtensionType(extType, ByteBuffer.wrap(bs));
         assertExtensionType(extensionType, extType, expectedByteBuffer);
 
         extType = 2;
         ByteBuffer bb = ByteBuffer.allocate(3);
         bb.put(bs);
         bb.position(0);
-        extensionType = new MessagePackextensionType(extType, bb);
-        assertextensionType(extensionType, extType, expectedByteBuffer);
+        extensionType = new MessagePackExtensionType(extType, bb);
+        assertExtensionType(extensionType, extType, expectedByteBuffer);
 
         extType = 3;
         bb = ByteBuffer.allocateDirect(3);
         bb.put(bs);
         bb.position(0);
-        extensionType = new MessagePackextensionType(extType, bb);
-        assertextensionType(extensionType, extType, expectedByteBuffer);
+        extensionType = new MessagePackExtensionType(extType, bb);
+        assertExtensionType(extensionType, extType, expectedByteBuffer);
 
         extType = -1;
         extensionType =
-                new MessagePackextensionType(extType, ByteBuffer.wrap(bs).asReadOnlyBuffer());
-        assertextensionType(extensionType, extType, expectedByteBuffer);
+                new MessagePackExtensionType(extType, ByteBuffer.wrap(bs).asReadOnlyBuffer());
+        assertExtensionType(extensionType, extType, expectedByteBuffer);
 
         extType = -2;
         bb = ByteBuffer.allocate(3);
         bb.put(bs);
         bb.position(0);
-        extensionType = new MessagePackextensionType(extType, bb.asReadOnlyBuffer());
-        assertextensionType(extensionType, extType, expectedByteBuffer);
+        extensionType = new MessagePackExtensionType(extType, bb.asReadOnlyBuffer());
+        assertExtensionType(extensionType, extType, expectedByteBuffer);
 
         extType = -3;
         bb = ByteBuffer.allocateDirect(3);
         bb.put(bs);
         bb.position(0);
-        extensionType = new MessagePackextensionType(extType, bb.asReadOnlyBuffer());
-        assertextensionType(extensionType, extType, expectedByteBuffer);
+        extensionType = new MessagePackExtensionType(extType, bb.asReadOnlyBuffer());
+        assertExtensionType(extensionType, extType, expectedByteBuffer);
     }
 }
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
@@ -142,9 +142,9 @@ else if (k.equals("bool")) {
             else if (k.equals("ext")) {
                 // #9
                 bitmap |= 1 << 10;
-                MessagePackExtensionType ExtensionType = (MessagePackExtensionType) v;
-                assertEquals(0, ExtensionType.extType());
-                assertEquals(ByteBuffer.wrap(extPayload), ExtensionType.byteBuffer());
+                MessagePackExtensionType extensionType = (MessagePackExtensionType) v;
+                assertEquals(0, extensionType.extType());
+                assertEquals(ByteBuffer.wrap(extPayload), extensionType.byteBuffer());
             }
         }
         assertEquals(0x7FF, bitmap);
@@ -249,9 +249,9 @@ else if (k.equals("child_map_age")) {
         // #10
         assertEquals(true, array.get(i++));
         // #11
-        MessagePackExtensionType ExtensionType = (MessagePackExtensionType) array.get(i++);
-        assertEquals(-1, ExtensionType.extType());
-        assertEquals(ByteBuffer.wrap(extPayload), ExtensionType.byteBuffer());
+        MessagePackExtensionType extensionType = (MessagePackExtensionType) array.get(i++);
+        assertEquals(-1, extensionType.extType());
+        assertEquals(ByteBuffer.wrap(extPayload), extensionType.byteBuffer());
     }
 
     @Test
