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

Polishing

Browse Source
This commit is contained in:
Juergen Hoeller
2015-12-02 15:35:42 +01:00
parent 747863d503
commit a9e5e9ecc8
4 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-web/src/main/java/org/springframework/web/accept/MappingMediaTypeFileExtensionResolver.java
View File

@@ -95,13 +95,11 @@ public class MappingMediaTypeFileExtensionResolver implements MediaTypeFileExten
}
/**
* Use this method for a reverse, case-insensitive MediaType lookup.
* @param extension the extension to look up
* @return a MediaType for the key or {@code null}
* Use this method for a reverse lookup from extension to MediaType.
* @return a MediaType for the key, or {@code null} if none found
*/
protected MediaType lookupMediaType(String extension) {
extension = extension.toLowerCase(Locale.ENGLISH);
return this.mediaTypes.get(extension);
return this.mediaTypes.get(extension.toLowerCase(Locale.ENGLISH));
}
}

8
spring-web/src/test/java/org/springframework/web/accept/MappingMediaTypeFileExtensionResolverTests.java
View File

@@ -29,6 +29,7 @@ import static org.junit.Assert.*;
* Test fixture for {@link MappingMediaTypeFileExtensionResolver}.
*
* @author Rossen Stoyanchev
* @author Melissa Hartsock
*/
public class MappingMediaTypeFileExtensionResolverTests {
@@ -51,8 +52,10 @@ public class MappingMediaTypeFileExtensionResolverTests {
assertTrue(extensions.isEmpty());
}
// SPR-13747
/**
* Unit test for SPR-13747 - ensures that reverse lookup of media type from media
* type key is case-insensitive.
*/
@Test
public void lookupMediaTypeCaseInsensitive() {
Map<String, MediaType> mapping = Collections.singletonMap("json", MediaType.APPLICATION_JSON);
@@ -61,4 +64,5 @@ public class MappingMediaTypeFileExtensionResolverTests {
assertEquals(mediaType, MediaType.APPLICATION_JSON);
}
}