diff --git a/spring-core/src/main/java/org/springframework/util/MimeTypeUtils.java b/spring-core/src/main/java/org/springframework/util/MimeTypeUtils.java index 27bbc609fc..fb23809994 100644 --- a/spring-core/src/main/java/org/springframework/util/MimeTypeUtils.java +++ b/spring-core/src/main/java/org/springframework/util/MimeTypeUtils.java @@ -362,7 +362,9 @@ public abstract class MimeTypeUtils { */ public static void sortBySpecificity(List mimeTypes) { Assert.notNull(mimeTypes, "'mimeTypes' must not be null"); - Assert.isTrue(mimeTypes.size() <= 50, "Too many elements"); + if (mimeTypes.size() >= 50) { + throw new InvalidMimeTypeException(mimeTypes.toString(), "Too many elements"); + } bubbleSort(mimeTypes, MimeType::isLessSpecific); } diff --git a/spring-core/src/test/java/org/springframework/util/MimeTypeTests.java b/spring-core/src/test/java/org/springframework/util/MimeTypeTests.java index 90b1fea3fa..e582bc60ec 100644 --- 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 mimeTypes = new ArrayList<>(List.of(MimeTypeUtils.ALL, audio, audioWave, audioBasic, - audioBasicLevel)); + List mimeTypes = new ArrayList<>( + List.of(MimeTypeUtils.ALL, audio, audioWave, audioBasic, audioBasicLevel)); + MimeTypeUtils.sortBySpecificity(mimeTypes); assertThat(mimeTypes).containsExactly(audioWave, audioBasicLevel, audioBasic, audio, MimeTypeUtils.ALL);