Add method to read response as Json

2 files changed, 11 insertions, 0 deletions

diff --git a/http-client/src/main/java/ai/vespa/hosted/client/AbstractHttpClient.java b/http-client/src/main/java/ai/vespa/hosted/client/AbstractHttpClient.java
index 9b08919600e..f6109f3ead8 100644
--- a/http-client/src/main/java/ai/vespa/hosted/client/AbstractHttpClient.java
+++ b/http-client/src/main/java/ai/vespa/hosted/client/AbstractHttpClient.java
@@ -4,6 +4,8 @@ package ai.vespa.hosted.client;
 import ai.vespa.http.HttpURL;
 import ai.vespa.http.HttpURL.Path;
 import ai.vespa.http.HttpURL.Query;
+import ai.vespa.json.Json;
+import com.yahoo.slime.SlimeUtils;
 import com.yahoo.time.TimeBudget;
 import org.apache.hc.client5.http.config.RequestConfig;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
@@ -282,6 +284,11 @@ public abstract class AbstractHttpClient implements HttpClient {
         }
 
         @Override
+        public Json readAsJson() {
+            return read(bytes -> Json.of(SlimeUtils.jsonToSlime(bytes)));
+        }
+
+        @Override
         public void discard() throws UncheckedIOException, ResponseException {
             handle((response, __) -> {
                 try (response) {
diff --git a/http-client/src/main/java/ai/vespa/hosted/client/HttpClient.java b/http-client/src/main/java/ai/vespa/hosted/client/HttpClient.java
index b764b3ad61a..57a7615421d 100644
--- a/http-client/src/main/java/ai/vespa/hosted/client/HttpClient.java
+++ b/http-client/src/main/java/ai/vespa/hosted/client/HttpClient.java
@@ -4,6 +4,7 @@ package ai.vespa.hosted.client;
 import ai.vespa.http.HttpURL;
 import ai.vespa.http.HttpURL.Path;
 import ai.vespa.http.HttpURL.Query;
+import ai.vespa.json.Json;
 import com.yahoo.time.TimeBudget;
 import org.apache.hc.client5.http.config.RequestConfig;
 import org.apache.hc.core5.http.ClassicHttpRequest;
@@ -140,6 +141,9 @@ public interface HttpClient extends Closeable {
         /** Reads and maps the response, or throws if unsuccessful. */
         <T> T read(Function<byte[], T> mapper);
 
+        /** Reads the response as a {@link Json}, or throws if unsuccessful. */
+        Json readAsJson();
+
         /** Discards the response, but throws if unsuccessful. */
         void discard();