Skip to content

Commit 7b954af

Browse files
XtansiaXtansia
authored
Tweak codegen logic for formatting, documentation and handling of anyOf (#1152)
* Re-generate code Signed-off-by: Thomas Farr <[email protected]> * Improve builder doc comments Signed-off-by: Thomas Farr <[email protected]> * Fix list/map isDefined serialize logic Signed-off-by: Thomas Farr <[email protected]> * Add support for deprecated enums Signed-off-by: Thomas Farr <[email protected]> * Improve isDefined logic Signed-off-by: Thomas Farr <[email protected]> * Allow overriding request/response naming Signed-off-by: Thomas Farr <[email protected]> * Support anyOf Signed-off-by: Thomas Farr <[email protected]> * Update spec Signed-off-by: Thomas Farr <[email protected]> * spotlessApply Signed-off-by: Thomas Farr <[email protected]> --------- Signed-off-by: Thomas Farr <[email protected]>
1 parent c84ad24 commit 7b954af

29 files changed

+3097
-933
lines changed

‎java-client/src/generated/java/org/opensearch/client/opensearch/_types/AcknowledgedResponseBase.java

-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
8181
protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
8282
generator.writeKey("acknowledged");
8383
generator.write(this.acknowledged);
84-
8584
}
8685

8786
// ---------------------------------------------------------------------------------------------

‎java-client/src/generated/java/org/opensearch/client/opensearch/_types/ErrorCause.java

+11-13
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ public final String type() {
148148
}
149149

150150
/**
151-
* Additional details about the error
151+
* Additional details about the error.
152152
*/
153153
public final Map<String, JsonData> metadata() {
154154
return this.metadata;
@@ -168,52 +168,42 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
168168
for (Map.Entry<String, JsonData> item0 : this.metadata.entrySet()) {
169169
generator.writeKey(item0.getKey());
170170
item0.getValue().serialize(generator, mapper);
171-
172171
}
173-
174172
if (this.causedBy != null) {
175173
generator.writeKey("caused_by");
176174
this.causedBy.serialize(generator, mapper);
177-
178175
}
179176

180177
if (this.reason != null) {
181178
generator.writeKey("reason");
182179
generator.write(this.reason);
183-
184180
}
185181

186182
if (ApiTypeHelper.isDefined(this.rootCause)) {
187183
generator.writeKey("root_cause");
188184
generator.writeStartArray();
189185
for (ErrorCause item0 : this.rootCause) {
190186
item0.serialize(generator, mapper);
191-
192187
}
193188
generator.writeEnd();
194-
195189
}
196190

197191
if (this.stackTrace != null) {
198192
generator.writeKey("stack_trace");
199193
generator.write(this.stackTrace);
200-
201194
}
202195

203196
if (ApiTypeHelper.isDefined(this.suppressed)) {
204197
generator.writeKey("suppressed");
205198
generator.writeStartArray();
206199
for (ErrorCause item0 : this.suppressed) {
207200
item0.serialize(generator, mapper);
208-
209201
}
210202
generator.writeEnd();
211-
212203
}
213204

214205
generator.writeKey("type");
215206
generator.write(this.type);
216-
217207
}
218208

219209
// ---------------------------------------------------------------------------------------------
@@ -355,15 +345,23 @@ public final Builder type(String value) {
355345
}
356346

357347
/**
358-
* Additional details about the error
348+
* Additional details about the error.
349+
*
350+
* <p>
351+
* Adds all elements of <code>map</code> to <code>metadata</code>.
352+
* </p>
359353
*/
360354
public final Builder metadata(Map<String, JsonData> map) {
361355
this.metadata = _mapPutAll(this.metadata, map);
362356
return this;
363357
}
364358

365359
/**
366-
* Additional details about the error
360+
* Additional details about the error.
361+
*
362+
* <p>
363+
* Adds an entry to <code>metadata</code>.
364+
* </p>
367365
*/
368366
public final Builder metadata(String key, JsonData value) {
369367
this.metadata = _mapPut(this.metadata, key, value);

‎java-client/src/generated/java/org/opensearch/client/opensearch/_types/NodeStatistics.java

-3
Original file line numberDiff line numberDiff line change
@@ -135,18 +135,15 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
135135
generator.writeStartArray();
136136
for (ErrorCause item0 : this.failures) {
137137
item0.serialize(generator, mapper);
138-
139138
}
140139
generator.writeEnd();
141-
142140
}
143141

144142
generator.writeKey("successful");
145143
generator.write(this.successful);
146144

147145
generator.writeKey("total");
148146
generator.write(this.total);
149-
150147
}
151148

152149
// ---------------------------------------------------------------------------------------------

‎java-client/src/generated/java/org/opensearch/client/opensearch/_types/OpenSearchVersionInfo.java

-2
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,6 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
192192
if (this.buildFlavor != null) {
193193
generator.writeKey("build_flavor");
194194
generator.write(this.buildFlavor);
195-
196195
}
197196

198197
generator.writeKey("build_hash");
@@ -218,7 +217,6 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
218217

219218
generator.writeKey("number");
220219
generator.write(this.number);
221-
222220
}
223221

224222
// ---------------------------------------------------------------------------------------------

‎java-client/src/generated/java/org/opensearch/client/opensearch/core/InfoResponse.java

-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
140140

141141
generator.writeKey("version");
142142
this.version.serialize(generator, mapper);
143-
144143
}
145144

146145
// ---------------------------------------------------------------------------------------------

‎java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/ListDanglingIndicesResponse.java

-4
Original file line numberDiff line numberDiff line change
@@ -118,23 +118,19 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
118118
if (this.clusterName != null) {
119119
generator.writeKey("cluster_name");
120120
generator.write(this.clusterName);
121-
122121
}
123122

124123
generator.writeKey("dangling_indices");
125124
generator.writeStartArray();
126125
for (DanglingIndex item0 : this.danglingIndices) {
127126
item0.serialize(generator, mapper);
128-
129127
}
130128
generator.writeEnd();
131129

132130
if (this.nodes != null) {
133131
generator.writeKey("_nodes");
134132
this.nodes.serialize(generator, mapper);
135-
136133
}
137-
138134
}
139135

140136
// ---------------------------------------------------------------------------------------------

‎java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/list_dangling_indices/DanglingIndex.java

-3
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
132132
if (this.creationDate != null) {
133133
generator.writeKey("creation_date");
134134
generator.write(this.creationDate);
135-
136135
}
137136

138137
generator.writeKey("creation_date_millis");
@@ -148,10 +147,8 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
148147
generator.writeStartArray();
149148
for (String item0 : this.nodeIds) {
150149
generator.write(item0);
151-
152150
}
153151
generator.writeEnd();
154-
155152
}
156153

157154
// ---------------------------------------------------------------------------------------------

0 commit comments

Comments
 (0)