Skip to content

Commit 79cd638

Browse files
jimczijimczi
authored
Collapse package structure for metrics aggs (#33463)
This change collapses all metrics aggregations classes into a single package `org.elasticsearch.aggregations.metrics`. It also restricts the visibility of some classes (aggregators and factories) that should not be used outside of the package. Relates #22868
1 parent 3485941 commit 79cd638

File tree

277 files changed

+780
-820
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

277 files changed

+780
-820
lines changed

‎buildSrc/src/main/resources/checkstyle_suppressions.xml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -360,13 +360,7 @@
360360
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]search[/\\]aggregations[/\\]bucket[/\\]terms[/\\]TermsAggregator.java" checks="LineLength" />
361361
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]search[/\\]aggregations[/\\]bucket[/\\]terms[/\\]TermsAggregatorFactory.java" checks="LineLength" />
362362
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]search[/\\]aggregations[/\\]bucket[/\\]terms[/\\]support[/\\]IncludeExclude.java" checks="LineLength" />
363-
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]search[/\\]aggregations[/\\]metrics[/\\]cardinality[/\\]CardinalityAggregator.java" checks="LineLength" />
364-
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]search[/\\]aggregations[/\\]metrics[/\\]cardinality[/\\]HyperLogLogPlusPlus.java" checks="LineLength" />
365-
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]search[/\\]aggregations[/\\]metrics[/\\]geobounds[/\\]GeoBoundsAggregator.java" checks="LineLength" />
366-
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]search[/\\]aggregations[/\\]metrics[/\\]geocentroid[/\\]InternalGeoCentroid.java" checks="LineLength" />
367-
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]search[/\\]aggregations[/\\]metrics[/\\]percentiles[/\\]tdigest[/\\]TDigestPercentileRanksAggregator.java" checks="LineLength" />
368-
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]search[/\\]aggregations[/\\]metrics[/\\]percentiles[/\\]tdigest[/\\]TDigestPercentilesAggregator.java" checks="LineLength" />
369-
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]search[/\\]aggregations[/\\]metrics[/\\]scripted[/\\]ScriptedMetricAggregator.java" checks="LineLength" />
363+
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]search[/\\]aggregations[/\\]metrics[/\\]HyperLogLogPlusPlus.java" checks="LineLength" />
370364
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]search[/\\]aggregations[/\\]support[/\\]AggregationPath.java" checks="LineLength" />
371365
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]search[/\\]dfs[/\\]AggregatedDfs.java" checks="LineLength" />
372366
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]search[/\\]dfs[/\\]DfsSearchResult.java" checks="LineLength" />
@@ -641,8 +635,6 @@
641635
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]search[/\\]aggregations[/\\]bucket[/\\]TermsDocCountErrorIT.java" checks="LineLength" />
642636
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]search[/\\]aggregations[/\\]bucket[/\\]TermsShardMinDocCountIT.java" checks="LineLength" />
643637
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]search[/\\]aggregations[/\\]bucket[/\\]nested[/\\]NestedAggregatorTests.java" checks="LineLength" />
644-
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]search[/\\]aggregations[/\\]metrics[/\\]AbstractGeoTestCase.java" checks="LineLength" />
645-
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]search[/\\]aggregations[/\\]metrics[/\\]TopHitsIT.java" checks="LineLength" />
646638
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]search[/\\]aggregations[/\\]pipeline[/\\]ExtendedStatsBucketIT.java" checks="LineLength" />
647639
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]search[/\\]aggregations[/\\]pipeline[/\\]moving[/\\]avg[/\\]MovAvgIT.java" checks="LineLength" />
648640
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]search[/\\]aggregations[/\\]pipeline[/\\]serialdiff[/\\]SerialDiffIT.java" checks="LineLength" />

‎client/rest-high-level/src/main/java/org/elasticsearch/client/RestHighLevelClient.java

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -120,38 +120,38 @@
120120
import org.elasticsearch.search.aggregations.bucket.terms.ParsedLongTerms;
121121
import org.elasticsearch.search.aggregations.bucket.terms.ParsedStringTerms;
122122
import org.elasticsearch.search.aggregations.bucket.terms.StringTerms;
123-
import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
124-
import org.elasticsearch.search.aggregations.metrics.avg.ParsedAvg;
125-
import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
126-
import org.elasticsearch.search.aggregations.metrics.cardinality.ParsedCardinality;
127-
import org.elasticsearch.search.aggregations.metrics.geobounds.GeoBoundsAggregationBuilder;
128-
import org.elasticsearch.search.aggregations.metrics.geobounds.ParsedGeoBounds;
129-
import org.elasticsearch.search.aggregations.metrics.geocentroid.GeoCentroidAggregationBuilder;
130-
import org.elasticsearch.search.aggregations.metrics.geocentroid.ParsedGeoCentroid;
131-
import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
132-
import org.elasticsearch.search.aggregations.metrics.max.ParsedMax;
133-
import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
134-
import org.elasticsearch.search.aggregations.metrics.min.ParsedMin;
135-
import org.elasticsearch.search.aggregations.metrics.percentiles.hdr.InternalHDRPercentileRanks;
136-
import org.elasticsearch.search.aggregations.metrics.percentiles.hdr.InternalHDRPercentiles;
137-
import org.elasticsearch.search.aggregations.metrics.percentiles.hdr.ParsedHDRPercentileRanks;
138-
import org.elasticsearch.search.aggregations.metrics.percentiles.hdr.ParsedHDRPercentiles;
139-
import org.elasticsearch.search.aggregations.metrics.percentiles.tdigest.InternalTDigestPercentileRanks;
140-
import org.elasticsearch.search.aggregations.metrics.percentiles.tdigest.InternalTDigestPercentiles;
141-
import org.elasticsearch.search.aggregations.metrics.percentiles.tdigest.ParsedTDigestPercentileRanks;
142-
import org.elasticsearch.search.aggregations.metrics.percentiles.tdigest.ParsedTDigestPercentiles;
143-
import org.elasticsearch.search.aggregations.metrics.scripted.ParsedScriptedMetric;
144-
import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
145-
import org.elasticsearch.search.aggregations.metrics.stats.ParsedStats;
146-
import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
147-
import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
148-
import org.elasticsearch.search.aggregations.metrics.stats.extended.ParsedExtendedStats;
149-
import org.elasticsearch.search.aggregations.metrics.sum.ParsedSum;
150-
import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
151-
import org.elasticsearch.search.aggregations.metrics.tophits.ParsedTopHits;
152-
import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
153-
import org.elasticsearch.search.aggregations.metrics.valuecount.ParsedValueCount;
154-
import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
123+
import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
124+
import org.elasticsearch.search.aggregations.metrics.ParsedAvg;
125+
import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
126+
import org.elasticsearch.search.aggregations.metrics.ParsedCardinality;
127+
import org.elasticsearch.search.aggregations.metrics.GeoBoundsAggregationBuilder;
128+
import org.elasticsearch.search.aggregations.metrics.ParsedGeoBounds;
129+
import org.elasticsearch.search.aggregations.metrics.GeoCentroidAggregationBuilder;
130+
import org.elasticsearch.search.aggregations.metrics.ParsedGeoCentroid;
131+
import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
132+
import org.elasticsearch.search.aggregations.metrics.ParsedMax;
133+
import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
134+
import org.elasticsearch.search.aggregations.metrics.ParsedMin;
135+
import org.elasticsearch.search.aggregations.metrics.InternalHDRPercentileRanks;
136+
import org.elasticsearch.search.aggregations.metrics.InternalHDRPercentiles;
137+
import org.elasticsearch.search.aggregations.metrics.ParsedHDRPercentileRanks;
138+
import org.elasticsearch.search.aggregations.metrics.ParsedHDRPercentiles;
139+
import org.elasticsearch.search.aggregations.metrics.InternalTDigestPercentileRanks;
140+
import org.elasticsearch.search.aggregations.metrics.InternalTDigestPercentiles;
141+
import org.elasticsearch.search.aggregations.metrics.ParsedTDigestPercentileRanks;
142+
import org.elasticsearch.search.aggregations.metrics.ParsedTDigestPercentiles;
143+
import org.elasticsearch.search.aggregations.metrics.ParsedScriptedMetric;
144+
import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
145+
import org.elasticsearch.search.aggregations.metrics.ParsedStats;
146+
import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
147+
import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
148+
import org.elasticsearch.search.aggregations.metrics.ParsedExtendedStats;
149+
import org.elasticsearch.search.aggregations.metrics.ParsedSum;
150+
import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
151+
import org.elasticsearch.search.aggregations.metrics.ParsedTopHits;
152+
import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
153+
import org.elasticsearch.search.aggregations.metrics.ParsedValueCount;
154+
import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
155155
import org.elasticsearch.search.aggregations.pipeline.InternalSimpleValue;
156156
import org.elasticsearch.search.aggregations.pipeline.ParsedSimpleValue;
157157
import org.elasticsearch.search.aggregations.pipeline.bucketmetrics.InternalBucketMetricValue;

‎client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/SearchDocumentationIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
import org.elasticsearch.search.aggregations.bucket.terms.Terms;
8787
import org.elasticsearch.search.aggregations.bucket.terms.Terms.Bucket;
8888
import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
89-
import org.elasticsearch.search.aggregations.metrics.avg.Avg;
89+
import org.elasticsearch.search.aggregations.metrics.Avg;
9090
import org.elasticsearch.search.builder.SearchSourceBuilder;
9191
import org.elasticsearch.search.fetch.subphase.FetchSourceContext;
9292
import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder;

‎client/rest-high-level/src/test/java/org/elasticsearch/client/ml/datafeed/DatafeedConfigTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import org.elasticsearch.search.SearchModule;
3131
import org.elasticsearch.search.aggregations.AggregationBuilders;
3232
import org.elasticsearch.search.aggregations.AggregatorFactories;
33-
import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
33+
import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
3434
import org.elasticsearch.search.builder.SearchSourceBuilder.ScriptField;
3535
import org.elasticsearch.test.AbstractXContentTestCase;
3636

‎docs/reference/migration/migrate_7_0/java.asciidoc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,9 @@
1212
The `prepareExecute` method which created a request builder has been
1313
removed from the client api. Instead, construct a builder for the
1414
appropriate request directly.
15+
16+
=== Some Aggregation classes have moved packages
17+
18+
* All classes present in `org.elasticsearch.search.aggregations.metrics.*` packages
19+
were moved to a single `org.elasticsearch.search.aggregations.metrics` package.
20+

‎modules/lang-expression/src/test/java/org/elasticsearch/script/expression/MoreExpressionTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
import org.elasticsearch.search.SearchHits;
4040
import org.elasticsearch.search.aggregations.AggregationBuilders;
4141
import org.elasticsearch.search.aggregations.bucket.histogram.Histogram;
42-
import org.elasticsearch.search.aggregations.metrics.stats.Stats;
42+
import org.elasticsearch.search.aggregations.metrics.Stats;
4343
import org.elasticsearch.search.aggregations.pipeline.SimpleValue;
4444
import org.elasticsearch.search.sort.SortBuilders;
4545
import org.elasticsearch.search.sort.SortOrder;

‎modules/parent-join/src/test/java/org/elasticsearch/join/aggregations/ChildrenIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
import org.elasticsearch.search.aggregations.AggregationBuilders;
3131
import org.elasticsearch.search.aggregations.InternalAggregation;
3232
import org.elasticsearch.search.aggregations.bucket.terms.Terms;
33-
import org.elasticsearch.search.aggregations.metrics.sum.Sum;
34-
import org.elasticsearch.search.aggregations.metrics.tophits.TopHits;
33+
import org.elasticsearch.search.aggregations.metrics.Sum;
34+
import org.elasticsearch.search.aggregations.metrics.TopHits;
3535
import org.elasticsearch.search.sort.SortOrder;
3636
import org.junit.Before;
3737

‎modules/parent-join/src/test/java/org/elasticsearch/join/aggregations/ParentToChildrenAggregatorTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
import org.elasticsearch.join.mapper.MetaJoinFieldMapper;
5050
import org.elasticsearch.join.mapper.ParentJoinFieldMapper;
5151
import org.elasticsearch.search.aggregations.AggregatorTestCase;
52-
import org.elasticsearch.search.aggregations.metrics.min.InternalMin;
53-
import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
52+
import org.elasticsearch.search.aggregations.metrics.InternalMin;
53+
import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
5454

5555
import java.io.IOException;
5656
import java.util.Arrays;

‎server/src/main/java/org/elasticsearch/search/SearchModule.java

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -151,38 +151,38 @@
151151
import org.elasticsearch.search.aggregations.bucket.terms.StringTerms;
152152
import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
153153
import org.elasticsearch.search.aggregations.bucket.terms.UnmappedTerms;
154-
import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
155-
import org.elasticsearch.search.aggregations.metrics.avg.InternalAvg;
156-
import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
157-
import org.elasticsearch.search.aggregations.metrics.cardinality.InternalCardinality;
158-
import org.elasticsearch.search.aggregations.metrics.geobounds.GeoBoundsAggregationBuilder;
159-
import org.elasticsearch.search.aggregations.metrics.geobounds.InternalGeoBounds;
160-
import org.elasticsearch.search.aggregations.metrics.geocentroid.GeoCentroidAggregationBuilder;
161-
import org.elasticsearch.search.aggregations.metrics.geocentroid.InternalGeoCentroid;
162-
import org.elasticsearch.search.aggregations.metrics.max.InternalMax;
163-
import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
164-
import org.elasticsearch.search.aggregations.metrics.min.InternalMin;
165-
import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
166-
import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
167-
import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
168-
import org.elasticsearch.search.aggregations.metrics.percentiles.hdr.InternalHDRPercentileRanks;
169-
import org.elasticsearch.search.aggregations.metrics.percentiles.hdr.InternalHDRPercentiles;
170-
import org.elasticsearch.search.aggregations.metrics.percentiles.tdigest.InternalTDigestPercentileRanks;
171-
import org.elasticsearch.search.aggregations.metrics.percentiles.tdigest.InternalTDigestPercentiles;
172-
import org.elasticsearch.search.aggregations.metrics.scripted.InternalScriptedMetric;
173-
import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
174-
import org.elasticsearch.search.aggregations.metrics.stats.InternalStats;
175-
import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
176-
import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
177-
import org.elasticsearch.search.aggregations.metrics.stats.extended.InternalExtendedStats;
178-
import org.elasticsearch.search.aggregations.metrics.sum.InternalSum;
179-
import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
180-
import org.elasticsearch.search.aggregations.metrics.tophits.InternalTopHits;
181-
import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
182-
import org.elasticsearch.search.aggregations.metrics.valuecount.InternalValueCount;
183-
import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
184-
import org.elasticsearch.search.aggregations.metrics.weighted_avg.InternalWeightedAvg;
185-
import org.elasticsearch.search.aggregations.metrics.weighted_avg.WeightedAvgAggregationBuilder;
154+
import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
155+
import org.elasticsearch.search.aggregations.metrics.InternalAvg;
156+
import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
157+
import org.elasticsearch.search.aggregations.metrics.InternalCardinality;
158+
import org.elasticsearch.search.aggregations.metrics.GeoBoundsAggregationBuilder;
159+
import org.elasticsearch.search.aggregations.metrics.InternalGeoBounds;
160+
import org.elasticsearch.search.aggregations.metrics.GeoCentroidAggregationBuilder;
161+
import org.elasticsearch.search.aggregations.metrics.InternalGeoCentroid;
162+
import org.elasticsearch.search.aggregations.metrics.InternalMax;
163+
import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
164+
import org.elasticsearch.search.aggregations.metrics.InternalMin;
165+
import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
166+
import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
167+
import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
168+
import org.elasticsearch.search.aggregations.metrics.InternalHDRPercentileRanks;
169+
import org.elasticsearch.search.aggregations.metrics.InternalHDRPercentiles;
170+
import org.elasticsearch.search.aggregations.metrics.InternalTDigestPercentileRanks;
171+
import org.elasticsearch.search.aggregations.metrics.InternalTDigestPercentiles;
172+
import org.elasticsearch.search.aggregations.metrics.InternalScriptedMetric;
173+
import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
174+
import org.elasticsearch.search.aggregations.metrics.InternalStats;
175+
import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
176+
import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
177+
import org.elasticsearch.search.aggregations.metrics.InternalExtendedStats;
178+
import org.elasticsearch.search.aggregations.metrics.InternalSum;
179+
import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
180+
import org.elasticsearch.search.aggregations.metrics.InternalTopHits;
181+
import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
182+
import org.elasticsearch.search.aggregations.metrics.InternalValueCount;
183+
import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
184+
import org.elasticsearch.search.aggregations.metrics.InternalWeightedAvg;
185+
import org.elasticsearch.search.aggregations.metrics.WeightedAvgAggregationBuilder;
186186
import org.elasticsearch.search.aggregations.pipeline.InternalSimpleValue;
187187
import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator;
188188
import org.elasticsearch.search.aggregations.pipeline.bucketmetrics.InternalBucketMetricValue;

0 commit comments

Comments
 (0)