Use InvalidMimeTypeException in MimeTypeUtils#sortBySpecificity

Closes gh-31254
spring-projects · Nov 15, 2023 · 05c3ffb · 05c3ffb
1 parent 19e8ed1
commit 05c3ffb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git 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 static String toString(Collection<? extends MimeType> mimeTypes) {
 	 */
 	public static <T extends MimeType> void sortBySpecificity(List<T> 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
@@ -451,8 +451,9 @@ void sortBySpecificity() {
 		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);