Simplify DefaultContextCache implementation by using entrySet().removeIf()

sbrannen · sbrannen · commit 01a57a72198f · 2026-01-14T13:47:44.000+01:00
diff --git a/spring-test/src/main/java/org/springframework/test/context/cache/DefaultContextCache.java b/spring-test/src/main/java/org/springframework/test/context/cache/DefaultContextCache.java
@@ -341,11 +341,7 @@ public void remove(MergedContextConfiguration key, @Nullable HierarchyMode hiera
 		}
 
 		// Remove empty entries from the hierarchy map.
-		for (Map.Entry<MergedContextConfiguration, Set<MergedContextConfiguration>> entry : this.hierarchyMap.entrySet()) {
-			if (entry.getValue().isEmpty()) {
-				this.hierarchyMap.remove(entry.getKey());
-			}
-		}
+		this.hierarchyMap.entrySet().removeIf(entry -> entry.getValue().isEmpty());
 	}
 
 	private void remove(List<MergedContextConfiguration> removedContexts, MergedContextConfiguration key) {

Original file line number	Diff line number	Diff line change
`@@ -341,11 +341,7 @@ public void remove(MergedContextConfiguration key, @Nullable HierarchyMode hiera`
`341`	`341`	`}`
`342`	`342`
`343`	`343`	`// Remove empty entries from the hierarchy map.`
`344`		`- for (Map.Entry<MergedContextConfiguration, Set<MergedContextConfiguration>> entry : this.hierarchyMap.entrySet()) {`
`345`		`- if (entry.getValue().isEmpty()) {`
`346`		`- this.hierarchyMap.remove(entry.getKey());`
`347`		`- }`
`348`		`- }`
	`344`	`+ this.hierarchyMap.entrySet().removeIf(entry -> entry.getValue().isEmpty());`
`349`	`345`	`}`
`350`	`346`
`351`	`347`	`private void remove(List<MergedContextConfiguration> removedContexts, MergedContextConfiguration key) {`