generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-03-22 00:19:19 +01:00
Code Issues Projects Releases Wiki Activity

java: supports packing/unpacking of BigInteger less than 0xffffffffffffffff

Browse Source
This commit is contained in:
frsyuki 2010-08-18 23:37:47 +09:00
parent d7469e4694
commit 40dc9de6c9
4 changed files with 42 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java/src/main/java/org/msgpack/MessageConvertable.java
View File

@ -18,6 +18,6 @@
package org.msgpack; package org.msgpack;
public interface MessageConvertable { public interface MessageConvertable {
public void messageConvert(Object obj) throws MessageTypeException; public void messageConvert(MessagePackObject obj) throws MessageTypeException;
} }

22
java/src/main/java/org/msgpack/Packer.java
View File

@ -196,19 +196,19 @@ public class Packer {
} }
public Packer packBigInteger(BigInteger d) throws IOException { public Packer packBigInteger(BigInteger d) throws IOException {
if(d.compareTo(BigInteger.valueOf(Long.MAX_VALUE)) <= 0) { if(d.bitLength() <= 63) {
return packLong(d.longValue()); return packLong(d.longValue());
} else if(d.bitLength() <= 64) { } else if(d.bitLength() <= 64 && d.signum() >= 0) {
castBytes[0] = (byte)0xcf; castBytes[0] = (byte)0xcf;
byte[] barray = d.toByteArray(); byte[] barray = d.toByteArray();
castBytes[1] = barray[0]; castBytes[1] = barray[barray.length-8];
castBytes[2] = barray[1]; castBytes[2] = barray[barray.length-7];
castBytes[3] = barray[2]; castBytes[3] = barray[barray.length-6];
castBytes[4] = barray[3]; castBytes[4] = barray[barray.length-5];
castBytes[5] = barray[4]; castBytes[5] = barray[barray.length-4];
castBytes[6] = barray[5]; castBytes[6] = barray[barray.length-3];
castBytes[7] = barray[6]; castBytes[7] = barray[barray.length-2];
castBytes[8] = barray[7]; castBytes[8] = barray[barray.length-1];
out.write(castBytes); out.write(castBytes);
return this; return this;
} else { } else {
@ -436,6 +436,8 @@ public class Packer {
return packFloat((Float)o); return packFloat((Float)o);
} else if(o instanceof Double) { } else if(o instanceof Double) {
return packDouble((Double)o); return packDouble((Double)o);
} else if(o instanceof BigInteger) {
return packBigInteger((BigInteger)o);
} else { } else {
throw new MessageTypeException("unknown object "+o+" ("+o.getClass()+")"); throw new MessageTypeException("unknown object "+o+" ("+o.getClass()+")");
} }

5
java/src/main/java/org/msgpack/UnpackerImpl.java
View File

@ -18,6 +18,7 @@
package org.msgpack; package org.msgpack;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.math.BigInteger;
import org.msgpack.object.*; import org.msgpack.object.*;
public class UnpackerImpl { public class UnpackerImpl {
@ -262,9 +263,7 @@ public class UnpackerImpl {
{ {
long o = castBuffer.getLong(0); long o = castBuffer.getLong(0);
if(o < 0) { if(o < 0) {
// FIXME obj = IntegerType.create(new BigInteger(1, castBuffer.array()));
//obj = GenericBigInteger.valueOf(o & 0x7fffffffL).setBit(31);
throw new UnpackException("uint 64 bigger than 0x7fffffff is not supported");
} else { } else {
obj = IntegerType.create(o); obj = IntegerType.create(o);
} }

27
java/src/test/java/org/msgpack/TestPackUnpack.java
View File

@ -3,6 +3,7 @@ package org.msgpack;
import org.msgpack.*; import org.msgpack.*;
import java.io.*; import java.io.*;
import java.util.*; import java.util.*;
import java.math.BigInteger;
import org.junit.Test; import org.junit.Test;
import static org.junit.Assert.*; import static org.junit.Assert.*;
@ -36,6 +37,32 @@ public class TestPackUnpack {
testInt(rand.nextInt()); testInt(rand.nextInt());
} }
public void testBigInteger(BigInteger val) throws Exception {
ByteArrayOutputStream out = new ByteArrayOutputStream();
new Packer(out).pack(val);
MessagePackObject obj = unpackOne(out);
if(!val.equals(obj.asBigInteger())) {
System.out.println("expect: "+val);
System.out.println("but : "+obj.asBigInteger());
}
assertEquals(val, obj.asBigInteger());
}
@Test
public void testBigInteger() throws Exception {
testBigInteger(BigInteger.valueOf(0));
testBigInteger(BigInteger.valueOf(-1));
testBigInteger(BigInteger.valueOf(1));
testBigInteger(BigInteger.valueOf(Integer.MIN_VALUE));
testBigInteger(BigInteger.valueOf(Integer.MAX_VALUE));
testBigInteger(BigInteger.valueOf(Long.MIN_VALUE));
testBigInteger(BigInteger.valueOf(Long.MAX_VALUE));
BigInteger max = BigInteger.valueOf(Long.MAX_VALUE).setBit(63);
testBigInteger(max);
Random rand = new Random();
for (int i = 0; i < 1000; i++)
testBigInteger( max.subtract(BigInteger.valueOf( Math.abs(rand.nextLong()) )) );
}
public void testFloat(float val) throws Exception { public void testFloat(float val) throws Exception {
ByteArrayOutputStream out = new ByteArrayOutputStream(); ByteArrayOutputStream out = new ByteArrayOutputStream();
new Packer(out).pack(val); new Packer(out).pack(val);