From 7578e8ff66c98cb0336233ecf6206a6782adebc2 Mon Sep 17 00:00:00 2001
From: Jermy Li <lizhangmei@baidu.com>
Date: Sat, 30 Jan 2021 16:52:19 +0800
Subject: [PATCH] auth-delete and role-get APIs need to check if the graph
 exists (#1338)

Change-Id: I5b76437bd68b1dbbe7bda04c796b9b815104fe20
---
 .../src/main/java/com/baidu/hugegraph/api/auth/AccessAPI.java | 2 ++
 .../src/main/java/com/baidu/hugegraph/api/auth/BelongAPI.java | 2 ++
 .../src/main/java/com/baidu/hugegraph/api/auth/GroupAPI.java  | 2 ++
 .../src/main/java/com/baidu/hugegraph/api/auth/TargetAPI.java | 3 +++
 .../src/main/java/com/baidu/hugegraph/api/auth/UserAPI.java   | 4 ++++
 .../src/main/java/com/baidu/hugegraph/api/graph/BatchAPI.java | 2 +-
 6 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/auth/AccessAPI.java b/hugegraph-api/src/main/java/com/baidu/hugegraph/api/auth/AccessAPI.java
index 7bd593393..ac41871a1 100644
--- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/auth/AccessAPI.java
+++ b/hugegraph-api/src/main/java/com/baidu/hugegraph/api/auth/AccessAPI.java
@@ -149,6 +149,8 @@ public class AccessAPI extends API {
                        @PathParam("id") String id) {
         LOG.debug("Graph [{}] delete access: {}", graph, id);
 
+        @SuppressWarnings("unused") // just check if the graph exists
+        HugeGraph g = graph(manager, graph);
         try {
             manager.userManager().deleteAccess(UserAPI.parseId(id));
         } catch (NotFoundException e) {
diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/auth/BelongAPI.java b/hugegraph-api/src/main/java/com/baidu/hugegraph/api/auth/BelongAPI.java
index efff34862..8aa02ef06 100644
--- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/auth/BelongAPI.java
+++ b/hugegraph-api/src/main/java/com/baidu/hugegraph/api/auth/BelongAPI.java
@@ -148,6 +148,8 @@ public class BelongAPI extends API {
                        @PathParam("id") String id) {
         LOG.debug("Graph [{}] delete belong: {}", graph, id);
 
+        @SuppressWarnings("unused") // just check if the graph exists
+        HugeGraph g = graph(manager, graph);
         try {
             manager.userManager().deleteBelong(UserAPI.parseId(id));
         } catch (NotFoundException e) {
diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/auth/GroupAPI.java b/hugegraph-api/src/main/java/com/baidu/hugegraph/api/auth/GroupAPI.java
index acbc49441..262ee00e1 100644
--- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/auth/GroupAPI.java
+++ b/hugegraph-api/src/main/java/com/baidu/hugegraph/api/auth/GroupAPI.java
@@ -134,6 +134,8 @@ public class GroupAPI extends API {
                        @PathParam("id") String id) {
         LOG.debug("Graph [{}] delete group: {}", graph, id);
 
+        @SuppressWarnings("unused") // just check if the graph exists
+        HugeGraph g = graph(manager, graph);
         try {
             manager.userManager().deleteGroup(IdGenerator.of(id));
         } catch (NotFoundException e) {
diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/auth/TargetAPI.java b/hugegraph-api/src/main/java/com/baidu/hugegraph/api/auth/TargetAPI.java
index 3c3385f56..47ea5e710 100644
--- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/auth/TargetAPI.java
+++ b/hugegraph-api/src/main/java/com/baidu/hugegraph/api/auth/TargetAPI.java
@@ -134,6 +134,9 @@ public class TargetAPI extends API {
                        @PathParam("graph") String graph,
                        @PathParam("id") String id) {
         LOG.debug("Graph [{}] delete target: {}", graph, id);
+
+        @SuppressWarnings("unused") // just check if the graph exists
+        HugeGraph g = graph(manager, graph);
         try {
             manager.userManager().deleteTarget(UserAPI.parseId(id));
         } catch (NotFoundException e) {
diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/auth/UserAPI.java b/hugegraph-api/src/main/java/com/baidu/hugegraph/api/auth/UserAPI.java
index a1e675eee..5199a79fa 100644
--- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/auth/UserAPI.java
+++ b/hugegraph-api/src/main/java/com/baidu/hugegraph/api/auth/UserAPI.java
@@ -136,6 +136,8 @@ public class UserAPI extends API {
                        @PathParam("id") String id) {
         LOG.debug("Graph [{}] get user role: {}", graph, id);
 
+        @SuppressWarnings("unused") // just check if the graph exists
+        HugeGraph g = graph(manager, graph);
         HugeUser user = manager.userManager().getUser(IdGenerator.of(id));
         return manager.userManager().rolePermission(user).toJson();
     }
@@ -149,6 +151,8 @@ public class UserAPI extends API {
                        @PathParam("id") String id) {
         LOG.debug("Graph [{}] delete user: {}", graph, id);
 
+        @SuppressWarnings("unused") // just check if the graph exists
+        HugeGraph g = graph(manager, graph);
         try {
             manager.userManager().deleteUser(IdGenerator.of(id));
         } catch (NotFoundException e) {
diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/graph/BatchAPI.java b/hugegraph-api/src/main/java/com/baidu/hugegraph/api/graph/BatchAPI.java
index 3343f0623..ebc54be66 100644
--- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/graph/BatchAPI.java
+++ b/hugegraph-api/src/main/java/com/baidu/hugegraph/api/graph/BatchAPI.java
@@ -148,7 +148,7 @@ public class BatchAPI extends API {
             } else if (oldElement.property(key).isPresent() &&
                        newElement.properties.get(key) == null) {
                 // If new property is null & old is present, use old property
-                newElement.properties.put(key, oldElement.property(key).value());
+                newElement.properties.put(key, oldElement.value(key));
             }
         }
     }