Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
labkey-adam wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions ehr/src/org/labkey/ehr/security/AbstractEHRDatasetRole.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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));
Expand Down
3 changes: 1 addition & 2 deletions ehr/src/org/labkey/ehr/security/EHRDataAdminRole.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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));
Expand Down
3 changes: 1 addition & 2 deletions ehr/src/org/labkey/ehr/security/EHRRequestAdminRole.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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));
Expand Down
3 changes: 1 addition & 2 deletions ehr/src/org/labkey/ehr/security/EHRRequestorRole.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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));
Expand Down
3 changes: 1 addition & 2 deletions snd/src/org/labkey/snd/security/roles/SNDBasicSubmitterRole.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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));
}
Expand Down
3 changes: 1 addition & 2 deletions snd/src/org/labkey/snd/security/roles/SNDDataAdminRole.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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));
}
Expand Down
3 changes: 1 addition & 2 deletions snd/src/org/labkey/snd/security/roles/SNDDataReviewerRole.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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));
}
Expand Down
3 changes: 1 addition & 2 deletions snd/src/org/labkey/snd/security/roles/SNDReaderRole.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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));
}
Expand Down
Loading