Merge branch '6.2.x'

Author: sdeleuze

spring-test/src/main/java/org/springframework/test/web/support/AbstractJsonPathAssertions.java

@@ -58,7 +58,7 @@ protected AbstractJsonPathAssertions(B spec, String content, String expression,
 	/**
 	 * Applies {@link JsonPathExpectationsHelper#assertValue(String, Object)}.
 	 */
-	public B isEqualTo(Object expectedValue) {
+	public B isEqualTo(@Nullable Object expectedValue) {
 		this.pathHelper.assertValue(this.content, expectedValue);
 		return this.bodySpec;
 	}

spring-test/src/test/java/org/springframework/test/util/JsonPathExpectationsHelperTests.java

@@ -60,7 +60,8 @@ class JsonPathExpectationsHelperTests {
 				'whitespace':  '    ',
 				'emptyString': '',
 				'emptyArray':  [],
-				'emptyMap':    {}
+				'emptyMap':    {},
+				'nullValue':   null
 			}""";
 
 	private static final String SIMPSONS = """
@@ -252,6 +253,11 @@ void assertValue() {
 		new JsonPathExpectationsHelper("$.num").assertValue(CONTENT, 5);
 	}
 
+	@Test
+	void assertNullValue() {
+		new JsonPathExpectationsHelper("$.nullValue").assertValue(CONTENT, (Object) null);
+	}
+
 	@Test // SPR-14498
 	void assertValueWithNumberConversion() {
 		new JsonPathExpectationsHelper("$.num").assertValue(CONTENT, 5.0);