Bugifx/custom serde (#308)

* CustomSerdeTest

* bugfix custom serialization in aql query

* bugfix custom deserialization in document APIs

* bugfix custom serialization in aql query

* CustomSerdeTest refactoring

* bugfix custom serialization in explainQuery

* test upd

Author: rashtao

pom.xml

@@ -219,6 +219,12 @@
 			<artifactId>hamcrest-all</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.arangodb</groupId>
+			<artifactId>jackson-dataformat-velocypack</artifactId>
+			<version>0.1.4</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<dependencyManagement>

src/main/java/com/arangodb/internal/ArangoExecutor.java

@@ -22,39 +22,45 @@
 
 import java.lang.reflect.Type;
 
+import com.arangodb.entity.Entity;
 import com.arangodb.internal.util.ArangoSerializationFactory;
 import com.arangodb.internal.util.ArangoSerializationFactory.Serializer;
-import com.arangodb.util.ArangoSerialization;
 import com.arangodb.velocypack.exception.VPackException;
 import com.arangodb.velocystream.Response;
 
 /**
  * @author Mark Vollmary
- *
  */
 public abstract class ArangoExecutor {
 
-	public static interface ResponseDeserializer<T> {
-		T deserialize(Response response) throws VPackException;
-	}
+    public static interface ResponseDeserializer<T> {
+        T deserialize(Response response) throws VPackException;
+    }
 
-	private final DocumentCache documentCache;
-	private final ArangoSerialization util;
+    private final DocumentCache documentCache;
+    private final ArangoSerializationFactory util;
 
-	protected ArangoExecutor(final ArangoSerializationFactory util, final DocumentCache documentCache) {
-		super();
-		this.documentCache = documentCache;
-		this.util = util.get(Serializer.INTERNAL);
-	}
+    protected ArangoExecutor(final ArangoSerializationFactory util, final DocumentCache documentCache) {
+        super();
+        this.documentCache = documentCache;
+        this.util = util;
+    }
 
-	public DocumentCache documentCache() {
-		return documentCache;
-	}
+    public DocumentCache documentCache() {
+        return documentCache;
+    }
 
-	@SuppressWarnings("unchecked")
-	protected <T> T createResult(final Type type, final Response response) {
-		return (T) ((type != Void.class && response.getBody() != null) ? util.deserialize(response.getBody(), type)
-				: null);
-	}
+    @SuppressWarnings("unchecked")
+    protected <T> T createResult(final Type type, final Response response) {
+        if (type != Void.class && response.getBody() != null) {
+            if (type instanceof Class && Entity.class.isAssignableFrom((Class) type)  ) {
+                return (T) util.get(Serializer.INTERNAL).deserialize(response.getBody(), type);
+            } else {
+                return (T) util.get(Serializer.CUSTOM).deserialize(response.getBody(), type);
+            }
+        } else {
+            return (T) null;
+        }
+    }
 
 }