Fix JsonData deserialization

Signed-off-by: Andriy Redko <drreta@gmail.com>

Author: reta

java-client/src/main/java/org/opensearch/client/json/JsonData.java

@@ -108,5 +108,7 @@ static JsonData from(JsonParser parser, JsonpMapper mapper) {
         return of(parser.getValue(), mapper);
     }
 
-    JsonpDeserializer<JsonData> _DESERIALIZER = JsonpDeserializer.of(EnumSet.allOf(JsonParser.Event.class), JsonData::from);
+    JsonpDeserializer<JsonData> _DESERIALIZER = JsonpDeserializer.of(EnumSet.allOf(JsonParser.Event.class), (parser, mapper, event) -> {
+        return of(parser.getValue(), mapper);
+    });
 }

java-client/src/test/java11/org/opensearch/client/opensearch/integTest/AbstractRequestIT.java

@@ -49,7 +49,7 @@
 import org.opensearch.client.opensearch._types.Time;
 import org.opensearch.client.opensearch._types.aggregations.Aggregate;
 import org.opensearch.client.opensearch._types.aggregations.HistogramAggregate;
-import org.opensearch.client.opensearch._types.aggregations.SingleBucketAggregateBase;
+import org.opensearch.client.opensearch._types.aggregations.MultiTermsBucket;
 import org.opensearch.client.opensearch._types.analysis.Analyzer;
 import org.opensearch.client.opensearch._types.analysis.CustomAnalyzer;
 import org.opensearch.client.opensearch._types.analysis.ShingleTokenFilter;
@@ -478,8 +478,8 @@ public void testSubAggregation() throws IOException {
         SearchResponse<Product> searchResponse = javaClient().search(searchRequest, Product.class);
 
         Aggregate prices = searchResponse.aggregations().get("price")._get().toAggregate();
-        assertEquals(1, prices.dterms().buckets().array().get(0).to(SingleBucketAggregateBase.class).docCount());
-        assertEquals(1, prices.dterms().buckets().array().get(1).to(SingleBucketAggregateBase.class).docCount());
+        assertEquals(1, prices.dterms().buckets().array().get(0).to(MultiTermsBucket.class).docCount());
+        assertEquals(1, prices.dterms().buckets().array().get(1).to(MultiTermsBucket.class).docCount());
 
         // We've set "size" to zero
         assertEquals(0, searchResponse.hits().hits().size());

java-client/src/test/java11/org/opensearch/client/opensearch/integTest/AbstractSearchTemplateRequestIT.java

@@ -16,7 +16,7 @@
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.opensearch._types.BuiltinScriptLanguage;
 import org.opensearch.client.opensearch._types.Refresh;
-import org.opensearch.client.opensearch._types.aggregations.SingleBucketAggregateBase;
+import org.opensearch.client.opensearch._types.aggregations.MultiTermsBucket;
 import org.opensearch.client.opensearch._types.mapping.Property;
 import org.opensearch.client.opensearch.core.PutScriptRequest;
 import org.opensearch.client.opensearch.core.SearchTemplateResponse;
@@ -85,8 +85,8 @@ public void testTemplateSearchAggregations() throws Exception {
         assertEquals(1, searchResponse.aggregations().size());
         var buckets = searchResponse.aggregations().get("test-aggs").sterms().buckets().array();
         assertEquals(2, buckets.size());
-        assertEquals(2, buckets.get(0).to(SingleBucketAggregateBase.class).docCount());
-        assertEquals(2, buckets.get(1).to(SingleBucketAggregateBase.class).docCount());
+        assertEquals(2, buckets.get(0).to(MultiTermsBucket.class).docCount());
+        assertEquals(2, buckets.get(1).to(MultiTermsBucket.class).docCount());
 
     }