SONAR-3618 Better naming of ResourcePermissioning methods

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 ba0e975295ecfc62914a182f6ea0f245972148d2..1e6a5519782290b52e46c4450f48127eabe78fd2 100644 (file)
--- 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 db88d0643a2537e47f1bbf545af4a91873bd9975..15777e3075cfd7af0ebe5f22aeed534045527e2a 100644 (file)
--- 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 cd212425246c232e60c265ea02ec74aec03993dc..1541f7eb6b805a5810dfd0c3a0598e87475543c0 100644 (file)
--- 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 6c0d86cd088ac00f0b1d83442c7003f02f61f051..e671f9bdc196df493eb385e34447afa241bd8c16 100644 (file)
--- 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/addGroupPermissions-result.xml b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/addGroupPermissions-result.xml
deleted file mode 100644 (file)
index db7b211..0000000
--- a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/addGroupPermissions-result.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<dataset>
-  <groups id="100" name="sonar-administrators"/>
-  <groups id="101" name="sonar-users"/>
-
-  <group_roles id="1" group_id="100" resource_id="123" role="admin"/>
-</dataset>
\ No newline at end of file

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/addGroupPermissions.xml
deleted file mode 100644 (file)
index 6a4d9c9..0000000
--- a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/addGroupPermissions.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<dataset>
-  <groups id="100" name="sonar-administrators" />
-  <groups id="101" name="sonar-users" />
-</dataset>
\ No newline at end of file

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/addGroupPermissions_anyone-result.xml
deleted file mode 100644 (file)
index 4b48bf9..0000000
--- a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/addGroupPermissions_anyone-result.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<dataset>
-  <groups id="100" name="sonar-administrators" />
-  <groups id="101" name="sonar-users" />
-
-  <group_roles id="1" group_id="[null]" resource_id="123" role="admin"/>
-</dataset>
\ No newline at end of file

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/addGroupPermissions_anyone.xml
deleted file mode 100644 (file)
index 6a4d9c9..0000000
--- a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/addGroupPermissions_anyone.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<dataset>
-  <groups id="100" name="sonar-administrators" />
-  <groups id="101" name="sonar-users" />
-</dataset>
\ No newline at end of file

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/addGroupPermissions_ignore_if_group_not_found-result.xml
deleted file mode 100644 (file)
index 78695dd..0000000
--- a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/addGroupPermissions_ignore_if_group_not_found-result.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<dataset>
-  <groups id="100" name="sonar-administrators" />
-  <groups id="101" name="sonar-users" />
-
-  <!-- already existed -->
-  <group_roles id="1" group_id="[null]" resource_id="123" role="admin"/>
-</dataset>
\ No newline at end of file

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/addGroupPermissions_ignore_if_group_not_found.xml
deleted file mode 100644 (file)
index 78695dd..0000000
--- a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/addGroupPermissions_ignore_if_group_not_found.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<dataset>
-  <groups id="100" name="sonar-administrators" />
-  <groups id="101" name="sonar-users" />
-
-  <!-- already existed -->
-  <group_roles id="1" group_id="[null]" resource_id="123" role="admin"/>
-</dataset>
\ No newline at end of file

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/addGroupPermissions_ignore_if_not_persisted-result.xml
deleted file mode 100644 (file)
index 78695dd..0000000
--- a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/addGroupPermissions_ignore_if_not_persisted-result.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<dataset>
-  <groups id="100" name="sonar-administrators" />
-  <groups id="101" name="sonar-users" />
-
-  <!-- already existed -->
-  <group_roles id="1" group_id="[null]" resource_id="123" role="admin"/>
-</dataset>
\ No newline at end of file

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/addGroupPermissions_ignore_if_not_persisted.xml
deleted file mode 100644 (file)
index 78695dd..0000000
--- a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/addGroupPermissions_ignore_if_not_persisted.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<dataset>
-  <groups id="100" name="sonar-administrators" />
-  <groups id="101" name="sonar-users" />
-
-  <!-- already existed -->
-  <group_roles id="1" group_id="[null]" resource_id="123" role="admin"/>
-</dataset>
\ 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/grantDefaultPermissions-result.xml
deleted file mode 100644 (file)
index 23b0c67..0000000
--- a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantDefaultPermissions-result.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<dataset>
-  <groups id="100" name="sonar-administrators"/>
-  <groups id="101" name="sonar-users"/>
-  <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/>
-
-  <!-- on other resources -->
-  <group_roles id="1" group_id="100" resource_id="1" role="admin"/>
-  <group_roles id="2" group_id="101" resource_id="1" role="user"/>
-  <user_roles id="1" user_id="200" resource_id="1" role="admin"/>
-
-  <!--
-  new rows : sonar-administrators (admin), sonar-users (user & codeviewer), Anyone (user & codeviewer),
-   -->
-  <group_roles id="3" group_id="100" resource_id="123" role="admin"/>
-  <group_roles id="4" group_id="101" resource_id="123" role="user"/>
-  <group_roles id="5" group_id="[null]" resource_id="123" role="user"/>
-  <group_roles id="6" group_id="101" resource_id="123" role="codeviewer"/>
-  <group_roles id="7" group_id="[null]" resource_id="123" role="codeviewer"/>
-
-</dataset>
\ No newline at end of file

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/grantDefaultPermissions.xml
deleted file mode 100644 (file)
index 21a4dda..0000000
--- a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantDefaultPermissions.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<dataset>
-  <groups id="100" name="sonar-administrators" />
-  <groups id="101" name="sonar-users" />
-  <users id="200" login="marius" name="Marius" email="[null]" active="[true]" />
-
-  <!-- on other resources -->
-  <group_roles id="1" group_id="100" resource_id="1" role="admin"/>
-  <group_roles id="2" group_id="101" resource_id="1" role="user"/>
-  <user_roles id="1" user_id="200" resource_id="1" role="admin"/>
-</dataset>
\ No newline at end of file

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/grantDefaultPermissions_unknown_group-result.xml
deleted file mode 100644 (file)
index ef56a12..0000000
--- a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantDefaultPermissions_unknown_group-result.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<dataset>
-  <groups id="100" name="sonar-administrators"/>
-  <groups id="101" name="sonar-users"/>
-  <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/>
-
-  <!-- on other resources -->
-  <group_roles id="1" group_id="100" resource_id="1" role="admin"/>
-  <group_roles id="2" group_id="101" resource_id="1" role="user"/>
-  <user_roles id="1" user_id="200" resource_id="1" role="admin"/>
-
-  <!--
-  new rows : sonar-administrators (admin)
-   -->
-  <group_roles id="3" group_id="100" resource_id="123" role="admin"/>
-
-</dataset>
\ No newline at end of file

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/grantDefaultPermissions_unknown_group.xml
deleted file mode 100644 (file)
index 21a4dda..0000000
--- a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantDefaultPermissions_unknown_group.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<dataset>
-  <groups id="100" name="sonar-administrators" />
-  <groups id="101" name="sonar-users" />
-  <users id="200" login="marius" name="Marius" email="[null]" active="[true]" />
-
-  <!-- on other resources -->
-  <group_roles id="1" group_id="100" resource_id="1" role="admin"/>
-  <group_roles id="2" group_id="101" resource_id="1" role="user"/>
-  <user_roles id="1" user_id="200" resource_id="1" role="admin"/>
-</dataset>
\ No newline at end of file

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/grantDefaultPermissions_users-result.xml
deleted file mode 100644 (file)
index caff65f..0000000
--- a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantDefaultPermissions_users-result.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<dataset>
-  <groups id="100" name="sonar-administrators"/>
-  <groups id="101" name="sonar-users"/>
-  <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/>
-  <users id="201" login="disabled" name="Disabled" email="[null]" active="[false]"/>
-
-  <!-- on other resources -->
-  <group_roles id="1" group_id="100" resource_id="1" role="admin"/>
-  <group_roles id="2" group_id="101" resource_id="1" role="user"/>
-  <user_roles id="1" user_id="200" resource_id="1" role="admin"/>
-
-  <!--
- new row : marius (admin)
-  -->
-  <user_roles id="2" user_id="200" resource_id="123" role="admin"/>
-</dataset>
\ No newline at end of file

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/grantDefaultPermissions_users.xml
deleted file mode 100644 (file)
index 7c5f6c5..0000000
--- a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantDefaultPermissions_users.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<dataset>
-  <groups id="100" name="sonar-administrators" />
-  <groups id="101" name="sonar-users" />
-  <users id="200" login="marius" name="Marius" email="[null]" active="[true]" />
-  <users id="201" login="disabled" name="Disabled" email="[null]" active="[false]" />
-
-  <!-- on other resources -->
-  <group_roles id="1" group_id="100" resource_id="1" role="admin"/>
-  <group_roles id="2" group_id="101" resource_id="1" role="user"/>
-  <user_roles id="1" user_id="200" resource_id="1" role="admin"/>
-</dataset>
\ No newline at end of file

diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantDefaultRoles-result.xml b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantDefaultRoles-result.xml
new file mode 100644 (file)
index 0000000..23b0c67
--- /dev/null
+++ b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantDefaultRoles-result.xml
@@ -0,0 +1,20 @@
+<dataset>
+  <groups id="100" name="sonar-administrators"/>
+  <groups id="101" name="sonar-users"/>
+  <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/>
+
+  <!-- on other resources -->
+  <group_roles id="1" group_id="100" resource_id="1" role="admin"/>
+  <group_roles id="2" group_id="101" resource_id="1" role="user"/>
+  <user_roles id="1" user_id="200" resource_id="1" role="admin"/>
+
+  <!--
+  new rows : sonar-administrators (admin), sonar-users (user & codeviewer), Anyone (user & codeviewer),
+   -->
+  <group_roles id="3" group_id="100" resource_id="123" role="admin"/>
+  <group_roles id="4" group_id="101" resource_id="123" role="user"/>
+  <group_roles id="5" group_id="[null]" resource_id="123" role="user"/>
+  <group_roles id="6" group_id="101" resource_id="123" role="codeviewer"/>
+  <group_roles id="7" group_id="[null]" resource_id="123" role="codeviewer"/>
+
+</dataset>
\ No newline at end of file

diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantDefaultRoles.xml b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantDefaultRoles.xml
new file mode 100644 (file)
index 0000000..21a4dda
--- /dev/null
+++ b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantDefaultRoles.xml
@@ -0,0 +1,10 @@
+<dataset>
+  <groups id="100" name="sonar-administrators" />
+  <groups id="101" name="sonar-users" />
+  <users id="200" login="marius" name="Marius" email="[null]" active="[true]" />
+
+  <!-- on other resources -->
+  <group_roles id="1" group_id="100" resource_id="1" role="admin"/>
+  <group_roles id="2" group_id="101" resource_id="1" role="user"/>
+  <user_roles id="1" user_id="200" resource_id="1" role="admin"/>
+</dataset>
\ No newline at end of file

diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantDefaultRoles_unknown_group-result.xml b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantDefaultRoles_unknown_group-result.xml
new file mode 100644 (file)
index 0000000..ef56a12
--- /dev/null
+++ b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantDefaultRoles_unknown_group-result.xml
@@ -0,0 +1,16 @@
+<dataset>
+  <groups id="100" name="sonar-administrators"/>
+  <groups id="101" name="sonar-users"/>
+  <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/>
+
+  <!-- on other resources -->
+  <group_roles id="1" group_id="100" resource_id="1" role="admin"/>
+  <group_roles id="2" group_id="101" resource_id="1" role="user"/>
+  <user_roles id="1" user_id="200" resource_id="1" role="admin"/>
+
+  <!--
+  new rows : sonar-administrators (admin)
+   -->
+  <group_roles id="3" group_id="100" resource_id="123" role="admin"/>
+
+</dataset>
\ No newline at end of file

diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantDefaultRoles_unknown_group.xml b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantDefaultRoles_unknown_group.xml
new file mode 100644 (file)
index 0000000..21a4dda
--- /dev/null
+++ b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantDefaultRoles_unknown_group.xml
@@ -0,0 +1,10 @@
+<dataset>
+  <groups id="100" name="sonar-administrators" />
+  <groups id="101" name="sonar-users" />
+  <users id="200" login="marius" name="Marius" email="[null]" active="[true]" />
+
+  <!-- on other resources -->
+  <group_roles id="1" group_id="100" resource_id="1" role="admin"/>
+  <group_roles id="2" group_id="101" resource_id="1" role="user"/>
+  <user_roles id="1" user_id="200" resource_id="1" role="admin"/>
+</dataset>
\ No newline at end of file

diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantDefaultRoles_users-result.xml b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantDefaultRoles_users-result.xml
new file mode 100644 (file)
index 0000000..caff65f
--- /dev/null
+++ b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantDefaultRoles_users-result.xml
@@ -0,0 +1,16 @@
+<dataset>
+  <groups id="100" name="sonar-administrators"/>
+  <groups id="101" name="sonar-users"/>
+  <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/>
+  <users id="201" login="disabled" name="Disabled" email="[null]" active="[false]"/>
+
+  <!-- on other resources -->
+  <group_roles id="1" group_id="100" resource_id="1" role="admin"/>
+  <group_roles id="2" group_id="101" resource_id="1" role="user"/>
+  <user_roles id="1" user_id="200" resource_id="1" role="admin"/>
+
+  <!--
+ new row : marius (admin)
+  -->
+  <user_roles id="2" user_id="200" resource_id="123" role="admin"/>
+</dataset>
\ No newline at end of file

diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantDefaultRoles_users.xml b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantDefaultRoles_users.xml
new file mode 100644 (file)
index 0000000..7c5f6c5
--- /dev/null
+++ b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantDefaultRoles_users.xml
@@ -0,0 +1,11 @@
+<dataset>
+  <groups id="100" name="sonar-administrators" />
+  <groups id="101" name="sonar-users" />
+  <users id="200" login="marius" name="Marius" email="[null]" active="[true]" />
+  <users id="201" login="disabled" name="Disabled" email="[null]" active="[false]" />
+
+  <!-- on other resources -->
+  <group_roles id="1" group_id="100" resource_id="1" role="admin"/>
+  <group_roles id="2" group_id="101" resource_id="1" role="user"/>
+  <user_roles id="1" user_id="200" resource_id="1" role="admin"/>
+</dataset>
\ No newline at end of file

diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantGroupRole-result.xml b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantGroupRole-result.xml
new file mode 100644 (file)
index 0000000..db7b211
--- /dev/null
+++ b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantGroupRole-result.xml
@@ -0,0 +1,6 @@
+<dataset>
+  <groups id="100" name="sonar-administrators"/>
+  <groups id="101" name="sonar-users"/>
+
+  <group_roles id="1" group_id="100" resource_id="123" role="admin"/>
+</dataset>
\ No newline at end of file

diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantGroupRole.xml b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantGroupRole.xml
new file mode 100644 (file)
index 0000000..6a4d9c9
--- /dev/null
+++ b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantGroupRole.xml
@@ -0,0 +1,4 @@
+<dataset>
+  <groups id="100" name="sonar-administrators" />
+  <groups id="101" name="sonar-users" />
+</dataset>
\ No newline at end of file

diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantGroupRole_anyone-result.xml b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantGroupRole_anyone-result.xml
new file mode 100644 (file)
index 0000000..4b48bf9
--- /dev/null
+++ b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantGroupRole_anyone-result.xml
@@ -0,0 +1,6 @@
+<dataset>
+  <groups id="100" name="sonar-administrators" />
+  <groups id="101" name="sonar-users" />
+
+  <group_roles id="1" group_id="[null]" resource_id="123" role="admin"/>
+</dataset>
\ No newline at end of file

diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantGroupRole_anyone.xml b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantGroupRole_anyone.xml
new file mode 100644 (file)
index 0000000..6a4d9c9
--- /dev/null
+++ b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantGroupRole_anyone.xml
@@ -0,0 +1,4 @@
+<dataset>
+  <groups id="100" name="sonar-administrators" />
+  <groups id="101" name="sonar-users" />
+</dataset>
\ No newline at end of file

diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantGroupRole_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
new file mode 100644 (file)
index 0000000..78695dd
--- /dev/null
+++ b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantGroupRole_ignore_if_group_not_found-result.xml
@@ -0,0 +1,7 @@
+<dataset>
+  <groups id="100" name="sonar-administrators" />
+  <groups id="101" name="sonar-users" />
+
+  <!-- already existed -->
+  <group_roles id="1" group_id="[null]" resource_id="123" role="admin"/>
+</dataset>
\ No newline at end of file

diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantGroupRole_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
new file mode 100644 (file)
index 0000000..78695dd
--- /dev/null
+++ b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantGroupRole_ignore_if_group_not_found.xml
@@ -0,0 +1,7 @@
+<dataset>
+  <groups id="100" name="sonar-administrators" />
+  <groups id="101" name="sonar-users" />
+
+  <!-- already existed -->
+  <group_roles id="1" group_id="[null]" resource_id="123" role="admin"/>
+</dataset>
\ No newline at end of file

diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantGroupRole_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
new file mode 100644 (file)
index 0000000..78695dd
--- /dev/null
+++ b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantGroupRole_ignore_if_not_persisted-result.xml
@@ -0,0 +1,7 @@
+<dataset>
+  <groups id="100" name="sonar-administrators" />
+  <groups id="101" name="sonar-users" />
+
+  <!-- already existed -->
+  <group_roles id="1" group_id="[null]" resource_id="123" role="admin"/>
+</dataset>
\ No newline at end of file

diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantGroupRole_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
new file mode 100644 (file)
index 0000000..78695dd
--- /dev/null
+++ b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/grantGroupRole_ignore_if_not_persisted.xml
@@ -0,0 +1,7 @@
+<dataset>
+  <groups id="100" name="sonar-administrators" />
+  <groups id="101" name="sonar-users" />
+
+  <!-- already existed -->
+  <group_roles id="1" group_id="[null]" resource_id="123" role="admin"/>
+</dataset>
\ No newline at end of file

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/hasPermissions.xml
deleted file mode 100644 (file)
index 3d5f9a5..0000000
--- a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/hasPermissions.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<dataset>
-  <groups id="100" name="sonar-administrators"/>
-  <groups id="101" name="sonar-users"/>
-  <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/>
-
-  <!-- only_users -->
-  <user_roles id="1" user_id="200" resource_id="1" role="admin"/>
-
-  <!-- only_groups -->
-  <group_roles id="1" group_id="100" resource_id="2" role="admin"/>
-
-  <!-- groups_and_users -->
-  <group_roles id="2" group_id="101" resource_id="3" role="user"/>
-  <user_roles id="2" user_id="200" resource_id="3" role="admin"/>
-
-</dataset>
\ No newline at end of file

diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/hasRoles.xml b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/hasRoles.xml
new file mode 100644 (file)
index 0000000..3d5f9a5
--- /dev/null
+++ b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/security/DefaultResourcePermissioningTest/hasRoles.xml
@@ -0,0 +1,16 @@
+<dataset>
+  <groups id="100" name="sonar-administrators"/>
+  <groups id="101" name="sonar-users"/>
+  <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/>
+
+  <!-- only_users -->
+  <user_roles id="1" user_id="200" resource_id="1" role="admin"/>
+
+  <!-- only_groups -->
+  <group_roles id="1" group_id="100" resource_id="2" role="admin"/>
+
+  <!-- groups_and_users -->
+  <group_roles id="2" group_id="101" resource_id="3" role="user"/>
+  <user_roles id="2" user_id="200" resource_id="3" role="admin"/>
+
+</dataset>
\ No newline at end of file

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 d40e8b7ca29006f2e6b793f302021754431d261f..270dd52f8d3d0427fd573945513737a1a5dbdf1c 100644 (file)
--- 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);
 }