Skip to content

Commit 5180f73

Browse files
committed
[codegen] update to latest api spec
1 parent 09dd9bb commit 5180f73

File tree

6 files changed

+53
-24
lines changed

6 files changed

+53
-24
lines changed

java-client/src/main/java/co/elastic/clients/elasticsearch/async_search/SubmitRequest.java

+10-4
Original file line numberDiff line numberDiff line change
@@ -1114,12 +1114,18 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
11141114
}
11151115
if (ApiTypeHelper.isDefined(this.storedFields)) {
11161116
generator.writeKey("stored_fields");
1117-
generator.writeStartArray();
1118-
for (String item0 : this.storedFields) {
1119-
generator.write(item0);
1117+
if (this.storedFields.size() == 1) {
1118+
String singleItem = this.storedFields.get(0);
1119+
generator.write(singleItem);
1120+
1121+
} else {
1122+
generator.writeStartArray();
1123+
for (String item0 : this.storedFields) {
1124+
generator.write(item0);
11201125

1126+
}
1127+
generator.writeEnd();
11211128
}
1122-
generator.writeEnd();
11231129

11241130
}
11251131
if (this.suggest != null) {

java-client/src/main/java/co/elastic/clients/elasticsearch/core/KnnSearchRequest.java

+10-4
Original file line numberDiff line numberDiff line change
@@ -244,12 +244,18 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
244244

245245
if (ApiTypeHelper.isDefined(this.storedFields)) {
246246
generator.writeKey("stored_fields");
247-
generator.writeStartArray();
248-
for (String item0 : this.storedFields) {
249-
generator.write(item0);
247+
if (this.storedFields.size() == 1) {
248+
String singleItem = this.storedFields.get(0);
249+
generator.write(singleItem);
250+
251+
} else {
252+
generator.writeStartArray();
253+
for (String item0 : this.storedFields) {
254+
generator.write(item0);
250255

256+
}
257+
generator.writeEnd();
251258
}
252-
generator.writeEnd();
253259

254260
}
255261

java-client/src/main/java/co/elastic/clients/elasticsearch/core/SearchRequest.java

+10-4
Original file line numberDiff line numberDiff line change
@@ -1178,12 +1178,18 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
11781178
}
11791179
if (ApiTypeHelper.isDefined(this.storedFields)) {
11801180
generator.writeKey("stored_fields");
1181-
generator.writeStartArray();
1182-
for (String item0 : this.storedFields) {
1183-
generator.write(item0);
1181+
if (this.storedFields.size() == 1) {
1182+
String singleItem = this.storedFields.get(0);
1183+
generator.write(singleItem);
1184+
1185+
} else {
1186+
generator.writeStartArray();
1187+
for (String item0 : this.storedFields) {
1188+
generator.write(item0);
11841189

1190+
}
1191+
generator.writeEnd();
11851192
}
1186-
generator.writeEnd();
11871193

11881194
}
11891195
if (this.suggest != null) {

java-client/src/main/java/co/elastic/clients/elasticsearch/core/search/Hit.java

+11-6
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@
7272
public class Hit<TDocument> implements JsonpSerializable {
7373
private final String index;
7474

75+
@Nullable
7576
private final String id;
7677

7778
@Nullable
@@ -126,7 +127,7 @@ public class Hit<TDocument> implements JsonpSerializable {
126127
private Hit(Builder<TDocument> builder) {
127128

128129
this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
129-
this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
130+
this.id = builder.id;
130131
this.score = builder.score;
131132
this.explanation = builder.explanation;
132133
this.fields = ApiTypeHelper.unmodifiable(builder.fields);
@@ -160,8 +161,9 @@ public final String index() {
160161
}
161162

162163
/**
163-
* Required - API name: {@code _id}
164+
* API name: {@code _id}
164165
*/
166+
@Nullable
165167
public final String id() {
166168
return this.id;
167169
}
@@ -311,9 +313,11 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
311313
generator.writeKey("_index");
312314
generator.write(this.index);
313315

314-
generator.writeKey("_id");
315-
generator.write(this.id);
316+
if (this.id != null) {
317+
generator.writeKey("_id");
318+
generator.write(this.id);
316319

320+
}
317321
if (this.score != null) {
318322
generator.writeKey("_score");
319323
JsonpUtils.serializeDoubleOrNull(generator, this.score, Double.NaN);
@@ -470,6 +474,7 @@ public static class Builder<TDocument> extends WithJsonObjectBuilderBase<Builder
470474
ObjectBuilder<Hit<TDocument>> {
471475
private String index;
472476

477+
@Nullable
473478
private String id;
474479

475480
@Nullable
@@ -535,9 +540,9 @@ public final Builder<TDocument> index(String value) {
535540
}
536541

537542
/**
538-
* Required - API name: {@code _id}
543+
* API name: {@code _id}
539544
*/
540-
public final Builder<TDocument> id(String value) {
545+
public final Builder<TDocument> id(@Nullable String value) {
541546
this.id = value;
542547
return this;
543548
}

java-client/src/main/java/co/elastic/clients/elasticsearch/doc-files/api-spec.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -2712,10 +2712,10 @@
27122712
if (hash.length > 1) {
27132713
hash = hash.substring(1);
27142714
}
2715-
window.location = "https://github.com/elastic/elasticsearch-specification/tree/f18cf1cf51367156f7d15a28174712696b4b6da2/specification/" + (paths[hash] || "");
2715+
window.location = "https://github.com/elastic/elasticsearch-specification/tree/9d726e6ef275db3645a638fe318c3ab2a569e2fe/specification/" + (paths[hash] || "");
27162716
</script>
27172717
</head>
27182718
<body>
2719-
Please see the <a href="https://github.com/elastic/elasticsearch-specification/tree/f18cf1cf51367156f7d15a28174712696b4b6da2/specification/">Elasticsearch API specification</a>.
2719+
Please see the <a href="https://github.com/elastic/elasticsearch-specification/tree/9d726e6ef275db3645a638fe318c3ab2a569e2fe/specification/">Elasticsearch API specification</a>.
27202720
</body>
27212721
</html>

java-client/src/main/java/co/elastic/clients/elasticsearch/fleet/FleetSearchRequest.java

+10-4
Original file line numberDiff line numberDiff line change
@@ -1005,12 +1005,18 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
10051005
}
10061006
if (ApiTypeHelper.isDefined(this.storedFields)) {
10071007
generator.writeKey("stored_fields");
1008-
generator.writeStartArray();
1009-
for (String item0 : this.storedFields) {
1010-
generator.write(item0);
1008+
if (this.storedFields.size() == 1) {
1009+
String singleItem = this.storedFields.get(0);
1010+
generator.write(singleItem);
1011+
1012+
} else {
1013+
generator.writeStartArray();
1014+
for (String item0 : this.storedFields) {
1015+
generator.write(item0);
10111016

1017+
}
1018+
generator.writeEnd();
10121019
}
1013-
generator.writeEnd();
10141020

10151021
}
10161022
if (this.suggest != null) {

0 commit comments

Comments
 (0)