test: add JSON de-/serialization for Role/Permission classes

Author: bevzzz

src/it/java/io/weaviate/integration/RbacITest.java

@@ -24,6 +24,7 @@
 import io.weaviate.client6.v1.api.rbac.RolesPermission.Scope;
 import io.weaviate.client6.v1.api.rbac.TenantsPermission;
 import io.weaviate.client6.v1.api.rbac.UsersPermission;
+import io.weaviate.client6.v1.api.rbac.groups.GroupType;
 import io.weaviate.client6.v1.api.rbac.roles.UserAssignment;
 import io.weaviate.client6.v1.api.rbac.users.DbUser;
 import io.weaviate.client6.v1.api.rbac.users.User;
@@ -69,7 +70,7 @@ public void test_roles_Lifecycle() throws IOException {
         Permission.roles(VIEWER_ROLE, Scope.MATCH, RolesPermission.Action.CREATE),
         Permission.collections(myCollection, CollectionsPermission.Action.CREATE),
         Permission.data(myCollection, DataPermission.Action.UPDATE),
-        Permission.groups("my-group", "oidc", GroupsPermission.Action.READ),
+        Permission.groups("my-group", GroupType.OIDC, GroupsPermission.Action.READ),
         Permission.tenants(myCollection, "my-tenant", TenantsPermission.Action.DELETE),
         Permission.users("my-user", UsersPermission.Action.READ),
         Permission.replicate(myCollection, "my-shard", ReplicatePermission.Action.READ),

src/main/java/io/weaviate/client6/v1/api/rbac/GroupsPermission.java

@@ -5,12 +5,14 @@
 
 import com.google.gson.annotations.SerializedName;
 
+import io.weaviate.client6.v1.api.rbac.groups.GroupType;
+
 public record GroupsPermission(
     @SerializedName("group") String groupId,
-    @SerializedName("groupType") String groupType,
+    @SerializedName("groupType") GroupType groupType,
     @SerializedName("actions") List<Action> actions) implements Permission {
 
-  public GroupsPermission(String groupId, String groupType, Action... actions) {
+  public GroupsPermission(String groupId, GroupType groupType, Action... actions) {
     this(groupId, groupType, Arrays.asList(actions));
   }
 

src/main/java/io/weaviate/client6/v1/api/rbac/Permission.java

@@ -22,6 +22,7 @@
 
 import io.weaviate.client6.v1.api.rbac.NodesPermission.Verbosity;
 import io.weaviate.client6.v1.api.rbac.RolesPermission.Scope;
+import io.weaviate.client6.v1.api.rbac.groups.GroupType;
 import io.weaviate.client6.v1.internal.json.JsonEnum;
 
 public interface Permission {
@@ -106,7 +107,7 @@ public static DataPermission data(String collection, DataPermission.Action... ac
   /**
    * Create permissions for managing RBAC groups.
    */
-  public static GroupsPermission groups(String groupId, String groupType, GroupsPermission.Action... actions) {
+  public static GroupsPermission groups(String groupId, GroupType groupType, GroupsPermission.Action... actions) {
     checkDeprecation(actions);
     return new GroupsPermission(groupId, groupType, actions);
   }
@@ -147,9 +148,9 @@ public static TenantsPermission tenants(String collection, String tenant, Tenant
   /**
    * Create {@link UsersPermission}.
    */
-  public static UsersPermission users(String user, UsersPermission.Action... actions) {
+  public static UsersPermission users(String userId, UsersPermission.Action... actions) {
     checkDeprecation(actions);
-    return new UsersPermission(user, actions);
+    return new UsersPermission(userId, actions);
   }
 
   /**
@@ -243,24 +244,24 @@ public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
 
         @Override
         public void write(JsonWriter out, Permission value) throws IOException {
-          out.beginObject();
-
-          if (!value.actions().isEmpty()) {
-            // User might not have provided any actions by mistake
-            var action = (RbacAction<?>) value.actions().get(0);
+          for (RbacAction<?> action : value.actions()) {
+            out.beginObject();
+            // User might not have provided many actions by mistake
             out.name("action");
             out.value(action.jsonValue());
-          }
 
-          if (value.self() != null) {
-            var permission = writeAdapter.toJsonTree((T) value.self());
-            // Some permission types do not have a body
-            permission.getAsJsonObject().remove("actions");
-            out.name(value._kind().jsonValue());
-            Streams.write(permission, out);
-          }
+            if (value.self() != null) {
+              var permission = writeAdapter.toJsonTree((T) value.self());
+              permission.getAsJsonObject().remove("actions");
 
-          out.endObject();
+              // Some permission types do not have a body
+              if (!permission.getAsJsonObject().keySet().isEmpty()) {
+                out.name(value._kind().jsonValue());
+                Streams.write(permission, out);
+              }
+            }
+            out.endObject();
+          }
         }
 
         @Override

src/main/java/io/weaviate/client6/v1/api/rbac/UsersPermission.java

@@ -6,11 +6,11 @@
 import com.google.gson.annotations.SerializedName;
 
 public record UsersPermission(
-    @SerializedName("users") String user,
+    @SerializedName("users") String userId,
     @SerializedName("actions") List<Action> actions) implements Permission {
 
-  public UsersPermission(String user, Action... actions) {
-    this(user, Arrays.asList(actions));
+  public UsersPermission(String userId, Action... actions) {
+    this(userId, Arrays.asList(actions));
   }
 
   @Override