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

INT-1481, more refactoring, added MVP generation only if applicable content-type oherwise payload is untouched

Browse Source
This commit is contained in:
Oleg Zhurakousky
2010-09-27 15:48:14 -04:00
parent 0bed56e780
commit a10f547269
2 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
spring-integration-http/src/main/java/org/springframework/integration/http/HttpRequestExecutingMessageHandler.java
View File

@@ -47,12 +47,12 @@ import org.springframework.integration.core.MessageHandler;
import org.springframework.integration.handler.AbstractReplyProducingMessageHandler;
import org.springframework.integration.mapping.HeaderMapper;
import org.springframework.integration.support.MessageBuilder;
import org.springframework.integration.support.converter.MessageConversionException;
import org.springframework.integration.util.SimpleBeanResolver;
import org.springframework.util.Assert;
import org.springframework.util.CollectionUtils;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import org.springframework.util.StringUtils;
import org.springframework.web.client.ResponseErrorHandler;
import org.springframework.web.client.RestTemplate;
@@ -61,6 +61,7 @@ import org.springframework.web.client.RestTemplate;
* to a {@link RestTemplate} instance.
*
* @author Mark Fisher
* @author Oleg Zhurakousky
* @since 2.0
*/
public class HttpRequestExecutingMessageHandler extends AbstractReplyProducingMessageHandler {
@@ -248,7 +249,7 @@ public class HttpRequestExecutingMessageHandler extends AbstractReplyProducingMe
: this.createHttpEntityWithMessageAsBody(message);
}
@SuppressWarnings({ "unchecked", "rawtypes" })
@SuppressWarnings({ "unchecked", "rawtypes"})
private HttpEntity<?> createHttpEntityWithPayloadAsBody(Message<?> requestMessage) {
if (requestMessage.getPayload() instanceof HttpEntity<?>) {
return (HttpEntity<?>) requestMessage.getPayload();
@@ -256,11 +257,14 @@ public class HttpRequestExecutingMessageHandler extends AbstractReplyProducingMe
HttpHeaders httpHeaders = new HttpHeaders();
this.headerMapper.fromHeaders(requestMessage.getHeaders(), httpHeaders);
Object payload = requestMessage.getPayload();
if (payload instanceof Map && !(payload instanceof MultiValueMap)){
payload = this.convertToMultipartValueMap((Map) payload);
}
MediaType contentType = (payload instanceof String) ? this.resolveContentType((String) payload, this.charset)
: this.resolveContentType(payload);
if (contentType.equals(MediaType.APPLICATION_FORM_URLENCODED) || contentType.equals(MediaType.MULTIPART_FORM_DATA)){
if (!(payload instanceof MultiValueMap)){
payload = this.convertToMultipartValueMap((Map) payload);
}
}
httpHeaders.setContentType(contentType);
if (HttpMethod.POST.equals(this.httpMethod) || HttpMethod.PUT.equals(this.httpMethod)) {
return new HttpEntity<Object>(payload, httpHeaders);
@@ -285,15 +289,12 @@ public class HttpRequestExecutingMessageHandler extends AbstractReplyProducingMe
}
else if (content instanceof Map){
Map multiValueMap = (Map) content;
if (!(content instanceof MultiValueMap)){
multiValueMap = this.convertToMultipartValueMap((Map) content);
}
/*
* We need to check separately for MULTIPART as well as URLENCODED simply because
* MultiValueMap<Object, Object> is actually valid content for serialization
*/
if (this.isFormData((MultiValueMap)multiValueMap)){
if (this.isMultipart((MultiValueMap)multiValueMap)){
if (this.isFormData(multiValueMap)){
if (this.isMultipart(multiValueMap)){
contentType = MediaType.MULTIPART_FORM_DATA;
}
else {
@@ -335,21 +336,32 @@ public class HttpRequestExecutingMessageHandler extends AbstractReplyProducingMe
* If all keys are Strings, and some values are not Strings we'll consider
* the Map to be multipart/form-data
*/
private boolean isMultipart(MultiValueMap<String, List<?>> map) {
private boolean isMultipart(Map<String, ?> map) {
for (String key : map.keySet()) {
List<?> values = map.get(key);
for (Object value : values) {
if (value != null && !(value instanceof String)) {
Object value = map.get(key);
if (value != null){
if (value instanceof Object[]){
value = CollectionUtils.arrayToList(value);
}
if (value instanceof Collection){
Collection<?> cValues = (Collection<?>) value;
for (Object cValue : cValues) {
if (cValue != null && !(cValue instanceof String)) {
return true;
}
}
}
else if (!(value instanceof String)) {
return true;
}
}
}
}
return false;
}
/**
* If all keys and values are Strings, we'll consider the Map to be form data.
*/
private boolean isFormData(MultiValueMap<Object, List<?>> map) {
private boolean isFormData(Map<Object, ?> map) {
for (Object key : map.keySet()) {
if (!(key instanceof String)){
return false;

8
spring-integration-http/src/test/java/org/springframework/integration/http/DefaultOutboundRequestMapperTests.java
View File

@@ -23,14 +23,12 @@ import static org.junit.Assert.assertTrue;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicReference;
import org.junit.Test;
import org.springframework.beans.DirectFieldAccessor;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpMethod;
@@ -245,10 +243,10 @@ public class DefaultOutboundRequestMapperTests {
}
assertEquals("intentional", exception.getCause().getMessage());
HttpEntity<?> request = template.lastRequestEntity.get();
MultiValueMap<?, ?> map = (MultiValueMap<?, ?>) request.getBody();
Map<?, ?> map = (Map<?, ?>) request.getBody();
assertEquals(2, map.size());
assertEquals(TestBean.class, map.get(1).get(0).getClass());
assertEquals(TestBean.class, map.get(2).get(0).getClass());
assertEquals(TestBean.class, map.get(1).getClass());
assertEquals(TestBean.class, map.get(2).getClass());
System.out.println(request.getHeaders().getContentType());
assertEquals("application", request.getHeaders().getContentType().getType());
assertEquals("x-java-serialized-object", request.getHeaders().getContentType().getSubtype());