Merge branch '6.0.x'

2023-11-15 18:57:35 +00:00
parent f15b8b95ad 05c3ffb2fb
commit 3a70c71c5e
4 changed files with 109 additions and 61 deletions
--- a/spring-core/src/test/java/org/springframework/util/MimeTypeTests.java
+++ b/spring-core/src/test/java/org/springframework/util/MimeTypeTests.java
@@ -451,8 +451,9 @@ class MimeTypeTests {
 		MimeType audioWave = new MimeType("audio", "wave");
 		MimeType audioBasicLevel = new MimeType("audio", "basic", singletonMap("level", "1"));

-		List<MimeType> mimeTypes = new ArrayList<>(List.of(MimeTypeUtils.ALL, audio, audioWave, audioBasic,
-				audioBasicLevel));
+		List<MimeType> mimeTypes = new ArrayList<>(
+				List.of(MimeTypeUtils.ALL, audio, audioWave, audioBasic, audioBasicLevel));
+
 		MimeTypeUtils.sortBySpecificity(mimeTypes);

 		assertThat(mimeTypes).containsExactly(audioWave, audioBasicLevel, audioBasic, audio, MimeTypeUtils.ALL);