Fix Quality flaws

diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionUpdater.java b/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionUpdater.java
index 49e61615dc62ba46ade54b8355fa2fa7762c3751..d18de1535c25285d81e622ad13b2a9512a029cf4 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionUpdater.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionUpdater.java
@@ -21,11 +21,8 @@ package org.sonar.server.permission;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
-import java.util.Set;
-import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
 import org.sonar.server.es.ProjectIndexer;
 import org.sonar.server.es.ProjectIndexers;
@@ -37,27 +34,23 @@ import org.sonar.server.es.ProjectIndexers;
  */
 public class PermissionUpdater {
 
-  private final DbClient dbClient;
   private final ProjectIndexers projectIndexers;
   private final UserPermissionChanger userPermissionChanger;
   private final GroupPermissionChanger groupPermissionChanger;
 
-  public PermissionUpdater(DbClient dbClient, ProjectIndexers projectIndexers,
+  public PermissionUpdater(ProjectIndexers projectIndexers,
     UserPermissionChanger userPermissionChanger, GroupPermissionChanger groupPermissionChanger) {
-    this.dbClient = dbClient;
     this.projectIndexers = projectIndexers;
     this.userPermissionChanger = userPermissionChanger;
     this.groupPermissionChanger = groupPermissionChanger;
   }
 
   public void apply(DbSession dbSession, Collection<PermissionChange> changes) {
-    Set<Long> projectIds = new HashSet<>();
     List<String> projectOrViewUuids = new ArrayList<>();
     for (PermissionChange change : changes) {
       boolean changed = doApply(dbSession, change);
       Optional<ProjectId> projectId = change.getProjectId();
       if (changed && projectId.isPresent()) {
-        projectIds.add(projectId.get().getId());
         projectOrViewUuids.add(projectId.get().getUuid());
       }
     }

diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/BasePermissionWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/BasePermissionWsTest.java
index 1ed30d1d67b5eb9b7f0aa6d0380c106a7580c8c8..cbc6023290fe6abebc5acc4b3e309cefc3879d51 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/BasePermissionWsTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/BasePermissionWsTest.java
@@ -54,6 +54,7 @@ public abstract class BasePermissionWsTest<A extends PermissionsWsAction> {
 
   @Rule
   public EsTester esTester = new EsTester(new FooIndexDefinition());
+
   @Rule
   public ExpectedException expectedException = ExpectedException.none();
 
@@ -82,7 +83,7 @@ public abstract class BasePermissionWsTest<A extends PermissionsWsAction> {
   }
 
   protected PermissionUpdater newPermissionUpdater() {
-    return new PermissionUpdater(db.getDbClient(),
+    return new PermissionUpdater(
       new ProjectIndexersImpl(new PermissionIndexer(db.getDbClient(), esTester.client())),
       new UserPermissionChanger(db.getDbClient()),
       new GroupPermissionChanger(db.getDbClient()));