default internal serde

Author: rashtao

driver/src/main/java/com/arangodb/ArangoDB.java

@@ -34,6 +34,7 @@
 import com.arangodb.internal.net.HostResolver;
 import com.arangodb.internal.serde.ContentTypeFactory;
 import com.arangodb.internal.serde.InternalSerde;
+import com.arangodb.internal.serde.InternalSerdeProvider;
 import com.arangodb.internal.velocystream.VstCommunicationSync;
 import com.arangodb.internal.velocystream.VstConnectionFactorySync;
 import com.arangodb.model.DBCreateOptions;
@@ -587,7 +588,7 @@ public ArangoDB build() {
 
             final ArangoSerde userSerde = this.userDataSerde != null ? this.userDataSerde :
                     serdeProvider().of(ContentTypeFactory.of(protocol));
-            final InternalSerde serde = InternalSerde.of(ContentTypeFactory.of(protocol), userSerde);
+            final InternalSerde serde = InternalSerdeProvider.create(ContentTypeFactory.of(protocol), userSerde);
 
             int protocolMaxConnections;
             switch (protocol) {

driver/src/main/java/com/arangodb/async/ArangoDBAsync.java

@@ -32,6 +32,7 @@
 import com.arangodb.internal.net.HostHandler;
 import com.arangodb.internal.net.HostResolver;
 import com.arangodb.internal.serde.InternalSerde;
+import com.arangodb.internal.serde.InternalSerdeProvider;
 import com.arangodb.internal.velocystream.VstCommunicationSync;
 import com.arangodb.internal.velocystream.VstConnectionFactorySync;
 import com.arangodb.model.DBCreateOptions;
@@ -516,7 +517,7 @@ public ArangoDBAsync build() {
             }
 
             final ArangoSerde userSerde = this.userDataSerde != null ? this.userDataSerde : serdeProvider().of(ContentType.VPACK);
-            final InternalSerde serde = InternalSerde.of(ContentType.VPACK, userSerde);
+            final InternalSerde serde = InternalSerdeProvider.create(ContentType.VPACK, userSerde);
 
             final int max = maxConnections != null ? Math.max(1, maxConnections)
                     : ArangoDefaults.MAX_CONNECTIONS_VST_DEFAULT;

driver/src/main/java/com/arangodb/internal/InternalArangoDBBuilder.java

@@ -25,6 +25,7 @@
 import com.arangodb.config.ConfigPropertyKey;
 import com.arangodb.entity.LoadBalancingStrategy;
 import com.arangodb.internal.net.*;
+import com.arangodb.internal.serde.InternalSerdeProvider;
 import com.arangodb.internal.util.HostUtils;
 import com.arangodb.serde.ArangoSerde;
 import com.arangodb.serde.ArangoSerdeProvider;
@@ -147,12 +148,15 @@ protected static String getProperty(ConfigPropertiesProvider props, ConfigProper
     protected static ArangoSerdeProvider serdeProvider() {
         ServiceLoader<ArangoSerdeProvider> loader = ServiceLoader.load(ArangoSerdeProvider.class);
         Iterator<ArangoSerdeProvider> it = loader.iterator();
+        ArangoSerdeProvider serdeProvider;
         if (!it.hasNext()) {
-            throw new ArangoDBException("No ArangoSerdeProvider found!");
-        }
-        ArangoSerdeProvider serdeProvider = it.next();
-        if (it.hasNext()) {
-            throw new ArangoDBException("Found multiple serde providers! Please set explicitly the one to use.");
+            LOG.info("No ArangoSerdeProvider found, using InternalSerdeProvider.");
+            serdeProvider = new InternalSerdeProvider();
+        } else {
+            serdeProvider = it.next();
+            if (it.hasNext()) {
+                throw new ArangoDBException("Found multiple serde providers! Please set explicitly the one to use.");
+            }
         }
         return serdeProvider;
     }

driver/src/main/java/com/arangodb/internal/serde/InternalSerde.java

@@ -9,16 +9,6 @@
 
 public interface InternalSerde extends ArangoSerde {
 
-    /**
-     * Creates a new InternalSerde with default settings for the specified data type.
-     *
-     * @param contentType serialization target data type
-     * @return the created InternalSerde
-     */
-    static InternalSerde of(final ContentType contentType, ArangoSerde userSerde) {
-        return new InternalSerdeImpl(InternalMapperProvider.of(contentType), userSerde);
-    }
-
     /**
      * Used for logging and debugging.
      *

driver/src/main/java/com/arangodb/internal/serde/InternalSerdeProvider.java

@@ -0,0 +1,30 @@
+package com.arangodb.internal.serde;
+
+import com.arangodb.ContentType;
+import com.arangodb.serde.ArangoSerde;
+import com.arangodb.serde.ArangoSerdeProvider;
+
+public class InternalSerdeProvider implements ArangoSerdeProvider {
+
+    /**
+     * Creates a new InternalSerde with default settings for the specified data type.
+     *
+     * @param contentType serialization target data type
+     * @return the created InternalSerde
+     */
+    @Override
+    public InternalSerde of(final ContentType contentType) {
+        return create(contentType, null);
+    }
+
+    /**
+     * Creates a new InternalSerde with default settings for the specified data type.
+     *
+     * @param contentType serialization target data type
+     * @return the created InternalSerde
+     */
+    public static InternalSerde create(final ContentType contentType, ArangoSerde userSerde) {
+        return new InternalSerdeImpl(InternalMapperProvider.of(contentType), userSerde);
+    }
+
+}

driver/src/test/java/com/arangodb/serde/SerdeTest.java

@@ -2,6 +2,7 @@
 
 import com.arangodb.ContentType;
 import com.arangodb.internal.serde.InternalSerde;
+import com.arangodb.internal.serde.InternalSerdeProvider;
 import com.arangodb.internal.serde.SerdeUtils;
 import com.arangodb.util.RawBytes;
 import com.arangodb.util.RawJson;
@@ -18,7 +19,7 @@ class SerdeTest {
     @ParameterizedTest
     @EnumSource(ContentType.class)
     void rawJsonSerde(ContentType type) {
-        InternalSerde s = InternalSerde.of(type, null);
+        InternalSerde s = new InternalSerdeProvider().of(type);
         ObjectNode node = JsonNodeFactory.instance.objectNode().put("foo", "bar");
         RawJson raw = RawJson.of(SerdeUtils.INSTANCE.writeJson(node));
         byte[] serialized = s.serialize(raw);
@@ -29,7 +30,7 @@ void rawJsonSerde(ContentType type) {
     @ParameterizedTest
     @EnumSource(ContentType.class)
     void rawBytesSerde(ContentType type) {
-        InternalSerde s = InternalSerde.of(type, null);
+        InternalSerde s = new InternalSerdeProvider().of(type);
         ObjectNode node = JsonNodeFactory.instance.objectNode().put("foo", "bar");
         RawBytes raw = RawBytes.of(s.serialize(node));
         byte[] serialized = s.serialize(raw);