From 707fcb29d63c8cccd7d480a83deb5b8ac32414d8 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Fri, 3 Oct 2014 11:34:21 +0200 Subject: [PATCH] Fix some quality flaws --- .../main/java/org/sonar/process/monitor/ProcessRef.java | 1 - .../referential/DefaultProjectReferentialsLoader.java | 6 ------ .../main/java/org/sonar/core/issue/db/IssueChangeDao.java | 8 ++++++-- .../java/org/sonar/core/issue/workflow/Transition.java | 5 +---- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/process/monitor/ProcessRef.java b/server/sonar-process-monitor/src/main/java/org/sonar/process/monitor/ProcessRef.java index 31eae8e9ba3..dc348a54516 100644 --- a/server/sonar-process-monitor/src/main/java/org/sonar/process/monitor/ProcessRef.java +++ b/server/sonar-process-monitor/src/main/java/org/sonar/process/monitor/ProcessRef.java @@ -19,7 +19,6 @@ */ package org.sonar.process.monitor; -import org.slf4j.LoggerFactory; import org.sonar.process.MessageException; import org.sonar.process.ProcessCommands; import org.sonar.process.ProcessUtils; diff --git a/sonar-batch/src/main/java/org/sonar/batch/referential/DefaultProjectReferentialsLoader.java b/sonar-batch/src/main/java/org/sonar/batch/referential/DefaultProjectReferentialsLoader.java index d0fc40db4bb..eeb1853de77 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/referential/DefaultProjectReferentialsLoader.java +++ b/sonar-batch/src/main/java/org/sonar/batch/referential/DefaultProjectReferentialsLoader.java @@ -19,7 +19,6 @@ */ package org.sonar.batch.referential; -import com.google.common.collect.ImmutableList; import com.google.common.collect.Maps; import org.sonar.api.batch.bootstrap.ProjectDefinition; import org.sonar.api.batch.bootstrap.ProjectReactor; @@ -54,11 +53,6 @@ public class DefaultProjectReferentialsLoader implements ProjectReferentialsLoad private static final String BATCH_PROJECT_URL = "/batch/project"; - private static final List METRICS = ImmutableList.of( - CoreMetrics.SCM_LAST_COMMIT_DATETIMES_BY_LINE, - CoreMetrics.SCM_REVISIONS_BY_LINE, - CoreMetrics.SCM_AUTHORS_BY_LINE); - private final ServerClient serverClient; private final AnalysisMode analysisMode; private final SnapshotDataDao dao; diff --git a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueChangeDao.java b/sonar-core/src/main/java/org/sonar/core/issue/db/IssueChangeDao.java index 92e971323fc..b236a18b366 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueChangeDao.java +++ b/sonar-core/src/main/java/org/sonar/core/issue/db/IssueChangeDao.java @@ -31,7 +31,11 @@ import org.sonar.core.persistence.MyBatis; import javax.annotation.CheckForNull; -import java.util.*; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Map; import static com.google.common.collect.Lists.newArrayList; import static com.google.common.collect.Maps.newHashMap; @@ -109,7 +113,7 @@ public class IssueChangeDao implements BatchComponent, ServerComponent { } public void insert(DbSession session, IssueChangeDto change) { - session.getMapper(IssueChangeMapper.class).insert(change); + session.getMapper(IssueChangeMapper.class).insert(change); } public boolean delete(String key) { diff --git a/sonar-core/src/main/java/org/sonar/core/issue/workflow/Transition.java b/sonar-core/src/main/java/org/sonar/core/issue/workflow/Transition.java index 2b18502b6a8..4afc317c75c 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/workflow/Transition.java +++ b/sonar-core/src/main/java/org/sonar/core/issue/workflow/Transition.java @@ -99,10 +99,7 @@ public class Transition { if (!key.equals(that.key)) { return false; } - if (!to.equals(that.to)) { - return false; - } - return true; + return to.equals(that.to); } @Override -- 2.39.5