[codegen] update to latest spec and generator

Author: l-trotta

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

@@ -180,12 +180,19 @@
  */
 public class ElasticsearchAsyncClient extends ApiClient<ElasticsearchTransport, ElasticsearchAsyncClient> {
 
+	/**
+	 * Creates a client from a {@link ElasticsearchTransportConfig.Default}}
+	 * configuration created with an inline lambda expression.
+	 */
 	public static ElasticsearchAsyncClient of(
 			Function<ElasticsearchTransportConfig.Builder, ElasticsearchTransportConfig.Builder> fn) {
 		return new ElasticsearchAsyncClient(
 				fn.apply(new ElasticsearchTransportConfig.Builder()).build().buildTransport());
 	}
 
+	/**
+	 * Creates a client from an {@link ElasticsearchTransportConfig}.
+	 */
 	public ElasticsearchAsyncClient(ElasticsearchTransportConfig config) {
 		this(config.buildTransport());
 	}

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

@@ -181,11 +181,18 @@
  */
 public class ElasticsearchClient extends ApiClient<ElasticsearchTransport, ElasticsearchClient> {
 
+	/**
+	 * Creates a client from a {@link ElasticsearchTransportConfig.Default}}
+	 * configuration created with an inline lambda expression.
+	 */
 	public static ElasticsearchClient of(
 			Function<ElasticsearchTransportConfig.Builder, ElasticsearchTransportConfig.Builder> fn) {
 		return new ElasticsearchClient(fn.apply(new ElasticsearchTransportConfig.Builder()).build().buildTransport());
 	}
 
+	/**
+	 * Creates a client from an {@link ElasticsearchTransportConfig}.
+	 */
 	public ElasticsearchClient(ElasticsearchTransportConfig config) {
 		this(config.buildTransport());
 	}

java-client/src/main/java/co/elastic/clients/elasticsearch/doc-files/api-spec.html

@@ -27,10 +27,14 @@
 '_global.create.Response': '_global/create/CreateResponse.ts#L22-L25',
 '_global.delete.Request': '_global/delete/DeleteRequest.ts#L34-L146',
 <<<<<<< HEAD
+<<<<<<< HEAD
 '_global.delete.Response': '_global/delete/DeleteResponse.ts#L22-L35',
 =======
 '_global.delete.Response': '_global/delete/DeleteResponse.ts#L22-L34',
 >>>>>>> 03828daff (regen from latest spec)
+=======
+'_global.delete.Response': '_global/delete/DeleteResponse.ts#L22-L35',
+>>>>>>> b5f478d93 ([codegen] update to latest spec and generator)
 '_global.delete_by_query.Request': '_global/delete_by_query/DeleteByQueryRequest.ts#L36-L314',
 '_global.delete_by_query.Response': '_global/delete_by_query/DeleteByQueryResponse.ts#L26-L88',
 '_global.delete_by_query_rethrottle.Request': '_global/delete_by_query_rethrottle/DeleteByQueryRethrottleRequest.ts#L24-L55',
@@ -1813,6 +1817,9 @@
 'inference._types.TextEmbeddingInferenceResult': 'inference/_types/Results.ts#L67-L75',
 'inference._types.TextEmbeddingResult': 'inference/_types/Results.ts#L60-L65',
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> b5f478d93 ([codegen] update to latest spec and generator)
 'inference._types.ToolCall': 'inference/_types/CommonTypes.ts#L112-L128',
 'inference._types.ToolCallFunction': 'inference/_types/CommonTypes.ts#L98-L110',
 'inference._types.VoyageAIServiceSettings': 'inference/_types/CommonTypes.ts#L1075-L1106',
@@ -1824,6 +1831,7 @@
 'inference._types.WatsonxTaskType': 'inference/_types/CommonTypes.ts#L1182-L1184',
 'inference.chat_completion_unified.Request': 'inference/chat_completion_unified/UnifiedRequest.ts#L24-L53',
 'inference.chat_completion_unified.Response': 'inference/chat_completion_unified/UnifiedResponse.ts#L22-L25',
+<<<<<<< HEAD
 =======
 'inference.chat_completion_unified.CompletionTool': 'inference/chat_completion_unified/UnifiedRequest.ts#L180-L192',
 'inference.chat_completion_unified.CompletionToolChoice': 'inference/chat_completion_unified/UnifiedRequest.ts#L143-L155',
@@ -1838,19 +1846,26 @@
 'inference.chat_completion_unified.ToolCall': 'inference/chat_completion_unified/UnifiedRequest.ts#L87-L103',
 'inference.chat_completion_unified.ToolCallFunction': 'inference/chat_completion_unified/UnifiedRequest.ts#L73-L85',
 >>>>>>> 03828daff (regen from latest spec)
+=======
+>>>>>>> b5f478d93 ([codegen] update to latest spec and generator)
 'inference.completion.Request': 'inference/completion/CompletionRequest.ts#L25-L63',
 'inference.completion.Response': 'inference/completion/CompletionResponse.ts#L22-L25',
 'inference.delete.Request': 'inference/delete/DeleteRequest.ts#L24-L66',
 'inference.delete.Response': 'inference/delete/DeleteResponse.ts#L22-L25',
 'inference.get.Request': 'inference/get/GetRequest.ts#L24-L56',
 'inference.get.Response': 'inference/get/GetResponse.ts#L22-L26',
 <<<<<<< HEAD
+<<<<<<< HEAD
 'inference.post_eis_chat_completion.Request': 'inference/post_eis_chat_completion/PostEisChatCompletionRequest.ts#L23-L48',
 'inference.post_eis_chat_completion.Response': 'inference/post_eis_chat_completion/PostEisChatCompletionResponse.ts#L22-L25',
 =======
 'inference.post_eis_chat_completion.Request': 'inference/post_eis_chat_completion/PostEisChatCompletionRequest.ts#L23-L46',
 'inference.post_eis_chat_completion.Response': 'inference/post_eis_chat_completion/PostEisChatCompletionResponse.ts#L22-L24',
 >>>>>>> 03828daff (regen from latest spec)
+=======
+'inference.post_eis_chat_completion.Request': 'inference/post_eis_chat_completion/PostEisChatCompletionRequest.ts#L23-L48',
+'inference.post_eis_chat_completion.Response': 'inference/post_eis_chat_completion/PostEisChatCompletionResponse.ts#L22-L25',
+>>>>>>> b5f478d93 ([codegen] update to latest spec and generator)
 'inference.put.Request': 'inference/put/PutRequest.ts#L25-L65',
 'inference.put.Response': 'inference/put/PutResponse.ts#L22-L25',
 'inference.put_alibabacloud.Request': 'inference/put_alibabacloud/PutAlibabaCloudRequest.ts#L30-L83',

java-client/src/main/java/co/elastic/clients/elasticsearch/inference/ChatCompletionUnifiedRequest.java

@@ -20,9 +20,12 @@
 package co.elastic.clients.elasticsearch.inference;
 
 import co.elastic.clients.elasticsearch._types.ErrorResponse;
+import co.elastic.clients.elasticsearch._types.RequestBase;
 import co.elastic.clients.elasticsearch._types.Time;
 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.ObjectBuilderDeserializer;
 import co.elastic.clients.json.ObjectDeserializer;
 import co.elastic.clients.transport.Endpoint;
@@ -34,11 +37,15 @@
 import jakarta.json.stream.JsonGenerator;
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 import jakarta.json.stream.JsonParser;
 =======
 >>>>>>> 03828daff (regen from latest spec)
 =======
 >>>>>>> c49af58dc (Revert "temp rebase fix")
+=======
+import jakarta.json.stream.JsonParser;
+>>>>>>> b5f478d93 ([codegen] update to latest spec and generator)
 import java.lang.String;
 import java.util.HashMap;
 import java.util.Map;
@@ -71,12 +78,13 @@ >>>>>>> c49af58dc (Revert "temp rebase fix")
  *      specification</a>
  */
 @JsonpDeserializable
-public class ChatCompletionUnifiedRequest extends RequestChatCompletionBase {
+public class ChatCompletionUnifiedRequest extends RequestBase implements JsonpSerializable {
 	private final String inferenceId;
 
 	@Nullable
 	private final Time timeout;
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 	private final RequestChatCompletion chatCompletionRequest;
@@ -85,21 +93,29 @@ public class ChatCompletionUnifiedRequest extends RequestChatCompletionBase {
 >>>>>>> 03828daff (regen from latest spec)
 =======
 >>>>>>> c49af58dc (Revert "temp rebase fix")
+=======
+	private final RequestChatCompletion chatCompletionRequest;
+
+>>>>>>> b5f478d93 ([codegen] update to latest spec and generator)
 	// ---------------------------------------------------------------------------------------------
 
 	private ChatCompletionUnifiedRequest(Builder builder) {
-		super(builder);
 
 		this.inferenceId = ApiTypeHelper.requireNonNull(builder.inferenceId, this, "inferenceId");
 		this.timeout = builder.timeout;
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
 		this.chatCompletionRequest = ApiTypeHelper.requireNonNull(builder.chatCompletionRequest, this,
 				"chatCompletionRequest");
 =======
 >>>>>>> 03828daff (regen from latest spec)
 =======
 >>>>>>> c49af58dc (Revert "temp rebase fix")
+=======
+		this.chatCompletionRequest = ApiTypeHelper.requireNonNull(builder.chatCompletionRequest, this,
+				"chatCompletionRequest");
+>>>>>>> b5f478d93 ([codegen] update to latest spec and generator)
 
 	}
 
@@ -128,6 +144,9 @@ public final Time timeout() {
 
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> b5f478d93 ([codegen] update to latest spec and generator)
 	/**
 	 * Required - Request body.
 	 */
@@ -143,24 +162,28 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
 
 	}
 
+<<<<<<< HEAD
 =======
 >>>>>>> 03828daff (regen from latest spec)
 =======
 >>>>>>> c49af58dc (Revert "temp rebase fix")
+=======
+>>>>>>> b5f478d93 ([codegen] update to latest spec and generator)
 	// ---------------------------------------------------------------------------------------------
 
 	/**
 	 * Builder for {@link ChatCompletionUnifiedRequest}.
 	 */
 
-	public static class Builder extends RequestChatCompletionBase.AbstractBuilder<Builder>
+	public static class Builder extends RequestBase.AbstractBuilder<Builder>
 			implements
 				ObjectBuilder<ChatCompletionUnifiedRequest> {
 		private String inferenceId;
 
 		@Nullable
 		private Time timeout;
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 		private RequestChatCompletion chatCompletionRequest;
@@ -169,6 +192,10 @@ public static class Builder extends RequestChatCompletionBase.AbstractBuilder<Bu
 >>>>>>> 03828daff (regen from latest spec)
 =======
 >>>>>>> c49af58dc (Revert "temp rebase fix")
+=======
+		private RequestChatCompletion chatCompletionRequest;
+
+>>>>>>> b5f478d93 ([codegen] update to latest spec and generator)
 		/**
 		 * Required - The inference Id
 		 * <p>
@@ -200,6 +227,9 @@ public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
 
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> b5f478d93 ([codegen] update to latest spec and generator)
 		/**
 		 * Required - Request body.
 		 */
@@ -225,10 +255,13 @@ public Builder withJson(JsonParser parser, JsonpMapper mapper) {
 			return this.chatCompletionRequest(value);
 		}
 
+<<<<<<< HEAD
 =======
 >>>>>>> 03828daff (regen from latest spec)
 =======
 >>>>>>> c49af58dc (Revert "temp rebase fix")
+=======
+>>>>>>> b5f478d93 ([codegen] update to latest spec and generator)
 		@Override
 		protected Builder self() {
 			return this;
@@ -247,6 +280,7 @@ public ChatCompletionUnifiedRequest build() {
 		}
 	}
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 	public static final JsonpDeserializer<ChatCompletionUnifiedRequest> _DESERIALIZER = createChatCompletionUnifiedRequestDeserializer();
 	protected static JsonpDeserializer<ChatCompletionUnifiedRequest> createChatCompletionUnifiedRequestDeserializer() {
@@ -275,6 +309,15 @@ protected static void setupChatCompletionUnifiedRequestDeserializer(
 =======
 
 >>>>>>> c49af58dc (Revert "temp rebase fix")
+=======
+	public static final JsonpDeserializer<ChatCompletionUnifiedRequest> _DESERIALIZER = createChatCompletionUnifiedRequestDeserializer();
+	protected static JsonpDeserializer<ChatCompletionUnifiedRequest> createChatCompletionUnifiedRequestDeserializer() {
+
+		JsonpDeserializer<RequestChatCompletion> valueDeserializer = RequestChatCompletion._DESERIALIZER;
+
+		return JsonpDeserializer.of(valueDeserializer.acceptedEvents(), (parser, mapper, event) -> new Builder()
+				.chatCompletionRequest(valueDeserializer.deserialize(parser, mapper, event)).build());
+>>>>>>> b5f478d93 ([codegen] update to latest spec and generator)
 	}
 
 	// ---------------------------------------------------------------------------------------------

java-client/src/main/java/co/elastic/clients/elasticsearch/inference/EisTaskType.java

@@ -17,6 +17,7 @@
  * under the License.
  */
 
+<<<<<<< HEAD
 <<<<<<< HEAD:java-client/src/main/java/co/elastic/clients/elasticsearch/inference/EisTaskType.java
 package co.elastic.clients.elasticsearch.inference;
 =======
@@ -26,6 +27,9 @@
 package co.elastic.clients.elasticsearch.inference.put_openai;
 >>>>>>>> c86960dc6 (regen from latest spec):java-client/src/main/java/co/elastic/clients/elasticsearch/inference/put_openai/ServiceType.java
 >>>>>>> 03828daff (regen from latest spec):java-client/src/main/java/co/elastic/clients/elasticsearch/inference/put_openai/ServiceType.java
+=======
+package co.elastic.clients.elasticsearch.inference;
+>>>>>>> b5f478d93 ([codegen] update to latest spec and generator)
 
 import co.elastic.clients.json.JsonEnum;
 import co.elastic.clients.json.JsonpDeserializable;
@@ -48,13 +52,17 @@ >>>>>>>> c86960dc6 (regen from latest spec):java-client/src/main/java/co/elastic
 
 /**
  *
+<<<<<<< HEAD
 <<<<<<< HEAD:java-client/src/main/java/co/elastic/clients/elasticsearch/inference/EisTaskType.java
+=======
+>>>>>>> b5f478d93 ([codegen] update to latest spec and generator)
  * @see <a href="../doc-files/api-spec.html#inference._types.EisTaskType">API
  *      specification</a>
  */
 @JsonpDeserializable
 public enum EisTaskType implements JsonEnum {
 	ChatCompletion("chat_completion"),
+<<<<<<< HEAD
 =======
  * @see <a href=
 <<<<<<<< HEAD:java-client/src/main/java/co/elastic/clients/elasticsearch/inference/put_voyageai/ServiceType.java
@@ -72,6 +80,8 @@ public enum ServiceType implements JsonEnum {
 	Openai("openai"),
 >>>>>>>> c86960dc6 (regen from latest spec):java-client/src/main/java/co/elastic/clients/elasticsearch/inference/put_openai/ServiceType.java
 >>>>>>> 03828daff (regen from latest spec):java-client/src/main/java/co/elastic/clients/elasticsearch/inference/put_openai/ServiceType.java
+=======
+>>>>>>> b5f478d93 ([codegen] update to latest spec and generator)
 
 	;