From ddc997836e98d6bbf3f8ffe7f6f9ac276f8bae8d Mon Sep 17 00:00:00 2001
From: Adam Rauch <adam@labkey.com>
Date: Wed, 18 Mar 2026 16:15:05 -0700
Subject: [PATCH] Stop passing SecurityPolicy parameter to Role.isApplicable()

---
 ehr/src/org/labkey/ehr/security/AbstractEHRDatasetRole.java    | 3 +--
 ehr/src/org/labkey/ehr/security/EHRDataAdminRole.java          | 3 +--
 ehr/src/org/labkey/ehr/security/EHRRequestAdminRole.java       | 3 +--
 ehr/src/org/labkey/ehr/security/EHRRequestorRole.java          | 3 +--
 .../org/labkey/snd/security/roles/SNDBasicSubmitterRole.java   | 3 +--
 snd/src/org/labkey/snd/security/roles/SNDDataAdminRole.java    | 3 +--
 snd/src/org/labkey/snd/security/roles/SNDDataReviewerRole.java | 3 +--
 snd/src/org/labkey/snd/security/roles/SNDReaderRole.java       | 3 +--
 8 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/ehr/src/org/labkey/ehr/security/AbstractEHRDatasetRole.java b/ehr/src/org/labkey/ehr/security/AbstractEHRDatasetRole.java
index 3b9682456..7ee255de6 100644
--- a/ehr/src/org/labkey/ehr/security/AbstractEHRDatasetRole.java
+++ b/ehr/src/org/labkey/ehr/security/AbstractEHRDatasetRole.java
@@ -17,7 +17,6 @@
 
 import org.labkey.api.module.ModuleLoader;
 import org.labkey.api.security.SecurableResource;
-import org.labkey.api.security.SecurityPolicy;
 import org.labkey.api.security.permissions.Permission;
 import org.labkey.api.security.roles.AbstractRole;
 import org.labkey.api.study.Dataset;
@@ -35,7 +34,7 @@ protected AbstractEHRDatasetRole(String name, String description, Class<? extend
     }
 
     @Override
-    public boolean isApplicable(SecurityPolicy policy, SecurableResource resource)
+    public boolean isApplicable(SecurableResource resource)
     {
         return resource instanceof Dataset &&
                 ((Dataset)resource).getContainer().getActiveModules().contains(ModuleLoader.getInstance().getModule(EHRModule.class));
diff --git a/ehr/src/org/labkey/ehr/security/EHRDataAdminRole.java b/ehr/src/org/labkey/ehr/security/EHRDataAdminRole.java
index fbcbfd4fc..ab454c938 100644
--- a/ehr/src/org/labkey/ehr/security/EHRDataAdminRole.java
+++ b/ehr/src/org/labkey/ehr/security/EHRDataAdminRole.java
@@ -19,7 +19,6 @@
 import org.labkey.api.ehr.security.*;
 import org.labkey.api.module.ModuleLoader;
 import org.labkey.api.security.SecurableResource;
-import org.labkey.api.security.SecurityPolicy;
 import org.labkey.api.security.permissions.DeletePermission;
 import org.labkey.api.security.permissions.InsertPermission;
 import org.labkey.api.security.permissions.ReadPermission;
@@ -115,7 +114,7 @@ public EHRDataAdminRole()
     }
 
     @Override
-    public boolean isApplicable(SecurityPolicy policy, SecurableResource resource)
+    public boolean isApplicable(SecurableResource resource)
     {
         if (resource instanceof Container)
             return ((Container)resource).getActiveModules().contains(ModuleLoader.getInstance().getModule(EHRModule.class));
diff --git a/ehr/src/org/labkey/ehr/security/EHRRequestAdminRole.java b/ehr/src/org/labkey/ehr/security/EHRRequestAdminRole.java
index 6d24a0928..0a7df4f60 100644
--- a/ehr/src/org/labkey/ehr/security/EHRRequestAdminRole.java
+++ b/ehr/src/org/labkey/ehr/security/EHRRequestAdminRole.java
@@ -19,7 +19,6 @@
 import org.labkey.api.ehr.security.*;
 import org.labkey.api.module.ModuleLoader;
 import org.labkey.api.security.SecurableResource;
-import org.labkey.api.security.SecurityPolicy;
 import org.labkey.api.security.permissions.DeletePermission;
 import org.labkey.api.security.permissions.InsertPermission;
 import org.labkey.api.security.permissions.ReadPermission;
@@ -91,7 +90,7 @@ public EHRRequestAdminRole()
     }
 
     @Override
-    public boolean isApplicable(SecurityPolicy policy, SecurableResource resource)
+    public boolean isApplicable(SecurableResource resource)
     {
         if (resource instanceof Container)
             return ((Container)resource).getActiveModules().contains(ModuleLoader.getInstance().getModule(EHRModule.class));
diff --git a/ehr/src/org/labkey/ehr/security/EHRRequestorRole.java b/ehr/src/org/labkey/ehr/security/EHRRequestorRole.java
index abce0a5e4..a9641d66f 100644
--- a/ehr/src/org/labkey/ehr/security/EHRRequestorRole.java
+++ b/ehr/src/org/labkey/ehr/security/EHRRequestorRole.java
@@ -30,7 +30,6 @@
 import org.labkey.api.ehr.security.EHRRequestSampleDeliveredUpdatePermission;
 import org.labkey.api.module.ModuleLoader;
 import org.labkey.api.security.SecurableResource;
-import org.labkey.api.security.SecurityPolicy;
 import org.labkey.api.security.permissions.DeletePermission;
 import org.labkey.api.security.permissions.InsertPermission;
 import org.labkey.api.security.permissions.ReadPermission;
@@ -91,7 +90,7 @@ public EHRRequestorRole()
     }
 
     @Override
-    public boolean isApplicable(SecurityPolicy policy, SecurableResource resource)
+    public boolean isApplicable(SecurableResource resource)
     {
         if (resource instanceof Container)
             return ((Container)resource).getActiveModules().contains(ModuleLoader.getInstance().getModule(EHRModule.class));
diff --git a/snd/src/org/labkey/snd/security/roles/SNDBasicSubmitterRole.java b/snd/src/org/labkey/snd/security/roles/SNDBasicSubmitterRole.java
index e1ec4c178..730f810d7 100644
--- a/snd/src/org/labkey/snd/security/roles/SNDBasicSubmitterRole.java
+++ b/snd/src/org/labkey/snd/security/roles/SNDBasicSubmitterRole.java
@@ -17,7 +17,6 @@
 
 import org.labkey.api.module.ModuleLoader;
 import org.labkey.api.security.SecurableResource;
-import org.labkey.api.security.SecurityPolicy;
 import org.labkey.api.security.roles.AbstractModuleScopedRole;
 import org.labkey.api.snd.Category;
 import org.labkey.snd.SNDModule;
@@ -54,7 +53,7 @@ public SNDBasicSubmitterRole()
     }
 
     @Override
-    public boolean isApplicable(SecurityPolicy policy, SecurableResource resource)
+    public boolean isApplicable(SecurableResource resource)
     {
         return resource instanceof Category && ((Category)resource).getContainer().getActiveModules().contains(ModuleLoader.getInstance().getModule(SNDModule.class));
     }
diff --git a/snd/src/org/labkey/snd/security/roles/SNDDataAdminRole.java b/snd/src/org/labkey/snd/security/roles/SNDDataAdminRole.java
index 0dc5895f9..7e33baa17 100644
--- a/snd/src/org/labkey/snd/security/roles/SNDDataAdminRole.java
+++ b/snd/src/org/labkey/snd/security/roles/SNDDataAdminRole.java
@@ -17,7 +17,6 @@
 
 import org.labkey.api.module.ModuleLoader;
 import org.labkey.api.security.SecurableResource;
-import org.labkey.api.security.SecurityPolicy;
 import org.labkey.api.security.roles.AbstractModuleScopedRole;
 import org.labkey.api.snd.Category;
 import org.labkey.snd.SNDModule;
@@ -55,7 +54,7 @@ public SNDDataAdminRole()
     }
 
     @Override
-    public boolean isApplicable(SecurityPolicy policy, SecurableResource resource)
+    public boolean isApplicable(SecurableResource resource)
     {
         return resource instanceof Category && ((Category)resource).getContainer().getActiveModules().contains(ModuleLoader.getInstance().getModule(SNDModule.class));
     }
diff --git a/snd/src/org/labkey/snd/security/roles/SNDDataReviewerRole.java b/snd/src/org/labkey/snd/security/roles/SNDDataReviewerRole.java
index c430aba9e..e0969c9d5 100644
--- a/snd/src/org/labkey/snd/security/roles/SNDDataReviewerRole.java
+++ b/snd/src/org/labkey/snd/security/roles/SNDDataReviewerRole.java
@@ -17,7 +17,6 @@
 
 import org.labkey.api.module.ModuleLoader;
 import org.labkey.api.security.SecurableResource;
-import org.labkey.api.security.SecurityPolicy;
 import org.labkey.api.security.roles.AbstractModuleScopedRole;
 import org.labkey.api.snd.Category;
 import org.labkey.snd.SNDModule;
@@ -42,7 +41,7 @@ public SNDDataReviewerRole()
     }
 
     @Override
-    public boolean isApplicable(SecurityPolicy policy, SecurableResource resource)
+    public boolean isApplicable(SecurableResource resource)
     {
         return resource instanceof Category && ((Category)resource).getContainer().getActiveModules().contains(ModuleLoader.getInstance().getModule(SNDModule.class));
     }
diff --git a/snd/src/org/labkey/snd/security/roles/SNDReaderRole.java b/snd/src/org/labkey/snd/security/roles/SNDReaderRole.java
index 4c19be108..9bfc30664 100644
--- a/snd/src/org/labkey/snd/security/roles/SNDReaderRole.java
+++ b/snd/src/org/labkey/snd/security/roles/SNDReaderRole.java
@@ -17,7 +17,6 @@
 
 import org.labkey.api.module.ModuleLoader;
 import org.labkey.api.security.SecurableResource;
-import org.labkey.api.security.SecurityPolicy;
 import org.labkey.api.security.roles.AbstractModuleScopedRole;
 import org.labkey.api.snd.Category;
 import org.labkey.snd.SNDModule;
@@ -33,7 +32,7 @@ public SNDReaderRole()
     }
 
     @Override
-    public boolean isApplicable(SecurityPolicy policy, SecurableResource resource)
+    public boolean isApplicable(SecurableResource resource)
     {
         return resource instanceof Category && ((Category)resource).getContainer().getActiveModules().contains(ModuleLoader.getInstance().getModule(SNDModule.class));
     }