Fix error handling and deserialization

Author: swallez

java-client/src/main/java/co/elastic/clients/base/ApiException.java

@@ -26,7 +26,11 @@ public class ApiException extends IOException {
  // Subclasses of java.lang.Throwable cannot have generic parameters
  // https://docs.oracle.com/javase/specs/jls/se10/html/jls-8.html#jls-8.1.2-310
 
- public final Object error;
+ private final Object error;
+
+ public Object error() {
+ return this.error;
+ }
 
  public ApiException(Object error) {
  this.error = error;

java-client/src/main/java/co/elastic/clients/base/ElasticsearchError.java

@@ -19,50 +19,120 @@
 
 package co.elastic.clients.base;
 
+import co.elastic.clients.json.DelegatingDeserializer;
+import co.elastic.clients.json.JsonpDeserializable;
 import co.elastic.clients.json.JsonpDeserializer;
-import co.elastic.clients.json.ObjectDeserializer;
+import co.elastic.clients.json.JsonpMapper;
+import co.elastic.clients.json.JsonpSerializable;
+import co.elastic.clients.json.ObjectBuilderDeserializer;
+import co.elastic.clients.util.ObjectBuilder;
+import jakarta.json.JsonValue;
+import jakarta.json.stream.JsonGenerator;
+import java.util.Objects;
+import java.util.function.Function;
 
-public class ElasticsearchError {
+@JsonpDeserializable
+public final class ElasticsearchError implements JsonpSerializable {
+ private final int status;
 
- // TODO: add fields for the detailed representation of errors
- // See org.elasticsearch.rest.BytesRestResponse.build() and ElasticsearchException
+ private final JsonValue error;
 
- private int status;
- private String error;
+ // ---------------------------------------------------------------------------------------------
 
- private ElasticsearchError() {}
+ public ElasticsearchError(ElasticsearchError.Builder builder) {
 
- public ElasticsearchError(int status, String error) {
- this.status = status;
- this.error = error;
+ this.status = Objects.requireNonNull(builder.status, "status");
+ this.error = Objects.requireNonNull(builder.error, "error");
+
+ }
+
+ public ElasticsearchError(Function<ElasticsearchError.Builder, ElasticsearchError.Builder> fn) {
+ this(fn.apply(new ElasticsearchError.Builder()));
  }
 
+ /**
+ * API name: {@code status}
+ */
  public int status() {
  return this.status;
  }
 
- private void status(int status) {
- this.status = status;
+ /**
+ * API name: {@code error}
+ */
+ public JsonValue error() {
+ return this.error;
  }
 
- public String error() {
- return this.error;
+ /**
+ * Serialize this object to JSON.
+ */
+ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+ generator.writeStartObject();
+ serializeInternal(generator, mapper);
+ generator.writeEnd();
  }
 
- private void error(String error) {
- this.error = error;
+ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+ generator.writeKey("status");
+ generator.write(this.status);
+
+ generator.writeKey("error");
+ generator.write(this.error);
+
  }
 
- public static final JsonpDeserializer<ElasticsearchError> PARSER;
+ // ---------------------------------------------------------------------------------------------
+
+ /**
+ * Builder for {@link ElasticsearchError}.
+ */
+ public static class Builder implements ObjectBuilder<ElasticsearchError> {
+ private Integer status;
+
+ private JsonValue error;
+
+ /**
+ * API name: {@code status}
+ */
+ public ElasticsearchError.Builder status(int value) {
+ this.status = value;
+ return this;
+ }
+
+ /**
+ * API name: {@code error}
+ */
+ public ElasticsearchError.Builder error(JsonValue value) {
+ this.error = value;
+ return this;
+ }
+
+ /**
+ * Builds a {@link ElasticsearchError}.
+ *
+ * @throws NullPointerException
+ * if some of the required fields are null.
+ */
+ public ElasticsearchError build() {
+
+ return new ElasticsearchError(this);
+ }
+ }
+
+ // ---------------------------------------------------------------------------------------------
+
+ /**
+ * Json deserializer for {@link ElasticsearchError}
+ */
+ public static final JsonpDeserializer<ElasticsearchError> _DESERIALIZER = ObjectBuilderDeserializer
+ .lazy(ElasticsearchError.Builder::new, ElasticsearchError::setupElasticsearchErrorDeserializer, ElasticsearchError.Builder::build);
 
- static {
- ObjectDeserializer<ElasticsearchError> op = new ObjectDeserializer<>(
- ElasticsearchError::new
- );
+ protected static void setupElasticsearchErrorDeserializer(DelegatingDeserializer<ElasticsearchError.Builder> op) {
 
- op.add(ElasticsearchError::status, "status");
- op.add(ElasticsearchError::error, JsonpDeserializer.stringDeserializer(), "error");
+ op.add(Builder::status, JsonpDeserializer.integerDeserializer(), "status");
+ op.add(ElasticsearchError.Builder::error, JsonpDeserializer.jsonValueDeserializer(), "error");
 
- PARSER = op;
  }
 }

java-client/src/main/java/co/elastic/clients/base/RestClientTransport.java

@@ -167,7 +167,8 @@ private <RequestT> org.elasticsearch.client.Request prepareLowLevelRequest(
 
  clientReq.setEntity(new ByteArrayEntity(baos.toByteArray(), ContentType.APPLICATION_JSON));
  }
-
+ // Request parameter intercepted by LLRC
+ clientReq.addParameter("ignore", "400,401,403,404,405");
  return clientReq;
  }
 

java-client/src/main/java/co/elastic/clients/base/SimpleEndpoint.java

@@ -100,7 +100,7 @@ public boolean isError(int statusCode) {
 
  @Override
  public JsonpDeserializer<ElasticsearchError> errorParser(int statusCode) {
- return ElasticsearchError.PARSER;
+ return ElasticsearchError._DESERIALIZER;
  }
 
  public <NewResponseT> SimpleEndpoint<RequestT, NewResponseT> withResponseDeserializer(

java-client/src/test/java/co/elastic/clients/elasticsearch/end_to_end/RequestTest.java

@@ -19,8 +19,9 @@
 
 package co.elastic.clients.elasticsearch.end_to_end;
 
-
+import co.elastic.clients.base.ApiException;
 import co.elastic.clients.base.BooleanResponse;
+import co.elastic.clients.base.ElasticsearchError;
 import co.elastic.clients.base.RestClientTransport;
 import co.elastic.clients.base.Transport;
 import co.elastic.clients.elasticsearch.ElasticsearchAsyncClient;
@@ -51,6 +52,7 @@
 import java.time.Duration;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
 public class RequestTest extends Assert {
@@ -231,6 +233,38 @@ public void testRefresh() throws IOException {
  assertEquals("1", ir.id());
  }
 
+ @Test public void errorResponse() throws Exception {
+
+ RestClient restClient = RestClient.builder(new HttpHost("localhost", container.getMappedPort(9200))).build();
+ Transport transport = new RestClientTransport(restClient, mapper);
+ ElasticsearchClient client = new ElasticsearchClient(transport);
+
+ BooleanResponse exists = client.exists(_0 -> _0.index("doesnotexist").id("reallynot"));
+ assertFalse(exists.value());
+
+ try {
+ co.elastic.clients.elasticsearch._core.GetResponse<String> response = client.get(
+ _0 -> _0.index("doesnotexist").id("reallynot"), String.class
+ );
+ } catch(ApiException apie) {
+ ElasticsearchError error = (ElasticsearchError) apie.error();
+ assertEquals(404, error.status());
+ assertEquals("index_not_found_exception", error.error().asJsonObject().getString("type"));
+ }
+
+ try {
+ ElasticsearchAsyncClient aClient = new ElasticsearchAsyncClient(transport);
+ co.elastic.clients.elasticsearch._core.GetResponse<String> response = aClient.get(
+ _0 -> _0.index("doesnotexist").id("reallynot"), String.class
+ ).get();
+ } catch(ExecutionException ee) {
+ ApiException apie = ((ApiException) ee.getCause());
+ ElasticsearchError error = (ElasticsearchError) apie.error();
+ assertEquals(404, error.status());
+ assertEquals("index_not_found_exception", error.error().asJsonObject().getString("type"));
+ }
+ }
+
  public static class AppData {
  private int intValue;
  private String msg;

java-client/src/test/java/co/elastic/clients/elasticsearch/model/BuiltinTypesTest.java

@@ -19,6 +19,7 @@
 
 package co.elastic.clients.elasticsearch.model;
 
+import co.elastic.clients.base.ElasticsearchError;
 import co.elastic.clients.elasticsearch._core.SearchRequest;
 import co.elastic.clients.elasticsearch._types.query_dsl.SpanGapQuery;
 import co.elastic.clients.elasticsearch.indices.IndexSettings;
@@ -59,4 +60,20 @@ public void testSpanGapQuery() {
  assertEquals("a-field", q.field());
  assertEquals(12, q.spanWidth());
  }
+
+ @Test
+ public void testErrorResponse() {
+ String json = "{\"error\":{\"root_cause\":[{\"type\":\"index_not_found_exception\",\"reason\":\"no such index [doesnotexist]\"," +
+ "\"resource.type\":\"index_expression\",\"resource.id\":\"doesnotexist\",\"index_uuid\":\"_na_\"," +
+ "\"index\":\"doesnotexist\"}],\"type\":\"index_not_found_exception\",\"reason\":\"no such index [doesnotexist]\",\"resource" +
+ ".type\":\"index_expression\",\"resource.id\":\"doesnotexist\",\"index_uuid\":\"_na_\",\"index\":\"doesnotexist\"}," +
+ "\"status\":404}";
+
+ System.out.println(json);
+
+ ElasticsearchError error = fromJson(json, ElasticsearchError.class);
+
+ assertEquals(404, error.status());
+ assertEquals("index_not_found_exception", error.error().asJsonObject().getString("type"));
+ }
 }