From 25bc8d1f050942ed29273b46efe0f7b2b0432045 Mon Sep 17 00:00:00 2001 From: jonmv Date: Fri, 4 Nov 2022 22:46:07 +0100 Subject: Revert "Merge pull request #24725 from vespa-engine/jonmv/application-package-streams" This reverts commit c7a0effde1c205d8790e5d989437aefd724bc70f, reversing changes made to 7bcb7768d75c1eef5bc70a2aa84c363f9b7ec643. --- .../src/main/java/ai/vespa/hosted/client/AbstractHttpClient.java | 2 +- http-client/src/main/java/ai/vespa/hosted/client/HttpClient.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'http-client') 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 48bbffc7e37..ed3fee101ed 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 @@ -173,7 +173,7 @@ public abstract class AbstractHttpClient implements HttpClient { @Override public HttpClient.RequestBuilder body(byte[] json) { - return body(() -> HttpEntities.create(json, ContentType.APPLICATION_JSON)); + return body(HttpEntities.create(json, ContentType.APPLICATION_JSON)); } @Override 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 4da887f0cbb..ea8328ed793 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 @@ -77,6 +77,12 @@ public interface HttpClient extends Closeable { /** Sets the request body as UTF-8 application/json. */ RequestBuilder body(byte[] json); + /** Sets the request body. */ + default RequestBuilder body(HttpEntity entity) { + if (entity.isRepeatable()) return body(() -> entity); + throw new IllegalArgumentException("entitiy must be repeatable, or a supplier must be used"); + } + /** Sets the request body. */ RequestBuilder body(Supplier entity); -- cgit v1.2.3