bugfix byte size of BCD

Author: rashtao

ChangeLog.md

@@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+- fixed custom types byte size
+- fixed BCD byte size
 - Map and Set VPackInstanceCreators preserve collections entries order (based on `LinkedHashSet` and `LinkedHashMap`) 
 
 ## [2.1.0] - 2019-12-20

src/main/java/com/arangodb/velocypack/VPackSlice.java

@@ -20,28 +20,19 @@
 
 package com.arangodb.velocypack;
 
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map.Entry;
-
 import com.arangodb.velocypack.exception.VPackException;
 import com.arangodb.velocypack.exception.VPackKeyTypeException;
 import com.arangodb.velocypack.exception.VPackNeedAttributeTranslatorException;
 import com.arangodb.velocypack.exception.VPackValueTypeException;
 import com.arangodb.velocypack.internal.VPackAttributeTranslatorImpl;
-import com.arangodb.velocypack.internal.util.BinaryUtil;
-import com.arangodb.velocypack.internal.util.DateUtil;
-import com.arangodb.velocypack.internal.util.NumberUtil;
-import com.arangodb.velocypack.internal.util.ObjectArrayUtil;
-import com.arangodb.velocypack.internal.util.ValueLengthUtil;
-import com.arangodb.velocypack.internal.util.ValueTypeUtil;
+import com.arangodb.velocypack.internal.util.*;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+import java.util.Map.Entry;
 
 /**
  * @author Mark Vollmary
@@ -520,10 +511,10 @@ private int getByteSize(int start) {
 				size = 1 + head - ((byte) 0xbf) + NumberUtil.toLong(vpack, start + 1, head - ((byte) 0xbf));
 				break;
 			case BCD:
-				if (head <= 0xcf) {
-					size = 1 + head + ((byte) 0xc7) + NumberUtil.toLong(vpack, start + 1, head - ((byte) 0xc7));
+				if (head <= (byte) 0xcf) {
+					size = 1 + head - ((byte) 0xc7) + NumberUtil.toLong(vpack, start + 1, head - ((byte) 0xc7)) + 4;
 				} else {
-					size = 1 + head - ((byte) 0xcf) + NumberUtil.toLong(vpack, start + 1, head - ((byte) 0xcf));
+					size = 1 + head - ((byte) 0xcf) + NumberUtil.toLong(vpack, start + 1, head - ((byte) 0xcf)) + 4;
 				}
 				break;
 			case TAGGED:

src/test/java/com/arangodb/velocypack/VPackSliceTest.java

@@ -375,27 +375,28 @@ private void checkBinary(final byte[] vpack) {
 
 	@Test
 	public void isBCD() {
-		checkBCD(new byte[] { (byte) 0xc8 });
-		checkBCD(new byte[] { (byte) 0xc9 });
-		checkBCD(new byte[] { (byte) 0xca });
-		checkBCD(new byte[] { (byte) 0xcb });
-		checkBCD(new byte[] { (byte) 0xcc });
-		checkBCD(new byte[] { (byte) 0xcd });
-		checkBCD(new byte[] { (byte) 0xce });
-		checkBCD(new byte[] { (byte) 0xcf });
-		checkBCD(new byte[] { (byte) 0xd0 });
-		checkBCD(new byte[] { (byte) 0xd1 });
-		checkBCD(new byte[] { (byte) 0xd2 });
-		checkBCD(new byte[] { (byte) 0xd3 });
-		checkBCD(new byte[] { (byte) 0xd4 });
-		checkBCD(new byte[] { (byte) 0xd5 });
-		checkBCD(new byte[] { (byte) 0xd6 });
-		checkBCD(new byte[] { (byte) 0xd7 });
-	}
-
-	private void checkBCD(final byte[] vpack) {
+		checkBCD(new byte[] { (byte) 0xc8, (byte) 0x03 }, 9);
+		checkBCD(new byte[] { (byte) 0xc9, (byte) 0x03, (byte) 0x00 }, 10);
+		checkBCD(new byte[] { (byte) 0xca, (byte) 0x03, (byte) 0x00, (byte) 0x00 }, 11);
+		checkBCD(new byte[] { (byte) 0xcb, (byte) 0x03, (byte) 0x00, (byte) 0x00, (byte) 0x00 }, 12);
+		checkBCD(new byte[] { (byte) 0xcc, (byte) 0x03, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00 }, 13);
+		checkBCD(new byte[] { (byte) 0xcd, (byte) 0x03, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00 }, 14);
+		checkBCD(new byte[] { (byte) 0xce, (byte) 0x03, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00 }, 15);
+		checkBCD(new byte[] { (byte) 0xcf, (byte) 0x03, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00 }, 16);
+		checkBCD(new byte[] { (byte) 0xd0, (byte) 0x03 }, 9);
+		checkBCD(new byte[] { (byte) 0xd1, (byte) 0x03, (byte) 0x00 }, 10);
+		checkBCD(new byte[] { (byte) 0xd2, (byte) 0x03, (byte) 0x00, (byte) 0x00 }, 11);
+		checkBCD(new byte[] { (byte) 0xd3, (byte) 0x03, (byte) 0x00, (byte) 0x00, (byte) 0x00 }, 12);
+		checkBCD(new byte[] { (byte) 0xd4, (byte) 0x03, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00 }, 13);
+		checkBCD(new byte[] { (byte) 0xd5, (byte) 0x03, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00 }, 14);
+		checkBCD(new byte[] { (byte) 0xd6, (byte) 0x03, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00 }, 15);
+		checkBCD(new byte[] { (byte) 0xd7, (byte) 0x03, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00 }, 16);
+	}
+
+	private void checkBCD(final byte[] vpack, final int expectedSize) {
 		final VPackSlice slice = new VPackSlice(vpack);
 		assertThat(slice.isBCD(), is(true));
+		assertThat(slice.getByteSize(), is(expectedSize));
 	}
 
 	@Test