From 4c544cc67ea5ac7584253cd08e269aef11467eba Mon Sep 17 00:00:00 2001 From: Zhangmei Li Date: Tue, 23 Feb 2021 16:52:15 +0800 Subject: [PATCH] tiny fix Change-Id: Ie49d8ec724af21aa38769ed924e9116d31467832 --- .../java/com/baidu/hugegraph/auth/HugeAuthenticator.java | 3 ++- .../src/main/java/com/baidu/hugegraph/auth/HugeAccess.java | 2 ++ .../src/main/java/com/baidu/hugegraph/auth/HugeBelong.java | 3 ++- .../src/main/java/com/baidu/hugegraph/auth/HugeGroup.java | 3 ++- .../src/main/java/com/baidu/hugegraph/auth/HugeTarget.java | 3 ++- .../src/main/java/com/baidu/hugegraph/auth/HugeUser.java | 2 ++ .../main/java/com/baidu/hugegraph/auth/SchemaDefine.java | 6 ++++++ .../com/baidu/hugegraph/unit/core/RolePermissionTest.java | 4 ++-- 8 files changed, 20 insertions(+), 6 deletions(-) diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/auth/HugeAuthenticator.java b/hugegraph-api/src/main/java/com/baidu/hugegraph/auth/HugeAuthenticator.java index 2ed3d8b131..3812c192ea 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/auth/HugeAuthenticator.java +++ b/hugegraph-api/src/main/java/com/baidu/hugegraph/auth/HugeAuthenticator.java @@ -459,7 +459,8 @@ public static String roleFor(String owner, HugePermission perm) { * Construct required permission such as: * $owner=graph1 $action=read * (means required read permission of any one resource) - * maybe also support: + * + * In the future maybe also support: * $owner=graph1 $action=vertex_read */ return String.format("%s=%s %s=%s", KEY_OWNER, owner, diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/HugeAccess.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/HugeAccess.java index 699bf60b32..99838d5c23 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/HugeAccess.java +++ b/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/HugeAccess.java @@ -37,6 +37,8 @@ public class HugeAccess extends Relationship { + private static final long serialVersionUID = -7644007602408729385L; + private final Id group; private final Id target; private HugePermission permission; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/HugeBelong.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/HugeBelong.java index dd2d31b213..54f15586c2 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/HugeBelong.java +++ b/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/HugeBelong.java @@ -29,13 +29,14 @@ import org.apache.tinkerpop.gremlin.structure.T; import com.baidu.hugegraph.HugeGraphParams; -import com.baidu.hugegraph.auth.ResourceType; import com.baidu.hugegraph.auth.SchemaDefine.Relationship; import com.baidu.hugegraph.backend.id.Id; import com.baidu.hugegraph.schema.EdgeLabel; public class HugeBelong extends Relationship { + private static final long serialVersionUID = -7242751631755533423L; + private final Id user; private final Id group; private String description; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/HugeGroup.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/HugeGroup.java index 6cd979c585..9b15afee8c 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/HugeGroup.java +++ b/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/HugeGroup.java @@ -29,7 +29,6 @@ import org.apache.tinkerpop.gremlin.structure.Vertex; import com.baidu.hugegraph.HugeGraphParams; -import com.baidu.hugegraph.auth.ResourceType; import com.baidu.hugegraph.auth.SchemaDefine.Entity; import com.baidu.hugegraph.backend.id.Id; import com.baidu.hugegraph.schema.VertexLabel; @@ -37,6 +36,8 @@ public class HugeGroup extends Entity { + private static final long serialVersionUID = 2330399818352242686L; + private String name; private String description; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/HugeTarget.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/HugeTarget.java index a18c15f524..799aba4eb2 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/HugeTarget.java +++ b/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/HugeTarget.java @@ -30,7 +30,6 @@ import com.baidu.hugegraph.HugeException; import com.baidu.hugegraph.HugeGraphParams; -import com.baidu.hugegraph.auth.ResourceType; import com.baidu.hugegraph.auth.SchemaDefine.Entity; import com.baidu.hugegraph.backend.id.Id; import com.baidu.hugegraph.schema.VertexLabel; @@ -41,6 +40,8 @@ public class HugeTarget extends Entity { + private static final long serialVersionUID = -3361487778656878418L; + private String name; private String graph; private String url; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/HugeUser.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/HugeUser.java index 78d376fd49..f327c596ad 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/HugeUser.java +++ b/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/HugeUser.java @@ -36,6 +36,8 @@ public class HugeUser extends Entity { + private static final long serialVersionUID = -8951193710873772717L; + private String name; private String password; private String phone; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/SchemaDefine.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/SchemaDefine.java index 57bf0e4fd0..176439f1aa 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/SchemaDefine.java +++ b/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/SchemaDefine.java @@ -118,6 +118,8 @@ protected static String unhideField(String label, String key) { public static abstract class UserElement implements Serializable { + private static final long serialVersionUID = 8746691160192814973L; + protected static final String CREATE = "create"; protected static final String UPDATE = "update"; protected static final String CREATOR = "creator"; @@ -241,6 +243,8 @@ protected Object[] asArray(List list) { public static abstract class Entity extends UserElement implements com.baidu.hugegraph.type.Namifiable { + private static final long serialVersionUID = 4113319546914811762L; + public static T fromVertex(Vertex vertex, T entity) { E.checkArgument(vertex.label().equals(entity.label()), "Illegal vertex label '%s' for entity '%s'", @@ -267,6 +271,8 @@ public String idString() { public static abstract class Relationship extends UserElement { + private static final long serialVersionUID = -1406157381685832493L; + public abstract String sourceLabel(); public abstract String targetLabel(); diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/RolePermissionTest.java b/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/RolePermissionTest.java index 3990b5e2e6..7463228ca3 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/RolePermissionTest.java +++ b/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/RolePermissionTest.java @@ -143,12 +143,12 @@ public void testResourceType() { Assert.assertTrue(ResourceType.ROOT.match(ResourceType.EDGE)); Assert.assertTrue(ResourceType.ROOT.match(ResourceType.VERTEX_LABEL)); Assert.assertTrue(ResourceType.ROOT.match(ResourceType.META)); - Assert.assertTrue(ResourceType.ALL.match(ResourceType.ALL));; + Assert.assertTrue(ResourceType.ROOT.match(ResourceType.ALL)); Assert.assertTrue(ResourceType.ROOT.match(ResourceType.GRANT)); Assert.assertTrue(ResourceType.ROOT.match(ResourceType.USER_GROUP)); Assert.assertTrue(ResourceType.ROOT.match(ResourceType.TARGET)); Assert.assertTrue(ResourceType.ROOT.match(ResourceType.METRICS)); - Assert.assertFalse(ResourceType.ALL.match(ResourceType.ROOT)); + Assert.assertTrue(ResourceType.ROOT.match(ResourceType.ROOT)); // ALL Assert.assertTrue(ResourceType.ALL.match(ResourceType.NONE));