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

Fix 'Align MimeMappings with Tomcat's defaults'

Browse Source 
Update COMMON_MAPPINGS to align with the properties file and change
the test so that it consistently works.

See gh-32101
This commit is contained in:
Phillip Webb
2022-08-23 16:38:31 -07:00
parent fe1ffff3d7
commit dd98b88732
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/MimeMappings.java
View File

@@ -261,14 +261,14 @@ public sealed class MimeMappings implements Iterable<MimeMappings.Mapping> {
mappings.add("jpg", "image/jpeg");
mappings.add("js", "application/javascript");
mappings.add("json", "application/json");
mappings.add("otf", "application/x-font-opentype");
mappings.add("otf", "font/otf");
mappings.add("pdf", "application/pdf");
mappings.add("png", "image/png");
mappings.add("ps", "application/postscript");
mappings.add("tar", "application/x-tar");
mappings.add("tif", "image/tiff");
mappings.add("tiff", "image/tiff");
mappings.add("ttf", "application/x-font-ttf");
mappings.add("ttf", "font/ttf");
mappings.add("txt", "text/plain");
mappings.add("xht", "application/xhtml+xml");
mappings.add("xhtml", "application/xhtml+xml");

4
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/MimeMappingsTests.java
View File

@@ -174,9 +174,11 @@ class MimeMappingsTests {
@Test
void commonMappingsAreSubsetOfAllMappings() {
MimeMappings defaultMappings = new DefaultMimeMappings();
MimeMappings commonMappings = (MimeMappings) ReflectionTestUtils.getField(DefaultMimeMappings.class, "COMMON");
defaultMappings.getAll();
for (Mapping commonMapping : commonMappings) {
assertThat(MimeMappings.DEFAULT.get(commonMapping.getExtension())).isEqualTo(commonMapping.getMimeType());
assertThat(defaultMappings.get(commonMapping.getExtension())).isEqualTo(commonMapping.getMimeType());
}
}