fixed graph bug

Author: gschwab

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

@@ -1,20 +1,100 @@
 package com.arangodb.entity;
 
+import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
+import com.arangodb.ArangoException;
+
 public class EdgeDefinitionsEntity {
-  List<EdgeDefinitionEntity> edgeDefinitions;
+  
+  /**
+   * The list of edgeDefinitions
+   */
+  private List<EdgeDefinitionEntity> edgeDefinitions;
+  
+  /**
+   * A list of edge collections used in the edge definitions
+   */
+  private List<String> edgeCollections; 
+  
 
+  public EdgeDefinitionsEntity(List<EdgeDefinitionEntity> edgeDefinitions) {
+    this.edgeDefinitions = edgeDefinitions;
+    this.edgeCollections = new ArrayList<String>();
+    this.evalEdgeCollections();
+  }
+  
+  public EdgeDefinitionsEntity() {
+    this.edgeDefinitions = new ArrayList<EdgeDefinitionEntity>();
+    this.edgeCollections = new ArrayList<String>();
+  }
+  
+  /**
+   * returns the number of edge definitions
+   * 
+   * @return number of edge definitions
+   */
+  public int getSize() {
+    return this.edgeDefinitions.size();
+  }
+
+  /**
+   * get all edge definitions
+   * 
+   * @return
+   */
   public List<EdgeDefinitionEntity> getEdgeDefinitions() {
     return edgeDefinitions;
   }
 
-    public void setEdgeDefinitions(List<EdgeDefinitionEntity> edgeDefinitions) {
-        this.edgeDefinitions = edgeDefinitions;
-    }
+  /**
+   * set the edge definitions (overwrites existing edge definitions)
+   * 
+   * @param edgeDefinitions the edge definitions to be set
+   */
+  public void setEdgeDefinitions(List<EdgeDefinitionEntity> edgeDefinitions) {
+    this.edgeDefinitions = edgeDefinitions;
+    this.evalEdgeCollections();
+  }
 
-    public void addEdgeDefinition(EdgeDefinitionEntity edgeDefinition) {
-        this.edgeDefinitions.add(edgeDefinition);
+  /**
+   * add a single edge definition
+   * 
+   * @param edgeDefinition the edge definition to be added
+   * @throws ArangoException
+   */
+  public void addEdgeDefinition(EdgeDefinitionEntity edgeDefinition) {
+    if(!this.edgeCollections.contains(edgeDefinition.getCollection())) {
+      this.edgeDefinitions.add(edgeDefinition);
+      this.edgeCollections.add(edgeDefinition.getCollection());
     }
-
+  }
+  
+  /**
+   * get a single edge definition identified by its edge collection name
+   * 
+   * @param collectionName the name of the edge collection 
+   * @return the adjacent edgeDefinition or null, if no match
+   */
+  public EdgeDefinitionEntity getEdgeDefinition(String collectionName) {
+    for (EdgeDefinitionEntity edgeDefintion : this.edgeDefinitions) {
+      if (edgeDefintion.getCollection() == collectionName) {
+        return edgeDefintion;
+      }
+    }
+    return null;
+  }
+  
+  /**
+   * fills the list of edgeCollections
+   */
+  private void evalEdgeCollections() {
+    this.edgeCollections.clear();
+    for (EdgeDefinitionEntity edgeDefintion : this.edgeDefinitions) {
+      this.edgeCollections.add(edgeDefintion.getCollection());
+    }
+  }
+  
+  
 }

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

@@ -23,6 +23,7 @@
 import java.util.*;
 import java.util.Map.Entry;
 
+import com.arangodb.ArangoException;
 import com.arangodb.entity.CollectionEntity.Figures;
 import com.arangodb.entity.ReplicationApplierState.LastError;
 import com.arangodb.entity.ReplicationApplierState.Progress;
@@ -1718,7 +1719,8 @@ public GraphEntity deserialize(JsonElement json, Type typeOfT, JsonDeserializati
 
       if (graph.has("edgeDefinitions")) {
         JsonArray edgeDefinitions = graph.getAsJsonArray("edgeDefinitions");
-        entity.edgeDefinitions = new ArrayList<EdgeDefinitionEntity>();
+        entity.edgeDefinitionsEntity = new EdgeDefinitionsEntity();
+//        EdgeDefinitionsEntity edgeDefinitionsEntity = new EdgeDefinitionsEntity(); 
         if (!edgeDefinitions.equals(null)) {
           for (int i = 0, imax = edgeDefinitions.size(); i < imax; i++) {
             EdgeDefinitionEntity edgeDefinitionEntity = new EdgeDefinitionEntity();
@@ -1727,12 +1729,29 @@ public GraphEntity deserialize(JsonElement json, Type typeOfT, JsonDeserializati
               edgeDefinitionEntity.setCollection(edgeDefinition.get("collection").getAsString());
             }
             if (edgeDefinition.has("from")) {
-              edgeDefinitionEntity.setFrom(new ArrayList<String>());
+              List<String> from = new ArrayList<String>();
+              JsonElement fromElem = edgeDefinition.get("from");
+              JsonArray fromArray = fromElem.getAsJsonArray();
+              Iterator<JsonElement> iterator = fromArray.iterator();
+              while(iterator.hasNext()) {
+                JsonElement e  = iterator.next();
+                from.add(e.getAsString());
+              }
+              
+              edgeDefinitionEntity.setFrom(from);
             }
             if (edgeDefinition.has("to")) {
-              edgeDefinitionEntity.setTo(new ArrayList<String>());
+              List<String> to = new ArrayList<String>();
+              JsonElement toElem = edgeDefinition.get("to");
+              JsonArray toArray = toElem.getAsJsonArray();
+              Iterator<JsonElement> iterator = toArray.iterator();
+              while(iterator.hasNext()) {
+                JsonElement e  = iterator.next();
+                to.add(e.getAsString());
+              }
+              edgeDefinitionEntity.setTo(to);
             }
-            entity.edgeDefinitions.add(edgeDefinitionEntity);
+            entity.edgeDefinitionsEntity.addEdgeDefinition(edgeDefinitionEntity);
           }
         }
       }

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

@@ -50,9 +50,9 @@ public class GraphEntity extends BaseEntity implements DocumentHolder {
   List<String> orphanCollections;
 
   /**
-   * List of edge definitions of the graph.
+   * The edge definitions of the graph.
    */
-  List<EdgeDefinitionEntity> edgeDefinitions;
+  EdgeDefinitionsEntity edgeDefinitionsEntity;
 
   /**
    * Name of the graph.
@@ -89,12 +89,20 @@ public void setDocumentKey(String documentKey) {
     this.documentKey = documentKey;
   }
 
+  public EdgeDefinitionsEntity getEdgeDefinitionsEntity() {
+    return edgeDefinitionsEntity;
+  }
+
   public List<EdgeDefinitionEntity> getEdgeDefinitions() {
-    return edgeDefinitions;
+    return edgeDefinitionsEntity.getEdgeDefinitions();
+  }
+
+  public void setEdgeDefinitionsEntity(EdgeDefinitionsEntity edgeDefinitionsEntity) {
+    this.edgeDefinitionsEntity = edgeDefinitionsEntity;
   }
 
   public void setEdgeDefinitions(List<EdgeDefinitionEntity> edgeDefinitions) {
-    this.edgeDefinitions = edgeDefinitions;
+    this.edgeDefinitionsEntity.setEdgeDefinitions(edgeDefinitions);
   }
 
   public List<String> getOrphanCollections() {

src/test/java/com/arangodb/ArangoDriverGraphTest.java

@@ -116,10 +116,12 @@ public void test_createGraph_2() throws ArangoException {
   public void test_getGraph() throws ArangoException {
     driver.createGraph(this.graphName, this.createEdgeDefinitions(2, 0), this.createOrphanCollections(2), true);
     GraphEntity graph = driver.getGraph(this.graphName);
+    assertThat(graph.getEdgeDefinitionsEntity().getEdgeDefinitions().get(0).getClass().getName(), is(EdgeDefinitionEntity.class.getName()));
+    assertThat(graph.getEdgeDefinitionsEntity().getEdgeDefinitions().get(0).getFrom().size(), is(3));
     assertThat(graph.getOrphanCollections().size(), is(2));
     assertThat(graph.getName(), is(this.graphName));
-    assertThat(graph.getEdgeDefinitions().size(), is(2));
-    assertThat(graph.getEdgeDefinitions().get(0).getCollection().startsWith("edge"), is(true));
+    assertThat(graph.getEdgeDefinitionsEntity().getSize(), is(2));
+    assertThat(graph.getEdgeDefinitionsEntity().getEdgeDefinitions().get(0).getCollection().startsWith("edge"), is(true));
 
   }
 
@@ -349,7 +351,7 @@ public void test_replace_edge_definition() throws ArangoException {
     to2.add(toCollectionName2);
     edgeDefinition2.setTo(to2);
     GraphEntity graph = driver.graphReplaceEdgeDefinition(this.graphName, edgeCollectionName, edgeDefinition2);
-    List<EdgeDefinitionEntity> edgeDefinitions = graph.getEdgeDefinitions();
+    List<EdgeDefinitionEntity> edgeDefinitions = graph.getEdgeDefinitionsEntity().getEdgeDefinitions();
     for (EdgeDefinitionEntity edgeDef : edgeDefinitions) {
       List<String> f = edgeDef.getFrom();
       assertThat(f.contains(from1), is(false));
@@ -399,15 +401,15 @@ public void test_replace_edge_definition_2_graphs() throws ArangoException {
     to2.add(toCollectionName2);
     edgeDefinition2.setTo(to2);
     GraphEntity graph1 = driver.graphReplaceEdgeDefinition(graphName1, edgeCollectionName, edgeDefinition2);
-    List<EdgeDefinitionEntity> edgeDefinitions1 = graph1.getEdgeDefinitions();
+    List<EdgeDefinitionEntity> edgeDefinitions1 = graph1.getEdgeDefinitionsEntity().getEdgeDefinitions();
     for (EdgeDefinitionEntity edgeDef : edgeDefinitions1) {
       List<String> f = edgeDef.getFrom();
       assertThat(f.contains(from1), is(false));
       List<String> t = edgeDef.getTo();
       assertThat(t.contains(to1), is(false));
     }
     GraphEntity graph2 = driver.graphReplaceEdgeDefinition(graphName1, edgeCollectionName, edgeDefinition2);
-    List<EdgeDefinitionEntity> edgeDefinitions2 = graph2.getEdgeDefinitions();
+    List<EdgeDefinitionEntity> edgeDefinitions2 = graph2.getEdgeDefinitionsEntity().getEdgeDefinitions();
     for (EdgeDefinitionEntity edgeDef : edgeDefinitions2) {
       List<String> f = edgeDef.getFrom();
       assertThat(f.contains(from1), is(false));