Improve check for getting vertex when create edge (#1477)

Change-Id: I86b7ac068154c52faf0d0d7f035cbf08178bf0d8
apache · Jun 9, 2021 · 9f62e6f · 9f62e6f
1 parent 23e3c31
commit 9f62e6f
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/graph/EdgeAPI.java b/hugegraph-api/src/main/java/com/baidu/hugegraph/api/graph/EdgeAPI.java
@@ -104,8 +104,8 @@ public String create(@Context GraphManager manager,
                         "Invalid target vertex label '%s'");
         }
 
-        Vertex srcVertex = getVertex(g, jsonEdge.source, null);
-        Vertex tgtVertex = getVertex(g, jsonEdge.target, null);
+        Vertex srcVertex = getVertex(g, jsonEdge.source, jsonEdge.sourceLabel);
+        Vertex tgtVertex = getVertex(g, jsonEdge.target, jsonEdge.targetLabel);
 
         Edge edge = commit(g, () -> {
             return srcVertex.addEdge(jsonEdge.label, tgtVertex,
@@ -275,7 +275,8 @@ public String list(@Context GraphManager manager,
                        @QueryParam("limit") @DefaultValue("100") long limit) {
         LOG.debug("Graph [{}] query edges by vertex: {}, direction: {}, " +
                   "label: {}, properties: {}, offset: {}, page: {}, limit: {}",
-                  vertexId, direction, label, properties, offset, page, limit);
+                  graph, vertexId, direction,
+                  label, properties, offset, page, limit);
 
         Map<String, Object> props = parseProperties(properties);
         if (page != null) {
@@ -402,6 +403,12 @@ private static Vertex getVertex(HugeGraph graph,
             throw new IllegalArgumentException(String.format(
                       "Invalid vertex id '%s'", id));
         }
+        if (!vertex.label().equals(label)) {
+            throw new IllegalArgumentException(String.format(
+                      "The label of vertex '%s' is unmatched, users expect " +
+                      "label '%s', actual label stored is '%s'",
+                      id, label, vertex.label()));
+        }
         // Clone a new vertex to support multi-thread access
         return vertex.copy();
     }