new

gumreal · Mar 4, 2022 · 77b52dd · 77b52dd
1 parent f42b0e9
commit 77b52dd
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -41,7 +41,7 @@ apply plugin: 'signing'
 
 group = 'io.dgraph'
 archivesBaseName = 'dgraph4j'
-version = '21.03.2.p12.20220221b'
+version = '21.03.2.p13.20220304a'
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 

diff --git a/src/main/java/io/dgraph/wrapper/model/VertexBase.java b/src/main/java/io/dgraph/wrapper/model/VertexBase.java
@@ -3,13 +3,14 @@
 import com.google.gson.Gson;
 import com.google.gson.annotations.SerializedName;
 import io.dgraph.DgraphProto;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /** Dgraph Custom Data Type */
 public abstract class VertexBase implements Serializable {
@@ -61,6 +62,28 @@ public VertexBase mergeJson(String jsonStr) {
     return vertex;
   }
 
+  public VertexBase merge(VertexBase other) {
+    mergeUid(other);
+    mergeChildren(other);
+    return this;
+  }
+
+  /** @param other */
+  protected void mergeUid(VertexBase other) {
+    if (null == other) {
+      return;
+    }
+    if (isStubUid() && !other.isStubUid()) {
+      setUid(other.getUid());
+    }
+  }
+
+  /**
+   * @param other
+   * @return
+   */
+  protected abstract VertexBase mergeChildren(VertexBase other);
+
   /**
    * get all property names except typeName and uid
    *
@@ -75,6 +98,13 @@ public VertexBase mergeJson(String jsonStr) {
    */
   public abstract Map<String, Object> primaryPairs();
 
+  /**
+   * primary values to a string
+   *
+   * @return
+   */
+  public abstract String getBizKey();
+
   public void setStubUid() {
     setStubUid(1);
   }