static factory methods

Author: rashtao

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

@@ -48,19 +48,19 @@ public class ArangoDBGremlinPlugin extends AbstractGremlinPlugin {
  // structure
  ArangoDBEdge.class,
  ArangoDBElement.class,
+ ArangoDBGraph.class,
+ ArangoDBGraphVariables.class,
  ArangoDBPersistentElement.class,
  ArangoDBProperty.class,
  ArangoDBSimpleElement.class,
  ArangoDBVertex.class,
  ArangoDBVertexProperty.class,
- ArangoDBGraph.class,
- ArangoDBGraphVariables.class,
 
  // persistence
  AdbValue.class,
  EdgeData.class,
- PropertyData.class,
  PersistentData.class,
+ PropertyData.class,
  SimplePropertyData.class,
  VertexData.class,
  VertexPropertyData.class

src/main/java/com/arangodb/tinkerpop/gremlin/persistence/EdgeData.java

@@ -39,11 +39,7 @@ public class EdgeData extends SimplePropertyData implements PersistentData {
  @InternalTo
  private String to;
 
- public EdgeData() {
- }
-
- // FIXME: static factory method
- public EdgeData(
+ public static EdgeData of(
  String label,
  String key,
  String from,
@@ -54,10 +50,15 @@ public EdgeData(
  Objects.requireNonNull(from, "from");
  Objects.requireNonNull(to, "to");
 
- this.label = label;
- this.key = key;
- this.from = from;
- this.to = to;
+ EdgeData data = new EdgeData();
+ data.label = label;
+ data.key = key;
+ data.from = from;
+ data.to = to;
+ return data;
+ }
+
+ public EdgeData() {
  }
 
  @Override

src/main/java/com/arangodb/tinkerpop/gremlin/persistence/VertexPropertyData.java

@@ -36,19 +36,14 @@ public class VertexPropertyData extends SimplePropertyData {
  @JsonProperty("id") String id,
  @JsonProperty("value") Object value,
  @JsonProperty("valueType") String valueType
-// @JsonProperty("properties") Map<String, AdbValue> properties
  ) {
-// super(properties);
  this.id = id;
  this.value = value;
  this.valueType = valueType;
  }
 
- // FIXME: static factory method
- public VertexPropertyData(String id, Object value) {
- this.id = id;
- this.value = value;
- valueType = (value != null ? value.getClass() : Void.class).getCanonicalName();
+ public static VertexPropertyData of(String id, Object value) {
+ return new VertexPropertyData(id, value, (value != null ? value.getClass() : Void.class).getCanonicalName());
  }
 
  public String getId() {

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

@@ -19,7 +19,6 @@
 
 package com.arangodb.tinkerpop.gremlin.structure;
 
-import com.arangodb.tinkerpop.gremlin.persistence.AdbValue;
 import com.arangodb.tinkerpop.gremlin.persistence.EdgeData;
 import org.apache.tinkerpop.gremlin.structure.*;
 import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
@@ -33,7 +32,7 @@
 public class ArangoDBEdge extends ArangoDBSimpleElement<EdgeData> implements Edge, ArangoDBPersistentElement {
 
  public static ArangoDBEdge of(final String id, final String label, final String outVertexId, final String inVertexId, ArangoDBGraph graph) {
- return new ArangoDBEdge(graph, new EdgeData(extractLabel(id, label).orElse(DEFAULT_LABEL), extractKey(id), outVertexId, inVertexId));
+ return new ArangoDBEdge(graph, EdgeData.of(extractLabel(id, label).orElse(DEFAULT_LABEL), extractKey(id), outVertexId, inVertexId));
  }
 
  public ArangoDBEdge(ArangoDBGraph graph, EdgeData data) {

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

@@ -66,7 +66,7 @@ public <V> VertexProperty<V> property(
  })
  .orElseGet(() -> UUID.randomUUID().toString());
 
- VertexPropertyData prop = new VertexPropertyData(idValue, value);
+ VertexPropertyData prop = VertexPropertyData.of(idValue, value);
  data.add(key, prop);
 
  ArangoDBVertexProperty<V> vertexProperty = new ArangoDBVertexProperty<>(key, prop, this);