Skip to content

Commit de73836

Browse files
committed
[Bug-fix] Translate JSONException to 400 instead of 500
Signed-off-by: Jialiang Liang <jiallian@amazon.com>
1 parent 21fd14c commit de73836

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

legacy/src/main/java/org/opensearch/sql/legacy/plugin/RestSqlAction.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import java.util.regex.Pattern;
2424
import org.apache.logging.log4j.LogManager;
2525
import org.apache.logging.log4j.Logger;
26+
import org.json.JSONException;
2627
import org.opensearch.OpenSearchException;
2728
import org.opensearch.common.inject.Injector;
2829
import org.opensearch.common.settings.Settings;
@@ -281,7 +282,8 @@ private static boolean isClientError(Exception e) {
281282
|| e instanceof SqlAnalysisException
282283
|| e instanceof SyntaxCheckException
283284
|| e instanceof SemanticCheckException
284-
|| e instanceof ExpressionEvaluationException;
285+
|| e instanceof ExpressionEvaluationException
286+
|| e instanceof JSONException;
285287
}
286288

287289
private void sendResponse(

plugin/src/main/java/org/opensearch/sql/plugin/rest/RestPPLQueryAction.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import org.opensearch.sql.plugin.transport.TransportPPLQueryRequest;
3838
import org.opensearch.sql.plugin.transport.TransportPPLQueryResponse;
3939
import org.opensearch.transport.client.node.NodeClient;
40+
import org.json.JSONException;
4041

4142
public class RestPPLQueryAction extends BaseRestHandler {
4243
public static final String QUERY_API_ENDPOINT = "/_plugins/_ppl";
@@ -59,7 +60,8 @@ private static boolean isClientError(Exception e) {
5960
|| e instanceof QueryEngineException
6061
|| e instanceof SyntaxCheckException
6162
|| e instanceof DataSourceClientException
62-
|| e instanceof IllegalAccessException;
63+
|| e instanceof IllegalAccessException
64+
|| e instanceof JSONException;
6365
}
6466

6567
@Override

0 commit comments

Comments
 (0)