Review fix

Tim-Brooks · Oct 16, 2024 · 29ec410 · 29ec410
1 parent 2f4adfe
commit 29ec410
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/qa/smoke-test-http/src/javaRestTest/java/org/elasticsearch/http/BulkRestIT.java b/qa/smoke-test-http/src/javaRestTest/java/org/elasticsearch/http/BulkRestIT.java
@@ -89,7 +89,7 @@ public void testBulkRequestBodyImproperlyTerminated() throws IOException {
         );
         ResponseException responseException = expectThrows(ResponseException.class, () -> getRestClient().performRequest(request));
         assertEquals(400, responseException.getResponse().getStatusLine().getStatusCode());
-        assertThat(responseException.getMessage(), containsString("could not parse bulk request body"));
+        assertThat(responseException.getMessage(), containsString("The bulk request must be terminated by a newline"));
     }
 
     public void testBulkRequest() throws IOException {

diff --git a/server/src/main/java/org/elasticsearch/rest/action/document/RestBulkAction.java b/server/src/main/java/org/elasticsearch/rest/action/document/RestBulkAction.java
@@ -139,8 +139,13 @@ public RestChannelConsumer prepareRequest(final RestRequest request, final NodeC
         }
     }
 
-    private static ElasticsearchParseException parseFailureException(Exception e) {
-        return new ElasticsearchParseException("could not parse bulk request body", e);
+    private static Exception parseFailureException(Exception e) {
+        if (e instanceof IllegalArgumentException) {
+            return e;
+        } else {
+            // TODO: Maybe improve in follow-up to be XContentParseException and include line number and column
+            return new ElasticsearchParseException("could not parse bulk request body", e);
+        }
     }
 
     static class ChunkHandler implements BaseRestHandler.RequestBodyChunkConsumer {