#4379 Improve Stroom permission model

gchq · Jul 31, 2024 · 6666a06 · 6666a06
1 parent 1b921e4
commit 6666a06
Show file tree

Hide file tree

Showing 553 changed files with 14,055 additions and 13,888 deletions.
diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
diff --git a/.idea/runConfigurations/GenerateExpectedYaml.xml b/.idea/runConfigurations/GenerateExpectedYaml.xml
diff --git a/.idea/runConfigurations/SetupSampleData.xml b/.idea/runConfigurations/SetupSampleData.xml
diff --git a/generate-jooq.sh b/generate-jooq.sh
@@ -16,16 +16,16 @@ cd -
 cd stroom-security/stroom-security-impl-db-jooq
 ../../gradlew generateJooq
 cd -
-cd .idea/modules/stroom-proxy/stroom-proxy-repo-db-jooq
+cd stroom-proxy/stroom-proxy-repo-db-jooq
 ../../gradlew generateJooq
 cd -
-cd .idea/modules/stroom-annotation/stroom-annotation-impl-db-jooq
+cd stroom-annotation/stroom-annotation-impl-db-jooq
 ../../gradlew generateJooq
 cd -
-cd .idea/modules/stroom-processor/stroom-processor-impl-db-jooq
+cd stroom-processor/stroom-processor-impl-db-jooq
 ../../gradlew generateJooq
 cd -
-cd .idea/modules/stroom-cluster/stroom-cluster-lock-impl-db-jooq
+cd stroom-cluster/stroom-cluster-lock-impl-db-jooq
 ../../gradlew generateJooq
 cd -
 cd stroom-activity/stroom-activity-impl-db-jooq

diff --git a/...-activity/stroom-activity-api/src/main/java/stroom/activity/api/FindActivityCriteria.java b/...-activity/stroom-activity-api/src/main/java/stroom/activity/api/FindActivityCriteria.java
@@ -19,6 +19,7 @@
 import stroom.util.shared.BaseCriteria;
 import stroom.util.shared.CriteriaFieldSort;
 import stroom.util.shared.PageRequest;
+import stroom.util.shared.UserRef;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -31,7 +32,7 @@
 public class FindActivityCriteria extends BaseCriteria {
 
     @JsonProperty
-    private String userId;
+    private UserRef userRef;
     @JsonProperty
     private String filter;
 
@@ -41,10 +42,10 @@ public FindActivityCriteria() {
     @JsonCreator
     public FindActivityCriteria(@JsonProperty("pageRequest") final PageRequest pageRequest,
                                 @JsonProperty("sortList") final List<CriteriaFieldSort> sortList,
-                                @JsonProperty("userId") final String userId,
+                                @JsonProperty("userId") final UserRef userRef,
                                 @JsonProperty("name") final String filter) {
         super(pageRequest, sortList);
-        this.userId = userId;
+        this.userRef = userRef;
         this.filter = filter;
     }
 
@@ -54,12 +55,12 @@ public static FindActivityCriteria create(final String filter) {
         return criteria;
     }
 
-    public String getUserId() {
-        return userId;
+    public UserRef getUserRef() {
+        return userRef;
     }
 
-    public void setUserId(final String userId) {
-        this.userId = userId;
+    public void setUserRef(final UserRef userRef) {
+        this.userRef = userRef;
     }
 
     public String getFilter() {

diff --git a/...room-activity-impl-db-jooq/src/main/java/stroom/activity/impl/db/jooq/DefaultCatalog.java b/...room-activity-impl-db-jooq/src/main/java/stroom/activity/impl/db/jooq/DefaultCatalog.java
diff --git a/...ctivity/stroom-activity-impl-db-jooq/src/main/java/stroom/activity/impl/db/jooq/Keys.java b/...ctivity/stroom-activity-impl-db-jooq/src/main/java/stroom/activity/impl/db/jooq/Keys.java
diff --git a/...ivity/stroom-activity-impl-db-jooq/src/main/java/stroom/activity/impl/db/jooq/Stroom.java b/...ivity/stroom-activity-impl-db-jooq/src/main/java/stroom/activity/impl/db/jooq/Stroom.java
diff --git a/...ivity/stroom-activity-impl-db-jooq/src/main/java/stroom/activity/impl/db/jooq/Tables.java b/...ivity/stroom-activity-impl-db-jooq/src/main/java/stroom/activity/impl/db/jooq/Tables.java
diff --git a/...oom-activity-impl-db-jooq/src/main/java/stroom/activity/impl/db/jooq/tables/Activity.java b/...oom-activity-impl-db-jooq/src/main/java/stroom/activity/impl/db/jooq/tables/Activity.java