feat(hubble): modernize graph workbench experience

README.md

@@ -132,6 +132,16 @@ docker run --rm hugegraph/hugegraph-loader ./bin/hugegraph-loader.sh -f example.
 
 ## Module Overview
 
+Before committing a new source or test file, run the same license-header check
+used by CI (`license-eye` from `apache/skywalking-eyes` is required):
+
+```bash
+./tools/check-license-header.sh
+```
+
+Do not use shortened Apache headers: the complete header configured in
+`.licenserc.yaml` is required.
+
 ### hugegraph-client
 
 **Purpose**: Official Java SDK for HugeGraph Server

hugegraph-client/src/main/java/org/apache/hugegraph/api/auth/GroupAPI.java

@@ -33,6 +33,10 @@ public GroupAPI(RestClient client) {
         super(client);
     }
 
+    public GroupAPI(RestClient client, String graphSpace) {
+        super(client, graphSpace);
+    }
+
     @Override
     protected String type() {
         return HugeType.GROUP.string();

hugegraph-client/src/main/java/org/apache/hugegraph/api/auth/ManagerAPI.java

@@ -35,7 +35,10 @@ public ManagerAPI(RestClient client, String graphSpace) {
     }
 
     public UserManager create(UserManager userManager) {
-        RestResult result = this.client.post(this.path(), userManager);
+        Map<String, Object> payload = new HashMap<>();
+        payload.put("user", userManager.user());
+        payload.put("type", userManager.type());
+        RestResult result = this.client.post(this.path(), payload);
         return result.readObject(UserManager.class);
     }
 

hugegraph-client/src/main/java/org/apache/hugegraph/driver/AuthManager.java

@@ -48,8 +48,10 @@
 
 public class AuthManager {
 
+    private final RestClient client;
     private final TargetAPI targetAPI;
     private final GroupAPI groupAPI;
+    private final GroupAPI graphSpaceGroupAPI;
     private final UserAPI userAPI;
     private final AccessAPI accessAPI;
     private final BelongAPI belongAPI;
@@ -60,8 +62,10 @@ public class AuthManager {
     private final ManagerAPI managerAPI;
 
     public AuthManager(RestClient client, String graphSpace, String graph) {
+        this.client = client;
         this.targetAPI = new TargetAPI(client, graphSpace);
         this.groupAPI = new GroupAPI(client);
+        this.graphSpaceGroupAPI = new GroupAPI(client, graphSpace);
         this.userAPI = new UserAPI(client, graphSpace);
         this.accessAPI = new AccessAPI(client, graphSpace);
         this.projectAPI = new ProjectAPI(client, graphSpace);
@@ -120,6 +124,30 @@ public void deleteGroup(Object id) {
         this.groupAPI.delete(id);
     }
 
+    public List<Group> listGraphSpaceGroups() {
+        return this.listGraphSpaceGroups(-1);
+    }
+
+    public List<Group> listGraphSpaceGroups(int limit) {
+        return this.graphSpaceGroupAPI.list(limit);
+    }
+
+    public Group getGraphSpaceGroup(Object id) {
+        return this.graphSpaceGroupAPI.get(id);
+    }
+
+    public Group createGraphSpaceGroup(Group group) {
+        return this.graphSpaceGroupAPI.create(group);
+    }
+
+    public Group updateGraphSpaceGroup(Group group) {
+        return this.graphSpaceGroupAPI.update(group);
+    }
+
+    public void deleteGraphSpaceGroup(Object id) {
+        this.graphSpaceGroupAPI.delete(id);
+    }
+
     public List<User> listUsers() {
         return this.listUsers(-1);
     }
@@ -305,19 +333,43 @@ public UserManager addSpaceAdmin(String user, String graphSpace) {
         userManager.type(HugePermission.SPACE);
         userManager.graphSpace(graphSpace);
         userManager.user(user);
-        return this.managerAPI.create(userManager);
+        return this.managerAPI(graphSpace).create(userManager);
+    }
+
+    public UserManager addSpaceMember(String user, String graphSpace) {
+        UserManager userManager = new UserManager();
+        userManager.type(HugePermission.SPACE_MEMBER);
+        userManager.graphSpace(graphSpace);
+        userManager.user(user);
+        return this.managerAPI(graphSpace).create(userManager);
     }
 
     public void delSuperAdmin(String user) {
         this.managerAPI.delete(user, HugePermission.ADMIN, null);
     }
 
     public void delSpaceAdmin(String user, String graphSpace) {
-        this.managerAPI.delete(user, HugePermission.SPACE, graphSpace);
+        this.managerAPI(graphSpace).delete(user, HugePermission.SPACE,
+                                           graphSpace);
+    }
+
+    public void delSpaceMember(String user, String graphSpace) {
+        this.managerAPI(graphSpace).delete(user, HugePermission.SPACE_MEMBER,
+                                           graphSpace);
     }
 
     public List<String> listSpaceAdmin(String graphSpace) {
-        return this.managerAPI.list(HugePermission.SPACE, graphSpace);
+        return this.managerAPI(graphSpace).list(HugePermission.SPACE,
+                                                graphSpace);
+    }
+
+    public List<String> listSpaceMember(String graphSpace) {
+        return this.managerAPI(graphSpace).list(HugePermission.SPACE_MEMBER,
+                                                graphSpace);
+    }
+
+    private ManagerAPI managerAPI(String graphSpace) {
+        return new ManagerAPI(this.client, graphSpace);
     }
 
     public List<String> listSuperAdmin() {
@@ -329,14 +381,17 @@ public boolean isSuperAdmin() {
     }
 
     public boolean isSpaceAdmin(String graphSpace) {
-        return this.managerAPI.checkPermission(HugePermission.SPACE, graphSpace);
+        return this.managerAPI(graphSpace)
+                   .checkPermission(HugePermission.SPACE, graphSpace);
     }
 
     public boolean checkDefaultRole(String graphSpace, String role) {
-        return this.managerAPI.checkDefaultRole(graphSpace, role, "");
+        return this.managerAPI(graphSpace)
+                   .checkDefaultRole(graphSpace, role, "");
     }
 
     public boolean checkDefaultRole(String graphSpace, String role, String graph) {
-        return this.managerAPI.checkDefaultRole(graphSpace, role, graph);
+        return this.managerAPI(graphSpace)
+                   .checkDefaultRole(graphSpace, role, graph);
     }
 }

hugegraph-client/src/main/java/org/apache/hugegraph/driver/GremlinManager.java

@@ -21,11 +21,15 @@
 import org.apache.hugegraph.api.gremlin.GremlinRequest;
 import org.apache.hugegraph.api.job.GremlinJobAPI;
 import org.apache.hugegraph.client.RestClient;
+import org.apache.hugegraph.exception.ServerException;
 import org.apache.hugegraph.structure.gremlin.Response;
 import org.apache.hugegraph.structure.gremlin.ResultSet;
 
 public class GremlinManager {
 
+    public static final String IDEMPOTENT_TRAVERSAL_FALLBACK_MARKER =
+            "// hugegraph-client:idempotent-traversal-fallback\n";
+
     private final GraphManager graphManager;
 
     private final GremlinAPI gremlinAPI;
@@ -43,22 +47,49 @@ public GremlinManager(RestClient client, String graphSpace, String graph,
     }
 
     public ResultSet execute(GremlinRequest request) {
-        if (this.gremlinAPI.isSupportGs()) {
+        bindAliases(request, this.gremlinAPI.isSupportGs(), this.graphSpace,
+                    this.graph);
+
+        Response response;
+        try {
+            response = this.gremlinAPI.post(request);
+        } catch (ServerException e) {
+            if (!this.gremlinAPI.isSupportGs() ||
+                !allowTraversalFallback(request, e.getMessage())) {
+                throw e;
+            }
+            prepareTraversalFallback(request);
+            response = this.gremlinAPI.post(request);
+        }
+        response.graphManager(this.graphManager);
+        // TODO: Can add some checks later
+        return response.result();
+    }
+
+    static void bindAliases(GremlinRequest request, boolean supportGraphSpace,
+                            String graphSpace, String graph) {
+        if (supportGraphSpace) {
             // Bind "graph" and graph space to all graphs
-            request.aliases.put("graph", this.graphSpace + "-" + this.graph);
+            request.aliases.put("graph", graphSpace + "-" + graph);
             // Bind "g" and graph space to all graphs by custom rule which define in gremlin server.
-            request.aliases.put("g", "__g_" + this.graphSpace + "-" + this.graph);
+            request.aliases.put("g", "__g_" + graphSpace + "-" + graph);
         } else {
             // Bind "graph" to all graphs
-            request.aliases.put("graph", this.graph);
+            request.aliases.put("graph", graph);
             // Bind "g" to all graphs by custom rule which define in gremlin server.
-            request.aliases.put("g", "__g_" + this.graph);
+            request.aliases.put("g", "__g_" + graph);
         }
+    }
 
-        Response response = this.gremlinAPI.post(request);
-        response.graphManager(this.graphManager);
-        // TODO: Can add some checks later
-        return response.result();
+    static void prepareTraversalFallback(GremlinRequest request) {
+        request.aliases.remove("g");
+        request.gremlin = "g = graph.traversal();\n" + request.gremlin;
+    }
+
+    static boolean allowTraversalFallback(GremlinRequest request,
+                                          String message) {
+        return request.gremlin.startsWith(IDEMPOTENT_TRAVERSAL_FALLBACK_MARKER) &&
+               message != null && message.contains("Could not rebind [g]");
     }
 
     public long executeAsTask(GremlinRequest request) {

hugegraph-client/src/main/java/org/apache/hugegraph/driver/factory/PDHugeClientFactory.java

@@ -17,6 +17,7 @@
 
 package org.apache.hugegraph.driver.factory;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -185,6 +186,9 @@ public List<String> getURLs(String cluster, String graphSpace,
                            .build();
 
         NodeInfos nodeInfos = client.getNodeInfos(query);
+        if (nodeInfos == null) {
+            return Collections.emptyList();
+        }
 
         List<String> urls = nodeInfos.getInfoList().stream()
                                      .map(nodeInfo -> nodeInfo.getAddress())
@@ -205,6 +209,9 @@ protected List<String> getURLsWithConfig(String cluster,
                            .build();
 
         NodeInfos nodeInfos = client.getNodeInfos(query);
+        if (nodeInfos == null) {
+            return Collections.emptyList();
+        }
 
         List<String> urls = nodeInfos.getInfoList().stream()
                                      .map(nodeInfo -> nodeInfo.getAddress())

hugegraph-client/src/main/java/org/apache/hugegraph/structure/auth/Access.java

@@ -26,7 +26,7 @@
 
 public class Access extends AuthElement {
 
-    @JsonProperty(value = "graphspace", access = JsonProperty.Access.READ_ONLY)
+    @JsonProperty(value = "graphspace", access = JsonProperty.Access.WRITE_ONLY)
     protected String graphSpace;
     @JsonProperty("group")
     private Object group;

hugegraph-client/src/main/java/org/apache/hugegraph/structure/auth/Belong.java

@@ -26,7 +26,7 @@
 
 public class Belong extends AuthElement {
 
-    @JsonProperty(value = "graphspace", access = JsonProperty.Access.READ_ONLY)
+    @JsonProperty(value = "graphspace", access = JsonProperty.Access.WRITE_ONLY)
     protected String graphSpace;
     @JsonProperty("user")
     protected Object user;

hugegraph-client/src/main/java/org/apache/hugegraph/structure/auth/HugePermission.java

@@ -27,6 +27,7 @@ public enum HugePermission {
     EXECUTE(0x08),
 
     SPACE(0x1f),
+    SPACE_MEMBER(0x2f),
     ADMIN(0x7f);
 
     private final byte code;

hugegraph-client/src/main/java/org/apache/hugegraph/structure/auth/Target.java

@@ -33,7 +33,8 @@ public class Target extends AuthElement {
 
     @JsonProperty("target_name")
     protected String name;
-    @JsonProperty("graphspace")
+    @JsonProperty(value = "graphspace",
+                  access = JsonProperty.Access.WRITE_ONLY)
     protected String graphSpace;
     @JsonProperty("target_graph")
     protected String graph;

hugegraph-client/src/main/java/org/apache/hugegraph/structure/space/GraphSpace.java

@@ -17,7 +17,6 @@
 
 package org.apache.hugegraph.structure.space;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -80,9 +79,9 @@ public class GraphSpace {
     @JsonProperty("dp_password")
     private String dpPassWord;
 
-    @JsonIgnore
+    @JsonProperty("create_time")
     private String createTime;
-    @JsonIgnore
+    @JsonProperty("update_time")
     private String updateTime;
 
     @JsonProperty("configs")