Skip to content

Commit e3f4b1e

Browse files
swallezswallez
committed
[codegen] Update to latest API spec
1 parent 6cbc9fd commit e3f4b1e

File tree

9 files changed

+130
-73
lines changed

9 files changed

+130
-73
lines changed

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

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import co.elastic.clients.json.JsonpMapper;
2929
import co.elastic.clients.json.ObjectBuilderDeserializer;
3030
import co.elastic.clients.json.ObjectDeserializer;
31-
import co.elastic.clients.util.ApiTypeHelper;
3231
import co.elastic.clients.util.ObjectBuilder;
3332
import jakarta.json.stream.JsonGenerator;
3433
import java.lang.String;
@@ -46,14 +45,15 @@
4645
*/
4746
@JsonpDeserializable
4847
public class StemmerTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
48+
@Nullable
4949
private final String language;
5050

5151
// ---------------------------------------------------------------------------------------------
5252

5353
private StemmerTokenFilter(Builder builder) {
5454
super(builder);
5555

56-
this.language = ApiTypeHelper.requireNonNull(builder.language, this, "language");
56+
this.language = builder.language;
5757

5858
}
5959

@@ -70,8 +70,9 @@ public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
7070
}
7171

7272
/**
73-
* Required - API name: {@code language}
73+
* API name: {@code language}
7474
*/
75+
@Nullable
7576
public final String language() {
7677
return this.language;
7778
}
@@ -80,8 +81,11 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
8081

8182
generator.write("type", "stemmer");
8283
super.serializeInternal(generator, mapper);
83-
generator.writeKey("language");
84-
generator.write(this.language);
84+
if (this.language != null) {
85+
generator.writeKey("language");
86+
generator.write(this.language);
87+
88+
}
8589

8690
}
8791

@@ -94,12 +98,13 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
9498
public static class Builder extends TokenFilterBase.AbstractBuilder<Builder>
9599
implements
96100
ObjectBuilder<StemmerTokenFilter> {
101+
@Nullable
97102
private String language;
98103

99104
/**
100-
* Required - API name: {@code language}
105+
* API name: {@code language}
101106
*/
102-
public final Builder language(String value) {
107+
public final Builder language(@Nullable String value) {
103108
this.language = value;
104109
return this;
105110
}
@@ -132,7 +137,7 @@ public StemmerTokenFilter build() {
132137

133138
protected static void setupStemmerTokenFilterDeserializer(ObjectDeserializer<StemmerTokenFilter.Builder> op) {
134139
TokenFilterBase.setupTokenFilterBaseDeserializer(op);
135-
op.add(Builder::language, JsonpDeserializer.stringDeserializer(), "language");
140+
op.add(Builder::language, JsonpDeserializer.stringDeserializer(), "language", "name");
136141

137142
op.ignore("type");
138143
}

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

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -627,24 +627,24 @@
627627
'_types.analysis.StandardAnalyzer': '_types/analysis/analyzers.ts#L95-L99',
628628
'_types.analysis.StandardTokenizer': '_types/analysis/tokenizers.ts#L104-L107',
629629
'_types.analysis.StemmerOverrideTokenFilter': '_types/analysis/token_filters.ts#L313-L317',
630-
'_types.analysis.StemmerTokenFilter': '_types/analysis/token_filters.ts#L319-L322',
630+
'_types.analysis.StemmerTokenFilter': '_types/analysis/token_filters.ts#L319-L323',
631631
'_types.analysis.StopAnalyzer': '_types/analysis/analyzers.ts#L101-L106',
632632
'_types.analysis.StopTokenFilter': '_types/analysis/token_filters.ts#L96-L102',
633633
'_types.analysis.SynonymFormat': '_types/analysis/token_filters.ts#L104-L107',
634634
'_types.analysis.SynonymGraphTokenFilter': '_types/analysis/token_filters.ts#L109-L118',
635635
'_types.analysis.SynonymTokenFilter': '_types/analysis/token_filters.ts#L120-L129',
636636
'_types.analysis.TokenChar': '_types/analysis/tokenizers.ts#L46-L53',
637-
'_types.analysis.TokenFilter': '_types/analysis/token_filters.ts#L342-L344',
637+
'_types.analysis.TokenFilter': '_types/analysis/token_filters.ts#L343-L345',
638638
'_types.analysis.TokenFilterBase': '_types/analysis/token_filters.ts#L39-L41',
639-
'_types.analysis.TokenFilterDefinition': '_types/analysis/token_filters.ts#L346-L399',
639+
'_types.analysis.TokenFilterDefinition': '_types/analysis/token_filters.ts#L347-L400',
640640
'_types.analysis.Tokenizer': '_types/analysis/tokenizers.ts#L119-L121',
641641
'_types.analysis.TokenizerBase': '_types/analysis/tokenizers.ts#L26-L28',
642642
'_types.analysis.TokenizerDefinition': '_types/analysis/tokenizers.ts#L123-L141',
643-
'_types.analysis.TrimTokenFilter': '_types/analysis/token_filters.ts#L324-L326',
644-
'_types.analysis.TruncateTokenFilter': '_types/analysis/token_filters.ts#L328-L331',
643+
'_types.analysis.TrimTokenFilter': '_types/analysis/token_filters.ts#L325-L327',
644+
'_types.analysis.TruncateTokenFilter': '_types/analysis/token_filters.ts#L329-L332',
645645
'_types.analysis.UaxEmailUrlTokenizer': '_types/analysis/tokenizers.ts#L109-L112',
646-
'_types.analysis.UniqueTokenFilter': '_types/analysis/token_filters.ts#L333-L336',
647-
'_types.analysis.UppercaseTokenFilter': '_types/analysis/token_filters.ts#L338-L340',
646+
'_types.analysis.UniqueTokenFilter': '_types/analysis/token_filters.ts#L334-L337',
647+
'_types.analysis.UppercaseTokenFilter': '_types/analysis/token_filters.ts#L339-L341',
648648
'_types.analysis.WhitespaceAnalyzer': '_types/analysis/analyzers.ts#L108-L111',
649649
'_types.analysis.WhitespaceTokenizer': '_types/analysis/tokenizers.ts#L114-L117',
650650
'_types.analysis.WordDelimiterGraphTokenFilter': '_types/analysis/token_filters.ts#L148-L165',
@@ -720,7 +720,7 @@
720720
'_types.mapping.TextIndexPrefixes': '_types/mapping/core.ts#L279-L282',
721721
'_types.mapping.TextProperty': '_types/mapping/core.ts#L284-L300',
722722
'_types.mapping.TokenCountProperty': '_types/mapping/specialized.ts#L70-L77',
723-
'_types.mapping.TypeMapping': '_types/mapping/TypeMapping.ts#L34-L53',
723+
'_types.mapping.TypeMapping': '_types/mapping/TypeMapping.ts#L34-L51',
724724
'_types.mapping.UnsignedLongNumberProperty': '_types/mapping/core.ts#L191-L194',
725725
'_types.mapping.VersionProperty': '_types/mapping/core.ts#L302-L304',
726726
'_types.mapping.WildcardProperty': '_types/mapping/core.ts#L306-L310',
@@ -1896,27 +1896,25 @@
18961896
'searchable_snapshots.mount.Response': 'searchable_snapshots/mount/SearchableSnapshotsMountResponse.ts#L22-L26',
18971897
'searchable_snapshots.stats.Request': 'searchable_snapshots/stats/SearchableSnapshotsStatsRequest.ts#L24-L36',
18981898
'searchable_snapshots.stats.Response': 'searchable_snapshots/stats/SearchableSnapshotsStatsResponse.ts#L22-L27',
1899-
'security._types.ApplicationGlobalUserPrivileges': 'security/_types/Privileges.ts#L190-L192',
1899+
'security._types.ApplicationGlobalUserPrivileges': 'security/_types/Privileges.ts#L192-L194',
19001900
'security._types.ApplicationPrivileges': 'security/_types/Privileges.ts#L26-L39',
19011901
'security._types.ClusterNode': 'security/_types/ClusterNode.ts#L22-L24',
1902-
'security._types.ClusterPrivilege': 'security/_types/Privileges.ts#L41-L78',
19031902
'security._types.CreatedStatus': 'security/_types/CreatedStatus.ts#L20-L22',
19041903
'security._types.FieldRule': 'security/_types/RoleMappingRule.ts#L33-L42',
19051904
'security._types.FieldSecurity': 'security/_types/FieldSecurity.ts#L22-L25',
1906-
'security._types.GlobalPrivilege': 'security/_types/Privileges.ts#L186-L188',
1907-
'security._types.IndexPrivilege': 'security/_types/Privileges.ts#L164-L184',
1908-
'security._types.IndicesPrivileges': 'security/_types/Privileges.ts#L80-L103',
1909-
'security._types.ManageUserPrivileges': 'security/_types/Privileges.ts#L194-L196',
1905+
'security._types.GlobalPrivilege': 'security/_types/Privileges.ts#L188-L190',
1906+
'security._types.IndicesPrivileges': 'security/_types/Privileges.ts#L81-L104',
1907+
'security._types.ManageUserPrivileges': 'security/_types/Privileges.ts#L196-L198',
19101908
'security._types.Realm': 'security/_types/RoleMappingRule.ts#L44-L46',
19111909
'security._types.RealmInfo': 'security/_types/RealmInfo.ts#L22-L25',
19121910
'security._types.RoleMapping': 'security/_types/RoleMapping.ts#L25-L31',
19131911
'security._types.RoleMappingRule': 'security/_types/RoleMappingRule.ts#L23-L31',
1914-
'security._types.RoleTemplateInlineQuery': 'security/_types/Privileges.ts#L158-L159',
1915-
'security._types.RoleTemplateInlineScript': 'security/_types/Privileges.ts#L151-L156',
1916-
'security._types.RoleTemplateScript': 'security/_types/Privileges.ts#L161-L162',
1912+
'security._types.RoleTemplateInlineQuery': 'security/_types/Privileges.ts#L159-L160',
1913+
'security._types.RoleTemplateInlineScript': 'security/_types/Privileges.ts#L152-L157',
1914+
'security._types.RoleTemplateScript': 'security/_types/Privileges.ts#L162-L163',
19171915
'security._types.TransientMetadataConfig': 'security/_types/TransientMetadataConfig.ts#L20-L22',
19181916
'security._types.User': 'security/_types/User.ts#L22-L29',
1919-
'security._types.UserIndicesPrivileges': 'security/_types/Privileges.ts#L105-L127',
1917+
'security._types.UserIndicesPrivileges': 'security/_types/Privileges.ts#L106-L128',
19201918
'security.authenticate.ApiKey': 'security/authenticate/types.ts#L28-L31',
19211919
'security.authenticate.Request': 'security/authenticate/SecurityAuthenticateRequest.ts#L22-L28',
19221920
'security.authenticate.Response': 'security/authenticate/SecurityAuthenticateResponse.ts#L24-L39',
@@ -2077,7 +2075,7 @@
20772075
'snapshot.get.SnapshotResponseItem': 'snapshot/get/SnapshotGetResponse.ts#L42-L46',
20782076
'snapshot.get_repository.Request': 'snapshot/get_repository/SnapshotGetRepositoryRequest.ts#L24-L38',
20792077
'snapshot.get_repository.Response': 'snapshot/get_repository/SnapshotGetRepositoryResponse.ts#L23-L23',
2080-
'snapshot.restore.Request': 'snapshot/restore/SnapshotRestoreRequest.ts#L25-L50',
2078+
'snapshot.restore.Request': 'snapshot/restore/SnapshotRestoreRequest.ts#L25-L51',
20812079
'snapshot.restore.Response': 'snapshot/restore/SnapshotRestoreResponse.ts#L23-L25',
20822080
'snapshot.restore.SnapshotRestore': 'snapshot/restore/SnapshotRestoreResponse.ts#L27-L31',
20832081
'snapshot.status.Request': 'snapshot/status/SnapshotStatusRequest.ts#L24-L38',
@@ -2319,10 +2317,10 @@
23192317
if (hash.length > 1) {
23202318
hash = hash.substring(1);
23212319
}
2322-
window.location = "https://github.com/elastic/elasticsearch-specification/tree/f59a1bdac170fc6fe0ca644b3e4ded3e081e32ae/specification/" + (paths[hash] || "");
2320+
window.location = "https://github.com/elastic/elasticsearch-specification/tree/3f7a4959ff4ed2023c554e3a138de270f7e6c2a7/specification/" + (paths[hash] || "");
23232321
</script>
23242322
</head>
23252323
<body>
2326-
Please see the <a href="https://github.com/elastic/elasticsearch-specification/tree/f59a1bdac170fc6fe0ca644b3e4ded3e081e32ae/specification/">Elasticsearch API specification</a>.
2324+
Please see the <a href="https://github.com/elastic/elasticsearch-specification/tree/3f7a4959ff4ed2023c554e3a138de270f7e6c2a7/specification/">Elasticsearch API specification</a>.
23272325
</body>
23282326
</html>

‎java-client/src/main/java/co/elastic/clients/elasticsearch/security/HasPrivilegesRequest.java

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
public class HasPrivilegesRequest extends RequestBase implements JsonpSerializable {
5858
private final List<ApplicationPrivilegesCheck> application;
5959

60-
private final List<ClusterPrivilege> cluster;
60+
private final List<String> cluster;
6161

6262
private final List<IndexPrivilegesCheck> index;
6363

@@ -89,7 +89,7 @@ public final List<ApplicationPrivilegesCheck> application() {
8989
/**
9090
* API name: {@code cluster}
9191
*/
92-
public final List<ClusterPrivilege> cluster() {
92+
public final List<String> cluster() {
9393
return this.cluster;
9494
}
9595

@@ -134,8 +134,9 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
134134
if (ApiTypeHelper.isDefined(this.cluster)) {
135135
generator.writeKey("cluster");
136136
generator.writeStartArray();
137-
for (ClusterPrivilege item0 : this.cluster) {
138-
item0.serialize(generator, mapper);
137+
for (String item0 : this.cluster) {
138+
generator.write(item0);
139+
139140
}
140141
generator.writeEnd();
141142

@@ -166,7 +167,7 @@ public static class Builder extends RequestBase.AbstractBuilder<Builder>
166167
private List<ApplicationPrivilegesCheck> application;
167168

168169
@Nullable
169-
private List<ClusterPrivilege> cluster;
170+
private List<String> cluster;
170171

171172
@Nullable
172173
private List<IndexPrivilegesCheck> index;
@@ -209,7 +210,7 @@ public final Builder application(
209210
* <p>
210211
* Adds all elements of <code>list</code> to <code>cluster</code>.
211212
*/
212-
public final Builder cluster(List<ClusterPrivilege> list) {
213+
public final Builder cluster(List<String> list) {
213214
this.cluster = _listAddAll(this.cluster, list);
214215
return this;
215216
}
@@ -219,7 +220,7 @@ public final Builder cluster(List<ClusterPrivilege> list) {
219220
* <p>
220221
* Adds one or more values to <code>cluster</code>.
221222
*/
222-
public final Builder cluster(ClusterPrivilege value, ClusterPrivilege... values) {
223+
public final Builder cluster(String value, String... values) {
223224
this.cluster = _listAdd(this.cluster, value, values);
224225
return this;
225226
}
@@ -293,7 +294,8 @@ protected static void setupHasPrivilegesRequestDeserializer(ObjectDeserializer<H
293294

294295
op.add(Builder::application, JsonpDeserializer.arrayDeserializer(ApplicationPrivilegesCheck._DESERIALIZER),
295296
"application");
296-
op.add(Builder::cluster, JsonpDeserializer.arrayDeserializer(ClusterPrivilege._DESERIALIZER), "cluster");
297+
op.add(Builder::cluster, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
298+
"cluster");
297299
op.add(Builder::index, JsonpDeserializer.arrayDeserializer(IndexPrivilegesCheck._DESERIALIZER), "index");
298300

299301
}

‎java-client/src/main/java/co/elastic/clients/elasticsearch/security/IndicesPrivileges.java

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public class IndicesPrivileges implements JsonpSerializable {
5656

5757
private final List<String> names;
5858

59-
private final List<IndexPrivilege> privileges;
59+
private final List<String> privileges;
6060

6161
@Nullable
6262
private final Query query;
@@ -105,7 +105,7 @@ public final List<String> names() {
105105
* <p>
106106
* API name: {@code privileges}
107107
*/
108-
public final List<IndexPrivilege> privileges() {
108+
public final List<String> privileges() {
109109
return this.privileges;
110110
}
111111

@@ -172,8 +172,9 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
172172
if (ApiTypeHelper.isDefined(this.privileges)) {
173173
generator.writeKey("privileges");
174174
generator.writeStartArray();
175-
for (IndexPrivilege item0 : this.privileges) {
176-
item0.serialize(generator, mapper);
175+
for (String item0 : this.privileges) {
176+
generator.write(item0);
177+
177178
}
178179
generator.writeEnd();
179180

@@ -208,7 +209,7 @@ public static class Builder extends WithJsonObjectBuilderBase<Builder> implement
208209

209210
private List<String> names;
210211

211-
private List<IndexPrivilege> privileges;
212+
private List<String> privileges;
212213

213214
@Nullable
214215
private Query query;
@@ -285,7 +286,7 @@ public final Builder names(String value, String... values) {
285286
* <p>
286287
* Adds all elements of <code>list</code> to <code>privileges</code>.
287288
*/
288-
public final Builder privileges(List<IndexPrivilege> list) {
289+
public final Builder privileges(List<String> list) {
289290
this.privileges = _listAddAll(this.privileges, list);
290291
return this;
291292
}
@@ -298,7 +299,7 @@ public final Builder privileges(List<IndexPrivilege> list) {
298299
* <p>
299300
* Adds one or more values to <code>privileges</code>.
300301
*/
301-
public final Builder privileges(IndexPrivilege value, IndexPrivilege... values) {
302+
public final Builder privileges(String value, String... values) {
302303
this.privileges = _listAdd(this.privileges, value, values);
303304
return this;
304305
}
@@ -376,7 +377,8 @@ protected static void setupIndicesPrivilegesDeserializer(ObjectDeserializer<Indi
376377
op.add(Builder::fieldSecurity, JsonpDeserializer.arrayDeserializer(FieldSecurity._DESERIALIZER),
377378
"field_security");
378379
op.add(Builder::names, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "names");
379-
op.add(Builder::privileges, JsonpDeserializer.arrayDeserializer(IndexPrivilege._DESERIALIZER), "privileges");
380+
op.add(Builder::privileges, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
381+
"privileges");
380382
op.add(Builder::query, JsonpDeserializer.jsonString(Query._DESERIALIZER), "query");
381383
op.add(Builder::allowRestrictedIndices, JsonpDeserializer.booleanDeserializer(), "allow_restricted_indices");
382384

‎java-client/src/main/java/co/elastic/clients/elasticsearch/security/PutRoleRequest.java

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
public class PutRoleRequest extends RequestBase implements JsonpSerializable {
6060
private final List<ApplicationPrivileges> applications;
6161

62-
private final List<ClusterPrivilege> cluster;
62+
private final List<String> cluster;
6363

6464
private final Map<String, JsonData> global;
6565

@@ -112,7 +112,7 @@ public final List<ApplicationPrivileges> applications() {
112112
* <p>
113113
* API name: {@code cluster}
114114
*/
115-
public final List<ClusterPrivilege> cluster() {
115+
public final List<String> cluster() {
116116
return this.cluster;
117117
}
118118

@@ -216,8 +216,9 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
216216
if (ApiTypeHelper.isDefined(this.cluster)) {
217217
generator.writeKey("cluster");
218218
generator.writeStartArray();
219-
for (ClusterPrivilege item0 : this.cluster) {
220-
item0.serialize(generator, mapper);
219+
for (String item0 : this.cluster) {
220+
generator.write(item0);
221+
221222
}
222223
generator.writeEnd();
223224

@@ -283,7 +284,7 @@ public static class Builder extends RequestBase.AbstractBuilder<Builder> impleme
283284
private List<ApplicationPrivileges> applications;
284285

285286
@Nullable
286-
private List<ClusterPrivilege> cluster;
287+
private List<String> cluster;
287288

288289
@Nullable
289290
private Map<String, JsonData> global;
@@ -349,7 +350,7 @@ public final Builder applications(
349350
* <p>
350351
* Adds all elements of <code>list</code> to <code>cluster</code>.
351352
*/
352-
public final Builder cluster(List<ClusterPrivilege> list) {
353+
public final Builder cluster(List<String> list) {
353354
this.cluster = _listAddAll(this.cluster, list);
354355
return this;
355356
}
@@ -362,7 +363,7 @@ public final Builder cluster(List<ClusterPrivilege> list) {
362363
* <p>
363364
* Adds one or more values to <code>cluster</code>.
364365
*/
365-
public final Builder cluster(ClusterPrivilege value, ClusterPrivilege... values) {
366+
public final Builder cluster(String value, String... values) {
366367
this.cluster = _listAdd(this.cluster, value, values);
367368
return this;
368369
}
@@ -563,7 +564,8 @@ protected static void setupPutRoleRequestDeserializer(ObjectDeserializer<PutRole
563564

564565
op.add(Builder::applications, JsonpDeserializer.arrayDeserializer(ApplicationPrivileges._DESERIALIZER),
565566
"applications");
566-
op.add(Builder::cluster, JsonpDeserializer.arrayDeserializer(ClusterPrivilege._DESERIALIZER), "cluster");
567+
op.add(Builder::cluster, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
568+
"cluster");
567569
op.add(Builder::global, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "global");
568570
op.add(Builder::indices, JsonpDeserializer.arrayDeserializer(IndicesPrivileges._DESERIALIZER), "indices");
569571
op.add(Builder::metadata, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "metadata");

0 commit comments

Comments
 (0)