Update generated code

Author: swallez

java-client/src/main/java/co/elastic/clients/elasticsearch/_core/BulkRequest.java

@@ -25,15 +25,19 @@
 
 import co.elastic.clients.base.ElasticsearchError;
 import co.elastic.clients.base.Endpoint;
+import co.elastic.clients.base.SimpleEndpoint;
+import co.elastic.clients.elasticsearch._core.bulk.Operation;
 import co.elastic.clients.elasticsearch._types.RequestBase;
-import co.elastic.clients.json.DelegatingDeserializer;
 import co.elastic.clients.json.JsonpDeserializable;
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.JsonpMapper;
 import co.elastic.clients.json.JsonpSerializable;
 import co.elastic.clients.json.JsonpSerializer;
+import co.elastic.clients.json.JsonpUtils;
+import co.elastic.clients.json.NdJsonpSerializable;
 import co.elastic.clients.json.ObjectBuilderDeserializer;
 import co.elastic.clients.json.ObjectDeserializer;
+import co.elastic.clients.util.ModelTypeHelper;
 import co.elastic.clients.util.ObjectBuilder;
 import jakarta.json.JsonValue;
 import jakarta.json.stream.JsonGenerator;
@@ -42,16 +46,17 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.function.Supplier;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 
 // typedef: _global.bulk.Request
 
-public final class BulkRequest<TSource> extends RequestBase implements JsonpSerializable {
+public final class BulkRequest<TSource> extends RequestBase implements NdJsonpSerializable<Object>, JsonpSerializable {
 	@Nullable
 	private final String index;
 
@@ -85,7 +90,7 @@ public final class BulkRequest<TSource> extends RequestBase implements JsonpSeri
 	@Nullable
 	private final Boolean requireAlias;
 
-	private final List<JsonValue /* Union(_global.bulk.OperationContainer | _global.bulk.TSource) */> value;
+	private final List<Object> operations;
 
 	@Nullable
 	private final JsonpSerializer<TSource> tSourceSerializer;
@@ -100,16 +105,20 @@ public BulkRequest(Builder<TSource> builder) {
 		this.refresh = builder.refresh;
 		this.routing = builder.routing;
 		this.source = builder.source;
-		this.sourceExcludes = builder.sourceExcludes;
-		this.sourceIncludes = builder.sourceIncludes;
+		this.sourceExcludes = ModelTypeHelper.unmodifiable(builder.sourceExcludes);
+		this.sourceIncludes = ModelTypeHelper.unmodifiable(builder.sourceIncludes);
 		this.timeout = builder.timeout;
 		this.waitForActiveShards = builder.waitForActiveShards;
 		this.requireAlias = builder.requireAlias;
-		this.value = Objects.requireNonNull(builder.value, "value");
+		this.operations = ModelTypeHelper.unmodifiableNonNull(builder.operations, "_value_body");
 		this.tSourceSerializer = builder.tSourceSerializer;
 
 	}
 
+	public BulkRequest(Function<Builder<TSource>, Builder<TSource>> fn) {
+		this(fn.apply(new Builder<>()));
+	}
+
 	/**
 	 * Default index for items which don't provide one
 	 * <p>
@@ -233,20 +242,24 @@ public Boolean requireAlias() {
 	/**
 	 * Request body.
 	 * <p>
-	 * API name: {@code value}
+	 * API name: {@code _value_body}
 	 */
-	public List<JsonValue /* Union(_global.bulk.OperationContainer | _global.bulk.TSource) */> value() {
-		return this.value;
+	public List<Object> operations() {
+		return this.operations;
+	}
+
+	@Override
+	public Iterator<Object> iterator() {
+		return this.operations.iterator();
 	}
 
 	/**
 	 * Serialize this value to JSON.
 	 */
 	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
 		generator.writeStartArray();
-		for (JsonValue /* Union(_global.bulk.OperationContainer | _global.bulk.TSource) */ item0 : this.value) {
-			generator.write(item0);
-
+		for (Object item0 : this.operations) {
+			mapper.serialize(item0, generator);
 		}
 		generator.writeEnd();
 
@@ -291,7 +304,7 @@ public static class Builder<TSource> implements ObjectBuilder<BulkRequest<TSourc
 		@Nullable
 		private Boolean requireAlias;
 
-		private List<JsonValue /* Union(_global.bulk.OperationContainer | _global.bulk.TSource) */> value;
+		private List<Object> operations;
 
 		@Nullable
 		private JsonpSerializer<TSource> tSourceSerializer;
@@ -383,9 +396,9 @@ public Builder<TSource> sourceExcludes(String... value) {
 		}
 
 		/**
-		 * Add a value to {@link #sourceExcludes(List)}, creating the list if needed.
+		 * Add a value to {@link #sourceExcludes(List)}, creating the list if needed. 4
 		 */
-		public Builder<TSource> add_sourceExcludes(String value) {
+		public Builder<TSource> addSourceExcludes(String value) {
 			if (this.sourceExcludes == null) {
 				this.sourceExcludes = new ArrayList<>();
 			}
@@ -416,9 +429,9 @@ public Builder<TSource> sourceIncludes(String... value) {
 		}
 
 		/**
-		 * Add a value to {@link #sourceIncludes(List)}, creating the list if needed.
+		 * Add a value to {@link #sourceIncludes(List)}, creating the list if needed. 4
 		 */
-		public Builder<TSource> add_sourceIncludes(String value) {
+		public Builder<TSource> addSourceIncludes(String value) {
 			if (this.sourceIncludes == null) {
 				this.sourceIncludes = new ArrayList<>();
 			}
@@ -463,37 +476,52 @@ public Builder<TSource> requireAlias(@Nullable Boolean value) {
 		/**
 		 * Request body.
 		 * <p>
-		 * API name: {@code value}
+		 * API name: {@code _value_body}
 		 */
-		public Builder<TSource> value(
-				List<JsonValue /* Union(_global.bulk.OperationContainer | _global.bulk.TSource) */> value) {
-			this.value = value;
+		public Builder<TSource> operations(List<Object> value) {
+			this.operations = value;
 			return this;
 		}
 
 		/**
 		 * Request body.
 		 * <p>
-		 * API name: {@code value}
+		 * API name: {@code _value_body}
+		 */
+		public Builder<TSource> operations(Object... value) {
+			this.operations = Arrays.asList(value);
+			return this;
+		}
+
+		/**
+		 * Add an Operation to {@link #operations(List)}, creating the list if needed. 1
 		 */
-		public Builder<TSource> value(
-				JsonValue /* Union(_global.bulk.OperationContainer | _global.bulk.TSource) */... value) {
-			this.value = Arrays.asList(value);
+		public Builder<TSource> addOperation(Operation value) {
+			if (this.operations == null) {
+				this.operations = new ArrayList<>();
+			}
+			this.operations.add(value);
 			return this;
 		}
 
 		/**
-		 * Add a value to {@link #value(List)}, creating the list if needed.
+		 * Add a document to {@link #operations(List)}, creating the list if needed. 2
 		 */
-		public Builder<TSource> addValue(
-				JsonValue /* Union(_global.bulk.OperationContainer | _global.bulk.TSource) */ value) {
-			if (this.value == null) {
-				this.value = new ArrayList<>();
+		public Builder<TSource> addDocument(TSource value) {
+			if (this.operations == null) {
+				this.operations = new ArrayList<>();
 			}
-			this.value.add(value);
+			this.operations.add(value);
 			return this;
 		}
 
+		/**
+		 * Add an Operation to {@link #operations(List)}, creating the list if needed. 3
+		 */
+		public Builder<TSource> addOperation(Function<Operation.Builder, ObjectBuilder<Operation>> fn) {
+			return this.addOperation(fn.apply(new Operation.Builder()).build());
+		}
+
 		/**
 		 * Serializer for TSource. If not set, an attempt will be made to find a
 		 * serializer from the JSON context.
@@ -517,28 +545,10 @@ public BulkRequest<TSource> build() {
 
 	// ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Create a json deserializer for BulkRequest
-	 */
-	public static <TSource> JsonpDeserializer<BulkRequest<TSource>> createBulkRequestDeserializer(
-			JsonpDeserializer<TSource> tSourceDeserializer) {
-		return ObjectBuilderDeserializer.createForValue((Supplier<Builder<TSource>>) Builder::new,
-				op -> BulkRequest.setupBulkRequestDeserializer(op, tSourceDeserializer));
-	};
-
-	protected static <TSource> void setupBulkRequestDeserializer(
-			DelegatingDeserializer<BulkRequest.Builder<TSource>> op, JsonpDeserializer<TSource> tSourceDeserializer) {
-
-		op.add(Builder::value, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.jsonValueDeserializer()), "value");
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
 	/**
 	 * Endpoint "{@code bulk}".
 	 */
-	public static final Endpoint<BulkRequest<?>, BulkResponse, ElasticsearchError> ENDPOINT = new Endpoint.Simple<>(
+	public static final Endpoint<BulkRequest<?>, BulkResponse, ElasticsearchError> ENDPOINT = new SimpleEndpoint<>(
 			// Request method
 			request -> {
 				return "POST";
@@ -565,20 +575,20 @@ protected static <TSource> void setupBulkRequestDeserializer(
 				if (propsSet == (_index)) {
 					StringBuilder buf = new StringBuilder();
 					buf.append("/");
-					buf.append(request.index);
+					SimpleEndpoint.pathEncode(request.index, buf);
 					buf.append("/_bulk");
 					return buf.toString();
 				}
 				if (propsSet == (_index | _type)) {
 					StringBuilder buf = new StringBuilder();
 					buf.append("/");
-					buf.append(request.index);
+					SimpleEndpoint.pathEncode(request.index, buf);
 					buf.append("/");
-					buf.append(request.type);
+					SimpleEndpoint.pathEncode(request.type, buf);
 					buf.append("/_bulk");
 					return buf.toString();
 				}
-				throw Endpoint.Simple.noPathTemplateFound("path");
+				throw SimpleEndpoint.noPathTemplateFound("path");
 
 			},
 
@@ -589,13 +599,13 @@ protected static <TSource> void setupBulkRequestDeserializer(
 					params.put("pipeline", request.pipeline);
 				}
 				if (request.refresh != null) {
-					params.put("refresh", request.refresh.toString());
+					params.put("refresh", JsonpUtils.toString(request.refresh));
 				}
 				if (request.routing != null) {
 					params.put("routing", request.routing);
 				}
 				if (request.source != null) {
-					params.put("_source", request.source.toString());
+					params.put("_source", JsonpUtils.toString(request.source));
 				}
 				if (request.sourceExcludes != null) {
 					params.put("_source_excludes",
@@ -609,12 +619,12 @@ protected static <TSource> void setupBulkRequestDeserializer(
 					params.put("timeout", request.timeout);
 				}
 				if (request.waitForActiveShards != null) {
-					params.put("wait_for_active_shards", request.waitForActiveShards.toString());
+					params.put("wait_for_active_shards", JsonpUtils.toString(request.waitForActiveShards));
 				}
 				if (request.requireAlias != null) {
 					params.put("require_alias", String.valueOf(request.requireAlias));
 				}
 				return params;
 
-			}, Endpoint.Simple.emptyMap(), true, BulkResponse._DESERIALIZER);
+			}, SimpleEndpoint.emptyMap(), true, BulkResponse._DESERIALIZER);
 }

java-client/src/main/java/co/elastic/clients/elasticsearch/_core/BulkResponse.java

@@ -31,6 +31,7 @@
 import co.elastic.clients.json.JsonpSerializable;
 import co.elastic.clients.json.ObjectBuilderDeserializer;
 import co.elastic.clients.json.ObjectDeserializer;
+import co.elastic.clients.util.ModelTypeHelper;
 import co.elastic.clients.util.ObjectBuilder;
 import jakarta.json.stream.JsonGenerator;
 import java.lang.Boolean;
@@ -59,12 +60,16 @@ public final class BulkResponse implements JsonpSerializable {
 	public BulkResponse(Builder builder) {
 
 		this.errors = Objects.requireNonNull(builder.errors, "errors");
-		this.items = Objects.requireNonNull(builder.items, "items");
+		this.items = ModelTypeHelper.unmodifiableNonNull(builder.items, "items");
 		this.took = Objects.requireNonNull(builder.took, "took");
 		this.ingestTook = builder.ingestTook;
 
 	}
 
+	public BulkResponse(Function<Builder, Builder> fn) {
+		this(fn.apply(new Builder()));
+	}
+
 	/**
 	 * API name: {@code errors}
 	 */
@@ -168,7 +173,7 @@ public Builder items(ResponseItem... value) {
 		}
 
 		/**
-		 * Add a value to {@link #items(List)}, creating the list if needed.
+		 * Add a value to {@link #items(List)}, creating the list if needed. 4
 		 */
 		public Builder addItems(ResponseItem value) {
 			if (this.items == null) {
@@ -186,7 +191,7 @@ public Builder items(Function<ResponseItem.Builder, ObjectBuilder<ResponseItem>>
 		}
 
 		/**
-		 * Add a value to {@link #items(List)}, creating the list if needed.
+		 * Add a value to {@link #items(List)}, creating the list if needed. 5
 		 */
 		public Builder addItems(Function<ResponseItem.Builder, ObjectBuilder<ResponseItem>> fn) {
 			return this.addItems(fn.apply(new ResponseItem.Builder()).build());