data classes refactoring

Author: rashtao

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

@@ -291,37 +291,6 @@ public void deleteDb() throws ArangoDBGraphException {
         }
     }
 
-    /**
-     * Get a document from the database. The method is generic so we it can be used to retrieve
-     * vertices, properties or variables.
-     *
-     * @param <V> 					the value type
-     * @param id                    the id of the document (should be a valid ArangoDB _id)
-     * @param collection            the collection from which the document is retrieved
-     * @param docClass                the returned document class
-     * @return the document
-     * @throws ArangoDBGraphException    If there was an error retrieving the document
-     */
-
-    public <V extends ArangoDBBaseDocument> V getDocument(
-            String id,
-            String collection,
-            Class<V> docClass) {
-        logger.debug("Get document with id {} from {}:{}", id, graph.name(), collection);
-        V result;
-        try {
-            result = db.graph(graph.name())
-                    .vertexCollection(collection)
-                    .getVertex(id, docClass);
-        } catch (ArangoDBException e) {
-            logger.error("Failed to retrieve vertex: {}", e.getErrorMessage());
-            throw new ArangoDBGraphException("Failed to retrieve vertex.", e);
-        }
-        result.collection(collection);
-        result.graph(graph);
-        return result;
-    }
-
     public ArangoDBGraphVariables getGraphVariables() {
         logger.debug("Get graph variables");
         ArangoDBGraphVariables result;

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

@@ -32,7 +32,6 @@ public class ArangoDBGremlinPlugin extends AbstractGremlinPlugin {
         try {
             IMPORTS = DefaultImportCustomizer.build().addClassImports(
                     ArangoDBBaseDocument.class,
-                    ArangoDBBaseEdge.class,
                     ArangoDBGraphClient.class,
                     ArangoDBGraphException.class,
                     ArangoDBPropertyFilter.class,

src/main/java/com/arangodb/tinkerpop/gremlin/jsr223/ArangoDBGremlinPlugin.java

@@ -0,0 +1,87 @@
+package com.arangodb.tinkerpop.gremlin.structure;
+
+import com.arangodb.serde.InternalKey;
+import com.arangodb.serde.InternalRev;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+abstract class ArangoDBData<T> {
+    private String label;
+
+    @InternalKey
+    private String key;
+
+    @InternalRev
+    private String rev;
+
+    private Map<String, T> properties = new HashMap<>();
+
+    public ArangoDBData() {
+    }
+
+    public ArangoDBData(String label, String key) {
+        Objects.requireNonNull(label, "label");
+        if (label.isEmpty()) throw new IllegalArgumentException("empty label");
+        if (key != null && key.isEmpty()) throw new IllegalArgumentException("empty key");
+
+        this.label = label;
+        this.key = key;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getRev() {
+        return rev;
+    }
+
+    public void setRev(String rev) {
+        this.rev = rev;
+    }
+
+    public String getLabel() {
+        return label;
+    }
+
+    public void setLabel(String label) {
+        this.label = label;
+    }
+
+    public Map<String, T> getProperties() {
+        if (properties == null) {
+            properties = new HashMap<>();
+        }
+        return properties;
+    }
+
+    public void setProperties(Map<String, T> properties) {
+        this.properties = properties;
+    }
+
+    @Override
+    public String toString() {
+        return "key='" + key + '\'' +
+                ", label='" + label + '\'' +
+                ", rev='" + rev + '\'' +
+                ", properties=" + properties;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o == null || getClass() != o.getClass()) return false;
+        ArangoDBData<?> that = (ArangoDBData<?>) o;
+        return Objects.equals(label, that.label) && Objects.equals(key, that.key) && Objects.equals(rev, that.rev) && Objects.equals(properties, that.properties);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(label, key, rev, properties);
+    }
+}

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

@@ -61,14 +61,6 @@ public ArangoDBEdge(final String id, final String label, final String outVertexI
             key = null;
         }
 
-        if (inferredLabel.isEmpty()) {
-            throw new IllegalArgumentException("empty label");
-        }
-
-        if (key != null && key.isEmpty()) {
-            throw new IllegalArgumentException("empty key");
-        }
-
         data = new ArangoDBEdgeData(inferredLabel, key, outVertexId, inVertexId);
         removed = false;
     }
@@ -141,7 +133,7 @@ public <V> Property<V> property(final String key) {
 
     @Override
     public Set<String> keys() {
-        return data.keys();
+        return data.getProperties().keySet();
     }
 
     @Override