Skip to content

Commit 1a7fbad

Browse files
l-trottal-trotta
authored
fixes from api-spec pr 2440 (#758)
1 parent ab90ea6 commit 1a7fbad

29 files changed

+3631
-323
lines changed

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

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ public class InlineGet<TDocument> implements JsonpSerializable {
8282
@Nullable
8383
private final String routing;
8484

85+
@Nullable
8586
private final TDocument source;
8687

8788
@Nullable
@@ -98,7 +99,7 @@ private InlineGet(Builder<TDocument> builder) {
9899
this.seqNo = builder.seqNo;
99100
this.primaryTerm = builder.primaryTerm;
100101
this.routing = builder.routing;
101-
this.source = ApiTypeHelper.requireNonNull(builder.source, this, "source");
102+
this.source = builder.source;
102103
this.tDocumentSerializer = builder.tDocumentSerializer;
103104

104105
}
@@ -154,8 +155,9 @@ public final String routing() {
154155
}
155156

156157
/**
157-
* Required - API name: {@code _source}
158+
* API name: {@code _source}
158159
*/
160+
@Nullable
159161
public final TDocument source() {
160162
return this.source;
161163
}
@@ -206,8 +208,11 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
206208
generator.write(this.routing);
207209

208210
}
209-
generator.writeKey("_source");
210-
JsonpUtils.serialize(this.source, generator, tDocumentSerializer, mapper);
211+
if (this.source != null) {
212+
generator.writeKey("_source");
213+
JsonpUtils.serialize(this.source, generator, tDocumentSerializer, mapper);
214+
215+
}
211216

212217
}
213218

@@ -262,6 +267,7 @@ public final Builder<TDocument> metadata(String key, JsonData value) {
262267
@Nullable
263268
private String routing;
264269

270+
@Nullable
265271
private TDocument source;
266272

267273
@Nullable
@@ -320,9 +326,9 @@ public final Builder<TDocument> routing(@Nullable String value) {
320326
}
321327

322328
/**
323-
* Required - API name: {@code _source}
329+
* API name: {@code _source}
324330
*/
325-
public final Builder<TDocument> source(TDocument value) {
331+
public final Builder<TDocument> source(@Nullable TDocument value) {
326332
this.source = value;
327333
return this;
328334
}

‎java-client/src/main/java/co/elastic/clients/elasticsearch/_types/mapping/DenseVectorProperty.java

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
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;
2827
import co.elastic.clients.util.ObjectBuilder;
2928
import jakarta.json.stream.JsonGenerator;
3029
import java.lang.Boolean;
@@ -59,7 +58,8 @@
5958
*/
6059
@JsonpDeserializable
6160
public class DenseVectorProperty extends PropertyBase implements PropertyVariant {
62-
private final int dims;
61+
@Nullable
62+
private final Integer dims;
6363

6464
@Nullable
6565
private final String similarity;
@@ -75,7 +75,7 @@ public class DenseVectorProperty extends PropertyBase implements PropertyVariant
7575
private DenseVectorProperty(Builder builder) {
7676
super(builder);
7777

78-
this.dims = ApiTypeHelper.requireNonNull(builder.dims, this, "dims");
78+
this.dims = builder.dims;
7979
this.similarity = builder.similarity;
8080
this.index = builder.index;
8181
this.indexOptions = builder.indexOptions;
@@ -95,9 +95,10 @@ public Property.Kind _propertyKind() {
9595
}
9696

9797
/**
98-
* Required - API name: {@code dims}
98+
* API name: {@code dims}
9999
*/
100-
public final int dims() {
100+
@Nullable
101+
public final Integer dims() {
101102
return this.dims;
102103
}
103104

@@ -129,9 +130,11 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
129130

130131
generator.write("type", "dense_vector");
131132
super.serializeInternal(generator, mapper);
132-
generator.writeKey("dims");
133-
generator.write(this.dims);
133+
if (this.dims != null) {
134+
generator.writeKey("dims");
135+
generator.write(this.dims);
134136

137+
}
135138
if (this.similarity != null) {
136139
generator.writeKey("similarity");
137140
generator.write(this.similarity);
@@ -159,6 +162,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
159162
public static class Builder extends PropertyBase.AbstractBuilder<Builder>
160163
implements
161164
ObjectBuilder<DenseVectorProperty> {
165+
@Nullable
162166
private Integer dims;
163167

164168
@Nullable
@@ -171,9 +175,9 @@ public static class Builder extends PropertyBase.AbstractBuilder<Builder>
171175
private DenseVectorIndexOptions indexOptions;
172176

173177
/**
174-
* Required - API name: {@code dims}
178+
* API name: {@code dims}
175179
*/
176-
public final Builder dims(int value) {
180+
public final Builder dims(@Nullable Integer value) {
177181
this.dims = value;
178182
return this;
179183
}

‎java-client/src/main/java/co/elastic/clients/elasticsearch/_types/mapping/GeoPointProperty.java

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
package co.elastic.clients.elasticsearch._types.mapping;
2121

2222
import co.elastic.clients.elasticsearch._types.GeoLocation;
23+
import co.elastic.clients.elasticsearch._types.Script;
2324
import co.elastic.clients.json.JsonpDeserializable;
2425
import co.elastic.clients.json.JsonpDeserializer;
2526
import co.elastic.clients.json.JsonpMapper;
@@ -66,6 +67,15 @@ public class GeoPointProperty extends DocValuesPropertyBase implements PropertyV
6667
@Nullable
6768
private final GeoLocation nullValue;
6869

70+
@Nullable
71+
private final Boolean index;
72+
73+
@Nullable
74+
private final OnScriptError onScriptError;
75+
76+
@Nullable
77+
private final Script script;
78+
6979
// ---------------------------------------------------------------------------------------------
7080

7181
private GeoPointProperty(Builder builder) {
@@ -74,6 +84,9 @@ private GeoPointProperty(Builder builder) {
7484
this.ignoreMalformed = builder.ignoreMalformed;
7585
this.ignoreZValue = builder.ignoreZValue;
7686
this.nullValue = builder.nullValue;
87+
this.index = builder.index;
88+
this.onScriptError = builder.onScriptError;
89+
this.script = builder.script;
7790

7891
}
7992

@@ -113,6 +126,30 @@ public final GeoLocation nullValue() {
113126
return this.nullValue;
114127
}
115128

129+
/**
130+
* API name: {@code index}
131+
*/
132+
@Nullable
133+
public final Boolean index() {
134+
return this.index;
135+
}
136+
137+
/**
138+
* API name: {@code on_script_error}
139+
*/
140+
@Nullable
141+
public final OnScriptError onScriptError() {
142+
return this.onScriptError;
143+
}
144+
145+
/**
146+
* API name: {@code script}
147+
*/
148+
@Nullable
149+
public final Script script() {
150+
return this.script;
151+
}
152+
116153
protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
117154

118155
generator.write("type", "geo_point");
@@ -132,6 +169,20 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
132169
this.nullValue.serialize(generator, mapper);
133170

134171
}
172+
if (this.index != null) {
173+
generator.writeKey("index");
174+
generator.write(this.index);
175+
176+
}
177+
if (this.onScriptError != null) {
178+
generator.writeKey("on_script_error");
179+
this.onScriptError.serialize(generator, mapper);
180+
}
181+
if (this.script != null) {
182+
generator.writeKey("script");
183+
this.script.serialize(generator, mapper);
184+
185+
}
135186

136187
}
137188

@@ -153,6 +204,15 @@ public static class Builder extends DocValuesPropertyBase.AbstractBuilder<Builde
153204
@Nullable
154205
private GeoLocation nullValue;
155206

207+
@Nullable
208+
private Boolean index;
209+
210+
@Nullable
211+
private OnScriptError onScriptError;
212+
213+
@Nullable
214+
private Script script;
215+
156216
/**
157217
* API name: {@code ignore_malformed}
158218
*/
@@ -184,6 +244,37 @@ public final Builder nullValue(Function<GeoLocation.Builder, ObjectBuilder<GeoLo
184244
return this.nullValue(fn.apply(new GeoLocation.Builder()).build());
185245
}
186246

247+
/**
248+
* API name: {@code index}
249+
*/
250+
public final Builder index(@Nullable Boolean value) {
251+
this.index = value;
252+
return this;
253+
}
254+
255+
/**
256+
* API name: {@code on_script_error}
257+
*/
258+
public final Builder onScriptError(@Nullable OnScriptError value) {
259+
this.onScriptError = value;
260+
return this;
261+
}
262+
263+
/**
264+
* API name: {@code script}
265+
*/
266+
public final Builder script(@Nullable Script value) {
267+
this.script = value;
268+
return this;
269+
}
270+
271+
/**
272+
* API name: {@code script}
273+
*/
274+
public final Builder script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
275+
return this.script(fn.apply(new Script.Builder()).build());
276+
}
277+
187278
@Override
188279
protected Builder self() {
189280
return this;
@@ -215,6 +306,9 @@ protected static void setupGeoPointPropertyDeserializer(ObjectDeserializer<GeoPo
215306
op.add(Builder::ignoreMalformed, JsonpDeserializer.booleanDeserializer(), "ignore_malformed");
216307
op.add(Builder::ignoreZValue, JsonpDeserializer.booleanDeserializer(), "ignore_z_value");
217308
op.add(Builder::nullValue, GeoLocation._DESERIALIZER, "null_value");
309+
op.add(Builder::index, JsonpDeserializer.booleanDeserializer(), "index");
310+
op.add(Builder::onScriptError, OnScriptError._DESERIALIZER, "on_script_error");
311+
op.add(Builder::script, Script._DESERIALIZER, "script");
218312

219313
op.ignore("type");
220314
}

‎java-client/src/main/java/co/elastic/clients/elasticsearch/_types/mapping/RankFeaturesProperty.java

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,10 @@
2626
import co.elastic.clients.json.ObjectDeserializer;
2727
import co.elastic.clients.util.ObjectBuilder;
2828
import jakarta.json.stream.JsonGenerator;
29+
import java.lang.Boolean;
2930
import java.util.Objects;
3031
import java.util.function.Function;
32+
import javax.annotation.Nullable;
3133

3234
//----------------------------------------------------------------
3335
// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
@@ -54,11 +56,16 @@
5456
*/
5557
@JsonpDeserializable
5658
public class RankFeaturesProperty extends PropertyBase implements PropertyVariant {
59+
@Nullable
60+
private final Boolean positiveScoreImpact;
61+
5762
// ---------------------------------------------------------------------------------------------
5863

5964
private RankFeaturesProperty(Builder builder) {
6065
super(builder);
6166

67+
this.positiveScoreImpact = builder.positiveScoreImpact;
68+
6269
}
6370

6471
public static RankFeaturesProperty of(Function<Builder, ObjectBuilder<RankFeaturesProperty>> fn) {
@@ -73,10 +80,23 @@ public Property.Kind _propertyKind() {
7380
return Property.Kind.RankFeatures;
7481
}
7582

83+
/**
84+
* API name: {@code positive_score_impact}
85+
*/
86+
@Nullable
87+
public final Boolean positiveScoreImpact() {
88+
return this.positiveScoreImpact;
89+
}
90+
7691
protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
7792

7893
generator.write("type", "rank_features");
7994
super.serializeInternal(generator, mapper);
95+
if (this.positiveScoreImpact != null) {
96+
generator.writeKey("positive_score_impact");
97+
generator.write(this.positiveScoreImpact);
98+
99+
}
80100

81101
}
82102

@@ -89,6 +109,17 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
89109
public static class Builder extends PropertyBase.AbstractBuilder<Builder>
90110
implements
91111
ObjectBuilder<RankFeaturesProperty> {
112+
@Nullable
113+
private Boolean positiveScoreImpact;
114+
115+
/**
116+
* API name: {@code positive_score_impact}
117+
*/
118+
public final Builder positiveScoreImpact(@Nullable Boolean value) {
119+
this.positiveScoreImpact = value;
120+
return this;
121+
}
122+
92123
@Override
93124
protected Builder self() {
94125
return this;
@@ -117,6 +148,7 @@ public RankFeaturesProperty build() {
117148

118149
protected static void setupRankFeaturesPropertyDeserializer(ObjectDeserializer<RankFeaturesProperty.Builder> op) {
119150
PropertyBase.setupPropertyBaseDeserializer(op);
151+
op.add(Builder::positiveScoreImpact, JsonpDeserializer.booleanDeserializer(), "positive_score_impact");
120152

121153
op.ignore("type");
122154
}

0 commit comments

Comments
 (0)