Apache
/
httpcomponents-client
mirror of https://github.com/apache/httpcomponents-client.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HTTPCLIENT-2066 Provide ByteArrayBody constructors w/o filename parameter 

This closes #319
This commit is contained in:
Arturo Bernal 2021-10-30 10:49:49 +02:00 committed by Michael Osipov
parent 0926f1e07a
commit af2cc82e82
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/ByteArrayBody.java
View File

@ -56,11 +56,22 @@ public class ByteArrayBody extends AbstractContentBody {
*/ */
public ByteArrayBody(final byte[] data, final ContentType contentType, final String filename) { public ByteArrayBody(final byte[] data, final ContentType contentType, final String filename) {
super(contentType); super(contentType);
Args.notNull(data, "byte[]"); this.data = Args.notNull(data, "data");
this.data = data;
this.filename = filename; this.filename = filename;
} }
/**
* Public constructor that creates a new ByteArrayBody.
*
* @param contentType the {@link ContentType}
* @param data the array of byte.
*
* @since 5.2
*/
public ByteArrayBody(final byte[] data, final ContentType contentType) {
this(data, contentType, null);
}
/** /**
* Creates a new ByteArrayBody. * Creates a new ByteArrayBody.
* *

2
httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/MultipartEntityBuilder.java
View File

@ -155,7 +155,7 @@ public class MultipartEntityBuilder {
public MultipartEntityBuilder addBinaryBody( public MultipartEntityBuilder addBinaryBody(
final String name, final byte[] b) { final String name, final byte[] b) {
return addBinaryBody(name, b, ContentType.DEFAULT_BINARY, null); return addPart(name, new ByteArrayBody(b, ContentType.DEFAULT_BINARY));
} }
public MultipartEntityBuilder addBinaryBody( public MultipartEntityBuilder addBinaryBody(

4
httpclient5/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartEntityBuilder.java
View File

@ -70,13 +70,15 @@ public class TestMultipartEntityBuilder {
.addBinaryBody("p2", new File("stuff")) .addBinaryBody("p2", new File("stuff"))
.addBinaryBody("p3", new byte[]{}) .addBinaryBody("p3", new byte[]{})
.addBinaryBody("p4", new ByteArrayInputStream(new byte[]{})) .addBinaryBody("p4", new ByteArrayInputStream(new byte[]{}))
.addBinaryBody("p5", new ByteArrayInputStream(new byte[]{}), ContentType.DEFAULT_BINARY, "filename")
.buildEntity(); .buildEntity();
Assert.assertNotNull(entity); Assert.assertNotNull(entity);
final List<MultipartPart> bodyParts = entity.getMultipart().getParts(); final List<MultipartPart> bodyParts = entity.getMultipart().getParts();
Assert.assertNotNull(bodyParts); Assert.assertNotNull(bodyParts);
Assert.assertEquals(4, bodyParts.size()); Assert.assertEquals(5, bodyParts.size());
} }
@Test @Test
public void testMultipartCustomContentType() throws Exception { public void testMultipartCustomContentType() throws Exception {
final MultipartFormEntity entity = MultipartEntityBuilder.create() final MultipartFormEntity entity = MultipartEntityBuilder.create()