fixed (de)serialize null user data

Author: rashtao

src/main/java/com/arangodb/ArangoSerdeAccessor.java

@@ -20,7 +20,6 @@
 
 package com.arangodb;
 
-import com.arangodb.serde.ArangoSerde;
 import com.arangodb.serde.InternalSerde;
 
 /**
@@ -35,11 +34,4 @@ public interface ArangoSerdeAccessor {
      */
     InternalSerde getSerde();
 
-    /**
-     * Returns serialization implementation for serializing and deserializing user's classes.
-     *
-     * @return ArangoSerde
-     */
-    ArangoSerde getUserSerde();
-
 }

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

@@ -23,7 +23,6 @@
 import com.arangodb.ArangoSerdeAccessor;
 import com.arangodb.DbName;
 import com.arangodb.internal.util.EncodeUtils;
-import com.arangodb.serde.ArangoSerde;
 import com.arangodb.serde.InternalSerde;
 import com.arangodb.velocystream.Request;
 import com.arangodb.velocystream.RequestType;
@@ -57,11 +56,6 @@ public InternalSerde getSerde() {
         return serde;
     }
 
-    @Override
-    public ArangoSerde getUserSerde() {
-        return serde.getUserSerde();
-    }
-
     protected Request request(final DbName dbName, final RequestType requestType, final String... path) {
         final Request request = new Request(dbName, requestType, createPath(path));
         for (final Entry<String, String> header : context.getHeaderParam().entrySet()) {

src/main/java/com/arangodb/serde/InternalSerdeImpl.java

@@ -72,9 +72,12 @@ public JsonNode parse(byte[] content, String jsonPointer) {
 
     @Override
     public byte[] serializeUserData(Object value) {
+        if (value == null) {
+            return serialize(null);
+        }
         Class<?> clazz = value.getClass();
-        if (    RawJson.class.equals(clazz) ||
-                RawBytes.class.equals(clazz) ||
+        if (RawJson.class.isAssignableFrom(clazz) ||
+                RawBytes.class.isAssignableFrom(clazz) ||
                 JsonNode.class.isAssignableFrom(clazz) ||
                 BaseDocument.class.isAssignableFrom(clazz)
         ) {
@@ -95,7 +98,7 @@ public byte[] serializeCollectionUserData(Collection<?> value) {
 
     @Override
     public <T> T deserializeUserData(byte[] content, Class<T> clazz) {
-        if (    RawJson.class.isAssignableFrom(clazz) ||
+        if (RawJson.class.isAssignableFrom(clazz) ||
                 RawBytes.class.isAssignableFrom(clazz) ||
                 JsonNode.class.isAssignableFrom(clazz) ||
                 BaseDocument.class.isAssignableFrom(clazz)

src/test/java/com/arangodb/serde/CustomSerdeTest.java

@@ -131,9 +131,9 @@ void customPersonDeserializer() {
     void manualCustomPersonDeserializer() {
         Person person = new Person();
         person.name = "Joe";
-        ArangoSerde serialization = arangoDB.getUserSerde();
-        byte[] serialized = serialization.serialize(person);
-        Person deserializedPerson = serialization.deserialize(serialized, Person.class);
+        InternalSerde serialization = arangoDB.getSerde();
+        byte[] serialized = serialization.serializeUserData(person);
+        Person deserializedPerson = serialization.deserializeUserData(serialized, Person.class);
         assertThat(deserializedPerson.name).isEqualTo(PERSON_DESERIALIZER_ADDED_PREFIX + PERSON_SERIALIZER_ADDED_PREFIX + person.name);
     }
 
@@ -229,7 +229,7 @@ void getDocument() {
 
     @Test
     void parseNullString() {
-        final String json = arangoDB.getUserSerde().deserialize(arangoDB.getUserSerde().serialize(null), String.class);
+        final String json = arangoDB.getSerde().deserializeUserData(arangoDB.getSerde().serializeUserData(null), String.class);
         assertThat(json).isNull();
     }