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

Add strictContentTypeMatching converter option

Browse Source 
AbstractMessageConverter now supports a strictContentTypeMatching mode
in which the content type of a message must be resolved to a (non-null)
value that matches one of the configured supported MIME types in order
for the converter to be used.

Issue: SPR-11463
This commit is contained in:
Rossen Stoyanchev
2014-02-27 15:47:42 +01:00
parent 2b69c1f15b
commit 56476cdd5f
4 changed files with 98 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
spring-messaging/src/test/java/org/springframework/messaging/converter/AbstractMessageConverterTests.java → spring-messaging/src/test/java/org/springframework/messaging/converter/MessageConverterTests.java
View File

@@ -16,6 +16,7 @@
package org.springframework.messaging.converter;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
@@ -30,13 +31,14 @@ import org.springframework.util.MimeType;
import org.springframework.util.MimeTypeUtils;
import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
/**
* Test fixture for {@link org.springframework.messaging.converter.AbstractMessageConverter}.
*
* @author Rossen Stoyanchev
*/
public class AbstractMessageConverterTests {
public class MessageConverterTests {
private TestMessageConverter converter;
@@ -89,6 +91,29 @@ public class AbstractMessageConverterTests {
assertEquals("success-from", this.converter.fromMessage(message, String.class));
}
@Test
public void canConvertFromStrictContentTypeMatch() {
this.converter = new TestMessageConverter(Arrays.asList(MimeTypeUtils.TEXT_PLAIN));
this.converter.setContentTypeResolver(new DefaultContentTypeResolver());
this.converter.setStrictContentTypeMatch(true);
Message<String> message = MessageBuilder.withPayload("ABC").build();
assertFalse(this.converter.canConvertFrom(message, String.class));
message = MessageBuilder.withPayload("ABC")
.setHeader(MessageHeaders.CONTENT_TYPE, MimeTypeUtils.TEXT_PLAIN).build();
assertTrue(this.converter.canConvertFrom(message, String.class));
}
@Test(expected = IllegalArgumentException.class)
public void setStrictContentTypeMatchWithNoSupportedMimeTypes() {
Message<String> message = MessageBuilder.withPayload("ABC").build();
this.converter = new TestMessageConverter(Collections.<MimeType>emptyList());
this.converter.setContentTypeResolver(new DefaultContentTypeResolver());
this.converter.setStrictContentTypeMatch(true);
}
@Test
public void toMessageHeadersCopied() {
Map<String, Object> map = new HashMap<String, Object>();