added deserializer for BaseDocument (issue #50)

Author: a-brandt

Diff for: src/main/java/com/arangodb/entity/EntityDeserializers.java

@@ -2090,6 +2090,28 @@ public GraphsEntity deserialize(
 		}
 	}
 
+	public static class BaseDocumentDeserializer implements JsonDeserializer<BaseDocument> {
+		@Override
+		public BaseDocument deserialize(
+			final JsonElement json,
+			final Type typeOfT,
+			final JsonDeserializationContext context) {
+
+			if (json.isJsonNull()) {
+				return null;
+			}
+
+			final JsonObject obj = json.getAsJsonObject();
+			final BaseDocument entity = deserializeDocumentParameter(obj, new BaseDocument());
+
+			if (entity instanceof BaseDocument) {
+				entity.setProperties(DeserializeSingleEntry.deserializeJsonObject(obj));
+			}
+
+			return entity;
+		}
+	}
+
 	public static class DeleteEntityDeserializer implements JsonDeserializer<DeletedEntity> {
 		@Override
 		public DeletedEntity deserialize(

Diff for: src/main/java/com/arangodb/entity/EntityFactory.java

@@ -112,6 +112,7 @@ public static GsonBuilder getGsonBuilder() {
 					new EntityDeserializers.ReplicationLoggerStateEntityDeserializer())
 				.registerTypeAdapter(ReplicationLoggerStateEntity.Client.class,
 					new EntityDeserializers.ReplicationLoggerStateEntityClientDeserializer())
+				.registerTypeAdapter(BaseDocument.class, new EntityDeserializers.BaseDocumentDeserializer())
 				.registerTypeAdapter(GraphEntity.class, new EntityDeserializers.GraphEntityDeserializer())
 				.registerTypeAdapter(GraphsEntity.class, new EntityDeserializers.GraphsEntityDeserializer())
 				.registerTypeAdapter(DeletedEntity.class, new EntityDeserializers.DeleteEntityDeserializer())
@@ -136,13 +137,10 @@ public static GsonBuilder getGsonBuilder() {
 	 * Configures instances of Gson used by this factory.
 	 * 
 	 * @param builders
-	 *            one or two GsonBuilder instances. If only one is provided it
-	 *            will be used for initializing both <code>gson</code> and
-	 *            <code>gsonNull</code> fields (latter with
-	 *            <code>serializeNulls()</code> called prior to creating). If
-	 *            two are given - first initializes <code>gson</code> field,
-	 *            second initializes <code>gsonNull</code> (used when
-	 *            serialization of nulls is requested).
+	 *            one or two GsonBuilder instances. If only one is provided it will be used for initializing both
+	 *            <code>gson</code> and <code>gsonNull</code> fields (latter with <code>serializeNulls()</code> called
+	 *            prior to creating). If two are given - first initializes <code>gson</code> field, second initializes
+	 *            <code>gsonNull</code> (used when serialization of nulls is requested).
 	 */
 	public static void configure(GsonBuilder... builders) {
 		if (builders.length < 1) {

Diff for: src/test/java/com/arangodb/ArangoDriverTraversalTest.java

@@ -31,6 +31,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
+import com.arangodb.entity.BaseDocument;
 import com.arangodb.entity.BaseEntity;
 import com.arangodb.entity.EdgeDefinitionEntity;
 import com.arangodb.entity.PathEntity;
@@ -88,7 +89,7 @@ public void _before() throws ArangoException {
 
 	@SuppressWarnings("rawtypes")
 	@Test
-	public void test_create_vertex() throws ArangoException {
+	public void test_getTraversal() throws ArangoException {
 		final TraversalQueryOptions traversalQueryOptions = new TraversalQueryOptions();
 
 		traversalQueryOptions.setGraphName(graphName);
@@ -124,12 +125,49 @@ public void test_create_vertex() throws ArangoException {
 		assertThat(paths.get(3).getVertices().size(), is(3));
 	}
 
+	@Test
+	public void test_getTraversalWithBaseDocument() throws ArangoException {
+		final TraversalQueryOptions traversalQueryOptions = new TraversalQueryOptions();
+
+		traversalQueryOptions.setGraphName(graphName);
+		traversalQueryOptions.setStartVertex("person/Alice");
+		traversalQueryOptions.setDirection(Direction.OUTBOUND);
+
+		final TraversalEntity<BaseDocument, BaseDocument> traversal = driver.getTraversal(traversalQueryOptions,
+			BaseDocument.class, BaseDocument.class);
+
+		assertThat(traversal, is(notNullValue()));
+
+		final List<VertexEntity<BaseDocument>> vertices = traversal.getVertices();
+		assertThat(vertices, is(notNullValue()));
+		assertThat(vertices.size(), is(4));
+		assertThat(vertices.get(0).getEntity().getProperties().size(), is(1));
+		assertThat((String) vertices.get(0).getEntity().getAttribute("name"), is("Alice"));
+		assertThat((String) vertices.get(1).getEntity().getAttribute("name"), is("Bob"));
+		assertThat((String) vertices.get(2).getEntity().getAttribute("name"), is("Charlie"));
+		assertThat((String) vertices.get(3).getEntity().getAttribute("name"), is("Dave"));
+
+		final List<PathEntity<BaseDocument, BaseDocument>> paths = traversal.getPaths();
+		assertThat(paths, is(notNullValue()));
+		assertThat(paths.size(), is(4));
+
+		// start vertex!
+		assertThat(paths.get(0).getEdges().size(), is(0));
+		assertThat(paths.get(0).getVertices().size(), is(1));
+		assertThat((String) paths.get(0).getVertices().get(0).getEntity().getAttribute("name"), is("Alice"));
+
+		assertThat(paths.get(3).getEdges().size(), is(2));
+		assertThat(paths.get(3).getVertices().size(), is(3));
+	}
+
 	private VertexEntity<Person> createPerson(final String name) throws ArangoException {
 		return driver.graphCreateVertex(graphName, vertexCollectionName, name, new Person(name), true);
 	}
 
 	public class Person extends BaseEntity {
 
+		private static final long serialVersionUID = 1L;
+
 		private String name;
 
 		public Person(final String name) {