Skip to content

Commit a1fa786

Browse files
l-trottal-trotta
committed
nullable properties based on flavor availability
1 parent cd58ae3 commit a1fa786

File tree

5 files changed

+50
-26
lines changed

5 files changed

+50
-26
lines changed

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ public class ModelSnapshotUpgrade implements JsonpSerializable {
6565

6666
private final SnapshotUpgradeState state;
6767

68+
@Nullable
6869
private final DiscoveryNodeContent node;
6970

7071
private final String assignmentExplanation;
@@ -76,7 +77,7 @@ private ModelSnapshotUpgrade(Builder builder) {
7677
this.jobId = ApiTypeHelper.requireNonNull(builder.jobId, this, "jobId");
7778
this.snapshotId = ApiTypeHelper.requireNonNull(builder.snapshotId, this, "snapshotId");
7879
this.state = ApiTypeHelper.requireNonNull(builder.state, this, "state");
79-
this.node = ApiTypeHelper.requireNonNull(builder.node, this, "node");
80+
this.node = builder.node;
8081
this.assignmentExplanation = ApiTypeHelper.requireNonNull(builder.assignmentExplanation, this,
8182
"assignmentExplanation");
8283

@@ -110,6 +111,7 @@ public final SnapshotUpgradeState state() {
110111
/**
111112
* Required - API name: {@code node}
112113
*/
114+
@Nullable
113115
public final DiscoveryNodeContent node() {
114116
return this.node;
115117
}
@@ -140,9 +142,11 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
140142

141143
generator.writeKey("state");
142144
this.state.serialize(generator, mapper);
143-
generator.writeKey("node");
144-
this.node.serialize(generator, mapper);
145+
if (this.node != null) {
146+
generator.writeKey("node");
147+
this.node.serialize(generator, mapper);
145148

149+
}
146150
generator.writeKey("assignment_explanation");
147151
generator.write(this.assignmentExplanation);
148152

@@ -168,6 +172,7 @@ public static class Builder extends WithJsonObjectBuilderBase<Builder>
168172

169173
private SnapshotUpgradeState state;
170174

175+
@Nullable
171176
private DiscoveryNodeContent node;
172177

173178
private String assignmentExplanation;
@@ -199,7 +204,7 @@ public final Builder state(SnapshotUpgradeState value) {
199204
/**
200205
* Required - API name: {@code node}
201206
*/
202-
public final Builder node(DiscoveryNodeContent value) {
207+
public final Builder node(@Nullable DiscoveryNodeContent value) {
203208
this.node = value;
204209
return this;
205210
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ private Http(Builder builder) {
8080
this.currentOpen = builder.currentOpen;
8181
this.totalOpened = builder.totalOpened;
8282
this.clients = ApiTypeHelper.unmodifiable(builder.clients);
83-
this.routes = ApiTypeHelper.unmodifiableRequired(builder.routes, this, "routes");
83+
this.routes = ApiTypeHelper.unmodifiable(builder.routes);
8484

8585
}
8686

@@ -195,6 +195,7 @@ public static class Builder extends WithJsonObjectBuilderBase<Builder> implement
195195
@Nullable
196196
private List<Client> clients;
197197

198+
@Nullable
198199
private Map<String, HttpRoute> routes;
199200

200201
/**

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ private GetBuiltinPrivilegesResponse(Builder builder) {
7373

7474
this.cluster = ApiTypeHelper.unmodifiableRequired(builder.cluster, this, "cluster");
7575
this.index = ApiTypeHelper.unmodifiableRequired(builder.index, this, "index");
76-
this.remoteCluster = ApiTypeHelper.unmodifiableRequired(builder.remoteCluster, this, "remoteCluster");
76+
this.remoteCluster = ApiTypeHelper.unmodifiable(builder.remoteCluster);
7777

7878
}
7979

@@ -163,6 +163,7 @@ public static class Builder extends WithJsonObjectBuilderBase<Builder>
163163

164164
private List<String> index;
165165

166+
@Nullable
166167
private List<RemoteClusterPrivilege> remoteCluster;
167168

168169
/**

‎java-client/src/main/java/co/elastic/clients/elasticsearch/xpack/info/Features.java‎

Lines changed: 37 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,12 @@ public class Features implements JsonpSerializable {
7070

7171
private final Feature enrich;
7272

73+
@Nullable
7374
private final Feature enterpriseSearch;
7475

7576
private final Feature eql;
7677

78+
@Nullable
7779
private final Feature esql;
7880

7981
private final Feature frozenIndices;
@@ -107,12 +109,14 @@ public class Features implements JsonpSerializable {
107109

108110
private final Feature transform;
109111

112+
@Nullable
110113
private final Feature universalProfiling;
111114

112115
private final Feature votingOnly;
113116

114117
private final Feature watcher;
115118

119+
@Nullable
116120
private final Feature archive;
117121

118122
// ---------------------------------------------------------------------------------------------
@@ -125,9 +129,9 @@ private Features(Builder builder) {
125129
this.dataStreams = ApiTypeHelper.requireNonNull(builder.dataStreams, this, "dataStreams");
126130
this.dataTiers = ApiTypeHelper.requireNonNull(builder.dataTiers, this, "dataTiers");
127131
this.enrich = ApiTypeHelper.requireNonNull(builder.enrich, this, "enrich");
128-
this.enterpriseSearch = ApiTypeHelper.requireNonNull(builder.enterpriseSearch, this, "enterpriseSearch");
132+
this.enterpriseSearch = builder.enterpriseSearch;
129133
this.eql = ApiTypeHelper.requireNonNull(builder.eql, this, "eql");
130-
this.esql = ApiTypeHelper.requireNonNull(builder.esql, this, "esql");
134+
this.esql = builder.esql;
131135
this.frozenIndices = ApiTypeHelper.requireNonNull(builder.frozenIndices, this, "frozenIndices");
132136
this.graph = ApiTypeHelper.requireNonNull(builder.graph, this, "graph");
133137
this.ilm = ApiTypeHelper.requireNonNull(builder.ilm, this, "ilm");
@@ -144,10 +148,10 @@ private Features(Builder builder) {
144148
this.spatial = ApiTypeHelper.requireNonNull(builder.spatial, this, "spatial");
145149
this.sql = ApiTypeHelper.requireNonNull(builder.sql, this, "sql");
146150
this.transform = ApiTypeHelper.requireNonNull(builder.transform, this, "transform");
147-
this.universalProfiling = ApiTypeHelper.requireNonNull(builder.universalProfiling, this, "universalProfiling");
151+
this.universalProfiling = builder.universalProfiling;
148152
this.votingOnly = ApiTypeHelper.requireNonNull(builder.votingOnly, this, "votingOnly");
149153
this.watcher = ApiTypeHelper.requireNonNull(builder.watcher, this, "watcher");
150-
this.archive = ApiTypeHelper.requireNonNull(builder.archive, this, "archive");
154+
this.archive = builder.archive;
151155

152156
}
153157

@@ -200,6 +204,7 @@ public final Feature enrich() {
200204
/**
201205
* Required - API name: {@code enterprise_search}
202206
*/
207+
@Nullable
203208
public final Feature enterpriseSearch() {
204209
return this.enterpriseSearch;
205210
}
@@ -214,6 +219,7 @@ public final Feature eql() {
214219
/**
215220
* Required - API name: {@code esql}
216221
*/
222+
@Nullable
217223
public final Feature esql() {
218224
return this.esql;
219225
}
@@ -327,6 +333,7 @@ public final Feature transform() {
327333
/**
328334
* Required - API name: {@code universal_profiling}
329335
*/
336+
@Nullable
330337
public final Feature universalProfiling() {
331338
return this.universalProfiling;
332339
}
@@ -348,6 +355,7 @@ public final Feature watcher() {
348355
/**
349356
* Required - API name: {@code archive}
350357
*/
358+
@Nullable
351359
public final Feature archive() {
352360
return this.archive;
353361
}
@@ -381,15 +389,19 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
381389
generator.writeKey("enrich");
382390
this.enrich.serialize(generator, mapper);
383391

384-
generator.writeKey("enterprise_search");
385-
this.enterpriseSearch.serialize(generator, mapper);
392+
if (this.enterpriseSearch != null) {
393+
generator.writeKey("enterprise_search");
394+
this.enterpriseSearch.serialize(generator, mapper);
386395

396+
}
387397
generator.writeKey("eql");
388398
this.eql.serialize(generator, mapper);
389399

390-
generator.writeKey("esql");
391-
this.esql.serialize(generator, mapper);
400+
if (this.esql != null) {
401+
generator.writeKey("esql");
402+
this.esql.serialize(generator, mapper);
392403

404+
}
393405
generator.writeKey("frozen_indices");
394406
this.frozenIndices.serialize(generator, mapper);
395407

@@ -437,17 +449,22 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
437449
generator.writeKey("transform");
438450
this.transform.serialize(generator, mapper);
439451

440-
generator.writeKey("universal_profiling");
441-
this.universalProfiling.serialize(generator, mapper);
452+
if (this.universalProfiling != null) {
453+
generator.writeKey("universal_profiling");
454+
this.universalProfiling.serialize(generator, mapper);
442455

456+
}
443457
generator.writeKey("voting_only");
444458
this.votingOnly.serialize(generator, mapper);
445459

446460
generator.writeKey("watcher");
447461
this.watcher.serialize(generator, mapper);
448462

449-
generator.writeKey("archive");
450-
this.archive.serialize(generator, mapper);
463+
if (this.archive != null) {
464+
generator.writeKey("archive");
465+
this.archive.serialize(generator, mapper);
466+
467+
}
451468

452469
}
453470

@@ -475,10 +492,12 @@ public static class Builder extends WithJsonObjectBuilderBase<Builder> implement
475492

476493
private Feature enrich;
477494

495+
@Nullable
478496
private Feature enterpriseSearch;
479497

480498
private Feature eql;
481499

500+
@Nullable
482501
private Feature esql;
483502

484503
private Feature frozenIndices;
@@ -512,12 +531,14 @@ public static class Builder extends WithJsonObjectBuilderBase<Builder> implement
512531

513532
private Feature transform;
514533

534+
@Nullable
515535
private Feature universalProfiling;
516536

517537
private Feature votingOnly;
518538

519539
private Feature watcher;
520540

541+
@Nullable
521542
private Feature archive;
522543

523544
/**
@@ -613,7 +634,7 @@ public final Builder enrich(Function<Feature.Builder, ObjectBuilder<Feature>> fn
613634
/**
614635
* Required - API name: {@code enterprise_search}
615636
*/
616-
public final Builder enterpriseSearch(Feature value) {
637+
public final Builder enterpriseSearch(@Nullable Feature value) {
617638
this.enterpriseSearch = value;
618639
return this;
619640
}
@@ -643,7 +664,7 @@ public final Builder eql(Function<Feature.Builder, ObjectBuilder<Feature>> fn) {
643664
/**
644665
* Required - API name: {@code esql}
645666
*/
646-
public final Builder esql(Feature value) {
667+
public final Builder esql(@Nullable Feature value) {
647668
this.esql = value;
648669
return this;
649670
}
@@ -883,7 +904,7 @@ public final Builder transform(Function<Feature.Builder, ObjectBuilder<Feature>>
883904
/**
884905
* Required - API name: {@code universal_profiling}
885906
*/
886-
public final Builder universalProfiling(Feature value) {
907+
public final Builder universalProfiling(@Nullable Feature value) {
887908
this.universalProfiling = value;
888909
return this;
889910
}
@@ -928,7 +949,7 @@ public final Builder watcher(Function<Feature.Builder, ObjectBuilder<Feature>> f
928949
/**
929950
* Required - API name: {@code archive}
930951
*/
931-
public final Builder archive(Feature value) {
952+
public final Builder archive(@Nullable Feature value) {
932953
this.archive = value;
933954
return this;
934955
}

‎java-client/src/test/java/co/elastic/clients/transport/VersionInfoTest.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@
2323
import org.junit.jupiter.api.Test;
2424

2525
public class VersionInfoTest {
26-
@Test
27-
public void testFlavor() {
28-
Assertions.assertEquals("stack", VersionInfo.FLAVOR);
29-
}
3026

3127
@Test
3228
public void testClientMeta() {

0 commit comments

Comments
 (0)