diff options
author | jonmv <venstad@gmail.com> | 2022-09-15 11:45:34 +0200 |
---|---|---|
committer | jonmv <venstad@gmail.com> | 2022-09-15 11:45:34 +0200 |
commit | 1ddaa590d2381f3141cb0775317394d14bd0565b (patch) | |
tree | 9abb3821f7677bcbeb0660c1d1fb85cbc39eff34 /hosted-api | |
parent | 641561888e998be6d198c651c3c45de9f1915b31 (diff) |
charset=, not charset:
Diffstat (limited to 'hosted-api')
-rw-r--r-- | hosted-api/src/main/java/ai/vespa/hosted/api/MultiPartStreamer.java | 2 | ||||
-rw-r--r-- | hosted-api/src/test/java/ai/vespa/hosted/api/MultiPartStreamerTest.java | 45 |
2 files changed, 24 insertions, 23 deletions
diff --git a/hosted-api/src/main/java/ai/vespa/hosted/api/MultiPartStreamer.java b/hosted-api/src/main/java/ai/vespa/hosted/api/MultiPartStreamer.java index 8c858437ad7..f1cbc027e17 100644 --- a/hosted-api/src/main/java/ai/vespa/hosted/api/MultiPartStreamer.java +++ b/hosted-api/src/main/java/ai/vespa/hosted/api/MultiPartStreamer.java @@ -105,7 +105,7 @@ public class MultiPartStreamer { /** Returns the value of the {@code "Content-Type"} header to use with this. */ public String contentType() { - return "multipart/form-data; boundary=" + boundary + "; charset: utf-8"; + return "multipart/form-data; boundary=" + boundary + "; charset=utf-8"; } /** Returns the separator to put between one part and the next, when this is a string. */ diff --git a/hosted-api/src/test/java/ai/vespa/hosted/api/MultiPartStreamerTest.java b/hosted-api/src/test/java/ai/vespa/hosted/api/MultiPartStreamerTest.java index 6307c9b69bf..9d7068589f5 100644 --- a/hosted-api/src/test/java/ai/vespa/hosted/api/MultiPartStreamerTest.java +++ b/hosted-api/src/test/java/ai/vespa/hosted/api/MultiPartStreamerTest.java @@ -29,27 +29,28 @@ class MultiPartStreamerTest { .addText("text", "Hello!") .addFile("file", file); - String expected = "--My boundary\r\n" + - "Content-Disposition: form-data; name=\"data\"\r\n" + - "Content-Type: uss/enterprise\r\n" + - "\r\n" + - "lore\r\n" + - "--My boundary\r\n" + - "Content-Disposition: form-data; name=\"json\"\r\n" + - "Content-Type: application/json\r\n" + - "\r\n" + - "{\"xml\":false}\r\n" + - "--My boundary\r\n" + - "Content-Disposition: form-data; name=\"text\"\r\n" + - "Content-Type: text/plain\r\n" + - "\r\n" + - "Hello!\r\n" + - "--My boundary\r\n" + - "Content-Disposition: form-data; name=\"file\"; filename=\"" + file.getFileName() + "\"\r\n" + - "Content-Type: application/octet-stream\r\n" + - "\r\n" + - "Hi\r\n" + - "--My boundary--"; + String expected = """ + --My boundary\r + Content-Disposition: form-data; name="data"\r + Content-Type: uss/enterprise\r + \r + lore\r + --My boundary\r + Content-Disposition: form-data; name="json"\r + Content-Type: application/json\r + \r + {"xml":false}\r + --My boundary\r + Content-Disposition: form-data; name="text"\r + Content-Type: text/plain\r + \r + Hello!\r + --My boundary\r + Content-Disposition: form-data; name="file"; filename="%s"\r + Content-Type: application/octet-stream\r + \r + Hi\r + --My boundary--""".formatted(file.getFileName()); assertEquals(expected, new String(streamer.data().readAllBytes())); @@ -58,7 +59,7 @@ class MultiPartStreamerTest { assertEquals(expected, new String(streamer.data().readAllBytes())); - assertEquals(List.of("multipart/form-data; boundary=My boundary; charset: utf-8"), + assertEquals(List.of("multipart/form-data; boundary=My boundary; charset=utf-8"), streamer.streamTo(HttpRequest.newBuilder(), Method.POST) .uri(URI.create("https://uri/path")) .build().headers().allValues("Content-Type")); |