Update generated code

Author: swallez

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

@@ -30,12 +30,19 @@
 public class ElasticsearchException extends RuntimeException {
 
 private final ErrorResponse response;
+private final String endpointId;
 
-public ElasticsearchException(ErrorResponse response) {
-super(response.error().type() != null
-? "[" + response.error().type() + "] " + response.error().reason()
-: response.error().reason());
+public ElasticsearchException(String endpointId, ErrorResponse response) {
+super("[" + endpointId + "] failed: [" + response.error().type() + "] " + response.error().reason());
 this.response = response;
+this.endpointId = endpointId;
+}
+
+/**
+ * Identifier of the API endpoint that failed to be called.
+ */
+public String endpointId() {
+return this.endpointId;
 }
 
 /**

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

@@ -21,7 +21,7 @@
 // THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
 //----------------------------------------------------
 
-package co.elastic.clients.elasticsearch.core.search;
+package co.elastic.clients.elasticsearch._types;
 
 import co.elastic.clients.elasticsearch._types.mapping.FieldType;
 import co.elastic.clients.json.JsonpDeserializable;
@@ -39,7 +39,7 @@
 import java.util.function.Consumer;
 import javax.annotation.Nullable;
 
-// typedef: _global.search._types.FieldSort
+// typedef: _types.FieldSort
 @JsonpDeserializable
 public class FieldSort implements JsonpSerializable {
 // Single key dictionary

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

@@ -21,7 +21,7 @@
 // THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
 //----------------------------------------------------
 
-package co.elastic.clients.elasticsearch.core.search;
+package co.elastic.clients.elasticsearch._types;
 
 import co.elastic.clients.json.JsonEnum;
 import co.elastic.clients.json.JsonpDeserializable;

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

@@ -27,19 +27,22 @@
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.JsonpMapper;
 import co.elastic.clients.json.JsonpSerializable;
+import co.elastic.clients.json.JsonpUtils;
 import co.elastic.clients.json.ObjectDeserializer;
-import co.elastic.clients.json.UnionDeserializer;
 import co.elastic.clients.util.ModelTypeHelper;
 import co.elastic.clients.util.ObjectBuilder;
 import co.elastic.clients.util.ObjectBuilderBase;
 import co.elastic.clients.util.TaggedUnion;
 import co.elastic.clients.util.TaggedUnionUtils;
 import jakarta.json.stream.JsonGenerator;
+import jakarta.json.stream.JsonParser;
+
 import java.lang.Boolean;
 import java.lang.Double;
 import java.lang.Long;
 import java.lang.Object;
 import java.lang.String;
+import java.util.EnumSet;
 import java.util.Objects;
 import java.util.function.Consumer;
 import javax.annotation.Nullable;
@@ -50,8 +53,7 @@
 public class FieldValue implements TaggedUnion<FieldValue.Kind, Object>, JsonpSerializable {
 
 public enum Kind {
-Double, Long, Boolean, String
-
+Double, Long, Boolean, String, Null
 }
 
 private final Kind _kind;
@@ -67,11 +69,6 @@ public final Object _get() {
 return _value;
 }
 
-public FieldValue(Kind kind, Object value) {
-this._kind = kind;
-this._value = value;
-}
-
 public String _toJsonString() {
 switch (_kind) {
 case Double :
@@ -82,6 +79,8 @@ public String _toJsonString() {
 return String.valueOf(this.boolean_());
 case String :
 return this.string();
+case Null :
+return "null";
 
 default :
 throw new IllegalStateException("Unknown kind " + _kind);
@@ -91,7 +90,9 @@ public String _toJsonString() {
 private FieldValue(Builder builder) {
 
 this._kind = ModelTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-this._value = ModelTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+this._value = this._kind == Kind.Null
+? null
+: ModelTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
 
 }
 
@@ -114,7 +115,7 @@ public boolean isDouble() {
  * @throws IllegalStateException
  * if the current variant is not of the {@code double} kind.
  */
-public Double double_() {
+public double double_() {
 return TaggedUnionUtils.get(this, Kind.Double);
 }
 
@@ -131,7 +132,7 @@ public boolean isLong() {
  * @throws IllegalStateException
  * if the current variant is not of the {@code long} kind.
  */
-public Long long_() {
+public long long_() {
 return TaggedUnionUtils.get(this, Kind.Long);
 }
 
@@ -148,7 +149,7 @@ public boolean isBoolean() {
  * @throws IllegalStateException
  * if the current variant is not of the {@code boolean} kind.
  */
-public Boolean boolean_() {
+public boolean boolean_() {
 return TaggedUnionUtils.get(this, Kind.Boolean);
 }
 
@@ -169,76 +170,113 @@ public String string() {
 return TaggedUnionUtils.get(this, Kind.String);
 }
 
+/**
+ * Is this variant instance of kind {@code null}?
+ */
+public boolean isNull() {
+return _kind == Kind.Null;
+}
+
+/**
+ * Get the {@code null} variant value.
+ *
+ * @throws IllegalStateException
+ * if the current variant is not of the {@code null} kind.
+ */
+public String null_() {
+return TaggedUnionUtils.get(this, Kind.Null);
+}
+
 @Override
 public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-if (_value instanceof JsonpSerializable) {
-((JsonpSerializable) _value).serialize(generator, mapper);
-} else {
-switch (_kind) {
-case Double :
-generator.write(((Double) this._value));
-
-break;
-case Long :
-generator.write(((Long) this._value));
-
-break;
-case Boolean :
-generator.write(((Boolean) this._value));
-
-break;
-case String :
-generator.write(((String) this._value));
-
-break;
-}
+switch (_kind) {
+case Double :
+generator.write(((Double) this._value));
+break;
+case Long :
+generator.write(((Long) this._value));
+break;
+case Boolean :
+generator.write(((Boolean) this._value));
+break;
+case String :
+generator.write(((String) this._value));
+break;
+case Null :
+generator.writeNull();
+break;
 }
-
 }
 
 public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FieldValue> {
 private Kind _kind;
 private Object _value;
 
-public Builder double_(Double v) {
+public ObjectBuilder<FieldValue> double_(double v) {
 this._kind = Kind.Double;
 this._value = v;
 return this;
 }
 
-public Builder long_(Long v) {
+public ObjectBuilder<FieldValue> long_(long v) {
 this._kind = Kind.Long;
 this._value = v;
 return this;
 }
 
-public Builder boolean_(Boolean v) {
+public ObjectBuilder<FieldValue> boolean_(boolean v) {
 this._kind = Kind.Boolean;
 this._value = v;
 return this;
 }
 
-public Builder string(String v) {
+public ObjectBuilder<FieldValue> string(String v) {
 this._kind = Kind.String;
 this._value = v;
 return this;
 }
 
+public ObjectBuilder<FieldValue> null_() {
+this._kind = Kind.Null;
+this._value = null;
+return this;
+}
+
 public FieldValue build() {
 _checkSingleUse();
 return new FieldValue(this);
 }
 
 }
 
-private static JsonpDeserializer<FieldValue> buildFieldValueDeserializer() {
-return new UnionDeserializer.Builder<FieldValue, Kind, Object>(FieldValue::new, true)
-.addMember(Kind.Double, JsonpDeserializer.doubleDeserializer())
-.addMember(Kind.Long, JsonpDeserializer.longDeserializer())
-.addMember(Kind.Boolean, JsonpDeserializer.booleanDeserializer())
-.addMember(Kind.String, JsonpDeserializer.stringDeserializer()).build();
-}
-
 public static final JsonpDeserializer<FieldValue> _DESERIALIZER = JsonpDeserializer
-.lazy(FieldValue::buildFieldValueDeserializer);
+.lazy(() -> JsonpDeserializer.of(
+EnumSet.of(JsonParser.Event.VALUE_STRING, JsonParser.Event.VALUE_NUMBER,
+JsonParser.Event.VALUE_NULL, JsonParser.Event.VALUE_TRUE, JsonParser.Event.VALUE_FALSE),
+(parser, mapper, event) -> {
+FieldValue.Builder b = new FieldValue.Builder();
+switch (event) {
+case VALUE_NULL :
+b.null_();
+break;
+case VALUE_STRING :
+b.string(parser.getString());
+break;
+case VALUE_TRUE :
+b.boolean_(Boolean.TRUE);
+break;
+case VALUE_FALSE :
+b.boolean_(Boolean.FALSE);
+break;
+case VALUE_NUMBER :
+if (parser.isIntegralNumber()) {
+b.long_(parser.getLong());
+} else {
+b.double_(parser.getBigDecimal().doubleValue());
+}
+break;
+}
+return b.build();
+}));
+
 }