From 598c972a78346dfeff459a5ffa510e90f4907ee2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Deleuze?= <sebastien.deleuze@broadcom.com>
Date: Tue, 9 Jan 2024 14:12:09 +0100
Subject: [PATCH] Update ContentRequestMatchers#multipartData Javadoc

This commit updates ContentRequestMatchers#multipartData
Javadoc to mention Tomcat fork of Commons FileUpload library
instead of the original variant.

It also adds a similar note to
ContentRequestMatchers#multipartDataContains.

Closes gh-31988
---
 .../test/web/client/match/ContentRequestMatchers.java     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java b/spring-test/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java
index 41e8f195e2a..d99d98f28f6 100644
--- a/spring-test/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java
+++ b/spring-test/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java
@@ -197,8 +197,9 @@ public class ContentRequestMatchers {
 	 * <li>{@link Resource} - content from a file
 	 * <li>{@code byte[]} - other raw content
 	 * </ul>
-	 * <p><strong>Note:</strong> This method uses the Apache Commons FileUpload
-	 * library to parse the multipart data and it must be on the test classpath.
+	 * <p><strong>Note:</strong> This method uses the fork of Commons FileUpload library
+	 * packaged with Apache Tomcat in the {@code org.apache.tomcat.util.http.fileupload}
+	 * package to parse the multipart data and it must be on the test classpath.
 	 * @param expectedMap the expected multipart values
 	 * @since 5.3
 	 */
@@ -209,6 +210,9 @@ public class ContentRequestMatchers {
 	/**
 	 * Variant of {@link #multipartData(MultiValueMap)} that does the same but
 	 * only for a subset of the actual values.
+	 * <p><strong>Note:</strong> This method uses the fork of Commons FileUpload library
+	 * packaged with Apache Tomcat in the {@code org.apache.tomcat.util.http.fileupload}
+	 * package to parse the multipart data and it must be on the test classpath.
 	 * @param expectedMap the expected multipart values
 	 * @since 5.3
 	 */