diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2022-11-07 15:08:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-07 15:08:46 +0100 |
| commit | a0a5b2d3c7cb9319590821bb1beb824dc25d1b89 (patch) | |
| tree | 4e1d28d33c02a86c179c94fda29158b4ada9d2c9 /http-client | |
| parent | a0e9b51aaf01a425dbd6cdd1fbc8fd5ce066a9bb (diff) | |
Revert "Jonmv/reapply app streams"
Diffstat (limited to 'http-client')
| -rw-r--r-- | http-client/src/main/java/ai/vespa/hosted/client/AbstractHttpClient.java | 2 | ||||
| -rw-r--r-- | http-client/src/main/java/ai/vespa/hosted/client/HttpClient.java | 6 |
2 files changed, 7 insertions, 1 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 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 @@ -78,6 +78,12 @@ public interface HttpClient extends Closeable { 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<HttpEntity> entity); /** Sets query parameters without a value, like {@code ?debug&recursive}. */ |