Skip to content

Commit a39d27a

Browse files
committed
Revert "[codegen] updated to latest api spec"
This reverts commit f91f275.
1 parent f91f275 commit a39d27a

File tree

114 files changed

+434
-22084
lines changed

Some content is hidden

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

114 files changed

+434
-22084
lines changed

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import co.elastic.clients.elasticsearch.cat.ElasticsearchCatAsyncClient;
2727
import co.elastic.clients.elasticsearch.ccr.ElasticsearchCcrAsyncClient;
2828
import co.elastic.clients.elasticsearch.cluster.ElasticsearchClusterAsyncClient;
29-
import co.elastic.clients.elasticsearch.connector.ElasticsearchConnectorAsyncClient;
3029
import co.elastic.clients.elasticsearch.core.BulkRequest;
3130
import co.elastic.clients.elasticsearch.core.BulkResponse;
3231
import co.elastic.clients.elasticsearch.core.ClearScrollRequest;
@@ -213,10 +212,6 @@ public ElasticsearchClusterAsyncClient cluster() {
213212
return new ElasticsearchClusterAsyncClient(this.transport, this.transportOptions);
214213
}
215214

216-
public ElasticsearchConnectorAsyncClient connector() {
217-
return new ElasticsearchConnectorAsyncClient(this.transport, this.transportOptions);
218-
}
219-
220215
public ElasticsearchDanglingIndicesAsyncClient danglingIndices() {
221216
return new ElasticsearchDanglingIndicesAsyncClient(this.transport, this.transportOptions);
222217
}

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import co.elastic.clients.elasticsearch.cat.ElasticsearchCatClient;
2828
import co.elastic.clients.elasticsearch.ccr.ElasticsearchCcrClient;
2929
import co.elastic.clients.elasticsearch.cluster.ElasticsearchClusterClient;
30-
import co.elastic.clients.elasticsearch.connector.ElasticsearchConnectorClient;
3130
import co.elastic.clients.elasticsearch.core.BulkRequest;
3231
import co.elastic.clients.elasticsearch.core.BulkResponse;
3332
import co.elastic.clients.elasticsearch.core.ClearScrollRequest;
@@ -214,10 +213,6 @@ public ElasticsearchClusterClient cluster() {
214213
return new ElasticsearchClusterClient(this.transport, this.transportOptions);
215214
}
216215

217-
public ElasticsearchConnectorClient connector() {
218-
return new ElasticsearchConnectorClient(this.transport, this.transportOptions);
219-
}
220-
221216
public ElasticsearchDanglingIndicesClient danglingIndices() {
222217
return new ElasticsearchDanglingIndicesClient(this.transport, this.transportOptions);
223218
}

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

Lines changed: 130 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,18 @@
2020
package co.elastic.clients.elasticsearch._types;
2121

2222
import co.elastic.clients.elasticsearch._types.query_dsl.Query;
23-
import co.elastic.clients.elasticsearch._types.query_dsl.QueryBase;
2423
import co.elastic.clients.elasticsearch._types.query_dsl.QueryVariant;
24+
import co.elastic.clients.elasticsearch.core.search.InnerHits;
2525
import co.elastic.clients.json.JsonpDeserializable;
2626
import co.elastic.clients.json.JsonpDeserializer;
2727
import co.elastic.clients.json.JsonpMapper;
28+
import co.elastic.clients.json.JsonpSerializable;
29+
import co.elastic.clients.json.JsonpUtils;
2830
import co.elastic.clients.json.ObjectBuilderDeserializer;
2931
import co.elastic.clients.json.ObjectDeserializer;
3032
import co.elastic.clients.util.ApiTypeHelper;
3133
import co.elastic.clients.util.ObjectBuilder;
34+
import co.elastic.clients.util.WithJsonObjectBuilderBase;
3235
import jakarta.json.stream.JsonGenerator;
3336
import java.lang.Float;
3437
import java.lang.Long;
@@ -61,33 +64,42 @@
6164
* specification</a>
6265
*/
6366
@JsonpDeserializable
64-
public class KnnQuery extends QueryBase implements QueryVariant {
67+
public class KnnQuery implements QueryVariant, JsonpSerializable {
6568
private final String field;
6669

6770
private final List<Float> queryVector;
6871

6972
@Nullable
7073
private final QueryVectorBuilder queryVectorBuilder;
7174

75+
private final long k;
76+
77+
private final long numCandidates;
78+
7279
@Nullable
73-
private final Long numCandidates;
80+
private final Float boost;
7481

7582
private final List<Query> filter;
7683

7784
@Nullable
7885
private final Float similarity;
7986

87+
@Nullable
88+
private final InnerHits innerHits;
89+
8090
// ---------------------------------------------------------------------------------------------
8191

8292
private KnnQuery(Builder builder) {
83-
super(builder);
8493

8594
this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
8695
this.queryVector = ApiTypeHelper.unmodifiable(builder.queryVector);
8796
this.queryVectorBuilder = builder.queryVectorBuilder;
88-
this.numCandidates = builder.numCandidates;
97+
this.k = ApiTypeHelper.requireNonNull(builder.k, this, "k");
98+
this.numCandidates = ApiTypeHelper.requireNonNull(builder.numCandidates, this, "numCandidates");
99+
this.boost = builder.boost;
89100
this.filter = ApiTypeHelper.unmodifiable(builder.filter);
90101
this.similarity = builder.similarity;
102+
this.innerHits = builder.innerHits;
91103

92104
}
93105

@@ -133,15 +145,33 @@ public final QueryVectorBuilder queryVectorBuilder() {
133145
}
134146

135147
/**
136-
* The number of nearest neighbor candidates to consider per shard
148+
* Required - The final number of nearest neighbors to return as top hits
149+
* <p>
150+
* API name: {@code k}
151+
*/
152+
public final long k() {
153+
return this.k;
154+
}
155+
156+
/**
157+
* Required - The number of nearest neighbor candidates to consider per shard
137158
* <p>
138159
* API name: {@code num_candidates}
139160
*/
140-
@Nullable
141-
public final Long numCandidates() {
161+
public final long numCandidates() {
142162
return this.numCandidates;
143163
}
144164

165+
/**
166+
* Boost value to apply to kNN scores
167+
* <p>
168+
* API name: {@code boost}
169+
*/
170+
@Nullable
171+
public final Float boost() {
172+
return this.boost;
173+
}
174+
145175
/**
146176
* Filters for the kNN search query
147177
* <p>
@@ -161,9 +191,27 @@ public final Float similarity() {
161191
return this.similarity;
162192
}
163193

194+
/**
195+
* If defined, each search hit will contain inner hits.
196+
* <p>
197+
* API name: {@code inner_hits}
198+
*/
199+
@Nullable
200+
public final InnerHits innerHits() {
201+
return this.innerHits;
202+
}
203+
204+
/**
205+
* Serialize this object to JSON.
206+
*/
207+
public void serialize(JsonGenerator generator, JsonpMapper mapper) {
208+
generator.writeStartObject();
209+
serializeInternal(generator, mapper);
210+
generator.writeEnd();
211+
}
212+
164213
protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
165214

166-
super.serializeInternal(generator, mapper);
167215
generator.writeKey("field");
168216
generator.write(this.field);
169217

@@ -182,9 +230,15 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
182230
this.queryVectorBuilder.serialize(generator, mapper);
183231

184232
}
185-
if (this.numCandidates != null) {
186-
generator.writeKey("num_candidates");
187-
generator.write(this.numCandidates);
233+
generator.writeKey("k");
234+
generator.write(this.k);
235+
236+
generator.writeKey("num_candidates");
237+
generator.write(this.numCandidates);
238+
239+
if (this.boost != null) {
240+
generator.writeKey("boost");
241+
generator.write(this.boost);
188242

189243
}
190244
if (ApiTypeHelper.isDefined(this.filter)) {
@@ -202,16 +256,26 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
202256
generator.write(this.similarity);
203257

204258
}
259+
if (this.innerHits != null) {
260+
generator.writeKey("inner_hits");
261+
this.innerHits.serialize(generator, mapper);
262+
263+
}
205264

206265
}
207266

267+
@Override
268+
public String toString() {
269+
return JsonpUtils.toString(this);
270+
}
271+
208272
// ---------------------------------------------------------------------------------------------
209273

210274
/**
211275
* Builder for {@link KnnQuery}.
212276
*/
213277

214-
public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<KnnQuery> {
278+
public static class Builder extends WithJsonObjectBuilderBase<Builder> implements ObjectBuilder<KnnQuery> {
215279
private String field;
216280

217281
@Nullable
@@ -220,15 +284,22 @@ public static class Builder extends QueryBase.AbstractBuilder<Builder> implement
220284
@Nullable
221285
private QueryVectorBuilder queryVectorBuilder;
222286

223-
@Nullable
287+
private Long k;
288+
224289
private Long numCandidates;
225290

291+
@Nullable
292+
private Float boost;
293+
226294
@Nullable
227295
private List<Query> filter;
228296

229297
@Nullable
230298
private Float similarity;
231299

300+
@Nullable
301+
private InnerHits innerHits;
302+
232303
/**
233304
* Required - The name of the vector field to search against
234305
* <p>
@@ -286,15 +357,35 @@ public final Builder queryVectorBuilder(
286357
}
287358

288359
/**
289-
* The number of nearest neighbor candidates to consider per shard
360+
* Required - The final number of nearest neighbors to return as top hits
361+
* <p>
362+
* API name: {@code k}
363+
*/
364+
public final Builder k(long value) {
365+
this.k = value;
366+
return this;
367+
}
368+
369+
/**
370+
* Required - The number of nearest neighbor candidates to consider per shard
290371
* <p>
291372
* API name: {@code num_candidates}
292373
*/
293-
public final Builder numCandidates(@Nullable Long value) {
374+
public final Builder numCandidates(long value) {
294375
this.numCandidates = value;
295376
return this;
296377
}
297378

379+
/**
380+
* Boost value to apply to kNN scores
381+
* <p>
382+
* API name: {@code boost}
383+
*/
384+
public final Builder boost(@Nullable Float value) {
385+
this.boost = value;
386+
return this;
387+
}
388+
298389
/**
299390
* Filters for the kNN search query
300391
* <p>
@@ -340,6 +431,25 @@ public final Builder similarity(@Nullable Float value) {
340431
return this;
341432
}
342433

434+
/**
435+
* If defined, each search hit will contain inner hits.
436+
* <p>
437+
* API name: {@code inner_hits}
438+
*/
439+
public final Builder innerHits(@Nullable InnerHits value) {
440+
this.innerHits = value;
441+
return this;
442+
}
443+
444+
/**
445+
* If defined, each search hit will contain inner hits.
446+
* <p>
447+
* API name: {@code inner_hits}
448+
*/
449+
public final Builder innerHits(Function<InnerHits.Builder, ObjectBuilder<InnerHits>> fn) {
450+
return this.innerHits(fn.apply(new InnerHits.Builder()).build());
451+
}
452+
343453
@Override
344454
protected Builder self() {
345455
return this;
@@ -367,14 +477,17 @@ public KnnQuery build() {
367477
KnnQuery::setupKnnQueryDeserializer);
368478

369479
protected static void setupKnnQueryDeserializer(ObjectDeserializer<KnnQuery.Builder> op) {
370-
QueryBase.setupQueryBaseDeserializer(op);
480+
371481
op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
372482
op.add(Builder::queryVector, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.floatDeserializer()),
373483
"query_vector");
374484
op.add(Builder::queryVectorBuilder, QueryVectorBuilder._DESERIALIZER, "query_vector_builder");
485+
op.add(Builder::k, JsonpDeserializer.longDeserializer(), "k");
375486
op.add(Builder::numCandidates, JsonpDeserializer.longDeserializer(), "num_candidates");
487+
op.add(Builder::boost, JsonpDeserializer.floatDeserializer(), "boost");
376488
op.add(Builder::filter, JsonpDeserializer.arrayDeserializer(Query._DESERIALIZER), "filter");
377489
op.add(Builder::similarity, JsonpDeserializer.floatDeserializer(), "similarity");
490+
op.add(Builder::innerHits, InnerHits._DESERIALIZER, "inner_hits");
378491

379492
}
380493

0 commit comments

Comments
 (0)