Skip to content

Commit 3076076

Browse files
l-trottal-trotta
authored
[codegen] update to latest spec and generator (#868)
1 parent 1217de0 commit 3076076

20 files changed

+1267
-504
lines changed

‎java-client/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/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/DateRangeQuery.java

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import co.elastic.clients.json.JsonpMapper;
2525
import co.elastic.clients.json.ObjectBuilderDeserializer;
2626
import co.elastic.clients.json.ObjectDeserializer;
27+
import co.elastic.clients.util.ApiTypeHelper;
2728
import co.elastic.clients.util.ObjectBuilder;
2829
import jakarta.json.stream.JsonGenerator;
2930
import java.lang.String;
@@ -56,6 +57,9 @@
5657
*/
5758
@JsonpDeserializable
5859
public class DateRangeQuery extends RangeQueryBase<String> implements RangeQueryVariant {
60+
// Single key dictionary
61+
private final String field;
62+
5963
@Nullable
6064
private final String format;
6165

@@ -66,6 +70,7 @@ public class DateRangeQuery extends RangeQueryBase<String> implements RangeQuery
6670

6771
private DateRangeQuery(Builder builder) {
6872
super(builder);
73+
this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
6974

7075
this.format = builder.format;
7176
this.timeZone = builder.timeZone;
@@ -84,6 +89,13 @@ public RangeQuery.Kind _rangeQueryKind() {
8489
return RangeQuery.Kind.Date;
8590
}
8691

92+
/**
93+
* Required - the required field
94+
*/
95+
public final String field() {
96+
return this.field;
97+
}
98+
8799
/**
88100
* Date format used to convert <code>date</code> values in the query.
89101
* <p>
@@ -106,6 +118,7 @@ public final String timeZone() {
106118
}
107119

108120
protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
121+
generator.writeStartObject(this.field);
109122

110123
super.serializeInternal(generator, mapper);
111124
if (this.format != null) {
@@ -119,6 +132,8 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
119132

120133
}
121134

135+
generator.writeEnd();
136+
122137
}
123138

124139
// ---------------------------------------------------------------------------------------------
@@ -130,6 +145,16 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
130145
public static class Builder extends RangeQueryBase.AbstractBuilder<String, Builder>
131146
implements
132147
ObjectBuilder<DateRangeQuery> {
148+
private String field;
149+
150+
/**
151+
* Required - the required field
152+
*/
153+
public final Builder field(String value) {
154+
this.field = value;
155+
return this;
156+
}
157+
133158
@Nullable
134159
private String format;
135160

@@ -189,6 +214,8 @@ protected static void setupDateRangeQueryDeserializer(ObjectDeserializer<DateRan
189214
op.add(Builder::format, JsonpDeserializer.stringDeserializer(), "format");
190215
op.add(Builder::timeZone, JsonpDeserializer.stringDeserializer(), "time_zone");
191216

217+
op.setKey(Builder::field, JsonpDeserializer.stringDeserializer());
218+
192219
}
193220

194221
}

‎java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/NumberRangeQuery.java

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,17 @@
2121

2222
import co.elastic.clients.json.JsonpDeserializable;
2323
import co.elastic.clients.json.JsonpDeserializer;
24+
import co.elastic.clients.json.JsonpMapper;
2425
import co.elastic.clients.json.ObjectBuilderDeserializer;
2526
import co.elastic.clients.json.ObjectDeserializer;
27+
import co.elastic.clients.util.ApiTypeHelper;
2628
import co.elastic.clients.util.ObjectBuilder;
2729
import jakarta.json.stream.JsonGenerator;
2830
import java.lang.Double;
31+
import java.lang.String;
2932
import java.util.Objects;
3033
import java.util.function.Function;
34+
import javax.annotation.Nullable;
3135

3236
//----------------------------------------------------------------
3337
// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
@@ -54,10 +58,14 @@
5458
*/
5559
@JsonpDeserializable
5660
public class NumberRangeQuery extends RangeQueryBase<Double> implements RangeQueryVariant {
61+
// Single key dictionary
62+
private final String field;
63+
5764
// ---------------------------------------------------------------------------------------------
5865

5966
private NumberRangeQuery(Builder builder) {
6067
super(builder);
68+
this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
6169

6270
}
6371

@@ -73,6 +81,22 @@ public RangeQuery.Kind _rangeQueryKind() {
7381
return RangeQuery.Kind.Number;
7482
}
7583

84+
/**
85+
* Required - the required field
86+
*/
87+
public final String field() {
88+
return this.field;
89+
}
90+
91+
protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
92+
generator.writeStartObject(this.field);
93+
94+
super.serializeInternal(generator, mapper);
95+
96+
generator.writeEnd();
97+
98+
}
99+
76100
// ---------------------------------------------------------------------------------------------
77101

78102
/**
@@ -82,6 +106,16 @@ public RangeQuery.Kind _rangeQueryKind() {
82106
public static class Builder extends RangeQueryBase.AbstractBuilder<Double, Builder>
83107
implements
84108
ObjectBuilder<NumberRangeQuery> {
109+
private String field;
110+
111+
/**
112+
* Required - the required field
113+
*/
114+
public final Builder field(String value) {
115+
this.field = value;
116+
return this;
117+
}
118+
85119
@Override
86120
protected Builder self() {
87121
return this;
@@ -112,6 +146,8 @@ public NumberRangeQuery build() {
112146
protected static void setupNumberRangeQueryDeserializer(ObjectDeserializer<NumberRangeQuery.Builder> op) {
113147
RangeQueryBase.setupRangeQueryBaseDeserializer(op, JsonpDeserializer.doubleDeserializer());
114148

149+
op.setKey(Builder::field, JsonpDeserializer.stringDeserializer());
150+
115151
}
116152

117153
}

‎java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/RangeQueryBase.java

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,9 @@
2626
import co.elastic.clients.json.JsonpUtils;
2727
import co.elastic.clients.json.ObjectBuilderDeserializer;
2828
import co.elastic.clients.json.ObjectDeserializer;
29-
import co.elastic.clients.util.ApiTypeHelper;
3029
import co.elastic.clients.util.ObjectBuilder;
3130
import co.elastic.clients.util.WithJsonObjectBuilderBase;
3231
import jakarta.json.stream.JsonGenerator;
33-
import java.lang.String;
3432
import java.util.Objects;
3533
import javax.annotation.Nullable;
3634

@@ -59,9 +57,6 @@
5957
*/
6058

6159
public abstract class RangeQueryBase<T> extends QueryBase {
62-
// Single key dictionary
63-
private final String field;
64-
6560
@Nullable
6661
private final RangeRelation relation;
6762

@@ -90,7 +85,6 @@ public abstract class RangeQueryBase<T> extends QueryBase {
9085

9186
protected RangeQueryBase(AbstractBuilder<T, ?> builder) {
9287
super(builder);
93-
this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
9488

9589
this.relation = builder.relation;
9690
this.gt = builder.gt;
@@ -103,13 +97,6 @@ protected RangeQueryBase(AbstractBuilder<T, ?> builder) {
10397

10498
}
10599

106-
/**
107-
* Required - the required field
108-
*/
109-
public final String field() {
110-
return this.field;
111-
}
112-
113100
/**
114101
* Indicates how the range query matches values for <code>range</code> fields.
115102
* <p>
@@ -177,7 +164,6 @@ public final T to() {
177164
}
178165

179166
protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
180-
generator.writeStartObject(this.field);
181167

182168
super.serializeInternal(generator, mapper);
183169
if (this.relation != null) {
@@ -215,23 +201,11 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
215201

216202
}
217203

218-
generator.writeEnd();
219-
220204
}
221205

222206
public abstract static class AbstractBuilder<T, BuilderT extends AbstractBuilder<T, BuilderT>>
223207
extends
224208
QueryBase.AbstractBuilder<BuilderT> {
225-
private String field;
226-
227-
/**
228-
* Required - the required field
229-
*/
230-
public final BuilderT field(String value) {
231-
this.field = value;
232-
return self();
233-
}
234-
235209
@Nullable
236210
private RangeRelation relation;
237211

@@ -345,8 +319,6 @@ protected static <T, BuilderT extends AbstractBuilder<T, BuilderT>> void setupRa
345319
op.add(AbstractBuilder::from, tDeserializer, "from");
346320
op.add(AbstractBuilder::to, tDeserializer, "to");
347321

348-
op.setKey(AbstractBuilder::field, JsonpDeserializer.stringDeserializer());
349-
350322
}
351323

352324
}

0 commit comments

Comments
 (0)