mirror of
https://github.com/honeymoose/OpenSearch.git
synced 2025-03-29 19:38:29 +00:00
Allow setting aggs after parsing them elsewhere (#22238)
This commit exposes public getters for the aggregations in AggregatorFactories.Builder. The reason is that it allows to parse the aggregation object from elsewhere (e.g. a plugin) and then be able to get the aggregation builders in order to set them in a SearchSourceBuilder. The alternative would have been to expose a setter for the AggregatorFactories.Builder object. But that would be making the API a bit trappy.
This commit is contained in:
parent
ce5c094cda
commit
b58bbb9e48
@ -32,6 +32,7 @@ import org.elasticsearch.search.profile.aggregation.ProfilingAggregator;
|
|||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collections;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.LinkedList;
|
import java.util.LinkedList;
|
||||||
@ -255,7 +256,7 @@ public class AggregatorFactories {
|
|||||||
} else {
|
} else {
|
||||||
// Check the non-pipeline sub-aggregator
|
// Check the non-pipeline sub-aggregator
|
||||||
// factories
|
// factories
|
||||||
AggregationBuilder[] subBuilders = aggBuilder.factoriesBuilder.getAggregatorFactories();
|
List<AggregationBuilder> subBuilders = aggBuilder.factoriesBuilder.aggregationBuilders;
|
||||||
boolean foundSubBuilder = false;
|
boolean foundSubBuilder = false;
|
||||||
for (AggregationBuilder subBuilder : subBuilders) {
|
for (AggregationBuilder subBuilder : subBuilders) {
|
||||||
if (aggName.equals(subBuilder.name)) {
|
if (aggName.equals(subBuilder.name)) {
|
||||||
@ -297,12 +298,12 @@ public class AggregatorFactories {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
AggregationBuilder[] getAggregatorFactories() {
|
public List<AggregationBuilder> getAggregatorFactories() {
|
||||||
return this.aggregationBuilders.toArray(new AggregationBuilder[this.aggregationBuilders.size()]);
|
return Collections.unmodifiableList(aggregationBuilders);
|
||||||
}
|
}
|
||||||
|
|
||||||
List<PipelineAggregationBuilder> getPipelineAggregatorFactories() {
|
public List<PipelineAggregationBuilder> getPipelineAggregatorFactories() {
|
||||||
return this.pipelineAggregatorBuilders;
|
return Collections.unmodifiableList(pipelineAggregatorBuilders);
|
||||||
}
|
}
|
||||||
|
|
||||||
public int count() {
|
public int count() {
|
||||||
|
@ -0,0 +1,45 @@
|
|||||||
|
/*
|
||||||
|
* Licensed to Elasticsearch under one or more contributor
|
||||||
|
* license agreements. See the NOTICE file distributed with
|
||||||
|
* this work for additional information regarding copyright
|
||||||
|
* ownership. Elasticsearch licenses this file to you under
|
||||||
|
* the Apache License, Version 2.0 (the "License"); you may
|
||||||
|
* not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing,
|
||||||
|
* software distributed under the License is distributed on an
|
||||||
|
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
|
* KIND, either express or implied. See the License for the
|
||||||
|
* specific language governing permissions and limitations
|
||||||
|
* under the License.
|
||||||
|
*/
|
||||||
|
package org.elasticsearch.search.aggregations;
|
||||||
|
|
||||||
|
import org.elasticsearch.search.aggregations.pipeline.PipelineAggregatorBuilders;
|
||||||
|
import org.elasticsearch.test.ESTestCase;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import static org.hamcrest.Matchers.equalTo;
|
||||||
|
|
||||||
|
public class AggregatorFactoriesTests extends ESTestCase {
|
||||||
|
|
||||||
|
public void testGetAggregatorFactories_returnsUnmodifiableList() {
|
||||||
|
AggregatorFactories.Builder builder = new AggregatorFactories.Builder().addAggregator(AggregationBuilders.avg("foo"));
|
||||||
|
List<AggregationBuilder> aggregatorFactories = builder.getAggregatorFactories();
|
||||||
|
assertThat(aggregatorFactories.size(), equalTo(1));
|
||||||
|
expectThrows(UnsupportedOperationException.class, () -> aggregatorFactories.add(AggregationBuilders.avg("bar")));
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testGetPipelineAggregatorFactories_returnsUnmodifiableList() {
|
||||||
|
AggregatorFactories.Builder builder = new AggregatorFactories.Builder().addPipelineAggregator(
|
||||||
|
PipelineAggregatorBuilders.avgBucket("foo", "path1"));
|
||||||
|
List<PipelineAggregationBuilder> pipelineAggregatorFactories = builder.getPipelineAggregatorFactories();
|
||||||
|
assertThat(pipelineAggregatorFactories.size(), equalTo(1));
|
||||||
|
expectThrows(UnsupportedOperationException.class,
|
||||||
|
() -> pipelineAggregatorFactories.add(PipelineAggregatorBuilders.avgBucket("bar", "path2")));
|
||||||
|
}
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user