Skip to content

Commit 05c3ffb

Browse files
committed
Use InvalidMimeTypeException in MimeTypeUtils#sortBySpecificity
Closes gh-31254
1 parent 19e8ed1 commit 05c3ffb

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

spring-core/src/main/java/org/springframework/util/MimeTypeUtils.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,9 @@ public static String toString(Collection<? extends MimeType> mimeTypes) {
362362
*/
363363
public static <T extends MimeType> void sortBySpecificity(List<T> mimeTypes) {
364364
Assert.notNull(mimeTypes, "'mimeTypes' must not be null");
365-
Assert.isTrue(mimeTypes.size() <= 50, "Too many elements");
365+
if (mimeTypes.size() >= 50) {
366+
throw new InvalidMimeTypeException(mimeTypes.toString(), "Too many elements");
367+
}
366368

367369
bubbleSort(mimeTypes, MimeType::isLessSpecific);
368370
}

spring-core/src/test/java/org/springframework/util/MimeTypeTests.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -451,8 +451,9 @@ void sortBySpecificity() {
451451
MimeType audioWave = new MimeType("audio", "wave");
452452
MimeType audioBasicLevel = new MimeType("audio", "basic", singletonMap("level", "1"));
453453

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

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

0 commit comments

Comments
 (0)