From: Julien Lancelot Date: Wed, 8 Oct 2014 08:03:04 +0000 (+0200) Subject: Fix quality flaws X-Git-Tag: 5.0-RC1~770 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d8a2f59a61e32d547c378197efd53edeab3e9f4b;p=sonarqube.git Fix quality flaws --- diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/AbstractNewCoverageFileAnalyzer.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/AbstractNewCoverageFileAnalyzer.java index 50a64524079..501a447b0a5 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/AbstractNewCoverageFileAnalyzer.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/AbstractNewCoverageFileAnalyzer.java @@ -35,6 +35,8 @@ import org.sonar.batch.components.Period; import org.sonar.batch.components.TimeMachineConfiguration; import org.sonar.core.DryRunIncompatible; +import javax.annotation.Nullable; + import java.util.Arrays; import java.util.Date; import java.util.List; @@ -161,7 +163,7 @@ public abstract class AbstractNewCoverageFileAnalyzer implements Decorator { context.saveMeasure(newUncoveredConditions); } - private Map parseCountByLine(Measure measure) { + private Map parseCountByLine(@Nullable Measure measure) { if (measure != null && measure.hasData()) { return KeyValueFormat.parseIntInt(measure.getData()); } @@ -176,7 +178,7 @@ public abstract class AbstractNewCoverageFileAnalyzer implements Decorator { Integer newConditions; Integer newCoveredConditions; - PeriodStruct(int index, Date date) { + PeriodStruct(int index, @Nullable Date date) { this.index = index; this.date = date; } @@ -188,7 +190,7 @@ public abstract class AbstractNewCoverageFileAnalyzer implements Decorator { newCoveredConditions = null; } - void analyze(Date lineDate, int hits, int conditions, int coveredConditions) { + void analyze(@Nullable Date lineDate, int hits, int conditions, int coveredConditions) { if (lineDate == null) { // TODO warning diff --git a/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsJsonWriter.java b/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsJsonWriter.java index 28463640567..14af1d0788c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsJsonWriter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsJsonWriter.java @@ -46,7 +46,7 @@ public class DuplicationsJsonWriter implements ServerComponent { void write(List blocks, JsonWriter json, DbSession session) { Map refByComponentKey = newHashMap(); json.name("duplications").beginArray(); - writeDuplications(blocks, refByComponentKey, json, session); + writeDuplications(blocks, refByComponentKey, json); json.endArray(); json.name("files").beginObject(); @@ -54,7 +54,7 @@ public class DuplicationsJsonWriter implements ServerComponent { json.endObject(); } - private void writeDuplications(List blocks, Map refByComponentKey, JsonWriter json, DbSession session) { + private void writeDuplications(List blocks, Map refByComponentKey, JsonWriter json) { for (DuplicationsParser.Block block : blocks) { json.beginObject().name("blocks").beginArray(); for (DuplicationsParser.Duplication duplication : block.duplications()) { diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java b/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java index dcad6f6af1c..148b9af0da8 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java @@ -45,11 +45,21 @@ import javax.annotation.Nullable; import java.util.*; import static com.google.common.collect.Lists.newArrayList; +import static com.google.common.collect.Maps.newHashMap; public class IssueIndex extends BaseIndex { + private Map sortColumns = newHashMap(); + public IssueIndex(IssueNormalizer normalizer, SearchClient client) { super(IndexDefinition.ISSUES, normalizer, client); + + sortColumns.put(IssueQuery.SORT_BY_ASSIGNEE, IssueNormalizer.IssueField.ASSIGNEE); + sortColumns.put(IssueQuery.SORT_BY_STATUS, IssueNormalizer.IssueField.STATUS); + sortColumns.put(IssueQuery.SORT_BY_SEVERITY, IssueNormalizer.IssueField.SEVERITY_VALUE); + sortColumns.put(IssueQuery.SORT_BY_CREATION_DATE, IssueNormalizer.IssueField.ISSUE_CREATED_AT); + sortColumns.put(IssueQuery.SORT_BY_UPDATE_DATE, IssueNormalizer.IssueField.ISSUE_UPDATED_AT); + sortColumns.put(IssueQuery.SORT_BY_CLOSE_DATE, IssueNormalizer.IssueField.ISSUE_CLOSE_DATE); } @Override @@ -221,7 +231,7 @@ public class IssueIndex extends BaseIndex { matchFilter(esFilter, IssueNormalizer.IssueField.SEVERITY, query.severities()); matchFilter(esFilter, IssueNormalizer.IssueField.STATUS, query.statuses()); - addDatesFilter(esFilter, query, options); + addDatesFilter(esFilter, query); return esFilter; } @@ -245,7 +255,7 @@ public class IssueIndex extends BaseIndex { )); } - private void addDatesFilter(BoolFilterBuilder esFilter, IssueQuery query, QueryContext options) { + private void addDatesFilter(BoolFilterBuilder esFilter, IssueQuery query) { Date createdAfter = query.createdAfter(); if (createdAfter != null) { esFilter.must(FilterBuilders @@ -298,18 +308,9 @@ public class IssueIndex extends BaseIndex { } private IndexField toIndexField(String sort) { - if (IssueQuery.SORT_BY_ASSIGNEE.equals(sort)) { - return IssueNormalizer.IssueField.ASSIGNEE; - } else if (IssueQuery.SORT_BY_STATUS.equals(sort)) { - return IssueNormalizer.IssueField.STATUS; - } else if (IssueQuery.SORT_BY_SEVERITY.equals(sort)) { - return IssueNormalizer.IssueField.SEVERITY_VALUE; - } else if (IssueQuery.SORT_BY_CREATION_DATE.equals(sort)) { - return IssueNormalizer.IssueField.ISSUE_CREATED_AT; - } else if (IssueQuery.SORT_BY_UPDATE_DATE.equals(sort)) { - return IssueNormalizer.IssueField.ISSUE_UPDATED_AT; - } else if (IssueQuery.SORT_BY_CLOSE_DATE.equals(sort)) { - return IssueNormalizer.IssueField.ISSUE_CLOSE_DATE; + IndexField indexFieldSort = sortColumns.get(sort); + if (indexFieldSort != null) { + return indexFieldSort; } throw new IllegalStateException("Unknown sort field : " + sort); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/search/Result.java b/server/sonar-server/src/main/java/org/sonar/server/search/Result.java index c7869559469..fa1c9d5af2c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/search/Result.java +++ b/server/sonar-server/src/main/java/org/sonar/server/search/Result.java @@ -33,11 +33,8 @@ import org.slf4j.LoggerFactory; import javax.annotation.CheckForNull; import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; -import java.util.Map; + +import java.util.*; public class Result { @@ -79,8 +76,9 @@ public class Result { } } else if (HasAggregations.class.isAssignableFrom(aggregation.getClass())) { HasAggregations hasAggregations = (HasAggregations) aggregation; - for (Aggregation internalAggregation : hasAggregations.getAggregations()) + for (Aggregation internalAggregation : hasAggregations.getAggregations()) { this.processAggregation(internalAggregation); + } } else { LOGGER.warn("Cannot process {} type of aggregation", aggregation.getClass()); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexMediumTest.java index 9868a85f8f6..366dc93e070 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexMediumTest.java @@ -107,7 +107,7 @@ public class RuleIndexMediumTest extends SearchMediumTest { assertThat(result.getFacets()).isEmpty(); // should not have any facet on non matching query! - result = index.search(new RuleQuery().setQueryText("aeiou"), new QueryOptions().setFacet(true)); + result = index.search(new RuleQuery().setQueryText("aeiou"), new QueryContext().setFacet(true)); assertThat(result.getFacets()).isEmpty(); // Repositories Facet is preset