Add support for UserDefined (JsonData), rename ToJsonp to JsonpSerializable

Author: swallez

java-client/src/main/java/co/elastic/clients/elasticsearch/ElasticsearchAsyncClient.java

@@ -21,18 +21,18 @@
 // THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
 //----------------------------------------------------
 
-package co.elastic.clients.elasticsearch._global;
+package co.elastic.clients.elasticsearch._core;
 
 import co.elastic.clients.base.ElasticsearchError;
 import co.elastic.clients.base.Endpoint;
 import co.elastic.clients.elasticsearch._types.RequestBase;
 import co.elastic.clients.json.DelegatingDeserializer;
 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.ObjectBuilderDeserializer;
 import co.elastic.clients.json.ObjectDeserializer;
-import co.elastic.clients.json.ToJsonp;
 import co.elastic.clients.util.ObjectBuilder;
 import jakarta.json.JsonValue;
 import jakarta.json.stream.JsonGenerator;
@@ -49,7 +49,7 @@
 import javax.annotation.Nullable;
 
 // typedef: _global.bulk.Request
-public final class BulkRequest<TSource> extends RequestBase implements ToJsonp {
+public final class BulkRequest<TSource> extends RequestBase implements JsonpSerializable {
 	@Nullable
 	private final String index;
 
@@ -90,7 +90,7 @@ public final class BulkRequest<TSource> extends RequestBase implements ToJsonp {
 
 	// ---------------------------------------------------------------------------------------------
 
-	protected BulkRequest(Builder<TSource> builder) {
+	public BulkRequest(Builder<TSource> builder) {
 
 		this.index = builder.index;
 		this.type = builder.type;
@@ -240,7 +240,7 @@ public List<JsonValue> value() {
 	/**
 	 * Serialize this value to JSON.
 	 */
-	public void toJsonp(JsonGenerator generator, JsonpMapper mapper) {
+	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
 		generator.writeStartArray();
 		for (JsonValue item0 : this.value) {
 			generator.write(item0);
@@ -383,7 +383,7 @@ public Builder<TSource> sourceExcludes(String... value) {
 		/**
 		 * Add a value to {@link #sourceExcludes(List)}, creating the list if needed.
 		 */
-		public Builder<TSource> addSourceExcludes(String value) {
+		public Builder<TSource> add_sourceExcludes(String value) {
 			if (this.sourceExcludes == null) {
 				this.sourceExcludes = new ArrayList<>();
 			}
@@ -416,7 +416,7 @@ public Builder<TSource> sourceIncludes(String... value) {
 		/**
 		 * Add a value to {@link #sourceIncludes(List)}, creating the list if needed.
 		 */
-		public Builder<TSource> addSourceIncludes(String value) {
+		public Builder<TSource> add_sourceIncludes(String value) {
 			if (this.sourceIncludes == null) {
 				this.sourceIncludes = new ArrayList<>();
 			}

java-client/src/main/java/co/elastic/clients/elasticsearch/ElasticsearchClient.java

@@ -21,15 +21,15 @@
 // THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
 //----------------------------------------------------
 
-package co.elastic.clients.elasticsearch._global;
+package co.elastic.clients.elasticsearch._core;
 
-import co.elastic.clients.elasticsearch._global.bulk.ResponseItemContainer;
+import co.elastic.clients.elasticsearch._core.bulk.ResponseItem;
 import co.elastic.clients.json.DelegatingDeserializer;
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.JsonpMapper;
+import co.elastic.clients.json.JsonpSerializable;
 import co.elastic.clients.json.ObjectBuilderDeserializer;
 import co.elastic.clients.json.ObjectDeserializer;
-import co.elastic.clients.json.ToJsonp;
 import co.elastic.clients.util.ObjectBuilder;
 import jakarta.json.stream.JsonGenerator;
 import java.lang.Boolean;
@@ -42,10 +42,10 @@
 import javax.annotation.Nullable;
 
 // typedef: _global.bulk.Response
-public final class BulkResponse implements ToJsonp {
+public final class BulkResponse implements JsonpSerializable {
 	private final Boolean errors;
 
-	private final List<ResponseItemContainer> items;
+	private final List<ResponseItem> items;
 
 	private final Number took;
 
@@ -54,7 +54,7 @@ public final class BulkResponse implements ToJsonp {
 
 	// ---------------------------------------------------------------------------------------------
 
-	protected BulkResponse(Builder builder) {
+	public BulkResponse(Builder builder) {
 
 		this.errors = Objects.requireNonNull(builder.errors, "errors");
 		this.items = Objects.requireNonNull(builder.items, "items");
@@ -73,7 +73,7 @@ public Boolean errors() {
 	/**
 	 * API name: {@code items}
 	 */
-	public List<ResponseItemContainer> items() {
+	public List<ResponseItem> items() {
 		return this.items;
 	}
 
@@ -95,21 +95,21 @@ public Number ingestTook() {
 	/**
 	 * Serialize this object to JSON.
 	 */
-	public void toJsonp(JsonGenerator generator, JsonpMapper mapper) {
+	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
 		generator.writeStartObject();
-		toJsonpInternal(generator, mapper);
+		serializeInternal(generator, mapper);
 		generator.writeEnd();
 	}
 
-	protected void toJsonpInternal(JsonGenerator generator, JsonpMapper mapper) {
+	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
 		generator.writeKey("errors");
 		generator.write(this.errors);
 
 		generator.writeKey("items");
 		generator.writeStartArray();
-		for (ResponseItemContainer item0 : this.items) {
-			item0.toJsonp(generator, mapper);
+		for (ResponseItem item0 : this.items) {
+			item0.serialize(generator, mapper);
 
 		}
 		generator.writeEnd();
@@ -134,7 +134,7 @@ protected void toJsonpInternal(JsonGenerator generator, JsonpMapper mapper) {
 	public static class Builder implements ObjectBuilder<BulkResponse> {
 		private Boolean errors;
 
-		private List<ResponseItemContainer> items;
+		private List<ResponseItem> items;
 
 		private Number took;
 
@@ -152,23 +152,23 @@ public Builder errors(Boolean value) {
 		/**
 		 * API name: {@code items}
 		 */
-		public Builder items(List<ResponseItemContainer> value) {
+		public Builder items(List<ResponseItem> value) {
 			this.items = value;
 			return this;
 		}
 
 		/**
 		 * API name: {@code items}
 		 */
-		public Builder items(ResponseItemContainer... value) {
+		public Builder items(ResponseItem... value) {
 			this.items = Arrays.asList(value);
 			return this;
 		}
 
 		/**
 		 * Add a value to {@link #items(List)}, creating the list if needed.
 		 */
-		public Builder addItems(ResponseItemContainer value) {
+		public Builder addItems(ResponseItem value) {
 			if (this.items == null) {
 				this.items = new ArrayList<>();
 			}
@@ -179,15 +179,15 @@ public Builder addItems(ResponseItemContainer value) {
 		/**
 		 * Set {@link #items(List)} to a singleton list.
 		 */
-		public Builder items(Function<ResponseItemContainer.Builder, ObjectBuilder<ResponseItemContainer>> fn) {
-			return this.items(fn.apply(new ResponseItemContainer.Builder()).build());
+		public Builder items(Function<ResponseItem.Builder, ObjectBuilder<ResponseItem>> fn) {
+			return this.items(fn.apply(new ResponseItem.Builder()).build());
 		}
 
 		/**
 		 * Add a value to {@link #items(List)}, creating the list if needed.
 		 */
-		public Builder addItems(Function<ResponseItemContainer.Builder, ObjectBuilder<ResponseItemContainer>> fn) {
-			return this.addItems(fn.apply(new ResponseItemContainer.Builder()).build());
+		public Builder addItems(Function<ResponseItem.Builder, ObjectBuilder<ResponseItem>> fn) {
+			return this.addItems(fn.apply(new ResponseItem.Builder()).build());
 		}
 
 		/**
@@ -221,15 +221,15 @@ public BulkResponse build() {
 	// ---------------------------------------------------------------------------------------------
 
 	/**
-	 * Json deserializer for BulkResponse
+	 * Json deserializer for {@link BulkResponse}
 	 */
 	public static final JsonpDeserializer<BulkResponse> DESERIALIZER = ObjectBuilderDeserializer
 			.createForObject(Builder::new, BulkResponse::setupBulkResponseDeserializer);
 
 	protected static void setupBulkResponseDeserializer(DelegatingDeserializer<BulkResponse.Builder> op) {
 
 		op.add(Builder::errors, JsonpDeserializer.booleanDeserializer(), "errors");
-		op.add(Builder::items, JsonpDeserializer.arrayDeserializer(ResponseItemContainer.DESERIALIZER), "items");
+		op.add(Builder::items, JsonpDeserializer.arrayDeserializer(ResponseItem.DESERIALIZER), "items");
 		op.add(Builder::took, JsonpDeserializer.numberDeserializer(), "took");
 		op.add(Builder::ingestTook, JsonpDeserializer.numberDeserializer(), "ingest_took");
 

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

@@ -21,35 +21,36 @@
 // THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
 //----------------------------------------------------
 
-package co.elastic.clients.elasticsearch._global;
+package co.elastic.clients.elasticsearch._core;
 
 import co.elastic.clients.base.ElasticsearchError;
 import co.elastic.clients.base.Endpoint;
 import co.elastic.clients.elasticsearch._types.RequestBase;
 import co.elastic.clients.json.DelegatingDeserializer;
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.JsonpMapper;
+import co.elastic.clients.json.JsonpSerializable;
 import co.elastic.clients.json.ObjectBuilderDeserializer;
 import co.elastic.clients.json.ObjectDeserializer;
-import co.elastic.clients.json.ToJsonp;
 import co.elastic.clients.util.ObjectBuilder;
 import jakarta.json.stream.JsonGenerator;
 import java.lang.String;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 
 // typedef: _global.clear_scroll.Request
-public final class ClearScrollRequest extends RequestBase implements ToJsonp {
+public final class ClearScrollRequest extends RequestBase implements JsonpSerializable {
 	@Nullable
 	private final List<String> scrollId;
 
 	// ---------------------------------------------------------------------------------------------
 
-	protected ClearScrollRequest(Builder builder) {
+	public ClearScrollRequest(Builder builder) {
 
 		this.scrollId = builder.scrollId;
 
@@ -68,13 +69,13 @@ public List<String> scrollId() {
 	/**
 	 * Serialize this object to JSON.
 	 */
-	public void toJsonp(JsonGenerator generator, JsonpMapper mapper) {
+	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
 		generator.writeStartObject();
-		toJsonpInternal(generator, mapper);
+		serializeInternal(generator, mapper);
 		generator.writeEnd();
 	}
 
-	protected void toJsonpInternal(JsonGenerator generator, JsonpMapper mapper) {
+	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
 	}
 
@@ -133,7 +134,7 @@ public ClearScrollRequest build() {
 	// ---------------------------------------------------------------------------------------------
 
 	/**
-	 * Json deserializer for ClearScrollRequest
+	 * Json deserializer for {@link ClearScrollRequest}
 	 */
 	public static final JsonpDeserializer<ClearScrollRequest> DESERIALIZER = ObjectBuilderDeserializer
 			.createForObject(Builder::new, ClearScrollRequest::setupClearScrollRequestDeserializer);

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

@@ -21,14 +21,14 @@
 // THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
 //----------------------------------------------------
 
-package co.elastic.clients.elasticsearch._global;
+package co.elastic.clients.elasticsearch._core;
 
 import co.elastic.clients.json.DelegatingDeserializer;
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.JsonpMapper;
+import co.elastic.clients.json.JsonpSerializable;
 import co.elastic.clients.json.ObjectBuilderDeserializer;
 import co.elastic.clients.json.ObjectDeserializer;
-import co.elastic.clients.json.ToJsonp;
 import co.elastic.clients.util.ObjectBuilder;
 import jakarta.json.stream.JsonGenerator;
 import java.lang.Boolean;
@@ -37,14 +37,14 @@
 import javax.annotation.Nullable;
 
 // typedef: _global.clear_scroll.Response
-public final class ClearScrollResponse implements ToJsonp {
+public final class ClearScrollResponse implements JsonpSerializable {
 	private final Boolean succeeded;
 
 	private final Number numFreed;
 
 	// ---------------------------------------------------------------------------------------------
 
-	protected ClearScrollResponse(Builder builder) {
+	public ClearScrollResponse(Builder builder) {
 
 		this.succeeded = Objects.requireNonNull(builder.succeeded, "succeeded");
 		this.numFreed = Objects.requireNonNull(builder.numFreed, "num_freed");
@@ -68,13 +68,13 @@ public Number numFreed() {
 	/**
 	 * Serialize this object to JSON.
 	 */
-	public void toJsonp(JsonGenerator generator, JsonpMapper mapper) {
+	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
 		generator.writeStartObject();
-		toJsonpInternal(generator, mapper);
+		serializeInternal(generator, mapper);
 		generator.writeEnd();
 	}
 
-	protected void toJsonpInternal(JsonGenerator generator, JsonpMapper mapper) {
+	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
 		generator.writeKey("succeeded");
 		generator.write(this.succeeded);
@@ -125,7 +125,7 @@ public ClearScrollResponse build() {
 	// ---------------------------------------------------------------------------------------------
 
 	/**
-	 * Json deserializer for ClearScrollResponse
+	 * Json deserializer for {@link ClearScrollResponse}
 	 */
 	public static final JsonpDeserializer<ClearScrollResponse> DESERIALIZER = ObjectBuilderDeserializer
 			.createForObject(Builder::new, ClearScrollResponse::setupClearScrollResponseDeserializer);