this.order = order == null ? ORDER_BY_BUCKET_SIZE_DESC : order;
}
- public TermsAggregationBuilder buildTermsAggregation(String name, TermTopAggregationDef topAggregation) {
+ public TermsAggregationBuilder buildTermsAggregation(String name,
+ TopAggregationDefinition topAggregation, @Nullable Integer numberOfTerms) {
TermsAggregationBuilder termsAggregation = AggregationBuilders.terms(name)
.field(topAggregation.getFieldName())
.order(order)
.minDocCount(TERM_AGGREGATION_MIN_DOC_COUNT);
- topAggregation.getMaxTerms().ifPresent(termsAggregation::size);
+ if (numberOfTerms != null) {
+ termsAggregation.size(numberOfTerms);
+ }
if (subAggregation != null) {
termsAggregation = termsAggregation.subAggregation(subAggregation);
}
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2020 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.server.es.searchrequest;
-
-import java.util.OptionalInt;
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
-
-import static com.google.common.base.Preconditions.checkArgument;
-
-/**
- * A top-aggregation which defines (at least) one sub-aggregation on the terms of the fields of the top-aggregation.
- */
-@Immutable
-public class TermTopAggregationDef implements TopAggregationDefinition {
- private final TopAggregationDef delegate;
- private final Integer maxTerms;
-
- public TermTopAggregationDef(String fieldName, boolean sticky, @Nullable Integer maxTerms) {
- this.delegate = new TopAggregationDef(fieldName, sticky);
- checkArgument(maxTerms == null || maxTerms >= 0, "maxTerms can't be < 0");
- this.maxTerms = maxTerms;
- }
-
- @Override
- public String getFieldName() {
- return delegate.getFieldName();
- }
-
- @Override
- public boolean isSticky() {
- return delegate.isSticky();
- }
-
- public OptionalInt getMaxTerms() {
- return maxTerms == null ? OptionalInt.empty() : OptionalInt.of(maxTerms);
- }
-}
package org.sonar.server.es.searchrequest;
import java.util.function.Consumer;
+import javax.annotation.Nullable;
import org.elasticsearch.index.query.BoolQueryBuilder;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.search.aggregations.AggregationBuilders;
/**
* Same as {@link #buildTopAggregation(String, TopAggregationDefinition, Consumer, Consumer)} with built-in addition of a
- * top-term sub aggregation based field defined by {@link TermTopAggregationDef#getFieldName()}.
+ * top-term sub aggregation based field defined by {@link TopAggregationDefinition#getFieldName()}.
*/
- public FilterAggregationBuilder buildTermTopAggregation(String topAggregationName, TermTopAggregationDef topAggregation,
+ public FilterAggregationBuilder buildTermTopAggregation(String topAggregationName,
+ TopAggregationDefinition topAggregation, @Nullable Integer numberOfTerms,
Consumer<BoolQueryBuilder> extraFilters, Consumer<FilterAggregationBuilder> otherSubAggregations) {
Consumer<FilterAggregationBuilder> subAggregations = t -> {
- t.subAggregation(subAggregationHelper.buildTermsAggregation(topAggregationName, topAggregation));
+ t.subAggregation(subAggregationHelper.buildTermsAggregation(topAggregationName, topAggregation, numberOfTerms));
otherSubAggregations.accept(t);
};
return buildTopAggregation(topAggregationName, topAggregation, extraFilters, subAggregations);
@Test
public void buildTermsAggregation_adds_term_subaggregation_with_minDoc_1_and_default_sort() {
String aggName = randomAlphabetic(10);
- TermTopAggregationDef topAggregation = new TermTopAggregationDef("bar", false, null);
+ TopAggregationDef topAggregation = new TopAggregationDef("bar", false);
Stream.of(
underTest,
underTestWithCustomSubAgg)
.forEach(t -> {
- TermsAggregationBuilder agg = t.buildTermsAggregation(aggName, topAggregation);
+ TermsAggregationBuilder agg = t.buildTermsAggregation(aggName, topAggregation, null);
assertThat(agg.getName()).isEqualTo(aggName);
assertThat(agg.field()).isEqualTo(topAggregation.getFieldName());
@Test
public void buildTermsAggregation_adds_custom_order_from_constructor() {
String aggName = randomAlphabetic(10);
- TermTopAggregationDef topAggregation = new TermTopAggregationDef("bar", false, null);
+ TopAggregationDef topAggregation = new TopAggregationDef("bar", false);
- TermsAggregationBuilder agg = underTestWithCustomsSubAggAndOrder.buildTermsAggregation(aggName, topAggregation);
+ TermsAggregationBuilder agg = underTestWithCustomsSubAggAndOrder.buildTermsAggregation(aggName, topAggregation, null);
assertThat(agg.getName()).isEqualTo(aggName);
assertThat(agg.field()).isEqualTo(topAggregation.getFieldName());
@Test
public void buildTermsAggregation_adds_custom_sub_agg_from_constructor() {
String aggName = randomAlphabetic(10);
- TermTopAggregationDef topAggregation = new TermTopAggregationDef("bar", false, null);
+ TopAggregationDef topAggregation = new TopAggregationDef("bar", false);
Stream.of(
underTestWithCustomSubAgg,
underTestWithCustomsSubAggAndOrder)
.forEach(t -> {
- TermsAggregationBuilder agg = t.buildTermsAggregation(aggName, topAggregation);
+ TermsAggregationBuilder agg = t.buildTermsAggregation(aggName, topAggregation, null);
assertThat(agg.getName()).isEqualTo(aggName);
assertThat(agg.field()).isEqualTo(topAggregation.getFieldName());
public void buildTermsAggregation_adds_custom_size_if_TermTopAggregation_specifies_one() {
String aggName = randomAlphabetic(10);
int customSize = 1 + new Random().nextInt(400);
- TermTopAggregationDef topAggregation = new TermTopAggregationDef("bar", false, customSize);
+ TopAggregationDef topAggregation = new TopAggregationDef("bar", false);
Stream.of(
underTest,
underTestWithCustomSubAgg,
underTestWithCustomsSubAggAndOrder)
.forEach(t -> {
- TermsAggregationBuilder agg = t.buildTermsAggregation(aggName, topAggregation);
+ TermsAggregationBuilder agg = t.buildTermsAggregation(aggName, topAggregation, customSize);
assertThat(agg.getName()).isEqualTo(aggName);
assertThat(agg.field()).isEqualTo(topAggregation.getFieldName());
@Test
public void buildSelectedItemsAggregation_returns_empty_if_no_selected_item() {
String aggName = randomAlphabetic(10);
- TermTopAggregationDef topAggregation = new TermTopAggregationDef("bar", false, null);
+ TopAggregationDef topAggregation = new TopAggregationDef("bar", false);
Stream.of(
underTest,
@Test
public void buildSelectedItemsAggregation_does_not_add_custom_order_from_constructor() {
String aggName = randomAlphabetic(10);
- TermTopAggregationDef topAggregation = new TermTopAggregationDef("bar", false, null);
+ TopAggregationDef topAggregation = new TopAggregationDef("bar", false);
String[] selected = randomNonEmptySelected();
TermsAggregationBuilder agg = underTestWithCustomsSubAggAndOrder.buildSelectedItemsAggregation(aggName, topAggregation, selected)
@Test
public void buildSelectedItemsAggregation_adds_custom_sub_agg_from_constructor() {
String aggName = randomAlphabetic(10);
- TermTopAggregationDef topAggregation = new TermTopAggregationDef("bar", false, null);
+ TopAggregationDef topAggregation = new TopAggregationDef("bar", false);
String[] selected = randomNonEmptySelected();
Stream.of(
@Test
public void buildTermTopAggregation_adds_term_subaggregation_from_subAggregationHelper() {
String topAggregationName = randomAlphabetic(10);
- TermTopAggregationDef topAggregation = new TermTopAggregationDef("bar", false, null);
+ TopAggregationDef topAggregation = new TopAggregationDef("bar", false);
TermsAggregationBuilder termSubAgg = AggregationBuilders.terms("foo");
- when(subAggregationHelper.buildTermsAggregation(topAggregationName, topAggregation)).thenReturn(termSubAgg);
+ when(subAggregationHelper.buildTermsAggregation(topAggregationName, topAggregation, null)).thenReturn(termSubAgg);
- FilterAggregationBuilder aggregationBuilder = underTest.buildTermTopAggregation(topAggregationName, topAggregation,
+ FilterAggregationBuilder aggregationBuilder = underTest.buildTermTopAggregation(
+ topAggregationName, topAggregation, null,
NO_EXTRA_FILTER, NO_OTHER_SUBAGGREGATION);
assertThat(aggregationBuilder.getName()).isEqualTo(topAggregationName);
@Test
public void buildTermTopAggregation_adds_subAggregation_from_lambda_parameter() {
- TermTopAggregationDef topAggregation = new TermTopAggregationDef("bar", false, null);
+ TopAggregationDef topAggregation = new TopAggregationDef("bar", false);
AggregationBuilder[] subAggs = IntStream.range(0, 1 + new Random().nextInt(12))
.mapToObj(i -> AggregationBuilders.min("subAgg_" + i))
.toArray(AggregationBuilder[]::new);
String topAggregationName = randomAlphabetic(10);
TermsAggregationBuilder termSubAgg = AggregationBuilders.terms("foo");
- when(subAggregationHelper.buildTermsAggregation(topAggregationName, topAggregation)).thenReturn(termSubAgg);
+ when(subAggregationHelper.buildTermsAggregation(topAggregationName, topAggregation, null)).thenReturn(termSubAgg);
AggregationBuilder[] allSubAggs = Stream.concat(Arrays.stream(subAggs), Stream.of(termSubAgg)).toArray(AggregationBuilder[]::new);
- AggregationBuilder aggregationBuilder = underTest.buildTermTopAggregation(topAggregationName, topAggregation,
+ AggregationBuilder aggregationBuilder = underTest.buildTermTopAggregation(
+ topAggregationName, topAggregation, null,
NO_EXTRA_FILTER, t -> Arrays.stream(subAggs).forEach(t::subAggregation));
assertThat(aggregationBuilder.getName()).isEqualTo(topAggregationName);
@Test
public void buildTermTopAggregation_adds_filter_from_FiltersComputer_for_TopAggregation() {
- TermTopAggregationDef topAggregation = new TermTopAggregationDef("bar", false, null);
- TermTopAggregationDef otherTopAggregation = new TermTopAggregationDef("acme", false, null);
+ TopAggregationDef topAggregation = new TopAggregationDef("bar", false);
+ TopAggregationDef otherTopAggregation = new TopAggregationDef("acme", false);
BoolQueryBuilder computerFilter = boolQuery();
BoolQueryBuilder otherFilter = boolQuery();
when(filtersComputer.getTopAggregationFilter(topAggregation)).thenReturn(Optional.of(computerFilter));
when(filtersComputer.getTopAggregationFilter(otherTopAggregation)).thenReturn(Optional.of(otherFilter));
String topAggregationName = randomAlphabetic(10);
TermsAggregationBuilder termSubAgg = AggregationBuilders.terms("foo");
- when(subAggregationHelper.buildTermsAggregation(topAggregationName, topAggregation)).thenReturn(termSubAgg);
+ when(subAggregationHelper.buildTermsAggregation(topAggregationName, topAggregation, null)).thenReturn(termSubAgg);
- FilterAggregationBuilder aggregationBuilder = underTest.buildTermTopAggregation(topAggregationName, topAggregation,
+ FilterAggregationBuilder aggregationBuilder = underTest.buildTermTopAggregation(
+ topAggregationName, topAggregation, null,
NO_EXTRA_FILTER, NO_OTHER_SUBAGGREGATION);
assertThat(aggregationBuilder.getName()).isEqualTo(topAggregationName);
@Test
public void buildTermTopAggregation_has_empty_filter_when_FiltersComputer_returns_empty_for_TopAggregation() {
- TermTopAggregationDef topAggregation = new TermTopAggregationDef("bar", false, null);
- TermTopAggregationDef otherTopAggregation = new TermTopAggregationDef("acme", false, null);
+ TopAggregationDef topAggregation = new TopAggregationDef("bar", false);
+ TopAggregationDef otherTopAggregation = new TopAggregationDef("acme", false);
BoolQueryBuilder otherFilter = boolQuery();
when(filtersComputer.getTopAggregationFilter(topAggregation)).thenReturn(Optional.empty());
when(filtersComputer.getTopAggregationFilter(otherTopAggregation)).thenReturn(Optional.of(otherFilter));
String topAggregationName = randomAlphabetic(10);
TermsAggregationBuilder termSubAgg = AggregationBuilders.terms("foo");
- when(subAggregationHelper.buildTermsAggregation(topAggregationName, topAggregation)).thenReturn(termSubAgg);
+ when(subAggregationHelper.buildTermsAggregation(topAggregationName, topAggregation, null)).thenReturn(termSubAgg);
- FilterAggregationBuilder aggregationBuilder = underTest.buildTermTopAggregation(topAggregationName, topAggregation,
+ FilterAggregationBuilder aggregationBuilder = underTest.buildTermTopAggregation(
+ topAggregationName, topAggregation, null,
NO_EXTRA_FILTER, NO_OTHER_SUBAGGREGATION);
assertThat(aggregationBuilder.getName()).isEqualTo(topAggregationName);
@Test
public void buildTermTopAggregation_adds_filter_from_FiltersComputer_for_TopAggregation_and_extra_one() {
String topAggregationName = randomAlphabetic(10);
- TermTopAggregationDef topAggregation = new TermTopAggregationDef("bar", false, null);
- TermTopAggregationDef otherTopAggregation = new TermTopAggregationDef("acme", false, null);
+ TopAggregationDef topAggregation = new TopAggregationDef("bar", false);
+ TopAggregationDef otherTopAggregation = new TopAggregationDef("acme", false);
BoolQueryBuilder computerFilter = boolQuery();
BoolQueryBuilder otherFilter = boolQuery();
BoolQueryBuilder extraFilter = boolQuery();
when(filtersComputer.getTopAggregationFilter(topAggregation)).thenReturn(Optional.of(computerFilter));
when(filtersComputer.getTopAggregationFilter(otherTopAggregation)).thenReturn(Optional.of(otherFilter));
TermsAggregationBuilder termSubAgg = AggregationBuilders.terms("foo");
- when(subAggregationHelper.buildTermsAggregation(topAggregationName, topAggregation)).thenReturn(termSubAgg);
+ when(subAggregationHelper.buildTermsAggregation(topAggregationName, topAggregation, null)).thenReturn(termSubAgg);
- FilterAggregationBuilder aggregationBuilder = underTest.buildTermTopAggregation(topAggregationName, topAggregation,
+ FilterAggregationBuilder aggregationBuilder = underTest.buildTermTopAggregation(
+ topAggregationName, topAggregation, null,
t -> t.must(extraFilter), NO_OTHER_SUBAGGREGATION);
assertThat(aggregationBuilder.getName()).isEqualTo(topAggregationName);
import org.sonar.server.es.searchrequest.RequestFiltersComputer;
import org.sonar.server.es.searchrequest.RequestFiltersComputer.AllFilters;
import org.sonar.server.es.searchrequest.SubAggregationHelper;
-import org.sonar.server.es.searchrequest.TermTopAggregationDef;
import org.sonar.server.es.searchrequest.TopAggregationDef;
import org.sonar.server.es.searchrequest.TopAggregationDefinition;
import org.sonar.server.es.searchrequest.TopAggregationHelper;
private final String name;
private final TopAggregationDefinition topAggregation;
+ private final Integer numberOfTerms;
- Facet(String name, String fieldName, boolean sticky, int size) {
+ Facet(String name, String fieldName, boolean sticky, int numberOfTerms) {
this.name = name;
- this.topAggregation = new TermTopAggregationDef(fieldName, sticky, size);
+ this.topAggregation = new TopAggregationDef(fieldName, sticky);
+ this.numberOfTerms = numberOfTerms;
}
Facet(String name, String fieldName, boolean sticky) {
this.name = name;
this.topAggregation = new TopAggregationDef(fieldName, sticky);
+ this.numberOfTerms = null;
}
public String getName() {
return topAggregation;
}
- public TermTopAggregationDef getTermTopAggregationDef() {
- return (TermTopAggregationDef) topAggregation;
+ public int getNumberOfTerms() {
+ checkState(numberOfTerms != null, "numberOfTerms should have been provided in constructor");
+
+ return numberOfTerms;
}
}
}
FilterAggregationBuilder topAggregation = aggregationHelper.buildTermTopAggregation(
- facet.getName(), facet.getTermTopAggregationDef(),
+ facet.getName(), facet.getTopAggregationDef(), facet.getNumberOfTerms(),
NO_EXTRA_FILTER,
- t -> aggregationHelper.getSubAggregationHelper().buildSelectedItemsAggregation(facet.getName(), facet.getTermTopAggregationDef(), selectedValues)
+ t -> aggregationHelper.getSubAggregationHelper().buildSelectedItemsAggregation(facet.getName(), facet.getTopAggregationDef(), selectedValues)
.ifPresent(t::subAggregation));
esRequest.addAggregation(topAggregation);
}
}
AggregationBuilder aggregation = aggregationHelper.buildTermTopAggregation(
- SEVERITIES.getName(), SEVERITIES.getTermTopAggregationDef(),
+ SEVERITIES.getName(), SEVERITIES.getTopAggregationDef(), SEVERITIES.getNumberOfTerms(),
// Ignore severity of Security HotSpots
filter -> filter.mustNot(termQuery(FIELD_ISSUE_TYPE, SECURITY_HOTSPOT.name())),
NO_OTHER_SUBAGGREGATION);
}
AggregationBuilder aggregation = aggregationHelper.buildTermTopAggregation(
- RESOLUTIONS.getName(), RESOLUTIONS.getTermTopAggregationDef(),
+ RESOLUTIONS.getName(), RESOLUTIONS.getTopAggregationDef(), RESOLUTIONS.getNumberOfTerms(),
NO_EXTRA_FILTER,
t -> {
// add aggregation of type "missing" to return count of unresolved issues in the facet
};
AggregationBuilder aggregation = aggregationHelper.buildTermTopAggregation(
- ASSIGNEES.getName(), ASSIGNEES.getTermTopAggregationDef(), NO_EXTRA_FILTER, assigneeAggregations);
+ ASSIGNEES.getName(), ASSIGNEES.getTopAggregationDef(), ASSIGNEES.getNumberOfTerms(),
+ NO_EXTRA_FILTER, assigneeAggregations);
esRequest.addAggregation(aggregation);
}
if (options.getFacets().contains(ASSIGNED_TO_ME.getName()) && !StringUtils.isEmpty(uuid)) {
AggregationBuilder aggregation = aggregationHelper.buildTermTopAggregation(
ASSIGNED_TO_ME.getName(),
- ASSIGNED_TO_ME.getTermTopAggregationDef(),
+ ASSIGNED_TO_ME.getTopAggregationDef(),
+ ASSIGNED_TO_ME.getNumberOfTerms(),
NO_EXTRA_FILTER,
t -> {
// add sub-aggregation to return issue count for current user
- aggregationHelper.getSubAggregationHelper().buildSelectedItemsAggregation(ASSIGNED_TO_ME.getName(), ASSIGNED_TO_ME.getTermTopAggregationDef(), new String[] {uuid})
+ aggregationHelper.getSubAggregationHelper()
+ .buildSelectedItemsAggregation(ASSIGNED_TO_ME.getName(), ASSIGNED_TO_ME.getTopAggregationDef(), new String[] {uuid})
.ifPresent(t::subAggregation);
});
esRequest.addAggregation(aggregation);
projects / sonarqube.git / commitdiff