From 22223866f71e83f3396b9e675d54aa216a608e22 Mon Sep 17 00:00:00 2001 From: marko-bekhta Date: Fri, 25 Jul 2025 22:47:12 +0200 Subject: [PATCH] HSEARCH-3661 Use `aggregations` key more consistently e.g. instead of `aggs` in bucket aggregations --- .../impl/AbstractElasticsearchBucketAggregation.java | 4 +++- .../aggregation/impl/ElasticsearchRangeAggregation.java | 2 +- .../aggregation/impl/ElasticsearchTermsAggregation.java | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/aggregation/impl/AbstractElasticsearchBucketAggregation.java b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/aggregation/impl/AbstractElasticsearchBucketAggregation.java index ecb88d2d6bd..97c05636e6e 100644 --- a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/aggregation/impl/AbstractElasticsearchBucketAggregation.java +++ b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/aggregation/impl/AbstractElasticsearchBucketAggregation.java @@ -23,6 +23,9 @@ public abstract class AbstractElasticsearchBucketAggregation extends AbstractElasticsearchNestableAggregation> { + protected static final JsonAccessor REQUEST_AGGREGATIONS_ACCESSOR = + JsonAccessor.root().property( "aggregations" ).asObject(); + private static final JsonAccessor REQUEST_REVERSE_NESTED_ACCESSOR = JsonAccessor.root().property( "reverse_nested" ).asObject(); @@ -30,7 +33,6 @@ public abstract class AbstractElasticsearchBucketAggregation private static final JsonAccessor REQUEST_AGGREGATIONS_ROOT_DOC_COUNT_ACCESSOR = JsonAccessor.root().property( "aggregations" ).property( ROOT_DOC_COUNT_NAME ).asObject(); - protected static final String INNER_EXTRACTOR_KEY = "innerExtractorKey"; protected static final String INNER_EXTRACTOR = "innerExtractor"; AbstractElasticsearchBucketAggregation(AbstractBuilder builder) { diff --git a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/aggregation/impl/ElasticsearchRangeAggregation.java b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/aggregation/impl/ElasticsearchRangeAggregation.java index 8833231202e..78806a11345 100644 --- a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/aggregation/impl/ElasticsearchRangeAggregation.java +++ b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/aggregation/impl/ElasticsearchRangeAggregation.java @@ -66,7 +66,7 @@ protected void doRequest(JsonObject outerObject, JsonObject innerObject, Aggrega aggregation.request( context, AggregationKey.of( "agg" ), subOuterObject ) ); if ( !subOuterObject.isEmpty() ) { - outerObject.add( "aggs", subOuterObject ); + REQUEST_AGGREGATIONS_ACCESSOR.set( outerObject, subOuterObject ); } } diff --git a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/aggregation/impl/ElasticsearchTermsAggregation.java b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/aggregation/impl/ElasticsearchTermsAggregation.java index c4dddb53813..f19a8027e91 100644 --- a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/aggregation/impl/ElasticsearchTermsAggregation.java +++ b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/aggregation/impl/ElasticsearchTermsAggregation.java @@ -72,7 +72,7 @@ protected void doRequest(JsonObject outerObject, JsonObject innerObject, Aggrega aggregation.request( context, AggregationKey.of( "agg" ), subOuterObject ) ); if ( !subOuterObject.isEmpty() ) { - outerObject.add( "aggs", subOuterObject ); + REQUEST_AGGREGATIONS_ACCESSOR.set( outerObject, subOuterObject ); } }