github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-04-19 04:45:07 -04:00
Code Issues Projects Releases Packages Wiki Activity

Update InferenceException to retain top-level message (#126345)

Browse source
This commit is contained in:
Mike Pellegrini 2025-04-07 09:05:00 -04:00 • committed by GitHub
parent 549fddb348
commit 72066ea49f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 60 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/InferenceException.java
View file

@ -8,11 +8,18 @@
package org.elasticsearch.xpack.inference;
import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.ElasticsearchWrapperException;
import org.elasticsearch.ExceptionsHelper;
import org.elasticsearch.rest.RestStatus;
public class InferenceException extends ElasticsearchException implements ElasticsearchWrapperException {
public class InferenceException extends ElasticsearchException {
public InferenceException(String message, Throwable cause, Object... args) {
super(message, cause, args);
}
@Override
public RestStatus status() {
// Override status so that we get the status of the cause while retaining the message of the inference exception when emitting to
// XContent
return ExceptionsHelper.status(getCause());
}
}

51
x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/InferenceExceptionTests.java Normal file
View file

@ -0,0 +1,51 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
package org.elasticsearch.xpack.inference;
import org.elasticsearch.ElasticsearchStatusException;
import org.elasticsearch.common.Strings;
import org.elasticsearch.rest.RestStatus;
import org.elasticsearch.test.ESTestCase;
import org.elasticsearch.xcontent.ToXContent;
import org.elasticsearch.xcontent.XContentBuilder;
import org.elasticsearch.xcontent.XContentFactory;
import static org.hamcrest.CoreMatchers.equalTo;
public class InferenceExceptionTests extends ESTestCase {
public void testWrapException() throws Exception {
ElasticsearchStatusException cause = new ElasticsearchStatusException("test", RestStatus.BAD_REQUEST);
InferenceException testException = new InferenceException("test wrapper", cause);
XContentBuilder builder = XContentFactory.jsonBuilder();
builder.startObject();
testException.toXContent(builder, ToXContent.EMPTY_PARAMS);
builder.endObject();
assertThat(
Strings.toString(builder),
equalTo(
"{\"type\":\"inference_exception\",\"reason\":\"test wrapper\","
+ "\"caused_by\":{\"type\":\"status_exception\",\"reason\":\"test\"}}"
)
);
assertThat(testException.status(), equalTo(RestStatus.BAD_REQUEST));
}
public void testNullCause() throws Exception {
InferenceException testException = new InferenceException("test exception", null);
XContentBuilder builder = XContentFactory.jsonBuilder();
builder.startObject();
testException.toXContent(builder, ToXContent.EMPTY_PARAMS);
builder.endObject();
assertThat(Strings.toString(builder), equalTo("{\"type\":\"inference_exception\",\"reason\":\"test exception\"}"));
assertThat(testException.status(), equalTo(RestStatus.INTERNAL_SERVER_ERROR));
}
}