Skip to content

Commit ed69bfa

Browse files
radhakrishnan-opgingeekrishna
authored andcommitted
revert: restore generated DerivedField.java to main state
The fix belongs in the OpenSearch API specification, not in generated code. Submitted upstream: opensearch-project/opensearch-api-specification#1156 The java-codegen/opensearch-openapi.yaml change is kept here as a local workaround until the upstream spec fix is pulled in by the weekly code-generation workflow. Signed-off-by: RadhaKrishnan Rajendran <gingeekrishna@gmail.com> Signed-off-by: Radhakrishnan Pachyappan <gingeekrishna@gmail.com>
1 parent d7f56bf commit ed69bfa

1 file changed

Lines changed: 30 additions & 0 deletions

File tree

  • java-client/src/generated/java/org/opensearch/client/opensearch/_types

java-client/src/generated/java/org/opensearch/client/opensearch/_types/DerivedField.java

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,9 @@ public class DerivedField implements PlainJsonSerializable, ToCopyableBuilder<De
6868
@Nullable
6969
private final Boolean ignoreMalformed;
7070

71+
@Nonnull
72+
private final String name;
73+
7174
@Nullable
7275
private final String prefilterField;
7376

@@ -85,6 +88,7 @@ public class DerivedField implements PlainJsonSerializable, ToCopyableBuilder<De
8588
private DerivedField(Builder builder) {
8689
this.format = builder.format;
8790
this.ignoreMalformed = builder.ignoreMalformed;
91+
this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
8892
this.prefilterField = builder.prefilterField;
8993
this.properties = ApiTypeHelper.unmodifiable(builder.properties);
9094
this.script = ApiTypeHelper.requireNonNull(builder.script, this, "script");
@@ -111,6 +115,14 @@ public final Boolean ignoreMalformed() {
111115
return this.ignoreMalformed;
112116
}
113117

118+
/**
119+
* Required - API name: {@code name}
120+
*/
121+
@Nonnull
122+
public final String name() {
123+
return this.name;
124+
}
125+
114126
/**
115127
* API name: {@code prefilter_field}
116128
*/
@@ -164,6 +176,9 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
164176
generator.write(this.ignoreMalformed);
165177
}
166178

179+
generator.writeKey("name");
180+
generator.write(this.name);
181+
167182
if (this.prefilterField != null) {
168183
generator.writeKey("prefilter_field");
169184
generator.write(this.prefilterField);
@@ -207,6 +222,7 @@ public static class Builder extends ObjectBuilderBase implements CopyableBuilder
207222
private String format;
208223
@Nullable
209224
private Boolean ignoreMalformed;
225+
private String name;
210226
@Nullable
211227
private String prefilterField;
212228
@Nullable
@@ -219,6 +235,7 @@ public Builder() {}
219235
private Builder(DerivedField o) {
220236
this.format = o.format;
221237
this.ignoreMalformed = o.ignoreMalformed;
238+
this.name = o.name;
222239
this.prefilterField = o.prefilterField;
223240
this.properties = _mapCopy(o.properties);
224241
this.script = o.script;
@@ -228,6 +245,7 @@ private Builder(DerivedField o) {
228245
private Builder(Builder o) {
229246
this.format = o.format;
230247
this.ignoreMalformed = o.ignoreMalformed;
248+
this.name = o.name;
231249
this.prefilterField = o.prefilterField;
232250
this.properties = _mapCopy(o.properties);
233251
this.script = o.script;
@@ -258,6 +276,15 @@ public final Builder ignoreMalformed(@Nullable Boolean value) {
258276
return this;
259277
}
260278

279+
/**
280+
* Required - API name: {@code name}
281+
*/
282+
@Nonnull
283+
public final Builder name(String value) {
284+
this.name = value;
285+
return this;
286+
}
287+
261288
/**
262289
* API name: {@code prefilter_field}
263290
*/
@@ -346,6 +373,7 @@ public DerivedField build() {
346373
protected static void setupDerivedFieldDeserializer(ObjectDeserializer<DerivedField.Builder> op) {
347374
op.add(Builder::format, JsonpDeserializer.stringDeserializer(), "format");
348375
op.add(Builder::ignoreMalformed, JsonpDeserializer.booleanDeserializer(), "ignore_malformed");
376+
op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
349377
op.add(Builder::prefilterField, JsonpDeserializer.stringDeserializer(), "prefilter_field");
350378
op.add(Builder::properties, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "properties");
351379
op.add(Builder::script, Script._DESERIALIZER, "script");
@@ -357,6 +385,7 @@ public int hashCode() {
357385
int result = 17;
358386
result = 31 * result + Objects.hashCode(this.format);
359387
result = 31 * result + Objects.hashCode(this.ignoreMalformed);
388+
result = 31 * result + this.name.hashCode();
360389
result = 31 * result + Objects.hashCode(this.prefilterField);
361390
result = 31 * result + Objects.hashCode(this.properties);
362391
result = 31 * result + this.script.hashCode();
@@ -371,6 +400,7 @@ public boolean equals(Object o) {
371400
DerivedField other = (DerivedField) o;
372401
return Objects.equals(this.format, other.format)
373402
&& Objects.equals(this.ignoreMalformed, other.ignoreMalformed)
403+
&& this.name.equals(other.name)
374404
&& Objects.equals(this.prefilterField, other.prefilterField)
375405
&& Objects.equals(this.properties, other.properties)
376406
&& this.script.equals(other.script)

0 commit comments

Comments
 (0)