Skip to content

Commit 0186134

Browse files
committed
[codegen] update serverless to latest spec
1 parent a9b3923 commit 0186134

File tree

320 files changed

+35344
-2385
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

320 files changed

+35344
-2385
lines changed

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

Lines changed: 104 additions & 78 deletions
Large diffs are not rendered by default.

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

Lines changed: 104 additions & 78 deletions
Large diffs are not rendered by default.

java-client-serverless/src/main/java/co/elastic/clients/elasticsearch/_types/KnnQuery.java

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@ public class KnnQuery extends QueryBase implements QueryVariant {
7272
@Nullable
7373
private final Integer numCandidates;
7474

75+
@Nullable
76+
private final Integer k;
77+
7578
private final List<Query> filter;
7679

7780
@Nullable
@@ -86,6 +89,7 @@ private KnnQuery(Builder builder) {
8689
this.queryVector = ApiTypeHelper.unmodifiable(builder.queryVector);
8790
this.queryVectorBuilder = builder.queryVectorBuilder;
8891
this.numCandidates = builder.numCandidates;
92+
this.k = builder.k;
8993
this.filter = ApiTypeHelper.unmodifiable(builder.filter);
9094
this.similarity = builder.similarity;
9195

@@ -142,6 +146,16 @@ public final Integer numCandidates() {
142146
return this.numCandidates;
143147
}
144148

149+
/**
150+
* The final number of nearest neighbors to return as top hits
151+
* <p>
152+
* API name: {@code k}
153+
*/
154+
@Nullable
155+
public final Integer k() {
156+
return this.k;
157+
}
158+
145159
/**
146160
* Filters for the kNN search query
147161
* <p>
@@ -186,6 +200,11 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
186200
generator.writeKey("num_candidates");
187201
generator.write(this.numCandidates);
188202

203+
}
204+
if (this.k != null) {
205+
generator.writeKey("k");
206+
generator.write(this.k);
207+
189208
}
190209
if (ApiTypeHelper.isDefined(this.filter)) {
191210
generator.writeKey("filter");
@@ -223,6 +242,9 @@ public static class Builder extends QueryBase.AbstractBuilder<Builder> implement
223242
@Nullable
224243
private Integer numCandidates;
225244

245+
@Nullable
246+
private Integer k;
247+
226248
@Nullable
227249
private List<Query> filter;
228250

@@ -295,6 +317,16 @@ public final Builder numCandidates(@Nullable Integer value) {
295317
return this;
296318
}
297319

320+
/**
321+
* The final number of nearest neighbors to return as top hits
322+
* <p>
323+
* API name: {@code k}
324+
*/
325+
public final Builder k(@Nullable Integer value) {
326+
this.k = value;
327+
return this;
328+
}
329+
298330
/**
299331
* Filters for the kNN search query
300332
* <p>
@@ -373,6 +405,7 @@ protected static void setupKnnQueryDeserializer(ObjectDeserializer<KnnQuery.Buil
373405
"query_vector");
374406
op.add(Builder::queryVectorBuilder, QueryVectorBuilder._DESERIALIZER, "query_vector_builder");
375407
op.add(Builder::numCandidates, JsonpDeserializer.integerDeserializer(), "num_candidates");
408+
op.add(Builder::k, JsonpDeserializer.integerDeserializer(), "k");
376409
op.add(Builder::filter, JsonpDeserializer.arrayDeserializer(Query._DESERIALIZER), "filter");
377410
op.add(Builder::similarity, JsonpDeserializer.floatDeserializer(), "similarity");
378411

java-client-serverless/src/main/java/co/elastic/clients/elasticsearch/_types/RrfRank.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,14 @@ public class RrfRank extends RankBase implements RankVariant, JsonpSerializable
6161
private final Long rankConstant;
6262

6363
@Nullable
64-
private final Long windowSize;
64+
private final Long rankWindowSize;
6565

6666
// ---------------------------------------------------------------------------------------------
6767

6868
private RrfRank(Builder builder) {
6969

7070
this.rankConstant = builder.rankConstant;
71-
this.windowSize = builder.windowSize;
71+
this.rankWindowSize = builder.rankWindowSize;
7272

7373
}
7474

@@ -98,11 +98,11 @@ public final Long rankConstant() {
9898
/**
9999
* Size of the individual result sets per query
100100
* <p>
101-
* API name: {@code window_size}
101+
* API name: {@code rank_window_size}
102102
*/
103103
@Nullable
104-
public final Long windowSize() {
105-
return this.windowSize;
104+
public final Long rankWindowSize() {
105+
return this.rankWindowSize;
106106
}
107107

108108
/**
@@ -121,9 +121,9 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
121121
generator.write(this.rankConstant);
122122

123123
}
124-
if (this.windowSize != null) {
125-
generator.writeKey("window_size");
126-
generator.write(this.windowSize);
124+
if (this.rankWindowSize != null) {
125+
generator.writeKey("rank_window_size");
126+
generator.write(this.rankWindowSize);
127127

128128
}
129129

@@ -145,7 +145,7 @@ public static class Builder extends RankBase.AbstractBuilder<Builder> implements
145145
private Long rankConstant;
146146

147147
@Nullable
148-
private Long windowSize;
148+
private Long rankWindowSize;
149149

150150
/**
151151
* How much influence documents in individual result sets per query have over
@@ -161,10 +161,10 @@ public final Builder rankConstant(@Nullable Long value) {
161161
/**
162162
* Size of the individual result sets per query
163163
* <p>
164-
* API name: {@code window_size}
164+
* API name: {@code rank_window_size}
165165
*/
166-
public final Builder windowSize(@Nullable Long value) {
167-
this.windowSize = value;
166+
public final Builder rankWindowSize(@Nullable Long value) {
167+
this.rankWindowSize = value;
168168
return this;
169169
}
170170

@@ -197,7 +197,7 @@ public RrfRank build() {
197197
protected static void setupRrfRankDeserializer(ObjectDeserializer<RrfRank.Builder> op) {
198198

199199
op.add(Builder::rankConstant, JsonpDeserializer.longDeserializer(), "rank_constant");
200-
op.add(Builder::windowSize, JsonpDeserializer.longDeserializer(), "window_size");
200+
op.add(Builder::rankWindowSize, JsonpDeserializer.longDeserializer(), "rank_window_size");
201201

202202
}
203203

0 commit comments

Comments
 (0)