gh-4594 Fix json ser test

gchq · Nov 15, 2024 · 61032a3 · 61032a3
1 parent d9d5627
commit 61032a3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/stroom-core-shared/src/main/java/stroom/security/shared/User.java b/stroom-core-shared/src/main/java/stroom/security/shared/User.java
@@ -256,7 +256,6 @@ public String getType() {
         return getType(CaseType.SENTENCE);
     }
 
-    @JsonIgnore
     public String getType(final CaseType caseType) {
         Objects.requireNonNull(caseType);
         final String type = group

diff --git a/stroom-util-shared/src/main/java/stroom/util/shared/UserRef.java b/stroom-util-shared/src/main/java/stroom/util/shared/UserRef.java
@@ -46,6 +46,20 @@ public UserRef(@JsonProperty("uuid") final String uuid,
         this.group = group;
     }
 
+    /**
+     * Creates a {@link UserRef} representing a user (not a group).
+     */
+    public static UserRef forUserUuid(final String userUuid) {
+        return new UserRef(userUuid, null, null, null, false);
+    }
+
+    /**
+     * Creates a {@link UserRef} representing a group.
+     */
+    public static UserRef forGroupUuid(final String groupUuid) {
+        return new UserRef(groupUuid, null, null, null, true);
+    }
+
     public String getUuid() {
         return uuid;
     }
@@ -74,7 +88,6 @@ public String getType() {
         return getType(CaseType.SENTENCE);
     }
 
-    @JsonIgnore
     public String getType(final CaseType caseType) {
         Objects.requireNonNull(caseType);
         final String type = group