root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Use InvalidMimeTypeException in MimeTypeUtils#sortBySpecificity 

Closes gh-31254
This commit is contained in:
rstoyanchev 2023-11-15 18:57:09 +00:00
parent 19e8ed130c
commit 05c3ffb2fb
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -362,7 +362,9 @@ public abstract class MimeTypeUtils {
*/ */
public static <T extends MimeType> void sortBySpecificity(List<T> mimeTypes) { public static <T extends MimeType> void sortBySpecificity(List<T> mimeTypes) {
Assert.notNull(mimeTypes, "'mimeTypes' must not be null"); 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); bubbleSort(mimeTypes, MimeType::isLessSpecific);
} }

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

@ -451,8 +451,9 @@ class MimeTypeTests {
MimeType audioWave = new MimeType("audio", "wave"); MimeType audioWave = new MimeType("audio", "wave");
MimeType audioBasicLevel = new MimeType("audio", "basic", singletonMap("level", "1")); MimeType audioBasicLevel = new MimeType("audio", "basic", singletonMap("level", "1"));
List<MimeType> mimeTypes = new ArrayList<>(List.of(MimeTypeUtils.ALL, audio, audioWave, audioBasic, List<MimeType> mimeTypes = new ArrayList<>(
audioBasicLevel)); List.of(MimeTypeUtils.ALL, audio, audioWave, audioBasic, audioBasicLevel));
MimeTypeUtils.sortBySpecificity(mimeTypes); MimeTypeUtils.sortBySpecificity(mimeTypes);
assertThat(mimeTypes).containsExactly(audioWave, audioBasicLevel, audioBasic, audio, MimeTypeUtils.ALL); assertThat(mimeTypes).containsExactly(audioWave, audioBasicLevel, audioBasic, audio, MimeTypeUtils.ALL);