Merge remote-tracking branch 'fork/master' into tags

Author: siilike

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

@@ -876,7 +876,8 @@ private void addValue(
             } else if (type instanceof Class && Map.class.isAssignableFrom((Class<?>) type)) {
                 serializeMap(name, value, builder, String.class, additionalFields);
             } else if (type instanceof Class && ((Class) type).isArray()) {
-                serializeArray(name, value, builder);
+				final Type elemType = ((Class<?>) type).getComponentType();
+				serializeArray(name, value, builder, elemType);
             } else if (type instanceof Class && ((Class) type).isEnum()) {
                 builder.add(name, Enum.class.cast(value).name());
             } else if (type != value.getClass()) {
@@ -888,13 +889,14 @@ private void addValue(
         }
     }
 
-    private void serializeArray(final String name, final Object value, final VPackBuilder builder)
+	private void serializeArray(final String name, final Object value, final VPackBuilder builder, final Type type)
             throws NoSuchMethodException, IllegalAccessException, InvocationTargetException, VPackException {
         builder.add(name, ValueType.ARRAY);
         for (int i = 0; i < Array.getLength(value); i++) {
             final Object element = Array.get(value, i);
             if (element != null) {
-                addValue(null, element.getClass(), element, builder, null, Collections.<String, Object>emptyMap());
+				final Type t = type != null ? type : element.getClass();
+				addValue(null, t, element, builder, null, Collections.<String, Object> emptyMap());
             } else {
                 builder.add(ValueType.NULL);
             }

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

@@ -4074,6 +4074,56 @@ public void objectList() {
 		assertThat(entityOut.value.get(0) instanceof TestEntityTypeInfo, is(true));
 	}
 
+	static class TestEntityObjectArray {
+		Object[] value;
+	}
+
+	@Test
+	public void heterogeneousArray() {
+		final TestEntityObjectArray entity = new TestEntityObjectArray();
+		entity.value = new Object[]{new TestEntityTypeInfo()};
+
+		final VPack vpack = new VPack.Builder().build();
+		final VPackSlice slice = vpack.serialize(entity);
+
+		assertThat(slice.isObject(), is(true));
+		assertThat(slice.get("value").isArray(), is(true));
+		assertThat(slice.get("value").get(0).isObject(), is(true));
+		assertThat(slice.get("value").get(0).get("_class").isString(), is(true));
+		assertThat(slice.get("value").get(0).get("_class").getAsString(),
+			is("com.arangodb.velocypack.VPackSerializeDeserializeTest$TestEntityTypeInfo"));
+
+		final TestEntityObjectArray entityOut = vpack.deserialize(slice, TestEntityObjectArray.class);
+		assertThat(entityOut, is(notNullValue()));
+		assertThat(entityOut.value, is(notNullValue()));
+		assertThat(entityOut.value.length, is(1));
+		assertThat(entityOut.value[0] instanceof TestEntityTypeInfo, is(true));
+	}
+
+	static class TestEntityTypeInfoArray {
+		TestEntityTypeInfo[] value;
+	}
+
+	@Test
+	public void homogeneousArray() {
+		final TestEntityTypeInfoArray entity = new TestEntityTypeInfoArray();
+		entity.value = new TestEntityTypeInfo[]{new TestEntityTypeInfo()};
+
+		final VPack vpack = new VPack.Builder().build();
+		final VPackSlice slice = vpack.serialize(entity);
+
+		assertThat(slice.isObject(), is(true));
+		assertThat(slice.get("value").isArray(), is(true));
+		assertThat(slice.get("value").get(0).isObject(), is(true));
+		assertThat(slice.get("value").get(0).get("_class").isNone(), is(true));
+
+		final TestEntityTypeInfoArray entityOut = vpack.deserialize(slice, TestEntityTypeInfoArray.class);
+		assertThat(entityOut, is(notNullValue()));
+		assertThat(entityOut.value, is(notNullValue()));
+		assertThat(entityOut.value.length, is(1));
+		assertThat(entityOut.value[0], notNullValue());
+	}
+
 	public static class Limb {
 	}