structure refactoring

Author: rashtao

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

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

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

@@ -39,9 +39,8 @@ public class AdbValue {
  this.valueType = valueType;
  }
 
- public AdbValue(Object value) {
- this.value = value;
- valueType = (value != null ? value.getClass() : Void.class).getCanonicalName();
+ public static AdbValue of(Object value) {
+ return new AdbValue(value, (value != null ? value.getClass() : Void.class).getCanonicalName());
  }
 
  public Object getValue() {

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

@@ -20,36 +20,61 @@
 package com.arangodb.tinkerpop.gremlin.persistence;
 
 import com.arangodb.serde.*;
+import com.arangodb.shaded.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.tinkerpop.gremlin.structure.util.ElementHelper;
 
 import java.util.*;
 
-public class EdgeData extends PersistentData<AdbValue> {
+public class EdgeData extends SimplePropertyData implements PersistentData {
+
+ @JsonProperty
+ private String label;
+
+ @InternalKey
+ private String key;
 
  @InternalFrom
  private String from;
 
  @InternalTo
  private String to;
 
- private final Map<String, AdbValue> properties = new HashMap<>();
-
  public EdgeData() {
  }
 
+ // FIXME: static factory method
  public EdgeData(
  String label,
  String key,
  String from,
  String to
  ) {
- super(label, key);
+ ElementHelper.validateLabel(label);
+ if (key != null && key.isEmpty()) throw new IllegalArgumentException("empty key");
  Objects.requireNonNull(from, "from");
  Objects.requireNonNull(to, "to");
 
+ this.label = label;
+ this.key = key;
  this.from = from;
  this.to = to;
  }
 
+ @Override
+ public String getLabel() {
+ return label;
+ }
+
+ @Override
+ public String getKey() {
+ return key;
+ }
+
+ @Override
+ public void setKey(String key) {
+ this.key = key;
+ }
+
  public String getFrom() {
  return from;
  }
@@ -66,31 +91,26 @@ public void setTo(String to) {
  this.to = to;
  }
 
- @Override
- public Map<String, AdbValue> getProperties() {
- return properties;
- }
-
  @Override
  public String toString() {
  return "EdgeData{" +
  "from='" + from + '\'' +
+ ", label='" + label + '\'' +
+ ", key='" + key + '\'' +
  ", to='" + to + '\'' +
- ", properties=" + properties +
  ", super=" + super.toString() +
  '}';
  }
 
  @Override
  public boolean equals(Object o) {
  if (!(o instanceof EdgeData)) return false;
- if (!super.equals(o)) return false;
  EdgeData edgeData = (EdgeData) o;
- return Objects.equals(from, edgeData.from) && Objects.equals(to, edgeData.to) && Objects.equals(properties, edgeData.properties);
+ return Objects.equals(label, edgeData.label) && Objects.equals(key, edgeData.key) && Objects.equals(from, edgeData.from) && Objects.equals(to, edgeData.to);
  }
 
  @Override
  public int hashCode() {
- return Objects.hash(super.hashCode(), from, to, properties);
+ return Objects.hash(label, key, from, to);
  }
 }

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

@@ -19,58 +19,10 @@
 
 package com.arangodb.tinkerpop.gremlin.persistence;
 
-import com.arangodb.serde.InternalKey;
-import org.apache.tinkerpop.gremlin.structure.util.ElementHelper;
+public interface PersistentData {
+ String getLabel();
 
-import java.util.Objects;
+ String getKey();
 
-public abstract class PersistentData<V> implements PropertyData<V> {
-
- private String label;
- @InternalKey
- private String key;
-
- public PersistentData() {
- }
-
- public PersistentData(String label, String key) {
- ElementHelper.validateLabel(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 getLabel() {
- return label;
- }
-
- @Override
- public String toString() {
- return "PersistentData{" +
- "key='" + key + '\'' +
- ", label='" + label + '\'' +
- '}';
- }
-
- @Override
- public boolean equals(Object o) {
- if (!(o instanceof PersistentData)) return false;
- PersistentData<?> that = (PersistentData<?>) o;
- return Objects.equals(label, that.label) && Objects.equals(key, that.key);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(label, key);
- }
+ void setKey(String key);
 }
-

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

@@ -20,7 +20,11 @@
 package com.arangodb.tinkerpop.gremlin.persistence;
 
 import java.util.Map;
+import java.util.stream.Stream;
 
-public interface PropertyData<P> {
- Map<String, P> getProperties();
+public interface PropertyData<V> {
+
+ Stream<Map.Entry<String, V>> entries();
+
+ void add(String key, V value);
 }

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

@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.arangodb.tinkerpop.gremlin.persistence;
+
+
+import com.arangodb.shaded.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Stream;
+
+public class SimplePropertyData implements PropertyData<AdbValue> {
+
+ @JsonProperty
+ private final Map<String, AdbValue> properties = new HashMap<>();
+
+ @Override
+ public Stream<Map.Entry<String, AdbValue>> entries() {
+ return properties.entrySet().stream();
+ }
+
+ @Override
+ public void add(String key, AdbValue value) {
+ properties.put(key, value);
+ }
+
+ public void remove(String key) {
+ properties.remove(key);
+ }
+
+ @Override
+ public String toString() {
+ return "SimplePropertyData{" +
+ "properties=" + properties +
+ '}';
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (!(o instanceof SimplePropertyData)) return false;
+ SimplePropertyData that = (SimplePropertyData) o;
+ return Objects.equals(properties, that.properties);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hashCode(properties);
+ }
+}

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

@@ -19,45 +19,86 @@
 
 package com.arangodb.tinkerpop.gremlin.persistence;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import com.arangodb.serde.InternalKey;
+import com.arangodb.shaded.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.tinkerpop.gremlin.structure.util.ElementHelper;
 
-public class VertexData extends PersistentData<List<VertexPropertyData>> {
+import java.util.*;
+import java.util.stream.Stream;
 
- private final Map<String, List<VertexPropertyData>> properties = new HashMap<>();
+public class VertexData implements PropertyData<VertexPropertyData>, PersistentData {
+
+ @JsonProperty
+ private String label;
+
+ @InternalKey
+ private String key;
+
+ @JsonProperty
+ private final Map<String, Set<VertexPropertyData>> properties = new HashMap<>();
 
  public VertexData() {
  }
 
  public VertexData(String label, String key) {
- super(label, key);
+ ElementHelper.validateLabel(label);
+ if (key != null && key.isEmpty()) throw new IllegalArgumentException("empty key");
+ this.label = label;
+ this.key = key;
+ }
+
+ @Override
+ public String getLabel() {
+ return label;
+ }
+
+ @Override
+ public String getKey() {
+ return key;
  }
 
  @Override
- public Map<String, List<VertexPropertyData>> getProperties() {
- return properties;
+ public void setKey(String key) {
+ this.key = key;
+ }
+
+ @Override
+ public Stream<Map.Entry<String, VertexPropertyData>> entries() {
+ return properties.entrySet().stream().flatMap(e -> e.getValue().stream()
+ .map(v -> new AbstractMap.SimpleImmutableEntry<>(e.getKey(), v)));
+ }
+
+ @Override
+ public void add(String key, VertexPropertyData value) {
+ properties.computeIfAbsent(key, k -> new HashSet<>()).add(value);
+ }
+
+ public void remove(String key, VertexPropertyData value) {
+ Set<VertexPropertyData> props = properties.getOrDefault(key, Collections.emptySet());
+ props.remove(value);
+ if (props.isEmpty()) {
+ properties.remove(key);
+ }
  }
 
  @Override
  public String toString() {
  return "VertexData{" +
- "properties=" + properties +
- ", super=" + super.toString() +
+ "key='" + key + '\'' +
+ ", label='" + label + '\'' +
+ ", properties=" + properties +
  '}';
  }
 
  @Override
  public boolean equals(Object o) {
  if (!(o instanceof VertexData)) return false;
- if (!super.equals(o)) return false;
  VertexData that = (VertexData) o;
- return Objects.equals(properties, that.properties);
+ return Objects.equals(label, that.label) && Objects.equals(key, that.key) && Objects.equals(properties, that.properties);
  }
 
  @Override
  public int hashCode() {
- return Objects.hash(super.hashCode(), properties);
+ return Objects.hash(label, key, properties);
  }
 }