Fix quality flaws

6 files changed, 14 insertions, 15 deletions

diff --git a/server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelBackup.java b/server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelBackup.java
index c277aa13f08..a695592cba2 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelBackup.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelBackup.java
@@ -240,7 +240,7 @@ public class DebtModelBackup implements ServerComponent {
       ruleOperations.updateRule(rule, subCharacteristicDto,
         ruleDebt != null ? ruleDebt.function() : null,
         ruleDebt != null ? ruleDebt.coefficient() : null,
-        ruleDebt != null ? ruleDebt.offset() : null, updateDate, session);
+        ruleDebt != null ? ruleDebt.offset() : null, session);
       rule.setUpdatedAt(updateDate);
       ruleDebts.remove(ruleDebt);
     }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueChangelogFormatter.java b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueChangelogFormatter.java
index 8489981b7b8..427a240ea1b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueChangelogFormatter.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueChangelogFormatter.java
@@ -51,7 +51,7 @@ public class IssueChangelogFormatter implements ServerComponent {
     for (Map.Entry<String, FieldDiffs.Diff> entry : diffs.diffs().entrySet()) {
       StringBuilder message = new StringBuilder();
       String key = entry.getKey();
-      IssueChangelogDiffFormat diffFormat = format(locale, key, entry.getValue());
+      IssueChangelogDiffFormat diffFormat = format(key, entry.getValue());
       if (diffFormat.newValue() != null) {
         message.append(i18n.message(locale, "issue.changelog.changed_to", null, i18n.message(locale, ISSUE_CHANGELOG_FIELD + key, null), diffFormat.newValue()));
       } else {
@@ -67,7 +67,7 @@ public class IssueChangelogFormatter implements ServerComponent {
     return result;
   }
 
-  private IssueChangelogDiffFormat format(Locale locale, String key, FieldDiffs.Diff diff) {
+  private IssueChangelogDiffFormat format(String key, FieldDiffs.Diff diff) {
     Serializable newValue = diff.newValue();
     Serializable oldValue = diff.oldValue();
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java
index 3724e0eda02..82dfcd3da35 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java
@@ -262,7 +262,7 @@ public class SearchAction extends SearchRequestHandler<IssueQuery, Issue> {
         userLogins.add(issueComment.userLogin());
         commentsByIssues.put(issueComment.issueKey(), issueComment);
       }
-      usersByLogin = getUsersByLogin(session, userLogins);
+      usersByLogin = getUsersByLogin(userLogins);
 
       List<ComponentDto> componentDtos = dbClient.componentDao().getByKeys(session, componentKeys);
       List<ComponentDto> subProjectDtos = dbClient.componentDao().findSubProjectsByComponentKeys(session, componentKeys);
@@ -501,7 +501,7 @@ public class SearchAction extends SearchRequestHandler<IssueQuery, Issue> {
     }
   }
 
-  private Map<String, User> getUsersByLogin(DbSession session, List<String> userLogins) {
+  private Map<String, User> getUsersByLogin(List<String> userLogins) {
     Map<String, User> usersByLogin = newHashMap();
     for (User user : userFinder.findByLogins(userLogins)) {
       usersByLogin.put(user.login(), user);
diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/RuleOperations.java b/server/sonar-server/src/main/java/org/sonar/server/rule/RuleOperations.java
index d346638ff21..7f0a6555aff 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/rule/RuleOperations.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/rule/RuleOperations.java
@@ -40,7 +40,6 @@ import org.sonar.server.user.UserSession;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
-import java.util.Date;
 
 /**
  * @deprecated to be dropped in 4.4
@@ -82,7 +81,7 @@ public class RuleOperations implements ServerComponent {
       }
 
       boolean needUpdate = updateRule(ruleDto, subCharacteristic, ruleChange.debtRemediationFunction(), ruleChange.debtRemediationCoefficient(), ruleChange.debtRemediationOffset(),
-        new Date(system.now()), session);
+        session);
       if (needUpdate) {
         session.commit();
       }
@@ -94,7 +93,7 @@ public class RuleOperations implements ServerComponent {
   }
 
   public boolean updateRule(RuleDto ruleDto, @Nullable CharacteristicDto newSubCharacteristic, @Nullable String newFunction,
-                            @Nullable String newCoefficient, @Nullable String newOffset, Date updateDate, DbSession session) {
+                            @Nullable String newCoefficient, @Nullable String newOffset, DbSession session) {
     boolean needUpdate = false;
 
     // A sub-characteristic and a remediation function is given -> update rule debt
diff --git a/server/sonar-server/src/main/java/org/sonar/server/test/ws/CoverageShowAction.java b/server/sonar-server/src/main/java/org/sonar/server/test/ws/CoverageShowAction.java
index fd1dafc609b..3ca0e0b5f8a 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/test/ws/CoverageShowAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/test/ws/CoverageShowAction.java
@@ -104,13 +104,13 @@ public class CoverageShowAction implements RequestHandler {
       Map<Integer, Integer> testCases = coverageService.getTestCases(fileKey, type);
       Map<Integer, Integer> conditions = coverageService.getConditions(fileKey, type);
       Map<Integer, Integer> coveredConditions = coverageService.getCoveredConditions(fileKey, type);
-      writeCoverage(fileKey, hits, testCases, conditions, coveredConditions, from, to, json);
+      writeCoverage(hits, testCases, conditions, coveredConditions, from, to, json);
     }
 
     json.endObject().close();
   }
 
-  private void writeCoverage(String fileKey, Map<Integer, Integer> hitsByLine,
+  private void writeCoverage(Map<Integer, Integer> hitsByLine,
                              Map<Integer, Integer> testCasesByLines,
                              Map<Integer, Integer> conditionsByLine,
                              Map<Integer, Integer> coveredConditionsByLine,
diff --git a/server/sonar-server/src/test/java/org/sonar/server/debt/DebtModelBackupTest.java b/server/sonar-server/src/test/java/org/sonar/server/debt/DebtModelBackupTest.java
index bba0951dd7d..ac001b84a4c 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/debt/DebtModelBackupTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/debt/DebtModelBackupTest.java
@@ -632,7 +632,7 @@ public class DebtModelBackupTest {
 
     debtModelBackup.restoreFromXml("<xml/>");
 
-    verify(ruleOperations).updateRule(ruleCaptor.capture(), eq(compiler), eq("LINEAR"), eq("2h"), isNull(String.class), eq(now), eq(session));
+    verify(ruleOperations).updateRule(ruleCaptor.capture(), eq(compiler), eq("LINEAR"), eq("2h"), isNull(String.class), eq(session));
 
     verify(ruleDao).selectEnabledAndNonManual(session);
     verify(session).commit();
@@ -656,7 +656,7 @@ public class DebtModelBackupTest {
 
     debtModelBackup.restoreFromXml("<xml/>");
 
-    verify(ruleOperations).updateRule(ruleCaptor.capture(), isNull(CharacteristicDto.class), isNull(String.class), isNull(String.class), isNull(String.class), eq(now), eq(session));
+    verify(ruleOperations).updateRule(ruleCaptor.capture(), isNull(CharacteristicDto.class), isNull(String.class), isNull(String.class), isNull(String.class), eq(session));
 
     verify(ruleDao).selectEnabledAndNonManual(session);
     verify(session).commit();
@@ -690,7 +690,7 @@ public class DebtModelBackupTest {
 
     debtModelBackup.restoreFromXml("<xml/>", "java");
 
-    verify(ruleOperations).updateRule(ruleCaptor.capture(), eq(compiler), eq("LINEAR"), eq("2h"), isNull(String.class), eq(now), eq(session));
+    verify(ruleOperations).updateRule(ruleCaptor.capture(), eq(compiler), eq("LINEAR"), eq("2h"), isNull(String.class), eq(session));
 
     verify(ruleDao).selectEnabledAndNonManual(session);
     verify(session).commit();
@@ -736,7 +736,7 @@ public class DebtModelBackupTest {
 
     debtModelBackup.restoreFromXml("<xml/>", "java");
 
-    verify(ruleOperations).updateRule(ruleCaptor.capture(), isNull(CharacteristicDto.class), isNull(String.class), isNull(String.class), isNull(String.class), eq(now), eq(session));
+    verify(ruleOperations).updateRule(ruleCaptor.capture(), isNull(CharacteristicDto.class), isNull(String.class), isNull(String.class), isNull(String.class), eq(session));
 
     verify(ruleDao).selectEnabledAndNonManual(session);
     verify(session).commit();
@@ -784,7 +784,7 @@ public class DebtModelBackupTest {
 //        .setCreatedAt(oldDate).setUpdatedAt(oldDate)
     ));
 
-    when(ruleOperations.updateRule(any(RuleDto.class), any(CharacteristicDto.class), anyString(), anyString(), anyString(), any(Date.class), eq(session))).thenThrow(IllegalArgumentException.class);
+    when(ruleOperations.updateRule(any(RuleDto.class), any(CharacteristicDto.class), anyString(), anyString(), anyString(), eq(session))).thenThrow(IllegalArgumentException.class);
 
     assertThat(debtModelBackup.restoreFromXml("<xml/>").getErrors()).hasSize(1);