#4379 Improve Stroom permission model

gchq · Aug 2, 2024 · 99428bc · 99428bc
1 parent ac5e51a
commit 99428bc
Show file tree

Hide file tree

Showing 254 changed files with 1,471 additions and 1,045 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/...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/...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
diff --git a/...mpl-db-jooq/src/main/java/stroom/activity/impl/db/jooq/tables/records/ActivityRecord.java b/...mpl-db-jooq/src/main/java/stroom/activity/impl/db/jooq/tables/records/ActivityRecord.java
diff --git a/...tivity/stroom-activity-impl-db/src/main/java/stroom/activity/impl/db/ActivityDaoImpl.java b/...tivity/stroom-activity-impl-db/src/main/java/stroom/activity/impl/db/ActivityDaoImpl.java
@@ -16,9 +16,6 @@
 
 package stroom.activity.impl.db;
 
-import jakarta.inject.Inject;
-import org.jooq.Condition;
-import org.jooq.Record;
 import stroom.activity.api.FindActivityCriteria;
 import stroom.activity.impl.ActivityDao;
 import stroom.activity.shared.Activity;
@@ -29,6 +26,10 @@
 import stroom.util.json.JsonUtil;
 import stroom.util.shared.UserRef;
 
+import jakarta.inject.Inject;
+import org.jooq.Condition;
+import org.jooq.Record;
+
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;

diff --git a/...activity/stroom-activity-impl/src/main/java/stroom/activity/impl/ActivityServiceImpl.java b/...activity/stroom-activity-impl/src/main/java/stroom/activity/impl/ActivityServiceImpl.java
@@ -16,8 +16,6 @@
 
 package stroom.activity.impl;
 
-import com.google.common.base.Strings;
-import jakarta.inject.Inject;
 import stroom.activity.api.ActivityService;
 import stroom.activity.api.FindActivityCriteria;
 import stroom.activity.shared.Activity;
@@ -35,6 +33,9 @@
 import stroom.util.shared.UserRef;
 import stroom.util.shared.filter.FilterFieldDefinition;
 
+import com.google.common.base.Strings;
+import jakarta.inject.Inject;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;

diff --git a/...om-analytics-impl-db-jooq/src/main/java/stroom/analytics/impl/db/jooq/DefaultCatalog.java b/...om-analytics-impl-db-jooq/src/main/java/stroom/analytics/impl/db/jooq/DefaultCatalog.java
diff --git a/...cs/stroom-analytics-impl-db-jooq/src/main/java/stroom/analytics/impl/db/jooq/Indexes.java b/...cs/stroom-analytics-impl-db-jooq/src/main/java/stroom/analytics/impl/db/jooq/Indexes.java
diff --git a/...ytics/stroom-analytics-impl-db-jooq/src/main/java/stroom/analytics/impl/db/jooq/Keys.java b/...ytics/stroom-analytics-impl-db-jooq/src/main/java/stroom/analytics/impl/db/jooq/Keys.java
diff --git a/...ics/stroom-analytics-impl-db-jooq/src/main/java/stroom/analytics/impl/db/jooq/Stroom.java b/...ics/stroom-analytics-impl-db-jooq/src/main/java/stroom/analytics/impl/db/jooq/Stroom.java
diff --git a/...tics-impl-db-jooq/src/main/java/stroom/analytics/impl/db/jooq/tables/AnalyticTracker.java b/...tics-impl-db-jooq/src/main/java/stroom/analytics/impl/db/jooq/tables/AnalyticTracker.java
diff --git a/...ics-impl-db-jooq/src/main/java/stroom/analytics/impl/db/jooq/tables/ExecutionHistory.java b/...ics-impl-db-jooq/src/main/java/stroom/analytics/impl/db/jooq/tables/ExecutionHistory.java
diff --git a/...cs-impl-db-jooq/src/main/java/stroom/analytics/impl/db/jooq/tables/ExecutionSchedule.java b/...cs-impl-db-jooq/src/main/java/stroom/analytics/impl/db/jooq/tables/ExecutionSchedule.java
diff --git a/...ics-impl-db-jooq/src/main/java/stroom/analytics/impl/db/jooq/tables/ExecutionTracker.java b/...ics-impl-db-jooq/src/main/java/stroom/analytics/impl/db/jooq/tables/ExecutionTracker.java
diff --git a/...ooq/src/main/java/stroom/analytics/impl/db/jooq/tables/records/AnalyticTrackerRecord.java b/...ooq/src/main/java/stroom/analytics/impl/db/jooq/tables/records/AnalyticTrackerRecord.java