Revert "temp rebase fix"

This reverts commit 48f2b57.

Author: l-trotta

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

@@ -120,6 +120,7 @@
 import co.elastic.clients.elasticsearch.graph.ElasticsearchGraphAsyncClient;
 import co.elastic.clients.elasticsearch.ilm.ElasticsearchIlmAsyncClient;
 import co.elastic.clients.elasticsearch.indices.ElasticsearchIndicesAsyncClient;
+import co.elastic.clients.elasticsearch.inference.ElasticsearchInferenceAsyncClient;
 import co.elastic.clients.elasticsearch.ingest.ElasticsearchIngestAsyncClient;
 import co.elastic.clients.elasticsearch.license.ElasticsearchLicenseAsyncClient;
 import co.elastic.clients.elasticsearch.logstash.ElasticsearchLogstashAsyncClient;
@@ -264,6 +265,10 @@ public ElasticsearchIndicesAsyncClient indices() {
 		return new ElasticsearchIndicesAsyncClient(this.transport, this.transportOptions);
 	}
 
+	public ElasticsearchInferenceAsyncClient inference() {
+		return new ElasticsearchInferenceAsyncClient(this.transport, this.transportOptions);
+	}
+
 	public ElasticsearchIngestAsyncClient ingest() {
 		return new ElasticsearchIngestAsyncClient(this.transport, this.transportOptions);
 	}

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

@@ -121,6 +121,7 @@
 import co.elastic.clients.elasticsearch.graph.ElasticsearchGraphClient;
 import co.elastic.clients.elasticsearch.ilm.ElasticsearchIlmClient;
 import co.elastic.clients.elasticsearch.indices.ElasticsearchIndicesClient;
+import co.elastic.clients.elasticsearch.inference.ElasticsearchInferenceClient;
 import co.elastic.clients.elasticsearch.ingest.ElasticsearchIngestClient;
 import co.elastic.clients.elasticsearch.license.ElasticsearchLicenseClient;
 import co.elastic.clients.elasticsearch.logstash.ElasticsearchLogstashClient;
@@ -264,6 +265,10 @@ public ElasticsearchIndicesClient indices() {
 		return new ElasticsearchIndicesClient(this.transport, this.transportOptions);
 	}
 
+	public ElasticsearchInferenceClient inference() {
+		return new ElasticsearchInferenceClient(this.transport, this.transportOptions);
+	}
+
 	public ElasticsearchIngestClient ingest() {
 		return new ElasticsearchIngestClient(this.transport, this.transportOptions);
 	}

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

@@ -33,9 +33,12 @@
 import co.elastic.clients.util.ObjectBuilder;
 import jakarta.json.stream.JsonGenerator;
 <<<<<<< HEAD
+<<<<<<< HEAD
 import jakarta.json.stream.JsonParser;
 =======
 >>>>>>> 03828daff (regen from latest spec)
+=======
+>>>>>>> c49af58dc (Revert "temp rebase fix")
 import java.lang.String;
 import java.util.HashMap;
 import java.util.Map;
@@ -74,23 +77,29 @@ public class ChatCompletionUnifiedRequest extends RequestChatCompletionBase {
 	@Nullable
 	private final Time timeout;
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 	private final RequestChatCompletion chatCompletionRequest;
 
 =======
 >>>>>>> 03828daff (regen from latest spec)
+=======
+>>>>>>> c49af58dc (Revert "temp rebase fix")
 	// ---------------------------------------------------------------------------------------------
 
 	private ChatCompletionUnifiedRequest(Builder builder) {
 		super(builder);
 
 		this.inferenceId = ApiTypeHelper.requireNonNull(builder.inferenceId, this, "inferenceId");
 		this.timeout = builder.timeout;
+<<<<<<< HEAD
 <<<<<<< HEAD
 		this.chatCompletionRequest = ApiTypeHelper.requireNonNull(builder.chatCompletionRequest, this,
 				"chatCompletionRequest");
 =======
 >>>>>>> 03828daff (regen from latest spec)
+=======
+>>>>>>> c49af58dc (Revert "temp rebase fix")
 
 	}
 
@@ -117,6 +126,7 @@ public final Time timeout() {
 		return this.timeout;
 	}
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 	/**
 	 * Required - Request body.
@@ -135,6 +145,8 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
 
 =======
 >>>>>>> 03828daff (regen from latest spec)
+=======
+>>>>>>> c49af58dc (Revert "temp rebase fix")
 	// ---------------------------------------------------------------------------------------------
 
 	/**
@@ -149,11 +161,14 @@ public static class Builder extends RequestChatCompletionBase.AbstractBuilder<Bu
 		@Nullable
 		private Time timeout;
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 		private RequestChatCompletion chatCompletionRequest;
 
 =======
 >>>>>>> 03828daff (regen from latest spec)
+=======
+>>>>>>> c49af58dc (Revert "temp rebase fix")
 		/**
 		 * Required - The inference Id
 		 * <p>
@@ -183,6 +198,7 @@ public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
 			return this.timeout(fn.apply(new Time.Builder()).build());
 		}
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 		/**
 		 * Required - Request body.
@@ -211,6 +227,8 @@ public Builder withJson(JsonParser parser, JsonpMapper mapper) {
 
 =======
 >>>>>>> 03828daff (regen from latest spec)
+=======
+>>>>>>> c49af58dc (Revert "temp rebase fix")
 		@Override
 		protected Builder self() {
 			return this;
@@ -229,12 +247,17 @@ public ChatCompletionUnifiedRequest build() {
 		}
 	}
 
+<<<<<<< HEAD
 	public static final JsonpDeserializer<ChatCompletionUnifiedRequest> _DESERIALIZER = createChatCompletionUnifiedRequestDeserializer();
 	protected static JsonpDeserializer<ChatCompletionUnifiedRequest> createChatCompletionUnifiedRequestDeserializer() {
 
 <<<<<<< HEAD
 		JsonpDeserializer<RequestChatCompletion> valueDeserializer = RequestChatCompletion._DESERIALIZER;
 =======
+=======
+	// ---------------------------------------------------------------------------------------------
+
+>>>>>>> c49af58dc (Revert "temp rebase fix")
 	/**
 	 * Json deserializer for {@link ChatCompletionUnifiedRequest}
 	 */
@@ -244,10 +267,14 @@ protected static JsonpDeserializer<ChatCompletionUnifiedRequest> createChatCompl
 	protected static void setupChatCompletionUnifiedRequestDeserializer(
 			ObjectDeserializer<ChatCompletionUnifiedRequest.Builder> op) {
 		RequestChatCompletionBase.setupRequestChatCompletionBaseDeserializer(op);
+<<<<<<< HEAD
 >>>>>>> 03828daff (regen from latest spec)
 
 		return JsonpDeserializer.of(valueDeserializer.acceptedEvents(), (parser, mapper, event) -> new Builder()
 				.chatCompletionRequest(valueDeserializer.deserialize(parser, mapper, event)).build());
+=======
+
+>>>>>>> c49af58dc (Revert "temp rebase fix")
 	}
 
 	// ---------------------------------------------------------------------------------------------

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

@@ -0,0 +1,157 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package co.elastic.clients.elasticsearch.inference;
+
+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.JsonpUtils;
+import co.elastic.clients.json.ObjectBuilderDeserializer;
+import co.elastic.clients.json.ObjectDeserializer;
+import co.elastic.clients.util.ApiTypeHelper;
+import co.elastic.clients.util.ObjectBuilder;
+import co.elastic.clients.util.WithJsonObjectBuilderBase;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.Objects;
+import java.util.function.Function;
+import javax.annotation.Nullable;
+
+//----------------------------------------------------------------
+//       THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------------------
+//
+// This code is generated from the Elasticsearch API specification
+// at https://github.com/elastic/elasticsearch-specification
+//
+// Manual updates to this file will be lost when the code is
+// re-generated.
+//
+// If you find a property that is missing or wrongly typed, please
+// open an issue or a PR on the API specification repository.
+//
+//----------------------------------------------------------------
+
+// typedef: inference._types.CompletionInferenceResult
+
+/**
+ * Defines the completion result.
+ * 
+ * @see <a href=
+ *      "../doc-files/api-spec.html#inference._types.CompletionInferenceResult">API
+ *      specification</a>
+ */
+
+public abstract class CompletionInferenceResult implements JsonpSerializable {
+	private final List<CompletionResult> completion;
+
+	// ---------------------------------------------------------------------------------------------
+
+	protected CompletionInferenceResult(AbstractBuilder<?> builder) {
+
+		this.completion = ApiTypeHelper.unmodifiableRequired(builder.completion, this, "completion");
+
+	}
+
+	/**
+	 * Required - API name: {@code completion}
+	 */
+	public final List<CompletionResult> completion() {
+		return this.completion;
+	}
+
+	/**
+	 * Serialize this object to JSON.
+	 */
+	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+		generator.writeStartObject();
+		serializeInternal(generator, mapper);
+		generator.writeEnd();
+	}
+
+	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+		if (ApiTypeHelper.isDefined(this.completion)) {
+			generator.writeKey("completion");
+			generator.writeStartArray();
+			for (CompletionResult item0 : this.completion) {
+				item0.serialize(generator, mapper);
+
+			}
+			generator.writeEnd();
+
+		}
+
+	}
+
+	@Override
+	public String toString() {
+		return JsonpUtils.toString(this);
+	}
+
+	public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
+			extends
+				WithJsonObjectBuilderBase<BuilderT> {
+		private List<CompletionResult> completion;
+
+		/**
+		 * Required - API name: {@code completion}
+		 * <p>
+		 * Adds all elements of <code>list</code> to <code>completion</code>.
+		 */
+		public final BuilderT completion(List<CompletionResult> list) {
+			this.completion = _listAddAll(this.completion, list);
+			return self();
+		}
+
+		/**
+		 * Required - API name: {@code completion}
+		 * <p>
+		 * Adds one or more values to <code>completion</code>.
+		 */
+		public final BuilderT completion(CompletionResult value, CompletionResult... values) {
+			this.completion = _listAdd(this.completion, value, values);
+			return self();
+		}
+
+		/**
+		 * Required - API name: {@code completion}
+		 * <p>
+		 * Adds a value to <code>completion</code> using a builder lambda.
+		 */
+		public final BuilderT completion(Function<CompletionResult.Builder, ObjectBuilder<CompletionResult>> fn) {
+			return completion(fn.apply(new CompletionResult.Builder()).build());
+		}
+
+		protected abstract BuilderT self();
+
+	}
+
+	// ---------------------------------------------------------------------------------------------
+	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupCompletionInferenceResultDeserializer(
+			ObjectDeserializer<BuilderT> op) {
+
+		op.add(AbstractBuilder::completion, JsonpDeserializer.arrayDeserializer(CompletionResult._DESERIALIZER),
+				"completion");
+
+	}
+
+}