[codegen] Update to latest API specification

Author: swallez

java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/KnnQuery.java renamed to java-client/src/main/java/co/elastic/clients/elasticsearch/_types/KnnQuery.java

@@ -21,49 +21,61 @@
 // THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
 //----------------------------------------------------
 
-package co.elastic.clients.elasticsearch._types.query_dsl;
+package co.elastic.clients.elasticsearch._types;
 
+import co.elastic.clients.elasticsearch._types.query_dsl.Query;
 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.lang.Double;
-import java.lang.Integer;
+import java.lang.Float;
+import java.lang.Long;
 import java.lang.String;
 import java.util.List;
 import java.util.Objects;
 import java.util.function.Function;
 import javax.annotation.Nullable;
 
-// typedef: _types.query_dsl.KnnQuery
+// typedef: _types.KnnQuery
 
 /**
- * A k-nearest neighbor (kNN) search finds the k nearest vectors to a query
- * vector, as measured by a similarity metric.
- * 
- * @see <a href="../../doc-files/api-spec.html#_types.query_dsl.KnnQuery">API
+ *
+ * @see <a href="../doc-files/api-spec.html#_types.KnnQuery">API
  *      specification</a>
  */
 @JsonpDeserializable
-public class KnnQuery extends QueryBase implements QueryVariant {
+public class KnnQuery implements JsonpSerializable {
 	private final String field;
 
-	private final int numCandidates;
-
 	private final List<Double> queryVector;
 
+	private final long k;
+
+	private final long numCandidates;
+
+	@Nullable
+	private final Float boost;
+
+	private final List<Query> filter;
+
 	// ---------------------------------------------------------------------------------------------
 
 	private KnnQuery(Builder builder) {
-		super(builder);
 
 		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-		this.numCandidates = ApiTypeHelper.requireNonNull(builder.numCandidates, this, "numCandidates");
 		this.queryVector = ApiTypeHelper.unmodifiableRequired(builder.queryVector, this, "queryVector");
+		this.k = ApiTypeHelper.requireNonNull(builder.k, this, "k");
+		this.numCandidates = ApiTypeHelper.requireNonNull(builder.numCandidates, this, "numCandidates");
+		this.boost = builder.boost;
+		this.filter = ApiTypeHelper.unmodifiable(builder.filter);
 
 	}
 
@@ -72,43 +84,74 @@ public static KnnQuery of(Function<Builder, ObjectBuilder<KnnQuery>> fn) {
 	}
 
 	/**
-	 * Query variant kind.
+	 * Required - The name of the vector field to search against
+	 * <p>
+	 * API name: {@code field}
 	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.Knn;
+	public final String field() {
+		return this.field;
 	}
 
 	/**
-	 * Required - API name: {@code field}
+	 * Required - The query vector
+	 * <p>
+	 * API name: {@code query_vector}
 	 */
-	public final String field() {
-		return this.field;
+	public final List<Double> queryVector() {
+		return this.queryVector;
 	}
 
 	/**
-	 * Required - API name: {@code num_candidates}
+	 * Required - The final number of nearest neighbors to return as top hits
+	 * <p>
+	 * API name: {@code k}
 	 */
-	public final int numCandidates() {
+	public final long k() {
+		return this.k;
+	}
+
+	/**
+	 * Required - The number of nearest neighbor candidates to consider per shard
+	 * <p>
+	 * API name: {@code num_candidates}
+	 */
+	public final long numCandidates() {
 		return this.numCandidates;
 	}
 
 	/**
-	 * Required - API name: {@code query_vector}
+	 * Boost value to apply to kNN scores
+	 * <p>
+	 * API name: {@code boost}
 	 */
-	public final List<Double> queryVector() {
-		return this.queryVector;
+	@Nullable
+	public final Float boost() {
+		return this.boost;
+	}
+
+	/**
+	 * Filters for the kNN search query
+	 * <p>
+	 * API name: {@code filter}
+	 */
+	public final List<Query> filter() {
+		return this.filter;
+	}
+
+	/**
+	 * 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) {
 
-		super.serializeInternal(generator, mapper);
 		generator.writeKey("field");
 		generator.write(this.field);
 
-		generator.writeKey("num_candidates");
-		generator.write(this.numCandidates);
-
 		if (ApiTypeHelper.isDefined(this.queryVector)) {
 			generator.writeKey("query_vector");
 			generator.writeStartArray();
@@ -119,7 +162,33 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 			generator.writeEnd();
 
 		}
+		generator.writeKey("k");
+		generator.write(this.k);
+
+		generator.writeKey("num_candidates");
+		generator.write(this.numCandidates);
+
+		if (this.boost != null) {
+			generator.writeKey("boost");
+			generator.write(this.boost);
+
+		}
+		if (ApiTypeHelper.isDefined(this.filter)) {
+			generator.writeKey("filter");
+			generator.writeStartArray();
+			for (Query item0 : this.filter) {
+				item0.serialize(generator, mapper);
 
+			}
+			generator.writeEnd();
+
+		}
+
+	}
+
+	@Override
+	public String toString() {
+		return JsonpUtils.toString(this);
 	}
 
 	// ---------------------------------------------------------------------------------------------
@@ -128,31 +197,35 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 	 * Builder for {@link KnnQuery}.
 	 */
 
-	public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<KnnQuery> {
+	public static class Builder extends WithJsonObjectBuilderBase<Builder> implements ObjectBuilder<KnnQuery> {
 		private String field;
 
-		private Integer numCandidates;
-
 		private List<Double> queryVector;
 
+		private Long k;
+
+		private Long numCandidates;
+
+		@Nullable
+		private Float boost;
+
+		@Nullable
+		private List<Query> filter;
+
 		/**
-		 * Required - API name: {@code field}
+		 * Required - The name of the vector field to search against
+		 * <p>
+		 * API name: {@code field}
 		 */
 		public final Builder field(String value) {
 			this.field = value;
 			return this;
 		}
 
 		/**
-		 * Required - API name: {@code num_candidates}
-		 */
-		public final Builder numCandidates(int value) {
-			this.numCandidates = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code query_vector}
+		 * Required - The query vector
+		 * <p>
+		 * API name: {@code query_vector}
 		 * <p>
 		 * Adds all elements of <code>list</code> to <code>queryVector</code>.
 		 */
@@ -162,7 +235,9 @@ public final Builder queryVector(List<Double> list) {
 		}
 
 		/**
-		 * Required - API name: {@code query_vector}
+		 * Required - The query vector
+		 * <p>
+		 * API name: {@code query_vector}
 		 * <p>
 		 * Adds one or more values to <code>queryVector</code>.
 		 */
@@ -171,6 +246,71 @@ public final Builder queryVector(Double value, Double... values) {
 			return this;
 		}
 
+		/**
+		 * Required - The final number of nearest neighbors to return as top hits
+		 * <p>
+		 * API name: {@code k}
+		 */
+		public final Builder k(long value) {
+			this.k = value;
+			return this;
+		}
+
+		/**
+		 * Required - The number of nearest neighbor candidates to consider per shard
+		 * <p>
+		 * API name: {@code num_candidates}
+		 */
+		public final Builder numCandidates(long value) {
+			this.numCandidates = value;
+			return this;
+		}
+
+		/**
+		 * Boost value to apply to kNN scores
+		 * <p>
+		 * API name: {@code boost}
+		 */
+		public final Builder boost(@Nullable Float value) {
+			this.boost = value;
+			return this;
+		}
+
+		/**
+		 * Filters for the kNN search query
+		 * <p>
+		 * API name: {@code filter}
+		 * <p>
+		 * Adds all elements of <code>list</code> to <code>filter</code>.
+		 */
+		public final Builder filter(List<Query> list) {
+			this.filter = _listAddAll(this.filter, list);
+			return this;
+		}
+
+		/**
+		 * Filters for the kNN search query
+		 * <p>
+		 * API name: {@code filter}
+		 * <p>
+		 * Adds one or more values to <code>filter</code>.
+		 */
+		public final Builder filter(Query value, Query... values) {
+			this.filter = _listAdd(this.filter, value, values);
+			return this;
+		}
+
+		/**
+		 * Filters for the kNN search query
+		 * <p>
+		 * API name: {@code filter}
+		 * <p>
+		 * Adds a value to <code>filter</code> using a builder lambda.
+		 */
+		public final Builder filter(Function<Query.Builder, ObjectBuilder<Query>> fn) {
+			return filter(fn.apply(new Query.Builder()).build());
+		}
+
 		@Override
 		protected Builder self() {
 			return this;
@@ -198,11 +338,14 @@ public KnnQuery build() {
 			KnnQuery::setupKnnQueryDeserializer);
 
 	protected static void setupKnnQueryDeserializer(ObjectDeserializer<KnnQuery.Builder> op) {
-		QueryBase.setupQueryBaseDeserializer(op);
+
 		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::numCandidates, JsonpDeserializer.integerDeserializer(), "num_candidates");
 		op.add(Builder::queryVector, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.doubleDeserializer()),
 				"query_vector");
+		op.add(Builder::k, JsonpDeserializer.longDeserializer(), "k");
+		op.add(Builder::numCandidates, JsonpDeserializer.longDeserializer(), "num_candidates");
+		op.add(Builder::boost, JsonpDeserializer.floatDeserializer(), "boost");
+		op.add(Builder::filter, JsonpDeserializer.arrayDeserializer(Query._DESERIALIZER), "filter");
 
 	}