Fix quality flaws

3 files changed, 7 insertions, 11 deletions

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistSnapshotsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistSnapshotsStep.java
index afb0bf5baa1..a059de34514 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistSnapshotsStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistSnapshotsStep.java
@@ -30,7 +30,6 @@ import org.sonar.db.component.SnapshotDto;
 import org.sonar.server.computation.analysis.AnalysisMetadataHolder;
 import org.sonar.server.computation.component.Component;
 import org.sonar.server.computation.component.CrawlerDepthLimit;
-import org.sonar.server.computation.component.DbIdsRepository;
 import org.sonar.server.computation.component.DbIdsRepositoryImpl;
 import org.sonar.server.computation.component.MutableDbIdsRepository;
 import org.sonar.server.computation.component.PathAwareCrawler;
@@ -79,11 +78,11 @@ public class PersistSnapshotsStep implements ComputationStep {
 
     private final DbSession dbSession;
     private final long analysisDate;
-    private final DbIdsRepository dbIdsRepository;
+    private final MutableDbIdsRepository dbIdsRepository;
 
     private long rootId;
 
-    public PersistSnapshotsPathAwareVisitor(DbSession dbSession, long analysisDate, DbIdsRepository dbIdsRepository) {
+    public PersistSnapshotsPathAwareVisitor(DbSession dbSession, long analysisDate, MutableDbIdsRepository dbIdsRepository) {
       super(CrawlerDepthLimit.LEAVES, Order.PRE_ORDER, SnapshotDtoHolderFactory.INSTANCE);
       this.dbSession = dbSession;
       this.analysisDate = analysisDate;
@@ -185,16 +184,16 @@ public class PersistSnapshotsStep implements ComputationStep {
       }
       return snapshotDto;
     }
+
+    private void addToCache(Component component, SnapshotDto snapshotDto) {
+      dbIdsRepository.setSnapshotId(component, snapshotDto.getId());
+    }
   }
 
   private void persist(SnapshotDto snapshotDto, DbSession dbSession) {
     dbClient.snapshotDao().insert(dbSession, snapshotDto);
   }
 
-  private void addToCache(Component component, SnapshotDto snapshotDto) {
-    dbIdsRepository.setSnapshotId(component, snapshotDto.getId());
-  }
-
   private static String getFileQualifier(Component component) {
     return component.getFileAttributes().isUnitTest() ? Qualifiers.UNIT_TEST_FILE : Qualifiers.FILE;
   }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterFactory.java b/server/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterFactory.java
index 2364d1e3309..8d614b1f2da 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterFactory.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterFactory.java
@@ -127,7 +127,7 @@ public class MeasureFilterFactory {
     }
   }
 
-  private List<String> sortFieldLabels() {
+  private static List<String> sortFieldLabels() {
     return newArrayList(Iterables.transform(Arrays.asList(MeasureFilterSort.Field.values()), FieldToName.INSTANCE));
   }
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/UpdateUser.java b/server/sonar-server/src/main/java/org/sonar/server/user/UpdateUser.java
index d90137d60b1..363001b6cf1 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/user/UpdateUser.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/user/UpdateUser.java
@@ -31,10 +31,7 @@ public class UpdateUser {
   private String name;
   private String email;
   private List<String> scmAccounts;
-
   private String password;
-  private String passwordConfirmation;
-
   private ExternalIdentity externalIdentity;
 
   boolean nameChanged;