Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MultipartBodyBuilder supports PublisherEntity as input

Browse Source 
Issue: SPR-16601
This commit is contained in:
Rossen Stoyanchev
2018-03-16 15:52:24 -04:00
parent 313c6cef32
commit 842c29103f
2 changed files with 38 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-web/src/main/java/org/springframework/http/client/MultipartBodyBuilder.java
View File

@@ -91,6 +91,12 @@ public final class MultipartBodyBuilder {
"publisher(String, Publisher, ParameterizedTypeReference) for adding Publisher parts");
}
if (part instanceof PublisherEntity<?,?>) {
PublisherPartBuilder<?, ?> builder = new PublisherPartBuilder<>((PublisherEntity<?, ?>) part);
this.parts.add(name, builder);
return builder;
}
Object partBody;
HttpHeaders partHeaders = new HttpHeaders();
@@ -154,7 +160,7 @@ public final class MultipartBodyBuilder {
Assert.notNull(elementType1, "'typeReference' must not be null");
HttpHeaders headers = new HttpHeaders();
PublisherPartBuilder<T, P> builder = new PublisherPartBuilder<>(publisher, typeReference, headers);
PublisherPartBuilder<T, P> builder = new PublisherPartBuilder<>(headers, publisher, typeReference);
this.parts.add(name, builder);
return builder;
}
@@ -239,11 +245,17 @@ public final class MultipartBodyBuilder {
this.resolvableType = ResolvableType.forClass(elementClass);
}
public PublisherPartBuilder(P body, ParameterizedTypeReference<S> typeReference, HttpHeaders headers) {
public PublisherPartBuilder(HttpHeaders headers, P body, ParameterizedTypeReference<S> typeReference) {
super(headers, body);
this.resolvableType = ResolvableType.forType(typeReference);
}
public PublisherPartBuilder(PublisherEntity<S, P> other) {
super(other.getHeaders(), other.getBody());
this.resolvableType = other.getResolvableType();
}
@Override
@SuppressWarnings("unchecked")
public HttpEntity<?> build() {

26
spring-web/src/test/java/org/springframework/http/client/MultipartBodyBuilderTests.java
View File

@@ -26,6 +26,7 @@ import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.client.MultipartBodyBuilder.PublisherEntity;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
@@ -80,15 +81,36 @@ public class MultipartBodyBuilderTests {
assertNotNull(resultEntity);
assertEquals(publisher, resultEntity.getBody());
assertEquals(ResolvableType.forClass(String.class),
((MultipartBodyBuilder.PublisherEntity<?,?>) resultEntity).getResolvableType());
((PublisherEntity<?,?>) resultEntity).getResolvableType());
assertEquals("qux", resultEntity.getHeaders().getFirst("baz"));
resultEntity = result.getFirst("publisherPtr");
assertNotNull(resultEntity);
assertEquals(publisher, resultEntity.getBody());
assertEquals(ResolvableType.forClass(String.class),
((MultipartBodyBuilder.PublisherEntity<?,?>) resultEntity).getResolvableType());
((PublisherEntity<?,?>) resultEntity).getResolvableType());
assertEquals("qux", resultEntity.getHeaders().getFirst("baz"));
}
@Test // SPR-16601
public void publisherEntityAcceptedAsInput() {
Publisher<String> publisher = Flux.just("foo", "bar", "baz");
MultipartBodyBuilder builder = new MultipartBodyBuilder();
builder.asyncPart("publisherClass", publisher, String.class).header("baz", "qux");
HttpEntity<?> entity = builder.build().getFirst("publisherClass");
assertNotNull(entity);
assertEquals(PublisherEntity.class, entity.getClass());
// Now build a new MultipartBodyBuilder, as BodyInserters.fromMultipartData would do...
builder = new MultipartBodyBuilder();
builder.part("publisherClass", entity);
entity = builder.build().getFirst("publisherClass");
assertNotNull(entity);
assertEquals(PublisherEntity.class, entity.getClass());
}
}