covariant types

Author: rashtao

ChangeLog.md

@@ -6,6 +6,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+- deserialization support for wildcard types
 - deserialization support for java.lang.Iterable
 - raised the minimum JVM source and target version to 8
 - All-Arguments constructor deserialization

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

@@ -638,7 +638,13 @@ private <T> Object getValue(
             } else if (realType instanceof WildcardType) {
                 final WildcardType wType = (WildcardType) realType;
                 final Type rawType = wType.getUpperBounds()[0];
-                value = deserializeObject(parent, vpack, rawType, fieldName, referencingElement);
+                value = getValue(
+                        parent,
+                        vpack,
+                        rawType,
+                        fieldName,
+                        referencingElement
+                );
             } else if (realType instanceof GenericArrayType) {
                 throw new VPackParserException(new IllegalArgumentException("Generic arrays are not supported!"));
             } else if (Iterable.class.isAssignableFrom((Class<?>) realType)) {
@@ -910,6 +916,10 @@ private void addValue(
                 } else {
                     serializeObject(name, value, builder, additionalFields);
                 }
+            } else if (type instanceof WildcardType) {
+                final WildcardType wType = (WildcardType) type;
+                final Type rawType = wType.getUpperBounds()[0];
+                addValue(name, rawType, value, builder, fieldInfo, additionalFields);
             } else if (type instanceof Class && Iterable.class.isAssignableFrom((Class<?>) type)) {
                 serializeIterable(name, value, builder, null);
             } else if (type instanceof Class && Map.class.isAssignableFrom((Class<?>) type)) {

src/test/java/com/arangodb/velocypack/immutable/ImmutablesTest.java

@@ -25,6 +25,7 @@
 import org.junit.Test;
 
 import java.util.Arrays;
+import java.util.Collections;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
@@ -44,6 +45,10 @@ public void serdePerson() {
 					.withName("name")
 					.withAge(99)
 					.withSecondNames(Arrays.asList("aaa", "bbb", "ccc"))
+					.withAddresses(Arrays.asList(
+							Collections.singletonMap("home", "Avocado Street 14"),
+							Collections.singletonMap("work", "Java Street 14")
+					))
 					.buildIt();
 			System.out.println(original);
 			VPackSlice serialized = vpack.serialize(original);

src/test/java/com/arangodb/velocypack/immutable/Person.java

@@ -23,6 +23,8 @@
 import com.arangodb.velocypack.annotations.VPackPOJOBuilder;
 import org.immutables.value.Value;
 
+import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -45,4 +47,6 @@ public static ImmutablePerson.Builder builderFunction() {
 
 	abstract Set<String> getSecondNames();
 
+	abstract List<Map<String, String>> getAddresses();
+
 }