Skip to content

Commit 8c76d82

Browse files
l-trottal-trotta
committed
[codegen] update to latest api spec
1 parent 32d66bc commit 8c76d82

21 files changed

+2311
-97
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@
127127
import co.elastic.clients.elasticsearch.ml.ElasticsearchMlAsyncClient;
128128
import co.elastic.clients.elasticsearch.monitoring.ElasticsearchMonitoringAsyncClient;
129129
import co.elastic.clients.elasticsearch.nodes.ElasticsearchNodesAsyncClient;
130+
import co.elastic.clients.elasticsearch.query_rule.ElasticsearchQueryRuleAsyncClient;
130131
import co.elastic.clients.elasticsearch.query_ruleset.ElasticsearchQueryRulesetAsyncClient;
131132
import co.elastic.clients.elasticsearch.rollup.ElasticsearchRollupAsyncClient;
132133
import co.elastic.clients.elasticsearch.search_application.ElasticsearchSearchApplicationAsyncClient;
@@ -280,6 +281,10 @@ public ElasticsearchNodesAsyncClient nodes() {
280281
return new ElasticsearchNodesAsyncClient(this.transport, this.transportOptions);
281282
}
282283

284+
public ElasticsearchQueryRuleAsyncClient queryRule() {
285+
return new ElasticsearchQueryRuleAsyncClient(this.transport, this.transportOptions);
286+
}
287+
283288
public ElasticsearchQueryRulesetAsyncClient queryRuleset() {
284289
return new ElasticsearchQueryRulesetAsyncClient(this.transport, this.transportOptions);
285290
}

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@
128128
import co.elastic.clients.elasticsearch.ml.ElasticsearchMlClient;
129129
import co.elastic.clients.elasticsearch.monitoring.ElasticsearchMonitoringClient;
130130
import co.elastic.clients.elasticsearch.nodes.ElasticsearchNodesClient;
131+
import co.elastic.clients.elasticsearch.query_rule.ElasticsearchQueryRuleClient;
131132
import co.elastic.clients.elasticsearch.query_ruleset.ElasticsearchQueryRulesetClient;
132133
import co.elastic.clients.elasticsearch.rollup.ElasticsearchRollupClient;
133134
import co.elastic.clients.elasticsearch.search_application.ElasticsearchSearchApplicationClient;
@@ -281,6 +282,10 @@ public ElasticsearchNodesClient nodes() {
281282
return new ElasticsearchNodesClient(this.transport, this.transportOptions);
282283
}
283284

285+
public ElasticsearchQueryRuleClient queryRule() {
286+
return new ElasticsearchQueryRuleClient(this.transport, this.transportOptions);
287+
}
288+
284289
public ElasticsearchQueryRulesetClient queryRuleset() {
285290
return new ElasticsearchQueryRulesetClient(this.transport, this.transportOptions);
286291
}

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

Lines changed: 44 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ public enum Kind implements JsonEnum {
152152

153153
Regexp("regexp"),
154154

155-
RuleQuery("rule_query"),
155+
Rule("rule"),
156156

157157
Script("script"),
158158

@@ -182,6 +182,8 @@ public enum Kind implements JsonEnum {
182182

183183
SpanWithin("span_within"),
184184

185+
SparseVector("sparse_vector"),
186+
185187
Term("term"),
186188

187189
Terms("terms"),
@@ -874,20 +876,20 @@ public RegexpQuery regexp() {
874876
}
875877

876878
/**
877-
* Is this variant instance of kind {@code rule_query}?
879+
* Is this variant instance of kind {@code rule}?
878880
*/
879-
public boolean isRuleQuery() {
880-
return _kind == Kind.RuleQuery;
881+
public boolean isRule() {
882+
return _kind == Kind.Rule;
881883
}
882884

883885
/**
884-
* Get the {@code rule_query} variant value.
886+
* Get the {@code rule} variant value.
885887
*
886888
* @throws IllegalStateException
887-
* if the current variant is not of the {@code rule_query} kind.
889+
* if the current variant is not of the {@code rule} kind.
888890
*/
889-
public RuleQuery ruleQuery() {
890-
return TaggedUnionUtils.get(this, Kind.RuleQuery);
891+
public RuleQuery rule() {
892+
return TaggedUnionUtils.get(this, Kind.Rule);
891893
}
892894

893895
/**
@@ -1131,6 +1133,23 @@ public SpanWithinQuery spanWithin() {
11311133
return TaggedUnionUtils.get(this, Kind.SpanWithin);
11321134
}
11331135

1136+
/**
1137+
* Is this variant instance of kind {@code sparse_vector}?
1138+
*/
1139+
public boolean isSparseVector() {
1140+
return _kind == Kind.SparseVector;
1141+
}
1142+
1143+
/**
1144+
* Get the {@code sparse_vector} variant value.
1145+
*
1146+
* @throws IllegalStateException
1147+
* if the current variant is not of the {@code sparse_vector} kind.
1148+
*/
1149+
public SparseVectorQuery sparseVector() {
1150+
return TaggedUnionUtils.get(this, Kind.SparseVector);
1151+
}
1152+
11341153
/**
11351154
* Is this variant instance of kind {@code term}?
11361155
*/
@@ -1698,14 +1717,14 @@ public ObjectBuilder<Query> regexp(Function<RegexpQuery.Builder, ObjectBuilder<R
16981717
return this.regexp(fn.apply(new RegexpQuery.Builder()).build());
16991718
}
17001719

1701-
public ObjectBuilder<Query> ruleQuery(RuleQuery v) {
1702-
this._kind = Kind.RuleQuery;
1720+
public ObjectBuilder<Query> rule(RuleQuery v) {
1721+
this._kind = Kind.Rule;
17031722
this._value = v;
17041723
return this;
17051724
}
17061725

1707-
public ObjectBuilder<Query> ruleQuery(Function<RuleQuery.Builder, ObjectBuilder<RuleQuery>> fn) {
1708-
return this.ruleQuery(fn.apply(new RuleQuery.Builder()).build());
1726+
public ObjectBuilder<Query> rule(Function<RuleQuery.Builder, ObjectBuilder<RuleQuery>> fn) {
1727+
return this.rule(fn.apply(new RuleQuery.Builder()).build());
17091728
}
17101729

17111730
public ObjectBuilder<Query> script(ScriptQuery v) {
@@ -1853,6 +1872,17 @@ public ObjectBuilder<Query> spanWithin(Function<SpanWithinQuery.Builder, ObjectB
18531872
return this.spanWithin(fn.apply(new SpanWithinQuery.Builder()).build());
18541873
}
18551874

1875+
public ObjectBuilder<Query> sparseVector(SparseVectorQuery v) {
1876+
this._kind = Kind.SparseVector;
1877+
this._value = v;
1878+
return this;
1879+
}
1880+
1881+
public ObjectBuilder<Query> sparseVector(
1882+
Function<SparseVectorQuery.Builder, ObjectBuilder<SparseVectorQuery>> fn) {
1883+
return this.sparseVector(fn.apply(new SparseVectorQuery.Builder()).build());
1884+
}
1885+
18561886
public ObjectBuilder<Query> term(TermQuery v) {
18571887
this._kind = Kind.Term;
18581888
this._value = v;
@@ -1996,7 +2026,7 @@ protected static void setupQueryDeserializer(ObjectDeserializer<Builder> op) {
19962026
op.add(Builder::range, RangeQuery._DESERIALIZER, "range");
19972027
op.add(Builder::rankFeature, RankFeatureQuery._DESERIALIZER, "rank_feature");
19982028
op.add(Builder::regexp, RegexpQuery._DESERIALIZER, "regexp");
1999-
op.add(Builder::ruleQuery, RuleQuery._DESERIALIZER, "rule_query");
2029+
op.add(Builder::rule, RuleQuery._DESERIALIZER, "rule");
20002030
op.add(Builder::script, ScriptQuery._DESERIALIZER, "script");
20012031
op.add(Builder::scriptScore, ScriptScoreQuery._DESERIALIZER, "script_score");
20022032
op.add(Builder::semantic, SemanticQuery._DESERIALIZER, "semantic");
@@ -2011,6 +2041,7 @@ protected static void setupQueryDeserializer(ObjectDeserializer<Builder> op) {
20112041
op.add(Builder::spanOr, SpanOrQuery._DESERIALIZER, "span_or");
20122042
op.add(Builder::spanTerm, SpanTermQuery._DESERIALIZER, "span_term");
20132043
op.add(Builder::spanWithin, SpanWithinQuery._DESERIALIZER, "span_within");
2044+
op.add(Builder::sparseVector, SparseVectorQuery._DESERIALIZER, "sparse_vector");
20142045
op.add(Builder::term, TermQuery._DESERIALIZER, "term");
20152046
op.add(Builder::terms, TermsQuery._DESERIALIZER, "terms");
20162047
op.add(Builder::termsSet, TermsSetQuery._DESERIALIZER, "terms_set");

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

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -667,18 +667,18 @@ public static Query regexp(Function<RegexpQuery.Builder, ObjectBuilder<RegexpQue
667667
}
668668

669669
/**
670-
* Creates a builder for the {@link RuleQuery rule_query} {@code Query} variant.
670+
* Creates a builder for the {@link RuleQuery rule} {@code Query} variant.
671671
*/
672-
public static RuleQuery.Builder ruleQuery() {
672+
public static RuleQuery.Builder rule() {
673673
return new RuleQuery.Builder();
674674
}
675675

676676
/**
677-
* Creates a Query of the {@link RuleQuery rule_query} {@code Query} variant.
677+
* Creates a Query of the {@link RuleQuery rule} {@code Query} variant.
678678
*/
679-
public static Query ruleQuery(Function<RuleQuery.Builder, ObjectBuilder<RuleQuery>> fn) {
679+
public static Query rule(Function<RuleQuery.Builder, ObjectBuilder<RuleQuery>> fn) {
680680
Query.Builder builder = new Query.Builder();
681-
builder.ruleQuery(fn.apply(new RuleQuery.Builder()).build());
681+
builder.rule(fn.apply(new RuleQuery.Builder()).build());
682682
return builder.build();
683683
}
684684

@@ -926,6 +926,24 @@ public static Query spanWithin(Function<SpanWithinQuery.Builder, ObjectBuilder<S
926926
return builder.build();
927927
}
928928

929+
/**
930+
* Creates a builder for the {@link SparseVectorQuery sparse_vector}
931+
* {@code Query} variant.
932+
*/
933+
public static SparseVectorQuery.Builder sparseVector() {
934+
return new SparseVectorQuery.Builder();
935+
}
936+
937+
/**
938+
* Creates a Query of the {@link SparseVectorQuery sparse_vector} {@code Query}
939+
* variant.
940+
*/
941+
public static Query sparseVector(Function<SparseVectorQuery.Builder, ObjectBuilder<SparseVectorQuery>> fn) {
942+
Query.Builder builder = new Query.Builder();
943+
builder.sparseVector(fn.apply(new SparseVectorQuery.Builder()).build());
944+
return builder.build();
945+
}
946+
929947
/**
930948
* Creates a builder for the {@link TermQuery term} {@code Query} variant.
931949
*/

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

Lines changed: 34 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import co.elastic.clients.util.ObjectBuilder;
3030
import jakarta.json.stream.JsonGenerator;
3131
import java.lang.String;
32+
import java.util.List;
3233
import java.util.Objects;
3334
import java.util.function.Function;
3435
import javax.annotation.Nullable;
@@ -59,7 +60,7 @@
5960
public class RuleQuery extends QueryBase implements QueryVariant {
6061
private final Query organic;
6162

62-
private final String rulesetId;
63+
private final List<String> rulesetIds;
6364

6465
private final JsonData matchCriteria;
6566

@@ -69,7 +70,7 @@ private RuleQuery(Builder builder) {
6970
super(builder);
7071

7172
this.organic = ApiTypeHelper.requireNonNull(builder.organic, this, "organic");
72-
this.rulesetId = ApiTypeHelper.requireNonNull(builder.rulesetId, this, "rulesetId");
73+
this.rulesetIds = ApiTypeHelper.unmodifiableRequired(builder.rulesetIds, this, "rulesetIds");
7374
this.matchCriteria = ApiTypeHelper.requireNonNull(builder.matchCriteria, this, "matchCriteria");
7475

7576
}
@@ -83,7 +84,7 @@ public static RuleQuery of(Function<Builder, ObjectBuilder<RuleQuery>> fn) {
8384
*/
8485
@Override
8586
public Query.Kind _queryKind() {
86-
return Query.Kind.RuleQuery;
87+
return Query.Kind.Rule;
8788
}
8889

8990
/**
@@ -94,10 +95,10 @@ public final Query organic() {
9495
}
9596

9697
/**
97-
* Required - API name: {@code ruleset_id}
98+
* Required - API name: {@code ruleset_ids}
9899
*/
99-
public final String rulesetId() {
100-
return this.rulesetId;
100+
public final List<String> rulesetIds() {
101+
return this.rulesetIds;
101102
}
102103

103104
/**
@@ -113,9 +114,16 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
113114
generator.writeKey("organic");
114115
this.organic.serialize(generator, mapper);
115116

116-
generator.writeKey("ruleset_id");
117-
generator.write(this.rulesetId);
117+
if (ApiTypeHelper.isDefined(this.rulesetIds)) {
118+
generator.writeKey("ruleset_ids");
119+
generator.writeStartArray();
120+
for (String item0 : this.rulesetIds) {
121+
generator.write(item0);
118122

123+
}
124+
generator.writeEnd();
125+
126+
}
119127
generator.writeKey("match_criteria");
120128
this.matchCriteria.serialize(generator, mapper);
121129

@@ -130,7 +138,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
130138
public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<RuleQuery> {
131139
private Query organic;
132140

133-
private String rulesetId;
141+
private List<String> rulesetIds;
134142

135143
private JsonData matchCriteria;
136144

@@ -150,10 +158,22 @@ public final Builder organic(Function<Query.Builder, ObjectBuilder<Query>> fn) {
150158
}
151159

152160
/**
153-
* Required - API name: {@code ruleset_id}
161+
* Required - API name: {@code ruleset_ids}
162+
* <p>
163+
* Adds all elements of <code>list</code> to <code>rulesetIds</code>.
164+
*/
165+
public final Builder rulesetIds(List<String> list) {
166+
this.rulesetIds = _listAddAll(this.rulesetIds, list);
167+
return this;
168+
}
169+
170+
/**
171+
* Required - API name: {@code ruleset_ids}
172+
* <p>
173+
* Adds one or more values to <code>rulesetIds</code>.
154174
*/
155-
public final Builder rulesetId(String value) {
156-
this.rulesetId = value;
175+
public final Builder rulesetIds(String value, String... values) {
176+
this.rulesetIds = _listAdd(this.rulesetIds, value, values);
157177
return this;
158178
}
159179

@@ -194,7 +214,8 @@ public RuleQuery build() {
194214
protected static void setupRuleQueryDeserializer(ObjectDeserializer<RuleQuery.Builder> op) {
195215
QueryBase.setupQueryBaseDeserializer(op);
196216
op.add(Builder::organic, Query._DESERIALIZER, "organic");
197-
op.add(Builder::rulesetId, JsonpDeserializer.stringDeserializer(), "ruleset_id");
217+
op.add(Builder::rulesetIds, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
218+
"ruleset_ids");
198219
op.add(Builder::matchCriteria, JsonData._DESERIALIZER, "match_criteria");
199220

200221
}

0 commit comments

Comments
 (0)