updates

Author: siilike

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

@@ -651,7 +651,7 @@ private <T> VPackBuilder addInternal(final String attribute, final long tag, fin
 				if (VPackSlice.attributeTranslator != null) {
 					final VPackSlice translate = VPackSlice.attributeTranslator.translate(attribute);
 					if (translate != null) {
-						final byte[] trValue = translate.getRawVPack();
+						final byte[] trValue = translate.getBuffer();
 						int trValueLength = translate.getByteSize();
 						int trValueStart = translate.getStart();
 						ensureCapacity(size + trValueLength);
@@ -838,7 +838,7 @@ private void appendBinary(final byte[] value) {
 	}
 
 	private void appendVPack(final VPackSlice value) {
-		final byte[] vpack = value.getRawVPack();
+		final byte[] vpack = value.getBuffer();
 		int length = value.getByteSize();
 		ensureCapacity(size + length);
 		System.arraycopy(vpack, value.getStart(), buffer, size, length);

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

@@ -25,7 +25,6 @@
 import java.math.BigInteger;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
 import java.util.Iterator;
@@ -544,7 +543,7 @@ private int getByteSize(int start) {
 				break;
 			default:
 				// TODO
-				throw new VPackException("Invalid type for byteSize()");
+				throw new IllegalStateException("Invalid type for byteSize()");
 			}
 		}
 		return (int) size;
@@ -885,18 +884,6 @@ public Iterator<Entry<String, VPackSlice>> objectIterator() {
 		}
 	}
 
-	protected byte[] getVPack() {
-		if(start == 0 && vpack.length == getByteSize()) {
-			return vpack;
-		}
-
-		return Arrays.copyOfRange(vpack, start, start + getByteSize());
-	}
-
-	protected byte[] getRawVPack() {
-		return vpack;
-	}
-
 	@Override
 	public String toString() {
 		try {

src/main/java/com/arangodb/velocypack/exception/VPackException.java

@@ -24,19 +24,19 @@
  * @author Mark Vollmary
  *
  */
-public class VPackException extends RuntimeException {
+protected class VPackException extends RuntimeException {
 
 	private static final long serialVersionUID = 3547943271830879415L;
 
-	public VPackException() {
+	protected VPackException() {
 		super();
 	}
 
-	public VPackException(final String message) {
+	protected VPackException(final String message) {
 		super(message);
 	}
 
-	public VPackException(final Throwable cause) {
+	protected VPackException(final Throwable cause) {
 		super(cause);
 	}
 

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

@@ -1462,37 +1462,47 @@ public void maxNegativeIntFromIntAsLong() {
 
 	@Test
 	public void testReadTag() {
+		testReadTag(1);
+		testReadTag(10000);
+	}
+
+	@Test
+	public void testReadTags() {
+		testReadTags(1);
+		testReadTags(10000);
+	}
+
+	protected void testReadTag(int size) {
 		VPackBuilder b = new VPackBuilder();
-		b.addTagged(42, 5);
+		b.addTagged(42 * size, 5);
 
 		VPackSlice s = b.slice();
 
 		assertTrue(s.isTagged());
-		assertEquals(s.getFirstTag(), 42);
-		assertEquals((long) s.getTags().get(0), 42);
+		assertEquals(s.getFirstTag(), 42 * size);
+		assertEquals((long) s.getTags().get(0), 42 * size);
 		assertEquals(s.getTags().size(), 1);
-		assertTrue(s.hasTag(42));
-		assertFalse(s.hasTag(49));
+		assertTrue(s.hasTag(42 * size));
+		assertFalse(s.hasTag(49 * size));
 		assertEquals(s.value().getAsInt(), 5);
 	}
 
-	@Test
-	public void testReadTags() {
+	protected void testReadTags(int size) {
 		VPackBuilder b = new VPackBuilder();
-		b.addTagged(42, 5);
+		b.addTagged(42 * size, 5);
 
 		VPackBuilder bb = new VPackBuilder();
-		bb.addTagged(49, b.slice());
+		bb.addTagged(49 * size, b.slice());
 
 		VPackSlice s = bb.slice();
 
 		assertTrue(s.isTagged());
-		assertEquals(s.getFirstTag(), 49);
+		assertEquals(s.getFirstTag(), 49 * size);
 		assertEquals(s.getTags().size(), 2);
-		assertEquals((long) s.getTags().get(0), 49);
-		assertEquals((long) s.getTags().get(1), 42);
-		assertTrue(s.hasTag(42));
-		assertTrue(s.hasTag(49));
-		assertFalse(s.hasTag(50));
+		assertEquals((long) s.getTags().get(0), 49 * size);
+		assertEquals((long) s.getTags().get(1), 42 * size);
+		assertTrue(s.hasTag(42 * size));
+		assertTrue(s.hasTag(49 * size));
+		assertFalse(s.hasTag(50 * size));
 	}
 }

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

@@ -29,7 +29,7 @@ public class VPackUtil {
 	private final static char[] hexArray = "0123456789ABCDEF".toCharArray();
 
 	public static String toHex(final VPackSlice vpack) {
-		final byte[] bytes = vpack.getRawVPack();
+		final byte[] bytes = vpack.getBuffer();
 		final int bytesLength = vpack.getByteSize();
 		final int bytesStart = vpack.getStart();
 		final char[] hexChars = new char[bytesLength * 2];