added byte[] de-/serialization from/to VPack.string (Base64)

Author: Mark

ChangeLog

@@ -3,6 +3,7 @@ v4.1.8 (2017-02-xx)
 * changed java.util.Date serialization from VPack.date to VPack.string (ISO 8601)
 * changed java.sql.Date serialization from VPack.date to VPack.string (ISO 8601)
 * changed java.sql.Timestamp serialization from VPack.date to VPack.string (ISO 8601)
+* added byte[] de-/serialization from/to VPack.string (Base64)
 
 v4.1.7 (2017-01-26)
 ---------------------------

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

@@ -125,6 +125,7 @@ public Builder() {
 			serializers.put(java.sql.Timestamp.class, VPackSerializers.SQL_TIMESTAMP);
 			serializers.put(VPackSlice.class, VPackSerializers.VPACK);
 			serializers.put(UUID.class, VPackSerializers.UUID);
+			serializers.put(new byte[] {}.getClass(), VPackSerializers.BYTE_ARRAY);
 
 			deserializers.put(String.class, VPackDeserializers.STRING);
 			deserializers.put(Boolean.class, VPackDeserializers.BOOLEAN);
@@ -149,6 +150,7 @@ public Builder() {
 			deserializers.put(java.sql.Timestamp.class, VPackDeserializers.SQL_TIMESTAMP);
 			deserializers.put(VPackSlice.class, VPackDeserializers.VPACK);
 			deserializers.put(UUID.class, VPackDeserializers.UUID);
+			deserializers.put(new byte[] {}.getClass(), VPackDeserializers.BYTE_ARRAY);
 
 			annotationFieldFilter.put(Expose.class, new VPackAnnotationFieldFilter<Expose>() {
 				@Override

src/main/java/com/arangodb/velocypack/internal/VPackDeserializers.java

@@ -27,6 +27,8 @@
 import java.util.Date;
 import java.util.UUID;
 
+import javax.xml.bind.DatatypeConverter;
+
 import com.arangodb.velocypack.VPackDeserializationContext;
 import com.arangodb.velocypack.VPackDeserializer;
 import com.arangodb.velocypack.VPackSlice;
@@ -219,5 +221,15 @@ public UUID deserialize(
 			return java.util.UUID.fromString(vpack.getAsString());
 		}
 	};
+	public static final VPackDeserializer<byte[]> BYTE_ARRAY = new VPackDeserializer<byte[]>() {
+		@Override
+		public byte[] deserialize(
+			final VPackSlice parent,
+			final VPackSlice vpack,
+			final VPackDeserializationContext context) throws VPackException {
+			return DatatypeConverter.parseBase64Binary(vpack.getAsString());
+		}
+
+	};
 
 }

src/main/java/com/arangodb/velocypack/internal/VPackSerializers.java

@@ -26,6 +26,8 @@
 import java.util.Date;
 import java.util.UUID;
 
+import javax.xml.bind.DatatypeConverter;
+
 import com.arangodb.velocypack.VPackBuilder;
 import com.arangodb.velocypack.VPackSerializationContext;
 import com.arangodb.velocypack.VPackSerializer;
@@ -203,4 +205,14 @@ public void serialize(
 			builder.add(attribute, value.toString());
 		}
 	};
+	public static final VPackSerializer<byte[]> BYTE_ARRAY = new VPackSerializer<byte[]>() {
+		@Override
+		public void serialize(
+			final VPackBuilder builder,
+			final String attribute,
+			final byte[] value,
+			final VPackSerializationContext context) throws VPackException {
+			builder.add(attribute, DatatypeConverter.printBase64Binary(value));
+		}
+	};
 }

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

@@ -49,6 +49,8 @@
 import java.util.Set;
 import java.util.UUID;
 
+import javax.xml.bind.DatatypeConverter;
+
 import org.junit.Test;
 
 import com.arangodb.velocypack.annotations.Expose;
@@ -3503,4 +3505,32 @@ public void toTransient() {
 		assertThat(entity.foo, is(nullValue()));
 	}
 
+	private static class BinaryEntity {
+		private byte[] foo;
+
+		public BinaryEntity() {
+			super();
+		}
+	}
+
+	@Test
+	public void fromBinary() {
+		final BinaryEntity entity = new BinaryEntity();
+		entity.foo = "bar".getBytes();
+		final VPackSlice vpack = new VPack.Builder().build().serialize(entity);
+		assertThat(vpack, is(notNullValue()));
+		assertThat(vpack.isObject(), is(true));
+		assertThat(vpack.get("foo").isString(), is(true));
+		assertThat(vpack.get("foo").getAsString(), is(DatatypeConverter.printBase64Binary(entity.foo)));
+	}
+
+	@Test
+	public void toBinary() {
+		final String value = DatatypeConverter.printBase64Binary("bar".getBytes());
+		final VPackSlice vpack = new VPackBuilder().add(ValueType.OBJECT).add("foo", value).close().slice();
+		final BinaryEntity entity = new VPack.Builder().build().deserialize(vpack, BinaryEntity.class);
+		assertThat(entity, is(notNullValue()));
+		assertThat(entity.foo, is("bar".getBytes()));
+	}
+
 }