From 321ee8c584cc938b262393a7de3be88fa04d17df Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Fri, 6 Jul 2012 11:13:44 +0200 Subject: [PATCH] SONAR-3618 Better naming of ResourcePermissioning methods --- .../security/ApplyProjectRolesDecorator.java | 4 +- .../DefaultResourcePermissioning.java | 20 +++--- .../ApplyProjectRolesDecoratorTest.java | 12 ++-- .../DefaultResourcePermissioningTest.java | 70 +++++++++---------- ...esult.xml => grantDefaultRoles-result.xml} | 0 ...tPermissions.xml => grantDefaultRoles.xml} | 0 ...rantDefaultRoles_unknown_group-result.xml} | 0 ...ml => grantDefaultRoles_unknown_group.xml} | 0 ...xml => grantDefaultRoles_users-result.xml} | 0 ..._users.xml => grantDefaultRoles_users.xml} | 0 ...s-result.xml => grantGroupRole-result.xml} | 0 ...roupPermissions.xml => grantGroupRole.xml} | 0 ...t.xml => grantGroupRole_anyone-result.xml} | 0 ...s_anyone.xml => grantGroupRole_anyone.xml} | 0 ...Role_ignore_if_group_not_found-result.xml} | 0 ...ntGroupRole_ignore_if_group_not_found.xml} | 0 ...upRole_ignore_if_not_persisted-result.xml} | 0 ...rantGroupRole_ignore_if_not_persisted.xml} | 0 .../{hasPermissions.xml => hasRoles.xml} | 0 .../api/security/ResourcePermissioning.java | 8 +-- 20 files changed, 57 insertions(+), 57 deletions(-) rename plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/{grantDefaultPermissions-result.xml => grantDefaultRoles-result.xml} (100%) rename plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/{grantDefaultPermissions.xml => grantDefaultRoles.xml} (100%) rename plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/{grantDefaultPermissions_unknown_group-result.xml => grantDefaultRoles_unknown_group-result.xml} (100%) rename plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/{grantDefaultPermissions_unknown_group.xml => grantDefaultRoles_unknown_group.xml} (100%) rename plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/{grantDefaultPermissions_users-result.xml => grantDefaultRoles_users-result.xml} (100%) rename plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/{grantDefaultPermissions_users.xml => grantDefaultRoles_users.xml} (100%) rename plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/{addGroupPermissions-result.xml => grantGroupRole-result.xml} (100%) rename plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/{addGroupPermissions.xml => grantGroupRole.xml} (100%) rename plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/{addGroupPermissions_anyone-result.xml => grantGroupRole_anyone-result.xml} (100%) rename plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/{addGroupPermissions_anyone.xml => grantGroupRole_anyone.xml} (100%) rename plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/{addGroupPermissions_ignore_if_group_not_found-result.xml => grantGroupRole_ignore_if_group_not_found-result.xml} (100%) rename plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/{addGroupPermissions_ignore_if_group_not_found.xml => grantGroupRole_ignore_if_group_not_found.xml} (100%) rename plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/{addGroupPermissions_ignore_if_not_persisted-result.xml => grantGroupRole_ignore_if_not_persisted-result.xml} (100%) rename plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/{addGroupPermissions_ignore_if_not_persisted.xml => grantGroupRole_ignore_if_not_persisted.xml} (100%) rename plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/{hasPermissions.xml => hasRoles.xml} (100%) diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/security/ApplyProjectRolesDecorator.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/security/ApplyProjectRolesDecorator.java index ba0e975295e..1e6a5519782 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/security/ApplyProjectRolesDecorator.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/security/ApplyProjectRolesDecorator.java @@ -40,12 +40,12 @@ public class ApplyProjectRolesDecorator implements Decorator { public void decorate(Resource resource, DecoratorContext context) { if (shouldDecorateResource(resource)) { - resourcePermissioning.grantDefaultPermissions(resource); + resourcePermissioning.grantDefaultRoles(resource); } } private boolean shouldDecorateResource(Resource resource) { - return resource.getId() != null && isProject(resource) && !resourcePermissioning.hasPermissions(resource); + return resource.getId() != null && isProject(resource) && !resourcePermissioning.hasRoles(resource); } private boolean isProject(Resource resource) { diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/security/DefaultResourcePermissioning.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/security/DefaultResourcePermissioning.java index db88d0643a2..15777e3075c 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/security/DefaultResourcePermissioning.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/security/DefaultResourcePermissioning.java @@ -61,7 +61,7 @@ public class DefaultResourcePermissioning implements ResourcePermissioning, Batc this.myBatis = myBatis; } - public boolean hasPermissions(Resource resource) { + public boolean hasRoles(Resource resource) { if (resource.getId() != null) { SqlSession session = myBatis.openSession(); try { @@ -76,7 +76,7 @@ public class DefaultResourcePermissioning implements ResourcePermissioning, Batc return false; } - public void addUserPermissions(Resource resource, String login, String role) { + public void grantUserRole(Resource resource, String login, String role) { if (resource.getId() != null) { SqlSession session = myBatis.openSession(); try { @@ -95,7 +95,7 @@ public class DefaultResourcePermissioning implements ResourcePermissioning, Batc } } - public void addGroupPermissions(Resource resource, String groupName, String role) { + public void grantGroupRole(Resource resource, String groupName, String role) { if (resource.getId() != null) { SqlSession session = myBatis.openSession(); try { @@ -118,14 +118,14 @@ public class DefaultResourcePermissioning implements ResourcePermissioning, Batc } } - public void grantDefaultPermissions(Resource resource) { + public void grantDefaultRoles(Resource resource) { if (resource.getId() != null) { SqlSession session = myBatis.openSession(); try { - removePermissions(resource, session); - grantDefaultPermissions(resource, UserRole.ADMIN, session); - grantDefaultPermissions(resource, UserRole.USER, session); - grantDefaultPermissions(resource, UserRole.CODEVIEWER, session); + removeRoles(resource, session); + grantDefaultRoles(resource, UserRole.ADMIN, session); + grantDefaultRoles(resource, UserRole.USER, session); + grantDefaultRoles(resource, UserRole.CODEVIEWER, session); session.commit(); } finally { MyBatis.closeQuietly(session); @@ -133,14 +133,14 @@ public class DefaultResourcePermissioning implements ResourcePermissioning, Batc } } - private void removePermissions(Resource resource, SqlSession session) { + private void removeRoles(Resource resource, SqlSession session) { Long resourceId = new Long(resource.getId()); RoleMapper mapper = session.getMapper(RoleMapper.class); mapper.deleteGroupRolesByResourceId(resourceId); mapper.deleteUserRolesByResourceId(resourceId); } - private void grantDefaultPermissions(Resource resource, String role, SqlSession session) { + private void grantDefaultRoles(Resource resource, String role, SqlSession session) { UserMapper userMapper = session.getMapper(UserMapper.class); RoleMapper roleMapper = session.getMapper(RoleMapper.class); String[] groupNames = settings.getStringArrayBySeparator("sonar.role." + role + "." + resource.getQualifier() + ".defaultGroups", ","); diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/security/ApplyProjectRolesDecoratorTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/security/ApplyProjectRolesDecoratorTest.java index cd212425246..1541f7eb6b8 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/security/ApplyProjectRolesDecoratorTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/security/ApplyProjectRolesDecoratorTest.java @@ -41,11 +41,11 @@ public class ApplyProjectRolesDecoratorTest { public void doNotApplySecurityWhenExistingPermissions() { Project project = new Project("project"); project.setId(10); - when(resourcePermissioning.hasPermissions(project)).thenReturn(true); + when(resourcePermissioning.hasRoles(project)).thenReturn(true); decorator.decorate(project, null); - verify(resourcePermissioning, never()).grantDefaultPermissions(project); + verify(resourcePermissioning, never()).grantDefaultRoles(project); } @Test @@ -53,22 +53,22 @@ public class ApplyProjectRolesDecoratorTest { Project project = new Project("project"); Project module = new Project("module").setParent(project); module.setId(10); - when(resourcePermissioning.hasPermissions(project)).thenReturn(false); + when(resourcePermissioning.hasRoles(project)).thenReturn(false); decorator.decorate(module, null); - verify(resourcePermissioning, never()).grantDefaultPermissions(module); + verify(resourcePermissioning, never()).grantDefaultRoles(module); } @Test public void applySecurityWhenNoPermissions() { Project project = new Project("project"); project.setId(10); - when(resourcePermissioning.hasPermissions(project)).thenReturn(false); + when(resourcePermissioning.hasRoles(project)).thenReturn(false); decorator.decorate(project, null); - verify(resourcePermissioning).grantDefaultPermissions(project); + verify(resourcePermissioning).grantDefaultRoles(project); } } diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/security/DefaultResourcePermissioningTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/security/DefaultResourcePermissioningTest.java index 6c0d86cd088..e671f9bdc19 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/security/DefaultResourcePermissioningTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/security/DefaultResourcePermissioningTest.java @@ -34,99 +34,99 @@ public class DefaultResourcePermissioningTest extends AbstractDaoTestCase { private Resource project = new Project("project").setId(123); @Test - public void addGroupPermissions() { - setupData("addGroupPermissions"); + public void grantGroupRole() { + setupData("grantGroupRole"); DefaultResourcePermissioning permissioning = new DefaultResourcePermissioning(new Settings(), getMyBatis()); - permissioning.addGroupPermissions(project, "sonar-administrators", "admin"); + permissioning.grantGroupRole(project, "sonar-administrators", "admin"); - checkTables("addGroupPermissions", "group_roles"); + checkTables("grantGroupRole", "group_roles"); } @Test - public void addGroupPermissions_anyone() { - setupData("addGroupPermissions_anyone"); + public void grantGroupRole_anyone() { + setupData("grantGroupRole_anyone"); DefaultResourcePermissioning permissioning = new DefaultResourcePermissioning(new Settings(), getMyBatis()); - permissioning.addGroupPermissions(project, DefaultGroups.ANYONE, "admin"); + permissioning.grantGroupRole(project, DefaultGroups.ANYONE, "admin"); - checkTables("addGroupPermissions_anyone", "group_roles"); + checkTables("grantGroupRole_anyone", "group_roles"); } @Test - public void addGroupPermissions_ignore_if_group_not_found() { - setupData("addGroupPermissions_ignore_if_group_not_found"); + public void grantGroupRole_ignore_if_group_not_found() { + setupData("grantGroupRole_ignore_if_group_not_found"); DefaultResourcePermissioning permissioning = new DefaultResourcePermissioning(new Settings(), getMyBatis()); - permissioning.addGroupPermissions(project, "not_found", "admin"); + permissioning.grantGroupRole(project, "not_found", "admin"); - checkTables("addGroupPermissions_ignore_if_group_not_found", "group_roles"); + checkTables("grantGroupRole_ignore_if_group_not_found", "group_roles"); } @Test - public void addGroupPermissions_ignore_if_not_persisted() { - setupData("addGroupPermissions_ignore_if_not_persisted"); + public void grantGroupRole_ignore_if_not_persisted() { + setupData("grantGroupRole_ignore_if_not_persisted"); DefaultResourcePermissioning permissioning = new DefaultResourcePermissioning(new Settings(), getMyBatis()); Project resourceWithoutId = new Project(""); - permissioning.addGroupPermissions(resourceWithoutId, "sonar-users", "admin"); + permissioning.grantGroupRole(resourceWithoutId, "sonar-users", "admin"); - checkTables("addGroupPermissions_ignore_if_not_persisted", "group_roles"); + checkTables("grantGroupRole_ignore_if_not_persisted", "group_roles"); } @Test - public void grantDefaultPermissions() { - setupData("grantDefaultPermissions"); + public void grantDefaultRoles() { + setupData("grantDefaultRoles"); Settings settings = new Settings(new PropertyDefinitions(DefaultResourcePermissioning.class)); DefaultResourcePermissioning permissioning = new DefaultResourcePermissioning(settings, getMyBatis()); - permissioning.grantDefaultPermissions(project); + permissioning.grantDefaultRoles(project); - checkTables("grantDefaultPermissions", "user_roles", "group_roles"); + checkTables("grantDefaultRoles", "user_roles", "group_roles"); } @Test - public void grantDefaultPermissions_unknown_group() { - setupData("grantDefaultPermissions_unknown_group"); + public void grantDefaultRoles_unknown_group() { + setupData("grantDefaultRoles_unknown_group"); Settings settings = new Settings(); settings.setProperty("sonar.role.admin.TRK.defaultGroups", "sonar-administrators,unknown"); DefaultResourcePermissioning permissioning = new DefaultResourcePermissioning(settings, getMyBatis()); - permissioning.grantDefaultPermissions(project); + permissioning.grantDefaultRoles(project); - checkTables("grantDefaultPermissions_unknown_group", "group_roles"); + checkTables("grantDefaultRoles_unknown_group", "group_roles"); } @Test - public void grantDefaultPermissions_users() { - setupData("grantDefaultPermissions_users"); + public void grantDefaultRoles_users() { + setupData("grantDefaultRoles_users"); Settings settings = new Settings(); settings.setProperty("sonar.role.admin.TRK.defaultUsers", "marius,disabled,notfound"); DefaultResourcePermissioning permissioning = new DefaultResourcePermissioning(settings, getMyBatis()); - permissioning.grantDefaultPermissions(project); + permissioning.grantDefaultRoles(project); - checkTables("grantDefaultPermissions_users", "user_roles"); + checkTables("grantDefaultRoles_users", "user_roles"); } @Test - public void hasPermissions() { - setupData("hasPermissions"); + public void hasRoles() { + setupData("hasRoles"); DefaultResourcePermissioning permissioning = new DefaultResourcePermissioning(new Settings(), getMyBatis()); // no groups and at least one user - assertThat(permissioning.hasPermissions(new Project("only_users").setId(1))).isTrue(); + assertThat(permissioning.hasRoles(new Project("only_users").setId(1))).isTrue(); // no users and at least one group - assertThat(permissioning.hasPermissions(new Project("only_groups").setId(2))).isTrue(); + assertThat(permissioning.hasRoles(new Project("only_groups").setId(2))).isTrue(); // groups and users - assertThat(permissioning.hasPermissions(new Project("groups_and_users").setId(3))).isTrue(); + assertThat(permissioning.hasRoles(new Project("groups_and_users").setId(3))).isTrue(); // no groups, no users - assertThat(permissioning.hasPermissions(new Project("no_groups_no_users").setId(4))).isFalse(); + assertThat(permissioning.hasRoles(new Project("no_groups_no_users").setId(4))).isFalse(); // does not exist - assertThat(permissioning.hasPermissions(new Project("not_found"))).isFalse(); + assertThat(permissioning.hasRoles(new Project("not_found"))).isFalse(); } } \ No newline at end of file diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantDefaultPermissions-result.xml b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantDefaultRoles-result.xml similarity index 100% rename from plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantDefaultPermissions-result.xml rename to plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantDefaultRoles-result.xml diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantDefaultPermissions.xml b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantDefaultRoles.xml similarity index 100% rename from plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantDefaultPermissions.xml rename to plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantDefaultRoles.xml diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantDefaultPermissions_unknown_group-result.xml b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantDefaultRoles_unknown_group-result.xml similarity index 100% rename from plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantDefaultPermissions_unknown_group-result.xml rename to plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantDefaultRoles_unknown_group-result.xml diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantDefaultPermissions_unknown_group.xml b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantDefaultRoles_unknown_group.xml similarity index 100% rename from plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantDefaultPermissions_unknown_group.xml rename to plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantDefaultRoles_unknown_group.xml diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantDefaultPermissions_users-result.xml b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantDefaultRoles_users-result.xml similarity index 100% rename from plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantDefaultPermissions_users-result.xml rename to plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantDefaultRoles_users-result.xml diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantDefaultPermissions_users.xml b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantDefaultRoles_users.xml similarity index 100% rename from plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantDefaultPermissions_users.xml rename to plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantDefaultRoles_users.xml diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/addGroupPermissions-result.xml b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantGroupRole-result.xml similarity index 100% rename from plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/addGroupPermissions-result.xml rename to plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantGroupRole-result.xml diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/addGroupPermissions.xml b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantGroupRole.xml similarity index 100% rename from plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/addGroupPermissions.xml rename to plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantGroupRole.xml diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/addGroupPermissions_anyone-result.xml b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantGroupRole_anyone-result.xml similarity index 100% rename from plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/addGroupPermissions_anyone-result.xml rename to plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantGroupRole_anyone-result.xml diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/addGroupPermissions_anyone.xml b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantGroupRole_anyone.xml similarity index 100% rename from plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/addGroupPermissions_anyone.xml rename to plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantGroupRole_anyone.xml diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/addGroupPermissions_ignore_if_group_not_found-result.xml b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantGroupRole_ignore_if_group_not_found-result.xml similarity index 100% rename from plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/addGroupPermissions_ignore_if_group_not_found-result.xml rename to plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantGroupRole_ignore_if_group_not_found-result.xml diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/addGroupPermissions_ignore_if_group_not_found.xml b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantGroupRole_ignore_if_group_not_found.xml similarity index 100% rename from plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/addGroupPermissions_ignore_if_group_not_found.xml rename to plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantGroupRole_ignore_if_group_not_found.xml diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/addGroupPermissions_ignore_if_not_persisted-result.xml b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantGroupRole_ignore_if_not_persisted-result.xml similarity index 100% rename from plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/addGroupPermissions_ignore_if_not_persisted-result.xml rename to plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantGroupRole_ignore_if_not_persisted-result.xml diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/addGroupPermissions_ignore_if_not_persisted.xml b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantGroupRole_ignore_if_not_persisted.xml similarity index 100% rename from plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/addGroupPermissions_ignore_if_not_persisted.xml rename to plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantGroupRole_ignore_if_not_persisted.xml diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/hasPermissions.xml b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/hasRoles.xml similarity index 100% rename from plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/hasPermissions.xml rename to plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/hasRoles.xml diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/security/ResourcePermissioning.java b/sonar-plugin-api/src/main/java/org/sonar/api/security/ResourcePermissioning.java index d40e8b7ca29..270dd52f8d3 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/security/ResourcePermissioning.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/security/ResourcePermissioning.java @@ -31,11 +31,11 @@ import org.sonar.api.resources.Resource; */ public interface ResourcePermissioning extends BatchComponent { - boolean hasPermissions(Resource resource); + boolean hasRoles(Resource resource); - void grantDefaultPermissions(Resource resource); + void grantDefaultRoles(Resource resource); - void addUserPermissions(Resource resource, String login, String role); + void grantUserRole(Resource resource, String login, String role); - void addGroupPermissions(Resource resource, String groupName, String role); + void grantGroupRole(Resource resource, String groupName, String role); } -- 2.39.5