Skip to content

Commit 64ec619

Browse files
l-trottal-trotta
authored
Fixes from spec 2549 (#800)
* fixes from 2549 * test fix
1 parent 767ee11 commit 64ec619

File tree

7 files changed

+204
-110
lines changed

7 files changed

+204
-110
lines changed

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

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ public abstract class WriteResponseBase implements JsonpSerializable {
7070

7171
private final Result result;
7272

73-
private final long seqNo;
73+
@Nullable
74+
private final Long seqNo;
7475

7576
private final ShardStatistics shards;
7677

@@ -87,7 +88,7 @@ protected WriteResponseBase(AbstractBuilder<?> builder) {
8788
this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
8889
this.primaryTerm = builder.primaryTerm;
8990
this.result = ApiTypeHelper.requireNonNull(builder.result, this, "result");
90-
this.seqNo = ApiTypeHelper.requireNonNull(builder.seqNo, this, "seqNo");
91+
this.seqNo = builder.seqNo;
9192
this.shards = ApiTypeHelper.requireNonNull(builder.shards, this, "shards");
9293
this.version = ApiTypeHelper.requireNonNull(builder.version, this, "version");
9394
this.forcedRefresh = builder.forcedRefresh;
@@ -124,9 +125,10 @@ public final Result result() {
124125
}
125126

126127
/**
127-
* Required - API name: {@code _seq_no}
128+
* API name: {@code _seq_no}
128129
*/
129-
public final long seqNo() {
130+
@Nullable
131+
public final Long seqNo() {
130132
return this.seqNo;
131133
}
132134

@@ -176,9 +178,11 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
176178
}
177179
generator.writeKey("result");
178180
this.result.serialize(generator, mapper);
179-
generator.writeKey("_seq_no");
180-
generator.write(this.seqNo);
181+
if (this.seqNo != null) {
182+
generator.writeKey("_seq_no");
183+
generator.write(this.seqNo);
181184

185+
}
182186
generator.writeKey("_shards");
183187
this.shards.serialize(generator, mapper);
184188

@@ -210,6 +214,7 @@ public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<Bu
210214

211215
private Result result;
212216

217+
@Nullable
213218
private Long seqNo;
214219

215220
private ShardStatistics shards;
@@ -252,9 +257,9 @@ public final BuilderT result(Result value) {
252257
}
253258

254259
/**
255-
* Required - API name: {@code _seq_no}
260+
* API name: {@code _seq_no}
256261
*/
257-
public final BuilderT seqNo(long value) {
262+
public final BuilderT seqNo(@Nullable Long value) {
258263
this.seqNo = value;
259264
return self();
260265
}

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

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,15 @@
6363
public class AdjacencyMatrixAggregation extends BucketAggregationBase implements AggregationVariant, JsonpSerializable {
6464
private final Map<String, Query> filters;
6565

66+
@Nullable
67+
private final String separator;
68+
6669
// ---------------------------------------------------------------------------------------------
6770

6871
private AdjacencyMatrixAggregation(Builder builder) {
6972

7073
this.filters = ApiTypeHelper.unmodifiable(builder.filters);
74+
this.separator = builder.separator;
7175

7276
}
7377

@@ -92,6 +96,16 @@ public final Map<String, Query> filters() {
9296
return this.filters;
9397
}
9498

99+
/**
100+
* Separator used to concatenate filter names. Defaults to &amp;.
101+
* <p>
102+
* API name: {@code separator}
103+
*/
104+
@Nullable
105+
public final String separator() {
106+
return this.separator;
107+
}
108+
95109
/**
96110
* Serialize this object to JSON.
97111
*/
@@ -114,6 +128,11 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
114128
generator.writeEnd();
115129

116130
}
131+
if (this.separator != null) {
132+
generator.writeKey("separator");
133+
generator.write(this.separator);
134+
135+
}
117136

118137
}
119138

@@ -134,6 +153,9 @@ public static class Builder extends BucketAggregationBase.AbstractBuilder<Builde
134153
@Nullable
135154
private Map<String, Query> filters;
136155

156+
@Nullable
157+
private String separator;
158+
137159
/**
138160
* Filters used to create buckets. At least one filter is required.
139161
* <p>
@@ -169,6 +191,16 @@ public final Builder filters(String key, Function<Query.Builder, ObjectBuilder<Q
169191
return filters(key, fn.apply(new Query.Builder()).build());
170192
}
171193

194+
/**
195+
* Separator used to concatenate filter names. Defaults to &amp;.
196+
* <p>
197+
* API name: {@code separator}
198+
*/
199+
public final Builder separator(@Nullable String value) {
200+
this.separator = value;
201+
return this;
202+
}
203+
172204
@Override
173205
protected Builder self() {
174206
return this;
@@ -199,6 +231,7 @@ protected static void setupAdjacencyMatrixAggregationDeserializer(
199231
ObjectDeserializer<AdjacencyMatrixAggregation.Builder> op) {
200232

201233
op.add(Builder::filters, JsonpDeserializer.stringMapDeserializer(Query._DESERIALIZER), "filters");
234+
op.add(Builder::separator, JsonpDeserializer.stringDeserializer(), "separator");
202235

203236
}
204237

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

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@
5858
*/
5959
@JsonpDeserializable
6060
public class DenseVectorProperty extends PropertyBase implements PropertyVariant {
61+
@Nullable
62+
private final String elementType;
63+
6164
@Nullable
6265
private final Integer dims;
6366

@@ -75,6 +78,7 @@ public class DenseVectorProperty extends PropertyBase implements PropertyVariant
7578
private DenseVectorProperty(Builder builder) {
7679
super(builder);
7780

81+
this.elementType = builder.elementType;
7882
this.dims = builder.dims;
7983
this.similarity = builder.similarity;
8084
this.index = builder.index;
@@ -94,6 +98,14 @@ public Property.Kind _propertyKind() {
9498
return Property.Kind.DenseVector;
9599
}
96100

101+
/**
102+
* API name: {@code element_type}
103+
*/
104+
@Nullable
105+
public final String elementType() {
106+
return this.elementType;
107+
}
108+
97109
/**
98110
* API name: {@code dims}
99111
*/
@@ -130,6 +142,11 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
130142

131143
generator.write("type", "dense_vector");
132144
super.serializeInternal(generator, mapper);
145+
if (this.elementType != null) {
146+
generator.writeKey("element_type");
147+
generator.write(this.elementType);
148+
149+
}
133150
if (this.dims != null) {
134151
generator.writeKey("dims");
135152
generator.write(this.dims);
@@ -162,6 +179,9 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
162179
public static class Builder extends PropertyBase.AbstractBuilder<Builder>
163180
implements
164181
ObjectBuilder<DenseVectorProperty> {
182+
@Nullable
183+
private String elementType;
184+
165185
@Nullable
166186
private Integer dims;
167187

@@ -174,6 +194,14 @@ public static class Builder extends PropertyBase.AbstractBuilder<Builder>
174194
@Nullable
175195
private DenseVectorIndexOptions indexOptions;
176196

197+
/**
198+
* API name: {@code element_type}
199+
*/
200+
public final Builder elementType(@Nullable String value) {
201+
this.elementType = value;
202+
return this;
203+
}
204+
177205
/**
178206
* API name: {@code dims}
179207
*/
@@ -242,6 +270,7 @@ public DenseVectorProperty build() {
242270

243271
protected static void setupDenseVectorPropertyDeserializer(ObjectDeserializer<DenseVectorProperty.Builder> op) {
244272
PropertyBase.setupPropertyBaseDeserializer(op);
273+
op.add(Builder::elementType, JsonpDeserializer.stringDeserializer(), "element_type");
245274
op.add(Builder::dims, JsonpDeserializer.integerDeserializer(), "dims");
246275
op.add(Builder::similarity, JsonpDeserializer.stringDeserializer(), "similarity");
247276
op.add(Builder::index, JsonpDeserializer.booleanDeserializer(), "index");

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

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,6 @@
9292
public class PutComponentTemplateRequest extends RequestBase implements JsonpSerializable {
9393
private final Map<String, JsonData> meta;
9494

95-
@Nullable
96-
private final String cause;
97-
9895
@Nullable
9996
private final Boolean create;
10097

@@ -116,7 +113,6 @@ public class PutComponentTemplateRequest extends RequestBase implements JsonpSer
116113
private PutComponentTemplateRequest(Builder builder) {
117114

118115
this.meta = ApiTypeHelper.unmodifiable(builder.meta);
119-
this.cause = builder.cause;
120116
this.create = builder.create;
121117
this.deprecated = builder.deprecated;
122118
this.masterTimeout = builder.masterTimeout;
@@ -142,14 +138,6 @@ public final Map<String, JsonData> meta() {
142138
return this.meta;
143139
}
144140

145-
/**
146-
* API name: {@code cause}
147-
*/
148-
@Nullable
149-
public final String cause() {
150-
return this.cause;
151-
}
152-
153141
/**
154142
* If <code>true</code>, this request cannot replace or update existing
155143
* component templates.
@@ -268,9 +256,6 @@ public static class Builder extends RequestBase.AbstractBuilder<Builder>
268256
@Nullable
269257
private Map<String, JsonData> meta;
270258

271-
@Nullable
272-
private String cause;
273-
274259
@Nullable
275260
private Boolean create;
276261

@@ -317,14 +302,6 @@ public final Builder meta(String key, JsonData value) {
317302
return this;
318303
}
319304

320-
/**
321-
* API name: {@code cause}
322-
*/
323-
public final Builder cause(@Nullable String value) {
324-
this.cause = value;
325-
return this;
326-
}
327-
328305
/**
329306
* If <code>true</code>, this request cannot replace or update existing
330307
* component templates.
@@ -508,9 +485,6 @@ protected static void setupPutComponentTemplateRequestDeserializer(
508485
if (request.create != null) {
509486
params.put("create", String.valueOf(request.create));
510487
}
511-
if (request.cause != null) {
512-
params.put("cause", request.cause);
513-
}
514488
return params;
515489

516490
}, SimpleEndpoint.emptyMap(), true, PutComponentTemplateResponse._DESERIALIZER);

0 commit comments

Comments
 (0)