Stop passing SecurityPolicy parameter to Role.isApplicable() (#1664)

labkey-adam · web-flow · commit cc90c8114e4d · 2026-03-23T10:48:05.000-07:00
diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/security/ONPRC_EHRCMUAdministrationRole.java b/onprc_ehr/src/org/labkey/onprc_ehr/security/ONPRC_EHRCMUAdministrationRole.java
@@ -18,7 +18,6 @@
 import org.labkey.api.data.Container;
 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;
@@ -43,7 +42,7 @@ public ONPRC_EHRCMUAdministrationRole()
         );
     }
     @Override
-    public boolean isApplicable(SecurityPolicy policy, SecurableResource resource)
+    public boolean isApplicable(SecurableResource resource)
     {
         return resource instanceof Container ? ((Container)resource).getActiveModules().contains(ModuleLoader.getInstance().getModule(ONPRC_EHRModule.class)) : false;
     }
diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/security/ONPRC_EHRCMUMedicationAdministrationRole.java b/onprc_ehr/src/org/labkey/onprc_ehr/security/ONPRC_EHRCMUMedicationAdministrationRole.java
@@ -18,7 +18,6 @@
 import org.labkey.api.data.Container;
 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;
@@ -42,7 +41,7 @@ public ONPRC_EHRCMUMedicationAdministrationRole()
         );
     }
     @Override
-    public boolean isApplicable(SecurityPolicy policy, SecurableResource resource)
+    public boolean isApplicable(SecurableResource resource)
     {
         return resource instanceof Container ? ((Container)resource).getActiveModules().contains(ModuleLoader.getInstance().getModule(ONPRC_EHRModule.class)) : false;
     }

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@`
`18`	`18`	`import org.labkey.api.data.Container;`
`19`	`19`	`import org.labkey.api.module.ModuleLoader;`
`20`	`20`	`import org.labkey.api.security.SecurableResource;`
`21`		`-import org.labkey.api.security.SecurityPolicy;`
`22`	`21`	`import org.labkey.api.security.permissions.DeletePermission;`
`23`	`22`	`import org.labkey.api.security.permissions.InsertPermission;`
`24`	`23`	`import org.labkey.api.security.permissions.ReadPermission;`
`@@ -43,7 +42,7 @@ public ONPRC_EHRCMUAdministrationRole()`
`43`	`42`	`);`
`44`	`43`	`}`
`45`	`44`	`@Override`
`46`		`- public boolean isApplicable(SecurityPolicy policy, SecurableResource resource)`
	`45`	`+ public boolean isApplicable(SecurableResource resource)`
`47`	`46`	`{`
`48`	`47`	`return resource instanceof Container ? ((Container)resource).getActiveModules().contains(ModuleLoader.getInstance().getModule(ONPRC_EHRModule.class)) : false;`
`49`	`48`	`}`