[DE-481] x-arango-driver header

Author: rashtao

core/src/main/java/com/arangodb/internal/serde/InternalSerializers.java

@@ -1,5 +1,6 @@
 package com.arangodb.internal.serde;
 
+import com.arangodb.DbName;
 import com.arangodb.entity.CollectionType;
 import com.arangodb.entity.arangosearch.CollectionLink;
 import com.arangodb.entity.arangosearch.FieldLink;
@@ -15,6 +16,7 @@
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
 
 public final class InternalSerializers {
 
@@ -40,7 +42,7 @@ public void serialize(InternalRequest value, JsonGenerator gen, SerializerProvid
             gen.writeStartArray();
             gen.writeNumber(value.getVersion());
             gen.writeNumber(value.getType());
-            gen.writeString(value.getDbName().get());
+            gen.writeString(Optional.ofNullable(value.getDbName()).orElse(DbName.SYSTEM).get());
             gen.writeNumber(value.getRequestType().getType());
             gen.writeString(value.getPath());
             gen.writeStartObject();

…ava/com/arangodb/PackageVersionTest.java …est/java/com/arangodb/UserAgentTest.javadriver/src/test/java/com/arangodb/PackageVersionTest.java renamed to driver/src/test/java/com/arangodb/UserAgentTest.java driver/src/test/java/com/arangodb/PackageVersionTest.java renamed to driver/src/test/java/com/arangodb/UserAgentTest.java

@@ -6,9 +6,8 @@
 import org.junit.jupiter.params.provider.EnumSource;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
-class PackageVersionTest extends BaseJunit5 {
+class UserAgentTest extends BaseJunit5 {
 
     private static final String EXPECTED_VERSION = "7.0.0-ALPHA.2";
 
@@ -20,7 +19,6 @@ void packageVersion() {
     @ParameterizedTest
     @EnumSource(Protocol.class)
     void userAgentHeader(Protocol protocol) {
-        assumeTrue(protocol != Protocol.VST);
         ArangoDB adb = new ArangoDB.Builder()
                 .loadProperties(config)
                 .useProtocol(protocol)

driver/src/test/java/com/arangodb/async/UserAgentTest.java

@@ -0,0 +1,35 @@
+package com.arangodb.async;
+
+
+import com.arangodb.PackageVersion;
+import com.arangodb.Request;
+import com.arangodb.Response;
+import com.arangodb.config.ArangoConfigProperties;
+import com.fasterxml.jackson.databind.JsonNode;
+import org.junit.jupiter.api.Test;
+
+import java.util.concurrent.ExecutionException;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class UserAgentTest {
+    @Test
+    void userAgentHeader() throws ExecutionException, InterruptedException {
+        ArangoDBAsync adb = new ArangoDBAsync.Builder()
+                .loadProperties(ArangoConfigProperties.fromFile())
+                .build();
+
+        Response<JsonNode> resp = adb.execute(Request.builder()
+                .method(Request.Method.GET)
+                .path("/_admin/echo")
+                .build(), JsonNode.class)
+                .get();
+        String headerValue = resp.getBody().get("headers").get("x-arango-driver").textValue();
+
+        String jvmVersion = System.getProperty("java.specification.version");
+        String expected = "JavaDriver/" + PackageVersion.VERSION + " (JVM/" + jvmVersion + ")";
+
+        assertThat(headerValue).isEqualTo(expected);
+        adb.shutdown();
+    }
+}

vst/src/main/java/com/arangodb/vst/VstCommunication.java

@@ -21,6 +21,7 @@
 package com.arangodb.vst;
 
 import com.arangodb.ArangoDBException;
+import com.arangodb.PackageVersion;
 import com.arangodb.internal.InternalRequest;
 import com.arangodb.internal.InternalResponse;
 import com.arangodb.internal.config.ArangoConfig;
@@ -55,6 +56,7 @@ public abstract class VstCommunication<R, C extends VstConnection<?>> implements
     protected static final AtomicLong mId = new AtomicLong(0L);
     private static final Logger LOGGER = LoggerFactory.getLogger(VstCommunication.class);
     protected final InternalSerde serde;
+    private static final String X_ARANGO_DRIVER = "JavaDriver/" + PackageVersion.VERSION + " (JVM/" + System.getProperty("java.specification.version") + ")";
 
     protected final String user;
     protected final String password;
@@ -163,6 +165,7 @@ protected InternalResponse createResponse(final Message message) throws VPackPar
     protected final Message createMessage(final InternalRequest request) throws VPackParserException {
         request.putHeaderParam("accept", "application/x-velocypack");
         request.putHeaderParam("content-type", "application/x-velocypack");
+        request.putHeaderParam("x-arango-driver", X_ARANGO_DRIVER);
         final long id = mId.incrementAndGet();
         return new Message(id, serde.serialize(request), request.getBody());
     }