1 files changed, 15 insertions, 1 deletions
diff --git a/src/main/java/org/openecomp/crud/entity/Vertex.java b/src/main/java/org/openecomp/crud/entity/Vertex.java
index 1b0b97d..d2f2b08 100644
--- a/src/main/java/org/openecomp/crud/entity/Vertex.java
+++ b/src/main/java/org/openecomp/crud/entity/Vertex.java
@@ -23,17 +23,23 @@
  */
 package org.openecomp.crud.entity;
 
+import net.dongliu.gson.GsonJava8TypeAdapterFactory;
+
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.google.gson.annotations.SerializedName;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 
 public class Vertex {
-  private static final Gson gson = new GsonBuilder().create();
+  private static final Gson gson = new GsonBuilder()
+      .registerTypeAdapterFactory(new GsonJava8TypeAdapterFactory()).create();
 
+  @SerializedName(value="id", alternate={"key"})
   private final Optional<String> id;
+
   private final String type;
   private final Map<String, Object> properties;
 
@@ -82,6 +88,14 @@ public class Vertex {
     return gson.toJson(this);
   }
 
+  public String toJson(Gson customGson) {
+    return customGson.toJson(this);
+  }
+
+  public static Vertex fromJson(String jsonString) {
+    return gson.fromJson(jsonString, Vertex.class);
+  }
+
   @Override
   public String toString() {
     return "Vertex [id=" + id + ", type=" + type + ", properties=" + properties + "]";