Replace XXXExtension by XXXComponent in some classes

4 files changed, 12 insertions, 10 deletions

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 cdaf5b445fb..eeec2bbebef 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
@@ -21,12 +21,10 @@ package org.sonar.core.resource;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.ibatis.session.SqlSession;
-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.permission.ComponentPermissionFacade;
 import org.sonar.core.persistence.MyBatis;
@@ -40,7 +38,7 @@ import java.util.List;
 /**
  * @since 3.2
  */
-public class DefaultResourcePermissions implements ResourcePermissions, TaskExtension, ServerExtension {
+public class DefaultResourcePermissions implements ResourcePermissions {
 
   private final Settings settings;
   private final MyBatis myBatis;
diff --git a/sonar-core/src/main/java/org/sonar/core/user/PermissionDao.java b/sonar-core/src/main/java/org/sonar/core/user/PermissionDao.java
index 0043f4339d5..bad927a8e50 100644
--- a/sonar-core/src/main/java/org/sonar/core/user/PermissionDao.java
+++ b/sonar-core/src/main/java/org/sonar/core/user/PermissionDao.java
@@ -21,16 +21,17 @@
 package org.sonar.core.user;
 
 import org.apache.ibatis.session.SqlSession;
-import org.sonar.api.ServerExtension;
-import org.sonar.api.task.TaskExtension;
+import org.sonar.api.ServerComponent;
+import org.sonar.api.task.TaskComponent;
 import org.sonar.core.persistence.MyBatis;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
+
 import java.util.Date;
 import java.util.List;
 
-public class PermissionDao implements TaskExtension, ServerExtension {
+public class PermissionDao implements TaskComponent, ServerComponent {
 
   private final MyBatis myBatis;
 
diff --git a/sonar-core/src/main/java/org/sonar/core/user/RoleDao.java b/sonar-core/src/main/java/org/sonar/core/user/RoleDao.java
index d76d7620615..c8bc741db1b 100644
--- a/sonar-core/src/main/java/org/sonar/core/user/RoleDao.java
+++ b/sonar-core/src/main/java/org/sonar/core/user/RoleDao.java
@@ -21,13 +21,13 @@
 package org.sonar.core.user;
 
 import org.apache.ibatis.session.SqlSession;
-import org.sonar.api.ServerExtension;
-import org.sonar.api.task.TaskExtension;
+import org.sonar.api.ServerComponent;
+import org.sonar.api.task.TaskComponent;
 import org.sonar.core.persistence.MyBatis;
 
 import java.util.List;
 
-public class RoleDao implements TaskExtension, ServerExtension {
+public class RoleDao implements TaskComponent, ServerComponent {
 
   private final MyBatis mybatis;
 
diff --git a/sonar-core/src/main/java/org/sonar/core/user/UserDao.java b/sonar-core/src/main/java/org/sonar/core/user/UserDao.java
index 65686ee93fa..a23f34426ba 100644
--- a/sonar-core/src/main/java/org/sonar/core/user/UserDao.java
+++ b/sonar-core/src/main/java/org/sonar/core/user/UserDao.java
@@ -21,6 +21,8 @@ package org.sonar.core.user;
 
 import com.google.common.collect.Lists;
 import org.apache.ibatis.session.SqlSession;
+import org.sonar.api.BatchComponent;
+import org.sonar.api.ServerComponent;
 import org.sonar.api.user.UserQuery;
 import org.sonar.core.persistence.MyBatis;
 
@@ -31,7 +33,8 @@ import java.util.List;
 /**
  * @since 3.2
  */
-public class UserDao {
+public class UserDao implements BatchComponent, ServerComponent {
+
   private final MyBatis mybatis;
 
   public UserDao(MyBatis mybatis) {