Skip to content

Commit 36218c8

Browse files
l-trottal-trotta
committed
[codegen] update to latest api spec
1 parent 7ce6f5a commit 36218c8

File tree

12 files changed

+85
-56
lines changed

12 files changed

+85
-56
lines changed

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

Lines changed: 10 additions & 4 deletions
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

Lines changed: 10 additions & 4 deletions
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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1200,12 +1200,18 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
12001200
}
12011201
if (ApiTypeHelper.isDefined(this.storedFields)) {
12021202
generator.writeKey("stored_fields");
1203-
generator.writeStartArray();
1204-
for (String item0 : this.storedFields) {
1205-
generator.write(item0);
1203+
if (this.storedFields.size() == 1) {
1204+
String singleItem = this.storedFields.get(0);
1205+
generator.write(singleItem);
1206+
1207+
} else {
1208+
generator.writeStartArray();
1209+
for (String item0 : this.storedFields) {
1210+
generator.write(item0);
12061211

1212+
}
1213+
generator.writeEnd();
12071214
}
1208-
generator.writeEnd();
12091215

12101216
}
12111217
if (this.suggest != null) {

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

Lines changed: 11 additions & 6 deletions
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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2170,7 +2170,7 @@
21702170
'search_application.put_behavioral_analytics.AnalyticsAcknowledgeResponseBase': 'search_application/put_behavioral_analytics/BehavioralAnalyticsPutResponse.ts#L28-L33',
21712171
'search_application.put_behavioral_analytics.Request': 'search_application/put_behavioral_analytics/BehavioralAnalyticsPutRequest.ts#L22-L35',
21722172
'search_application.put_behavioral_analytics.Response': 'search_application/put_behavioral_analytics/BehavioralAnalyticsPutResponse.ts#L24-L26',
2173-
'search_application.search.Request': 'search_application/search/SearchApplicationsSearchRequest.ts#L24-L43',
2173+
'search_application.search.Request': 'search_application/search/SearchApplicationsSearchRequest.ts#L24-L52',
21742174
'search_application.search.Response': 'search_application/search/SearchApplicationsSearchResponse.ts#L23-L25',
21752175
'searchable_snapshots._types.StatsLevel': 'searchable_snapshots/_types/stats.ts#L20-L24',
21762176
'searchable_snapshots.cache_stats.Node': 'searchable_snapshots/cache_stats/Response.ts#L30-L32',
@@ -2720,10 +2720,10 @@
27202720
if (hash.length > 1) {
27212721
hash = hash.substring(1);
27222722
}
2723-
window.location = "https://github.com/elastic/elasticsearch-specification/tree/bb080f9057bc00a3e5f39bd34fc6dfa31ceec81a/specification/" + (paths[hash] || "");
2723+
window.location = "https://github.com/elastic/elasticsearch-specification/tree/b1f91f1a0ae5d09da92cf0859b0ff92410cdb6e3/specification/" + (paths[hash] || "");
27242724
</script>
27252725
</head>
27262726
<body>
2727-
Please see the <a href="https://github.com/elastic/elasticsearch-specification/tree/bb080f9057bc00a3e5f39bd34fc6dfa31ceec81a/specification/">Elasticsearch API specification</a>.
2727+
Please see the <a href="https://github.com/elastic/elasticsearch-specification/tree/b1f91f1a0ae5d09da92cf0859b0ff92410cdb6e3/specification/">Elasticsearch API specification</a>.
27282728
</body>
27292729
</html>

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

Lines changed: 10 additions & 4 deletions
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) {

‎java-client/src/main/java/co/elastic/clients/elasticsearch/indices/MappingLimitSettingsDepth.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import co.elastic.clients.util.ObjectBuilder;
3030
import co.elastic.clients.util.WithJsonObjectBuilderBase;
3131
import jakarta.json.stream.JsonGenerator;
32-
import java.lang.Integer;
32+
import java.lang.Long;
3333
import java.util.Objects;
3434
import java.util.function.Function;
3535
import javax.annotation.Nullable;
@@ -60,7 +60,7 @@
6060
@JsonpDeserializable
6161
public class MappingLimitSettingsDepth implements JsonpSerializable {
6262
@Nullable
63-
private final Integer limit;
63+
private final Long limit;
6464

6565
// ---------------------------------------------------------------------------------------------
6666

@@ -83,7 +83,7 @@ public static MappingLimitSettingsDepth of(Function<Builder, ObjectBuilder<Mappi
8383
* API name: {@code limit}
8484
*/
8585
@Nullable
86-
public final Integer limit() {
86+
public final Long limit() {
8787
return this.limit;
8888
}
8989

@@ -121,7 +121,7 @@ public static class Builder extends WithJsonObjectBuilderBase<Builder>
121121
implements
122122
ObjectBuilder<MappingLimitSettingsDepth> {
123123
@Nullable
124-
private Integer limit;
124+
private Long limit;
125125

126126
/**
127127
* The maximum depth for a field, which is measured as the number of inner
@@ -131,7 +131,7 @@ public static class Builder extends WithJsonObjectBuilderBase<Builder>
131131
* <p>
132132
* API name: {@code limit}
133133
*/
134-
public final Builder limit(@Nullable Integer value) {
134+
public final Builder limit(@Nullable Long value) {
135135
this.limit = value;
136136
return this;
137137
}
@@ -165,7 +165,7 @@ public MappingLimitSettingsDepth build() {
165165
protected static void setupMappingLimitSettingsDepthDeserializer(
166166
ObjectDeserializer<MappingLimitSettingsDepth.Builder> op) {
167167

168-
op.add(Builder::limit, JsonpDeserializer.integerDeserializer(), "limit");
168+
op.add(Builder::limit, JsonpDeserializer.longDeserializer(), "limit");
169169

170170
}
171171

‎java-client/src/main/java/co/elastic/clients/elasticsearch/indices/MappingLimitSettingsDimensionFields.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import co.elastic.clients.util.ObjectBuilder;
3030
import co.elastic.clients.util.WithJsonObjectBuilderBase;
3131
import jakarta.json.stream.JsonGenerator;
32-
import java.lang.Integer;
32+
import java.lang.Long;
3333
import java.util.Objects;
3434
import java.util.function.Function;
3535
import javax.annotation.Nullable;
@@ -60,7 +60,7 @@
6060
@JsonpDeserializable
6161
public class MappingLimitSettingsDimensionFields implements JsonpSerializable {
6262
@Nullable
63-
private final Integer limit;
63+
private final Long limit;
6464

6565
// ---------------------------------------------------------------------------------------------
6666

@@ -84,7 +84,7 @@ public static MappingLimitSettingsDimensionFields of(
8484
* API name: {@code limit}
8585
*/
8686
@Nullable
87-
public final Integer limit() {
87+
public final Long limit() {
8888
return this.limit;
8989
}
9090

@@ -122,7 +122,7 @@ public static class Builder extends WithJsonObjectBuilderBase<Builder>
122122
implements
123123
ObjectBuilder<MappingLimitSettingsDimensionFields> {
124124
@Nullable
125-
private Integer limit;
125+
private Long limit;
126126

127127
/**
128128
* [preview] This functionality is in technical preview and may be changed or
@@ -132,7 +132,7 @@ public static class Builder extends WithJsonObjectBuilderBase<Builder>
132132
* <p>
133133
* API name: {@code limit}
134134
*/
135-
public final Builder limit(@Nullable Integer value) {
135+
public final Builder limit(@Nullable Long value) {
136136
this.limit = value;
137137
return this;
138138
}
@@ -167,7 +167,7 @@ public MappingLimitSettingsDimensionFields build() {
167167
protected static void setupMappingLimitSettingsDimensionFieldsDeserializer(
168168
ObjectDeserializer<MappingLimitSettingsDimensionFields.Builder> op) {
169169

170-
op.add(Builder::limit, JsonpDeserializer.integerDeserializer(), "limit");
170+
op.add(Builder::limit, JsonpDeserializer.longDeserializer(), "limit");
171171

172172
}
173173

‎java-client/src/main/java/co/elastic/clients/elasticsearch/indices/MappingLimitSettingsNestedFields.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import co.elastic.clients.util.ObjectBuilder;
3030
import co.elastic.clients.util.WithJsonObjectBuilderBase;
3131
import jakarta.json.stream.JsonGenerator;
32-
import java.lang.Integer;
32+
import java.lang.Long;
3333
import java.util.Objects;
3434
import java.util.function.Function;
3535
import javax.annotation.Nullable;
@@ -60,7 +60,7 @@
6060
@JsonpDeserializable
6161
public class MappingLimitSettingsNestedFields implements JsonpSerializable {
6262
@Nullable
63-
private final Integer limit;
63+
private final Long limit;
6464

6565
// ---------------------------------------------------------------------------------------------
6666

@@ -84,7 +84,7 @@ public static MappingLimitSettingsNestedFields of(
8484
* API name: {@code limit}
8585
*/
8686
@Nullable
87-
public final Integer limit() {
87+
public final Long limit() {
8888
return this.limit;
8989
}
9090

@@ -122,7 +122,7 @@ public static class Builder extends WithJsonObjectBuilderBase<Builder>
122122
implements
123123
ObjectBuilder<MappingLimitSettingsNestedFields> {
124124
@Nullable
125-
private Integer limit;
125+
private Long limit;
126126

127127
/**
128128
* The maximum number of distinct nested mappings in an index. The nested type
@@ -132,7 +132,7 @@ public static class Builder extends WithJsonObjectBuilderBase<Builder>
132132
* <p>
133133
* API name: {@code limit}
134134
*/
135-
public final Builder limit(@Nullable Integer value) {
135+
public final Builder limit(@Nullable Long value) {
136136
this.limit = value;
137137
return this;
138138
}
@@ -166,7 +166,7 @@ public MappingLimitSettingsNestedFields build() {
166166
protected static void setupMappingLimitSettingsNestedFieldsDeserializer(
167167
ObjectDeserializer<MappingLimitSettingsNestedFields.Builder> op) {
168168

169-
op.add(Builder::limit, JsonpDeserializer.integerDeserializer(), "limit");
169+
op.add(Builder::limit, JsonpDeserializer.longDeserializer(), "limit");
170170

171171
}
172172

‎java-client/src/main/java/co/elastic/clients/elasticsearch/indices/MappingLimitSettingsNestedObjects.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import co.elastic.clients.util.ObjectBuilder;
3030
import co.elastic.clients.util.WithJsonObjectBuilderBase;
3131
import jakarta.json.stream.JsonGenerator;
32-
import java.lang.Integer;
32+
import java.lang.Long;
3333
import java.util.Objects;
3434
import java.util.function.Function;
3535
import javax.annotation.Nullable;
@@ -60,7 +60,7 @@
6060
@JsonpDeserializable
6161
public class MappingLimitSettingsNestedObjects implements JsonpSerializable {
6262
@Nullable
63-
private final Integer limit;
63+
private final Long limit;
6464

6565
// ---------------------------------------------------------------------------------------------
6666

@@ -83,7 +83,7 @@ public static MappingLimitSettingsNestedObjects of(
8383
* API name: {@code limit}
8484
*/
8585
@Nullable
86-
public final Integer limit() {
86+
public final Long limit() {
8787
return this.limit;
8888
}
8989

@@ -121,7 +121,7 @@ public static class Builder extends WithJsonObjectBuilderBase<Builder>
121121
implements
122122
ObjectBuilder<MappingLimitSettingsNestedObjects> {
123123
@Nullable
124-
private Integer limit;
124+
private Long limit;
125125

126126
/**
127127
* The maximum number of nested JSON objects that a single document can contain
@@ -130,7 +130,7 @@ public static class Builder extends WithJsonObjectBuilderBase<Builder>
130130
* <p>
131131
* API name: {@code limit}
132132
*/
133-
public final Builder limit(@Nullable Integer value) {
133+
public final Builder limit(@Nullable Long value) {
134134
this.limit = value;
135135
return this;
136136
}
@@ -164,7 +164,7 @@ public MappingLimitSettingsNestedObjects build() {
164164
protected static void setupMappingLimitSettingsNestedObjectsDeserializer(
165165
ObjectDeserializer<MappingLimitSettingsNestedObjects.Builder> op) {
166166

167-
op.add(Builder::limit, JsonpDeserializer.integerDeserializer(), "limit");
167+
op.add(Builder::limit, JsonpDeserializer.longDeserializer(), "limit");
168168

169169
}
170170

0 commit comments

Comments
 (0)