Merge branch '6.2.x'

sbrannen · sbrannen · commit af461fc0a600 · 2025-04-14T14:27:27.000+02:00
diff --git a/spring-context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java b/spring-context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java
@@ -441,7 +441,7 @@ protected void clearMetadataCache() {
 		return cacheHit;
 	}
 
-	@SuppressWarnings("unchecked")
+	@SuppressWarnings({ "unchecked", "rawtypes" })
 	private @Nullable Object executeSynchronized(CacheOperationInvoker invoker, Method method, CacheOperationContexts contexts) {
 		CacheOperationContext context = contexts.get(CacheableOperation.class).iterator().next();
 		if (isConditionPassing(context, CacheOperationExpressionEvaluator.NO_RESULT)) {

Original file line number	Diff line number	Diff line change
`@@ -441,7 +441,7 @@ protected void clearMetadataCache() {`
`441`	`441`	`return cacheHit;`
`442`	`442`	`}`
`443`	`443`
`444`		`- @SuppressWarnings("unchecked")`
	`444`	`+ @SuppressWarnings({ "unchecked", "rawtypes" })`
`445`	`445`	`private @Nullable Object executeSynchronized(CacheOperationInvoker invoker, Method method, CacheOperationContexts contexts) {`
`446`	`446`	`CacheOperationContext context = contexts.get(CacheableOperation.class).iterator().next();`
`447`	`447`	`if (isConditionPassing(context, CacheOperationExpressionEvaluator.NO_RESULT)) {`