From 010b453f84939596bdc1d83b6e4841156477a291 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Lievremont Date: Tue, 4 Nov 2014 16:04:07 +0100 Subject: [PATCH] SONAR-5749 SONAR-5779 Always populate data for fixed facets (status, resolution, severity) --- .../main/java/org/sonar/server/issue/index/IssueIndex.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 d348c3e6a7d..7dbc9d99c84 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 @@ -40,6 +40,7 @@ import org.elasticsearch.search.sort.FieldSortBuilder; import org.elasticsearch.search.sort.SortBuilders; import org.elasticsearch.search.sort.SortOrder; import org.sonar.api.issue.Issue; +import org.sonar.api.rule.Severity; import org.sonar.core.issue.db.IssueDto; import org.sonar.server.issue.IssueQuery; import org.sonar.server.issue.filter.IssueFilterParameters; @@ -341,9 +342,9 @@ public class IssueIndex extends BaseIndex { StickyFacetBuilder stickyFacetBuilder = stickyFacetBuilder(esQuery, filters); // Execute Term aggregations addSimpleStickyFacetIfNeeded(options, stickyFacetBuilder, esSearch, - IssueFilterParameters.SEVERITIES, IssueNormalizer.IssueField.SEVERITY.field(), 0); + IssueFilterParameters.SEVERITIES, IssueNormalizer.IssueField.SEVERITY.field(), 0, Severity.ALL.toArray()); addSimpleStickyFacetIfNeeded(options, stickyFacetBuilder, esSearch, - IssueFilterParameters.STATUSES, IssueNormalizer.IssueField.STATUS.field(), 0); + IssueFilterParameters.STATUSES, IssueNormalizer.IssueField.STATUS.field(), 0, Issue.STATUSES.toArray()); addSimpleStickyFacetIfNeeded(options, stickyFacetBuilder, esSearch, IssueFilterParameters.ACTION_PLANS, IssueNormalizer.IssueField.ACTION_PLAN.field(), 1, query.actionPlans().toArray()); addSimpleStickyFacetIfNeeded(options, stickyFacetBuilder, esSearch, @@ -409,7 +410,7 @@ public class IssueIndex extends BaseIndex { StickyFacetBuilder assigneeFacetBuilder = new StickyFacetBuilder(esQuery, resolutionFilters); BoolFilterBuilder facetFilter = assigneeFacetBuilder.getStickyFacetFilter(fieldName); FilterAggregationBuilder facetTopAggregation = assigneeFacetBuilder.buildTopFacetAggregation(fieldName, facetName, facetFilter, DEFAULT_ISSUE_FACET_SIZE, 0); - facetTopAggregation = assigneeFacetBuilder.addSelectedItemsToFacet(fieldName, facetName, facetTopAggregation, query.resolutions().toArray()); + facetTopAggregation = assigneeFacetBuilder.addSelectedItemsToFacet(fieldName, facetName, facetTopAggregation, Issue.RESOLUTIONS.toArray()); // Add missing facet for unresolved issues facetTopAggregation.subAggregation( -- 2.39.5