Merge branch '2.6.x' into 2.7.x

Closes gh-29751
spring-projects · Feb 11, 2022 · 197112e · 197112e
2 parents da61545 + 4b33ea7
commit 197112e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/...t-project/spring-boot/src/main/java/org/springframework/boot/web/server/MimeMappings.java b/...t-project/spring-boot/src/main/java/org/springframework/boot/web/server/MimeMappings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -128,7 +128,7 @@ public final class MimeMappings implements Iterable<MimeMappings.Mapping> {
 		mappings.add("otg", "application/vnd.oasis.opendocument.graphics-template");
 		mappings.add("oth", "application/vnd.oasis.opendocument.text-web");
 		mappings.add("otp", "application/vnd.oasis.opendocument.presentation-template");
-		mappings.add("ots", "application/vnd.oasis.opendocument.spreadsheet-template ");
+		mappings.add("ots", "application/vnd.oasis.opendocument.spreadsheet-template");
 		mappings.add("ott", "application/vnd.oasis.opendocument.text-template");
 		mappings.add("ogx", "application/ogg");
 		mappings.add("ogv", "video/ogg");

diff --git a/...ject/spring-boot/src/test/java/org/springframework/boot/web/server/MimeMappingsTests.java b/...ject/spring-boot/src/test/java/org/springframework/boot/web/server/MimeMappingsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.regex.Pattern;
 
 import org.junit.jupiter.api.Test;
 
@@ -135,4 +136,11 @@ void makeUnmodifiable() {
 		assertThat(unmodifiable.get("foo")).isNull();
 	}
 
+	@Test
+	void mimeTypesInDefaultMappingsAreCorrectlyStructured() {
+		String regName = "[A-Za-z0-9!#$&.+\\-^_]{1,127}";
+		Pattern pattern = Pattern.compile("^" + regName + "\\/" + regName + "$");
+		assertThat(MimeMappings.DEFAULT).allSatisfy((mapping) -> assertThat(mapping.getMimeType()).matches(pattern));
+	}
+
 }