Fix serialization of nested aggregates under `SingleBucketAggregateBa…

…se` (#1350) (#1352) * Add failing test Signed-off-by: Thomas Farr <[email protected]> * Fix Signed-off-by: Thomas Farr <[email protected]> --------- Signed-off-by: Thomas Farr <[email protected]> (cherry picked from commit 29381c0)
opensearch-project · Dec 11, 2024 · f98e8ea · f98e8ea
1 parent 29dc4c1
commit f98e8ea
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -22,6 +22,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - Fixed an issue where `FieldSort` was not implementing `SortOptionsVariant` ([#1323](https://github.com/opensearch-project/opensearch-java/pull/1323))
 - Fixed `CreateSnapshotResponse` deserialization when wait_for_completion is false  ([#1332](https://github.com/opensearch-project/opensearch-java/pull/1332))
 - Fixed `GetSnapshotResponse` deserialization ([#1299](https://github.com/opensearch-project/opensearch-java/pull/1299))
+- Fixed serialization of nested aggregates under `SingleBucketAggregateBase` ([#1350](https://github.com/opensearch-project/opensearch-java/pull/1350))
 
 ### Security
 

diff --git a/.../java/org/opensearch/client/opensearch/_types/aggregations/SingleBucketAggregateBase.java b/.../java/org/opensearch/client/opensearch/_types/aggregations/SingleBucketAggregateBase.java
@@ -37,6 +37,7 @@
 import java.util.Map;
 import java.util.function.Function;
 import javax.annotation.Nullable;
+import org.opensearch.client.json.ExternallyTaggedUnion;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectDeserializer;
@@ -71,8 +72,10 @@ public final long docCount() {
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         super.serializeInternal(generator, mapper);
+
+        ExternallyTaggedUnion.serializeTypedKeysInner(this.aggregations, generator, mapper);
+
         generator.writeKey("doc_count");
         generator.write(this.docCount);
 

diff --git a/...c/test/java/org/opensearch/client/opensearch/_types/aggregations/FilterAggregateTest.java b/...c/test/java/org/opensearch/client/opensearch/_types/aggregations/FilterAggregateTest.java
@@ -0,0 +1,21 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
+
+package org.opensearch.client.opensearch._types.aggregations;
+
+import org.junit.Test;
+import org.opensearch.client.opensearch.model.ModelTestCase;
+
+public class FilterAggregateTest extends ModelTestCase {
+    @Test
+    public void serializesNestedAggregates() {
+        String json = "{\"sum#l2_result\":{\"value\":1.0},\"doc_count\":1}";
+        FilterAggregate aggregate = fromJson(json, FilterAggregate._DESERIALIZER);
+        assertEquals(json, toJson(aggregate));
+    }
+}