Updated Java driver to version 7.16.0

Author: rashtao

pom.xml

@@ -23,7 +23,7 @@
 
 <properties>
 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-<arangodb-java-driver.version>5.0.0</arangodb-java-driver.version>
+<arangodb-java-driver.version>7.16.0</arangodb-java-driver.version>
 <tinkerpop.version>3.3.11</tinkerpop.version>
 <junit.version>4.13.1</junit.version>
 <logback-classic.version>1.2.13</logback-classic.version>

src/main/java/com/arangodb/tinkerpop/gremlin/client/ArangoConfigMap.java

@@ -0,0 +1,134 @@
+package com.arangodb.tinkerpop.gremlin.client;
+
+import com.arangodb.Compression;
+import com.arangodb.Protocol;
+import com.arangodb.config.ArangoConfigProperties;
+import com.arangodb.config.HostDescription;
+import com.arangodb.entity.LoadBalancingStrategy;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.Properties;
+
+public final class ArangoConfigMap implements ArangoConfigProperties {
+ private static final String PREFIX = "arangodb.";
+ private final Properties properties;
+
+ public ArangoConfigMap(final Properties properties) {
+ this.properties = properties;
+ }
+
+ private String getProperty(String key) {
+ return properties.getProperty(PREFIX + key);
+ }
+
+ @Override
+ public Optional<List<HostDescription>> getHosts() {
+ return Optional.ofNullable(getProperty("hosts"))
+ .map(s -> {
+ List<HostDescription> hostDescriptions = new ArrayList<>();
+ String[] hosts = s.split(",");
+ for (String host : hosts) {
+ hostDescriptions.add(HostDescription.parse(host));
+ }
+ return hostDescriptions;
+ });
+ }
+
+ @Override
+ public Optional<Protocol> getProtocol() {
+ return Optional.ofNullable(getProperty("protocol")).map(Protocol::valueOf);
+ }
+
+ @Override
+ public Optional<String> getUser() {
+ return Optional.ofNullable(getProperty("user"));
+ }
+
+ @Override
+ public Optional<String> getPassword() {
+ return Optional.ofNullable(getProperty("password"));
+ }
+
+ @Override
+ public Optional<String> getJwt() {
+ return Optional.ofNullable(getProperty("jwt"));
+ }
+
+ @Override
+ public Optional<Integer> getTimeout() {
+ return Optional.ofNullable(getProperty("timeout")).map(Integer::valueOf);
+ }
+
+ @Override
+ public Optional<Boolean> getUseSsl() {
+ return Optional.ofNullable(getProperty("useSsl")).map(Boolean::valueOf);
+ }
+
+ @Override
+ public Optional<Boolean> getVerifyHost() {
+ return Optional.ofNullable(getProperty("verifyHost")).map(Boolean::valueOf);
+ }
+
+ @Override
+ public Optional<Integer> getChunkSize() {
+ return Optional.ofNullable(getProperty("chunkSize")).map(Integer::valueOf);
+ }
+
+ @Override
+ public Optional<Integer> getMaxConnections() {
+ return Optional.ofNullable(getProperty("maxConnections")).map(Integer::valueOf);
+ }
+
+ @Override
+ public Optional<Long> getConnectionTtl() {
+ return Optional.ofNullable(getProperty("connectionTtl")).map(Long::valueOf);
+ }
+
+ @Override
+ public Optional<Integer> getKeepAliveInterval() {
+ return Optional.ofNullable(getProperty("keepAliveInterval")).map(Integer::valueOf);
+ }
+
+ @Override
+ public Optional<Boolean> getAcquireHostList() {
+ return Optional.ofNullable(getProperty("acquireHostList")).map(Boolean::valueOf);
+ }
+
+ @Override
+ public Optional<Integer> getAcquireHostListInterval() {
+ return Optional.ofNullable(getProperty("acquireHostListInterval")).map(Integer::valueOf);
+ }
+
+ @Override
+ public Optional<LoadBalancingStrategy> getLoadBalancingStrategy() {
+ return Optional.ofNullable(getProperty("loadBalancingStrategy")).map(LoadBalancingStrategy::valueOf);
+ }
+
+ @Override
+ public Optional<Integer> getResponseQueueTimeSamples() {
+ return Optional.ofNullable(getProperty("responseQueueTimeSamples")).map(Integer::valueOf);
+ }
+
+ @Override
+ public Optional<Compression> getCompression() {
+ return Optional.ofNullable(getProperty("compression")).map(Compression::valueOf);
+ }
+
+ @Override
+ public Optional<Integer> getCompressionThreshold() {
+ return Optional.ofNullable(getProperty("compressionThreshold")).map(Integer::valueOf);
+ }
+
+ @Override
+ public Optional<Integer> getCompressionLevel() {
+ return Optional.ofNullable(getProperty("compressionLevel")).map(Integer::valueOf);
+ }
+
+ @Override
+ public Optional<String> getSerdeProviderClass() {
+ return Optional.ofNullable(getProperty("serdeProviderClass"));
+ }
+
+}

src/main/java/com/arangodb/tinkerpop/gremlin/client/ArangoDBBaseDocument.java

@@ -8,9 +8,12 @@
 
 package com.arangodb.tinkerpop.gremlin.client;
 
-import com.arangodb.entity.DocumentField;
+import com.arangodb.serde.jackson.Id;
+import com.arangodb.serde.jackson.Key;
+import com.arangodb.serde.jackson.Rev;
 import com.arangodb.tinkerpop.gremlin.structure.ArangoDBGraph;
-import com.arangodb.velocypack.annotations.Expose;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
  * The ArangoDB BaseBaseDocument provides the internal fields required for the driver to correctly
@@ -23,37 +26,37 @@ public abstract class ArangoDBBaseDocument {
 
  /** ArangoDB internal id. */
 
- @DocumentField(DocumentField.Type.ID)
+ @Id
  protected String _id;
 
  /** ArangoDB internal revision. */
 
- @DocumentField(DocumentField.Type.REV)
+ @Rev
  protected String _rev;
 
  /** ArangoDB internal name - mapped to TinkerPop's ID. */
 
- @DocumentField(DocumentField.Type.KEY)
+ @Key
  protected String _key;
 
  /** The label of the document */
 
- @Expose
+ @JsonProperty
  protected String label;
 
  /** The collection in which the element is placed. */
 
- @Expose(serialize = false, deserialize = false)
+ @JsonIgnore
  protected String collection;
 
  /** the graph of the document. */
 
- @Expose(serialize = false, deserialize = false)
+ @JsonIgnore
  protected ArangoDBGraph graph;
 
  /** Flag to indicate if the element is paired to a document in the DB. */
 
- @Expose(serialize = false, deserialize = false)
+ @JsonIgnore
  protected boolean paired = false;
 
  /**

src/main/java/com/arangodb/tinkerpop/gremlin/client/ArangoDBBaseEdge.java

@@ -8,7 +8,8 @@
 
 package com.arangodb.tinkerpop.gremlin.client;
 
-import com.arangodb.entity.DocumentField;
+import com.arangodb.serde.jackson.From;
+import com.arangodb.serde.jackson.To;
 import com.arangodb.tinkerpop.gremlin.structure.ArangoDBGraph;
 
 /**
@@ -23,12 +24,12 @@ public abstract class ArangoDBBaseEdge extends ArangoDBBaseDocument {
 
  /** ArangoDB internal from. */
 
- @DocumentField(DocumentField.Type.FROM)
+ @From
  private String _from;
 
  /** ArangoDB internal to. */
 
- @DocumentField(DocumentField.Type.TO)
+ @To
  private String _to;
 
  /**

src/main/java/com/arangodb/tinkerpop/gremlin/client/ArangoDBGraphClient.java

@@ -8,10 +8,6 @@
 
 package com.arangodb.tinkerpop.gremlin.client;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -189,15 +185,9 @@ public ArangoDBGraphClient(
 throws ArangoDBGraphException {
 logger.info("Initiating the ArangoDb Client");
 this.graph = graph;
-ByteArrayOutputStream os = new ByteArrayOutputStream();
-try {
-properties.store(os, null);
-InputStream targetStream = new ByteArrayInputStream(os.toByteArray());
-driver = new ArangoDB.Builder().loadProperties(targetStream)
-.build();
-} catch (IOException e) {
-throw new ArangoDBGraphException("Unable to read properties", e);
-}
+driver = new ArangoDB.Builder()
+.loadProperties(new ArangoConfigMap(properties))
+.build();
 db = driver.db(dbname);
 if (createDatabase) {
 if (!db.exists()) {
@@ -239,7 +229,6 @@ public void shutdown() {
 db.clearQueryCache();
 }
 }
-if (driver != null) driver.shutdown();
 }
 
 /**
@@ -429,14 +418,18 @@ public <V extends ArangoDBBaseEdge> V getEdge(
 
 public void insertEdge(ArangoDBBaseEdge edge) {
 logger.debug("Insert edge {} in {} ", edge, graph.name());
+EdgeEntity insertEntity;
 try {
-db.graph(graph.name())
+insertEntity = db.graph(graph.name())
 .edgeCollection(edge.collection())
 .insertEdge(edge);
 } catch (ArangoDBException e) {
 logger.error("Failed to insert edge: {}", e.getErrorMessage());
 throw ArangoDBExceptions.getArangoDBException(e);
 }
+edge._id(insertEntity.getId());
+edge._key(insertEntity.getKey());
+edge._rev(insertEntity.getRev());
 edge.setPaired(true);
 }
 
@@ -512,7 +505,7 @@ public void insertGraphVariables(ArangoDBGraphVariables document) {
 CollectionEntity ce = db.createCollection(document.collection());
 System.out.println(ce.getStatus());
 }
-DocumentCreateEntity<ArangoDBGraphVariables> vertexEntity;
+DocumentCreateEntity<?> vertexEntity;
 try {
 vertexEntity = gVars.insertDocument(document);
 } catch (ArangoDBException e) {
@@ -922,7 +915,7 @@ public <T> ArangoCursor<T> executeAqlQuery(
 throws ArangoDBGraphException {
 logger.debug("Executing AQL query ({}) against db, with bind vars: {}", query, bindVars);
 try {
-return db.query(query, bindVars, aqlQueryOptions, type);
+return db.query(query, type, bindVars, aqlQueryOptions);
 } catch (ArangoDBException e) {
 logger.error("Error executing query", e);
  throw ArangoDBExceptions.getArangoDBException(e);

src/main/java/com/arangodb/tinkerpop/gremlin/structure/ArangoDBElementProperty.java

@@ -8,14 +8,10 @@
 
 package com.arangodb.tinkerpop.gremlin.structure;
 
-import java.util.HashMap;
-import java.util.Map;
 import java.util.NoSuchElementException;
-import java.util.Optional;
 
-import com.arangodb.tinkerpop.gremlin.client.ArangoDBQueryBuilder;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import org.apache.tinkerpop.gremlin.structure.Property;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
 import org.apache.tinkerpop.gremlin.structure.util.ElementHelper;
 import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
 
@@ -59,16 +55,19 @@ public ElementHasProperty(ArangoDBBaseDocument from, ArangoDBElementProperty<?>
  }
 
 /** The property name. */
- 
+
+ @JsonProperty
 protected String name;
 
  /** The property value. */
-
+
+ @JsonProperty
  protected V value;
 
  /** The property type */
- 
- protected String valutType;
+
+ @JsonProperty
+ protected String valueType;
 
 
  /**
@@ -91,7 +90,7 @@ public ArangoDBElementProperty(String key, String name, V value, ArangoDBBaseDoc
  super(key, label, owner.graph());
  this.name = name;
  this.value = value;
- this.valutType = value.getClass().getCanonicalName();
+ this.valueType = value.getClass().getCanonicalName();
  }
 
  /**
@@ -133,7 +132,7 @@ public void remove() {
 @SuppressWarnings("unchecked")
 @Override
 public V value() throws NoSuchElementException {
- return (V) ArangoDBUtil.getCorretctPrimitive(value, valutType);
+ return (V) ArangoDBUtil.getCorretctPrimitive(value, valueType);
 }
 
 /**

src/main/java/com/arangodb/tinkerpop/gremlin/structure/ArangoDBGraphVariables.java

@@ -14,6 +14,7 @@
 import java.util.Optional;
 import java.util.Set;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.structure.util.GraphVariableHelper;
 import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
@@ -38,7 +39,8 @@ public static class ArangoDBGraphVariableFeatures implements Graph.Features.Vari
  }
 
  /** The key:value store for properties. */
- 
+
+@JsonProperty
  private final Map<String, Object> store = new HashMap<>(4);
 
  /**