From bc89d03da6c10eb38577c279cd26c82bf914a3bc Mon Sep 17 00:00:00 2001
From: jonmv <venstad@gmail.com>
Date: Fri, 26 Jan 2024 09:37:11 +0100
Subject: Revert "Merge pull request #30067 from
 vespa-engine/revert-30038-jonmv/leaner-token-buffer"

This reverts commit b771fbe5fe648cf4c64e04341542e11c2e21cb9d, reversing
changes made to 7b578506b5c4c59f4273e74af1f0db4a74f82175.
---
 .../com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java    | 2 +-
 .../java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java  | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'vespaclient-container-plugin')

diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java
index 5c63b07dcc0..5ff7b4592a1 100644
--- a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java
+++ b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java
@@ -1058,7 +1058,7 @@ public class DocumentV1ApiHandler extends AbstractRequestHandler {
 
         private ParsedDocumentOperation parse(InputStream inputStream, String docId, DocumentOperationType operation) {
             try {
-                return new JsonReader(manager, inputStream, jsonFactory).readSingleDocument(operation, docId);
+                return new JsonReader(manager, inputStream, jsonFactory).readSingleDocumentStreaming(operation, docId);
             } catch (IllegalArgumentException e) {
                 incrementMetricParseError();
                 throw e;
diff --git a/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java b/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java
index c8fcb4c4635..847b61b4af0 100644
--- a/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java
+++ b/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java
@@ -778,7 +778,7 @@ public class DocumentV1ApiTest {
         response = driver.sendRequest("http://localhost/document/v1/space/music/number/1/two?condition=test%20it", POST, "");
         assertSameJson("{" +
                        "  \"pathId\": \"/document/v1/space/music/number/1/two\"," +
-                       "  \"message\": \"Could not read document, no document?\"" +
+                       "  \"message\": \"expected start of root object, got null\"" +
                        "}",
                        response.readAll());
         assertEquals(400, response.getStatus());
@@ -791,7 +791,8 @@ public class DocumentV1ApiTest {
                                       "}");
         Inspector responseRoot = SlimeUtils.jsonToSlime(response.readAll()).get();
         assertEquals("/document/v1/space/music/number/1/two", responseRoot.field("pathId").asString());
-        assertTrue(responseRoot.field("message").asString().startsWith("Unexpected character ('┻' (code 9531 / 0x253b)): was expecting double-quote to start field name"));
+        assertTrue(responseRoot.field("message").asString(),
+                   responseRoot.field("message").asString().startsWith("failed parsing document: Unexpected character ('┻' (code 9531 / 0x253b)): was expecting double-quote to start field name"));
         assertEquals(400, response.getStatus());
 
         // PUT on a unknown document type is a 400
-- 
cgit v1.2.3