SONAR-4069 ResourcePermission need to be in TaskContainer

4 files changed, 16 insertions, 11 deletions

diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/TaskContainer.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/TaskContainer.java
index d1772e1497c..da09f319a6d 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/TaskContainer.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/TaskContainer.java
@@ -19,6 +19,8 @@
  */
 package org.sonar.batch.bootstrap;
 
+import org.sonar.core.resource.DefaultResourcePermissions;
+
 import org.sonar.api.CoreProperties;
 import org.sonar.api.config.Settings;
 import org.sonar.api.platform.ComponentContainer;
@@ -60,7 +62,11 @@ public class TaskContainer extends ComponentContainer {
   }
 
   private void installComponentsUsingTaskExtensions() {
-    add(ResourceTypes.class, MetricProvider.class, Tasks.class);
+    add(
+        ResourceTypes.class,
+        DefaultResourcePermissions.class,
+        MetricProvider.class,
+        Tasks.class);
   }
 
   @Override
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectScanContainer.java b/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectScanContainer.java
index 6ed74215880..186d3c86811 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectScanContainer.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectScanContainer.java
@@ -76,7 +76,6 @@ public class ProjectScanContainer extends ComponentContainer {
       LinkPersister.class,
       MeasurePersister.class,
       MemoryOptimizer.class,
-      DefaultResourcePermissions.class,
       DefaultResourcePersister.class,
       SourcePersister.class,
       DefaultNotificationManager.class,
diff --git a/sonar-core/src/main/java/org/sonar/core/resource/DefaultResourcePermissions.java b/sonar-core/src/main/java/org/sonar/core/resource/DefaultResourcePermissions.java
index 0ecb0964341..ead87a970c9 100644
--- a/sonar-core/src/main/java/org/sonar/core/resource/DefaultResourcePermissions.java
+++ b/sonar-core/src/main/java/org/sonar/core/resource/DefaultResourcePermissions.java
@@ -20,12 +20,12 @@
 package org.sonar.core.resource;
 
 import org.apache.ibatis.session.SqlSession;
-import org.sonar.api.BatchExtension;
 import org.sonar.api.ServerExtension;
 import org.sonar.api.config.Settings;
 import org.sonar.api.resources.Resource;
 import org.sonar.api.security.DefaultGroups;
 import org.sonar.api.security.ResourcePermissions;
+import org.sonar.api.task.TaskExtension;
 import org.sonar.api.web.UserRole;
 import org.sonar.core.persistence.MyBatis;
 import org.sonar.core.user.GroupDto;
@@ -38,7 +38,7 @@ import org.sonar.core.user.UserRoleDto;
 /**
  * @since 3.2
  */
-public class DefaultResourcePermissions implements ResourcePermissions, BatchExtension, ServerExtension {
+public class DefaultResourcePermissions implements ResourcePermissions, TaskExtension, ServerExtension {
 
   private final Settings settings;
   private final MyBatis myBatis;
@@ -70,9 +70,9 @@ public class DefaultResourcePermissions implements ResourcePermissions, BatchExt
         UserDto user = session.getMapper(UserMapper.class).selectUserByLogin(login);
         if (user != null) {
           UserRoleDto userRole = new UserRoleDto()
-            .setRole(role)
-            .setUserId(user.getId())
-            .setResourceId(Long.valueOf(resource.getId()));
+              .setRole(role)
+              .setUserId(user.getId())
+              .setResourceId(Long.valueOf(resource.getId()));
           RoleMapper roleMapper = session.getMapper(RoleMapper.class);
           roleMapper.deleteUserRole(userRole);
           roleMapper.insertUserRole(userRole);
@@ -89,8 +89,8 @@ public class DefaultResourcePermissions implements ResourcePermissions, BatchExt
       SqlSession session = myBatis.openSession();
       try {
         GroupRoleDto groupRole = new GroupRoleDto()
-          .setRole(role)
-          .setResourceId(Long.valueOf(resource.getId()));
+            .setRole(role)
+            .setResourceId(Long.valueOf(resource.getId()));
         RoleMapper roleMapper = session.getMapper(RoleMapper.class);
         if (DefaultGroups.isAnyone(groupName)) {
           roleMapper.deleteGroupRole(groupRole);
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/security/ResourcePermissions.java b/sonar-plugin-api/src/main/java/org/sonar/api/security/ResourcePermissions.java
index b3eff260a25..5fe0a58b9e6 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/security/ResourcePermissions.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/security/ResourcePermissions.java
@@ -19,9 +19,9 @@
  */
 package org.sonar.api.security;
 
-import org.sonar.api.BatchComponent;
 import org.sonar.api.ServerComponent;
 import org.sonar.api.resources.Resource;
+import org.sonar.api.task.TaskComponent;
 
 /**
  * Grant access to newly created projects.
@@ -30,7 +30,7 @@ import org.sonar.api.resources.Resource;
  *
  * @since 3.2
  */
-public interface ResourcePermissions extends BatchComponent, ServerComponent {
+public interface ResourcePermissions extends TaskComponent, ServerComponent {
 
   /**
    * Limitation - the resource id is used instead of logical key.