Add support for deserializing null values into None

Author: mpv1989

ChangeLog

@@ -0,0 +1,3 @@
+v1.0.1 (2017-06-xx)
+---------------------------
+* added support for deserializing null values into None

pom.xml

@@ -22,7 +22,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<arangodb.velocypack.version>1.0.3</arangodb.velocypack.version>
+		<arangodb.velocypack.version>1.0.8-SNAPSHOT</arangodb.velocypack.version>
 	</properties>
 
 	<developers>

src/main/scala/com/arangodb/velocypack/module/scala/VPackScalaModule.scala

@@ -9,7 +9,7 @@ import com.arangodb.velocypack.VPackInstanceCreator
 class VPackScalaModule extends VPackModule {
 
   def setup[C <: VPackSetupContext[C]](context: C): Unit = {
-    context.registerDeserializer(classOf[Option[Any]], VPackScalaDeserializers.OPTION)
+    context.registerDeserializer(classOf[Option[Any]], VPackScalaDeserializers.OPTION, true)
     context.registerDeserializer(classOf[List[Any]], VPackScalaDeserializers.LIST)
     context.registerDeserializer(classOf[Map[Any, Any]], VPackScalaDeserializers.MAP)
 

src/test/scala/com/arangodb/velocypack/module/scala/VPackOptionTest.scala

@@ -11,8 +11,8 @@ import com.arangodb.velocypack.VPackBuilder
 import com.arangodb.velocypack.ValueType
 
 case class OptionTestEntity(@BeanProperty var s: Option[String] = Option.empty,
-                               @BeanProperty var i: Option[Int] = Option.empty,
-                               @BeanProperty var o: Option[OptionTestEntity] = Option.empty) {
+                            @BeanProperty var i: Option[Int] = Option.empty,
+                            @BeanProperty var o: Option[OptionTestEntity] = Option.empty) {
   def this() = this(s = Option.empty)
 }
 
@@ -48,4 +48,23 @@ class VPackOptionTest extends FunSuite with Matchers {
     entity.i.get should be(69)
     entity.o.isDefined should be(true)
   }
+
+  test("deserialize null") {
+    val builder = new VPackBuilder()
+    builder add ValueType.OBJECT
+    builder add ("s", ValueType.NULL)
+    builder add ("i", ValueType.NULL)
+    builder add ("o", ValueType.NULL)
+    builder close
+
+    val vp = new VPack.Builder().registerModule(new VPackScalaModule).build()
+    val entity: OptionTestEntity = vp.deserialize(builder.slice, classOf[OptionTestEntity])
+    entity should not be null
+    entity.s should not be null
+    entity.s.isDefined should be(false)
+    entity.i should not be null
+    entity.i.isDefined should be(false)
+    entity.o should not be null
+    entity.o.isDefined should be(false)
+  }
 }