[codegen] Update to latest API specification

Author: swallez

java-client/src/main/java/co/elastic/clients/elasticsearch/_types/EmptyTransform.java

@@ -288,10 +288,9 @@ public SortOptions build() {
 	}
 
 	public static final JsonpDeserializer<SortOptions> _DESERIALIZER = JsonpDeserializer.lazy(() -> JsonpDeserializer
-			.of(EnumSet.of(JsonParser.Event.START_OBJECT, JsonParser.Event.VALUE_STRING), (parser, mapper) -> {
+			.of(EnumSet.of(JsonParser.Event.START_OBJECT, JsonParser.Event.VALUE_STRING), (parser, mapper, event) -> {
 				SortOptions.Builder b = new SortOptions.Builder();
 
-				JsonParser.Event event = parser.next();
 				if (event == JsonParser.Event.VALUE_STRING) {
 					switch (parser.getString()) {
 						case "_score" :

java-client/src/main/java/co/elastic/clients/elasticsearch/_types/SortOptions.java

@@ -37,6 +37,7 @@
 import co.elastic.clients.util.TaggedUnionUtils;
 import jakarta.json.stream.JsonGenerator;
 import java.lang.Object;
+import java.util.List;
 import java.util.Objects;
 import java.util.function.Function;
 import javax.annotation.Nullable;
@@ -126,7 +127,7 @@ public boolean isChain() {
 	 * @throws IllegalStateException
 	 *             if the current variant is not of the {@code chain} kind.
 	 */
-	public ChainTransform chain() {
+	public List<Transform> chain() {
 		return TaggedUnionUtils.get(this, Kind.Chain);
 	}
 
@@ -173,6 +174,18 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
 		generator.writeKey(_kind.jsonValue());
 		if (_value instanceof JsonpSerializable) {
 			((JsonpSerializable) _value).serialize(generator, mapper);
+		} else {
+			switch (_kind) {
+				case Chain :
+					generator.writeStartArray();
+					for (Transform item0 : ((List<Transform>) this._value)) {
+						item0.serialize(generator, mapper);
+
+					}
+					generator.writeEnd();
+
+					break;
+			}
 		}
 
 		generator.writeEnd();
@@ -183,16 +196,12 @@ public static class Builder extends ObjectBuilderBase implements ObjectBuilder<T
 		private Kind _kind;
 		private Object _value;
 
-		public ObjectBuilder<Transform> chain(ChainTransform v) {
+		public ObjectBuilder<Transform> chain(List<Transform> v) {
 			this._kind = Kind.Chain;
 			this._value = v;
 			return this;
 		}
 
-		public ObjectBuilder<Transform> chain(Function<ChainTransform.Builder, ObjectBuilder<ChainTransform>> fn) {
-			return this.chain(fn.apply(new ChainTransform.Builder()).build());
-		}
-
 		public ObjectBuilder<Transform> script(ScriptTransform v) {
 			this._kind = Kind.Script;
 			this._value = v;
@@ -222,7 +231,7 @@ public Transform build() {
 
 	protected static void setupTransformDeserializer(ObjectDeserializer<Builder> op) {
 
-		op.add(Builder::chain, ChainTransform._DESERIALIZER, "chain");
+		op.add(Builder::chain, JsonpDeserializer.arrayDeserializer(Transform._DESERIALIZER), "chain");
 		op.add(Builder::script, ScriptTransform._DESERIALIZER, "script");
 		op.add(Builder::search, SearchTransform._DESERIALIZER, "search");
 

java-client/src/main/java/co/elastic/clients/elasticsearch/_types/Transform.java

@@ -25,19 +25,15 @@
 
 /**
  * Builders for {@link Transform} variants.
+ * <p>
+ * Variants <code>chain</code> are not available here as they don't have a
+ * dedicated class. Use {@link Transform}'s builder for these.
+ * 
  */
 public class TransformBuilders {
 	private TransformBuilders() {
 	}
 
-	/**
-	 * Creates a builder for the {@link ChainTransform chain} {@code Transform}
-	 * variant.
-	 */
-	public static ChainTransform.Builder chain() {
-		return new ChainTransform.Builder();
-	}
-
 	/**
 	 * Creates a builder for the {@link ScriptTransform script} {@code Transform}
 	 * variant.

java-client/src/main/java/co/elastic/clients/elasticsearch/_types/TransformBuilders.java

@@ -58,6 +58,9 @@ public class RangeBucket extends MultiBucketBase {
 	@Nullable
 	private final String toAsString;
 
+	@Nullable
+	private final String key;
+
 	// ---------------------------------------------------------------------------------------------
 
 	private RangeBucket(Builder builder) {
@@ -67,6 +70,7 @@ private RangeBucket(Builder builder) {
 		this.to = builder.to;
 		this.fromAsString = builder.fromAsString;
 		this.toAsString = builder.toAsString;
+		this.key = builder.key;
 
 	}
 
@@ -106,6 +110,16 @@ public final String toAsString() {
 		return this.toAsString;
 	}
 
+	/**
+	 * The bucket key. Present if the aggregation is <em>not</em> keyed
+	 * <p>
+	 * API name: {@code key}
+	 */
+	@Nullable
+	public final String key() {
+		return this.key;
+	}
+
 	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
 		super.serializeInternal(generator, mapper);
@@ -129,6 +143,11 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 			generator.write(this.toAsString);
 
 		}
+		if (this.key != null) {
+			generator.writeKey("key");
+			generator.write(this.key);
+
+		}
 
 	}
 
@@ -151,6 +170,9 @@ public static class Builder extends MultiBucketBase.AbstractBuilder<Builder> imp
 		@Nullable
 		private String toAsString;
 
+		@Nullable
+		private String key;
+
 		/**
 		 * API name: {@code from}
 		 */
@@ -183,6 +205,16 @@ public final Builder toAsString(@Nullable String value) {
 			return this;
 		}
 
+		/**
+		 * The bucket key. Present if the aggregation is <em>not</em> keyed
+		 * <p>
+		 * API name: {@code key}
+		 */
+		public final Builder key(@Nullable String value) {
+			this.key = value;
+			return this;
+		}
+
 		@Override
 		protected Builder self() {
 			return this;
@@ -215,6 +247,7 @@ protected static void setupRangeBucketDeserializer(ObjectDeserializer<RangeBucke
 		op.add(Builder::to, JsonpDeserializer.doubleDeserializer(), "to");
 		op.add(Builder::fromAsString, JsonpDeserializer.stringDeserializer(), "from_as_string");
 		op.add(Builder::toAsString, JsonpDeserializer.stringDeserializer(), "to_as_string");
+		op.add(Builder::key, JsonpDeserializer.stringDeserializer(), "key");
 
 	}
 

java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/ChildrenAggregateBucket.java

@@ -104,8 +104,7 @@ public SpanGapQuery build() {
 	 * Json deserializer for {@link SpanGapQuery}
 	 */
 	public static final JsonpDeserializer<SpanGapQuery> _DESERIALIZER = JsonpDeserializer
-			.of(EnumSet.of(JsonParser.Event.START_OBJECT), (parser, mapper) -> {
-				JsonpUtils.expectNextEvent(parser, JsonParser.Event.START_OBJECT);
+			.of(EnumSet.of(JsonParser.Event.START_OBJECT), (parser, mapper, event) -> {
 				String name = JsonpUtils.expectKeyName(parser, parser.next());
 
 				JsonpUtils.expectNextEvent(parser, JsonParser.Event.VALUE_NUMBER);

java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/RangeBucket.java

@@ -297,20 +297,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
 		if (ApiTypeHelper.isDefined(this.suggest)) {
 			generator.writeKey("suggest");
-			generator.writeStartObject();
-			for (Map.Entry<String, List<Suggestion<TDocument>>> item0 : this.suggest.entrySet()) {
-				generator.writeKey(item0.getKey());
-				generator.writeStartArray();
-				if (item0.getValue() != null) {
-					for (Suggestion<TDocument> item1 : item0.getValue()) {
-						item1.serialize(generator, mapper);
-
-					}
-				}
-				generator.writeEnd();
-
-			}
-			generator.writeEnd();
+			ExternallyTaggedUnion.serializeTypedKeysArray(this.suggest, generator, mapper);
 
 		}
 		if (this.terminatedEarly != null) {
@@ -608,9 +595,8 @@ protected static <TDocument> void setupAsyncSearchDeserializer(
 		op.add(Builder::pitId, JsonpDeserializer.stringDeserializer(), "pit_id");
 		op.add(Builder::scrollId, JsonpDeserializer.stringDeserializer(), "_scroll_id");
 		op.add(Builder::shards, ShardStatistics._DESERIALIZER, "_shards");
-		op.add(Builder::suggest, JsonpDeserializer.stringMapDeserializer(
-				JsonpDeserializer.arrayDeserializer(Suggestion.createSuggestionDeserializer(tDocumentDeserializer))),
-				"suggest");
+		op.add(Builder::suggest, ExternallyTaggedUnion.<Suggestion<TDocument>>arrayMapDeserializer(
+				Suggestion.createSuggestionDeserializer(tDocumentDeserializer)), "suggest");
 		op.add(Builder::terminatedEarly, JsonpDeserializer.booleanDeserializer(), "terminated_early");
 		op.add(Builder::timedOut, JsonpDeserializer.booleanDeserializer(), "timed_out");
 		op.add(Builder::took, JsonpDeserializer.longDeserializer(), "took");