diff options
| author | Julien Lancelot <julien.lancelot@gmail.com> | 2013-08-20 12:26:24 +0200 |
|---|---|---|
| committer | Julien Lancelot <julien.lancelot@gmail.com> | 2013-08-20 12:26:24 +0200 |
| commit | cfd9912407a505d6005d70f89ffc01c2d19b7ab4 (patch) | |
| tree | bcb920437ce0055791f01d994dc3560d99e63e58 /sonar-batch | |
| parent | ab09254608fa6dcf5595891d9070e4d9faf21276 (diff) | |
| download | sonarqube-cfd9912407a505d6005d70f89ffc01c2d19b7ab4.tar.gz sonarqube-cfd9912407a505d6005d70f89ffc01c2d19b7ab4.zip | |
Fix quality flaws
Diffstat (limited to 'sonar-batch')
3 files changed, 10 insertions, 20 deletions
diff --git a/sonar-batch/src/main/java/org/sonar/batch/index/Bucket.java b/sonar-batch/src/main/java/org/sonar/batch/index/Bucket.java index d44e9613e11..a7feab13006 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/index/Bucket.java +++ b/sonar-batch/src/main/java/org/sonar/batch/index/Bucket.java @@ -71,7 +71,7 @@ public final class Bucket { } public List<Bucket> getChildren() { - return (children == null ? Collections.<Bucket>emptyList() : children); + return children == null ? Collections.<Bucket>emptyList() : children; } public Bucket getParent() { diff --git a/sonar-batch/src/main/java/org/sonar/batch/index/DefaultIndex.java b/sonar-batch/src/main/java/org/sonar/batch/index/DefaultIndex.java index 40a2b99c773..308b9f02eb5 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/index/DefaultIndex.java +++ b/sonar-batch/src/main/java/org/sonar/batch/index/DefaultIndex.java @@ -331,9 +331,9 @@ public class DefaultIndex extends SonarIndex { } private static boolean isFiltered(Violation violation, ViolationQuery.SwitchMode mode) { - return (mode == ViolationQuery.SwitchMode.BOTH + return mode == ViolationQuery.SwitchMode.BOTH || (mode == ViolationQuery.SwitchMode.OFF && violation.isSwitchedOff()) - || (mode == ViolationQuery.SwitchMode.ON && !violation.isSwitchedOff())); + || (mode == ViolationQuery.SwitchMode.ON && !violation.isSwitchedOff()); } @Override @@ -535,7 +535,8 @@ public class DefaultIndex extends SonarIndex { boolean excluded = checkExclusion(resource, parentBucket); if (!excluded) { - Snapshot snapshot = persistence.saveResource(currentProject, resource, (parentBucket != null ? parentBucket.getResource() : null)); + Resource parentSnapshot = parentBucket != null ? parentBucket.getResource() : null; + Snapshot snapshot = persistence.saveResource(currentProject, resource, parentSnapshot); if (ResourceUtils.isPersistable(resource) && !Qualifiers.LIBRARY.equals(resource.getQualifier())) { graph.addComponent(resource, snapshot); } diff --git a/sonar-batch/src/main/java/org/sonar/batch/profiling/PhasesSumUpTimeProfiler.java b/sonar-batch/src/main/java/org/sonar/batch/profiling/PhasesSumUpTimeProfiler.java index 9e35c1936d0..ed23f549868 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/profiling/PhasesSumUpTimeProfiler.java +++ b/sonar-batch/src/main/java/org/sonar/batch/profiling/PhasesSumUpTimeProfiler.java @@ -25,16 +25,7 @@ import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.sonar.api.batch.Decorator; -import org.sonar.api.batch.events.DecoratorExecutionHandler; -import org.sonar.api.batch.events.DecoratorsPhaseHandler; -import org.sonar.api.batch.events.InitializerExecutionHandler; -import org.sonar.api.batch.events.InitializersPhaseHandler; -import org.sonar.api.batch.events.MavenPhaseHandler; -import org.sonar.api.batch.events.PostJobExecutionHandler; -import org.sonar.api.batch.events.PostJobsPhaseHandler; -import org.sonar.api.batch.events.ProjectAnalysisHandler; -import org.sonar.api.batch.events.SensorExecutionHandler; -import org.sonar.api.batch.events.SensorsPhaseHandler; +import org.sonar.api.batch.events.*; import org.sonar.api.resources.Project; import org.sonar.api.utils.TimeUtils; import org.sonar.batch.events.BatchStepHandler; @@ -51,7 +42,7 @@ import static org.sonar.batch.profiling.AbstractTimeProfiling.sortByDescendingTo import static org.sonar.batch.profiling.AbstractTimeProfiling.truncate; public class PhasesSumUpTimeProfiler implements ProjectAnalysisHandler, SensorExecutionHandler, DecoratorExecutionHandler, PostJobExecutionHandler, DecoratorsPhaseHandler, - SensorsPhaseHandler, PostJobsPhaseHandler, MavenPhaseHandler, InitializersPhaseHandler, InitializerExecutionHandler, BatchStepHandler { + SensorsPhaseHandler, PostJobsPhaseHandler, MavenPhaseHandler, InitializersPhaseHandler, InitializerExecutionHandler, BatchStepHandler { static final Logger LOG = LoggerFactory.getLogger(PhasesSumUpTimeProfiler.class); private static final int TEXT_RIGHT_PAD = 60; @@ -166,7 +157,7 @@ public class PhasesSumUpTimeProfiler implements ProjectAnalysisHandler, SensorEx } else { for (Decorator decorator : decoratorsProfiler.getDurations().keySet()) { currentModuleProfiling.getProfilingPerPhase(Phases.Phase.DECORATOR) - .getProfilingPerItem(decorator).setTotalTime(decoratorsProfiler.getDurations().get(decorator)); + .getProfilingPerItem(decorator).setTotalTime(decoratorsProfiler.getDurations().get(decorator)); } currentModuleProfiling.getProfilingPerPhase(Phases.Phase.DECORATOR).stop(); } @@ -202,8 +193,7 @@ public class PhasesSumUpTimeProfiler implements ProjectAnalysisHandler, SensorEx public void onInitializersPhase(InitializersPhaseEvent event) { if (event.isStart()) { currentModuleProfiling.addPhaseProfiling(Phases.Phase.INIT); - } - else { + } else { currentModuleProfiling.getProfilingPerPhase(Phases.Phase.INIT).stop(); } } @@ -222,8 +212,7 @@ public class PhasesSumUpTimeProfiler implements ProjectAnalysisHandler, SensorEx public void onBatchStep(BatchStepEvent event) { if (event.isStart()) { currentModuleProfiling.addBatchStepProfiling(event.stepName()); - } - else { + } else { currentModuleProfiling.getProfilingPerBatchStep(event.stepName()).stop(); } } |