serde serialization refactoring: graph API

Author: rashtao

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

@@ -38,7 +38,6 @@
 import com.arangodb.model.LogOptions;
 import com.arangodb.model.UserCreateOptions;
 import com.arangodb.model.UserUpdateOptions;
-import com.arangodb.serde.ArangoSerde;
 import com.arangodb.serde.DataType;
 import com.arangodb.serde.InternalSerde;
 import com.arangodb.util.ArangoCursorInitializer;

src/main/java/com/arangodb/entity/EdgeDefinition.java

@@ -22,6 +22,7 @@
 
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 
 /**
  * @author Mark Vollmary
@@ -32,7 +33,7 @@ public class EdgeDefinition {
     private String collection;
     private Collection<String> from;
     private Collection<String> to;
-    private Options options;
+    private final Options options = new Options();
 
     public String getCollection() {
         return collection;
@@ -65,6 +66,10 @@ public Collection<String> getSatellites() {
         return options.satellites;
     }
 
+    public Options getOptions() {
+        return options;
+    }
+
     /**
      * @param satellites collection names that will be used to create SatelliteCollections
      *                   for a Hybrid (Disjoint) SmartGraph (Enterprise Edition only). Each array element
@@ -73,12 +78,15 @@ public Collection<String> getSatellites() {
      * @since ArangoDB 3.9.0
      */
     public EdgeDefinition satellites(final String... satellites) {
-        options = new Options();
         options.satellites = Arrays.asList(satellites);
         return this;
     }
 
     public static class Options {
-        private Collection<String> satellites;
+        private Collection<String> satellites = Collections.emptyList();
+
+        public Collection<String> getSatellites() {
+            return satellites;
+        }
     }
 }

src/main/java/com/arangodb/model/GraphCreateOptions.java

@@ -25,6 +25,8 @@
 
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
+import java.util.Objects;
 
 /**
  * @author Mark Vollmary
@@ -33,16 +35,16 @@
 public class GraphCreateOptions {
 
     private String name;
-    private Collection<EdgeDefinition> edgeDefinitions;
-    private Collection<String> orphanCollections;
+    private Collection<EdgeDefinition> edgeDefinitions = Collections.emptyList();
+    private Collection<String> orphanCollections = Collections.emptyList();
     private Boolean isSmart;
     private SmartOptions options;
 
     public GraphCreateOptions() {
         super();
     }
 
-    protected String getName() {
+    public String getName() {
         return name;
     }
 
@@ -64,6 +66,7 @@ public Collection<EdgeDefinition> getEdgeDefinitions() {
      * @return options
      */
     protected GraphCreateOptions edgeDefinitions(final Collection<EdgeDefinition> edgeDefinitions) {
+        Objects.requireNonNull(edgeDefinitions);
         this.edgeDefinitions = edgeDefinitions;
         return this;
     }

src/main/java/com/arangodb/model/StreamTransactionOptions.java

@@ -39,6 +39,10 @@ public StreamTransactionOptions() {
         collections = new TransactionCollectionOptions();
     }
 
+    public TransactionCollectionOptions getCollections() {
+        return collections;
+    }
+
     public Integer getLockTimeout() {
         return lockTimeout;
     }

src/main/java/com/arangodb/model/TransactionCollectionOptions.java

@@ -22,16 +22,17 @@
 
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 
 /**
  * @author Mark Vollmary
  * @author Michele Rastelli
  */
 public class TransactionCollectionOptions {
 
-    private Collection<String> read;
-    private Collection<String> write;
-    private Collection<String> exclusive;
+    private Collection<String> read = Collections.emptyList();
+    private Collection<String> write = Collections.emptyList();
+    private Collection<String> exclusive = Collections.emptyList();
     private Boolean allowImplicit;
 
     public Collection<String> getRead() {

src/main/java/com/arangodb/model/VertexCollectionCreateOptions.java

@@ -29,13 +29,13 @@
 public class VertexCollectionCreateOptions {
 
     private String collection;
-    private Options options;
+    private final Options options = new Options();;
 
     public VertexCollectionCreateOptions() {
         super();
     }
 
-    protected String getCollection() {
+    public String getCollection() {
         return collection;
     }
 
@@ -60,13 +60,16 @@ public Collection<String> getSatellites() {
      * @since ArangoDB 3.9.0
      */
     public VertexCollectionCreateOptions satellites(final String... satellites) {
-        options = new Options();
         options.satellites = Arrays.asList(satellites);
         return this;
     }
 
     public static class Options {
         private Collection<String> satellites;
+
+        public Collection<String> getSatellites() {
+            return satellites;
+        }
     }
 
 }

src/test/java/com/arangodb/ArangoDBTest.java

@@ -31,6 +31,7 @@
 import com.arangodb.velocystream.Response;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -591,6 +592,7 @@ void accessMultipleDatabases(ArangoDB arangoDB) {
 
     @ParameterizedTest(name = "{index}")
     @MethodSource("arangos")
+    @Disabled("Manual execution only")
     void queueTime(ArangoDB arangoDB) throws InterruptedException, ExecutionException {
         List<CompletableFuture<Void>> futures = IntStream.range(0, 80)
                 .mapToObj(i -> CompletableFuture.runAsync(

src/test/java/com/arangodb/async/ArangoDBTest.java

@@ -28,6 +28,7 @@
 import com.arangodb.velocypack.exception.VPackException;
 import com.arangodb.velocystream.Request;
 import com.arangodb.velocystream.RequestType;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
 
@@ -501,6 +502,7 @@ void setLogLevel() throws InterruptedException, ExecutionException {
     }
 
     @Test
+    @Disabled("Manual execution only")
     void queueTime() throws InterruptedException, ExecutionException {
         List<CompletableFuture<ArangoCursorAsync<Void>>> reqs = IntStream.range(0, 80)
                 .mapToObj(__ -> arangoDB.db().query("RETURN SLEEP(1)", Void.class))

src/test/java/com/arangodb/async/ArangoDatabaseTest.java

@@ -847,7 +847,7 @@ void createGetDeleteAqlFunctionWithNamespace() throws InterruptedException, Exec
     @Test
     void createGraph() throws InterruptedException, ExecutionException {
         try {
-            db.createGraph(GRAPH_NAME, null, null)
+            db.createGraph(GRAPH_NAME, Collections.emptyList(), null)
                     .whenComplete((result, ex) -> {
                         assertThat(result).isNotNull();
                         assertThat(result.getName()).isEqualTo(GRAPH_NAME);
@@ -861,7 +861,7 @@ void createGraph() throws InterruptedException, ExecutionException {
     @Test
     void getGraphs() throws InterruptedException, ExecutionException {
         try {
-            db.createGraph(GRAPH_NAME, null, null).get();
+            db.createGraph(GRAPH_NAME, Collections.emptyList(), null).get();
             db.getGraphs()
                     .whenComplete((graphs, ex) -> {
                         assertThat(graphs).isNotNull();

src/test/java/com/arangodb/async/ArangoGraphTest.java

@@ -85,7 +85,7 @@ void teardown() throws InterruptedException, ExecutionException {
     @Test
     void create() throws InterruptedException, ExecutionException {
         try {
-            final GraphEntity result = db.graph(GRAPH_NAME + "_1").create(null).get();
+            final GraphEntity result = db.graph(GRAPH_NAME + "_1").create(Collections.emptyList()).get();
             assertThat(result).isNotNull();
             assertThat(result.getName()).isEqualTo(GRAPH_NAME + "_1");
         } finally {