Merge branch '3.5.x'

Closes gh-46165

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/structured/ContextPairsTests.java

@@ -38,7 +38,7 @@ class ContextPairsTests {
 		ContextPairs contextPairs = new ContextPairs(false, null);
 		Map<String, String> map = Map.of("spring", "boot");
 		Map<String, Object> actual = apply(contextPairs.flat(".", (pairs) -> pairs.addMapEntries((item) -> map)));
-		assertThat(actual.isEmpty());
+		assertThat(actual).isEmpty();
 	}
 
 	@Test
@@ -96,7 +96,7 @@ class ContextPairsTests {
 		ContextPairs contextPairs = new ContextPairs(false, null);
 		Map<String, String> map = Map.of("spring", "boot");
 		Map<String, Object> actual = apply(contextPairs.nested((pairs) -> pairs.addMapEntries((item) -> map)));
-		assertThat(actual.isEmpty());
+		assertThat(actual).isEmpty();
 	}
 
 	@Test