spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-10-04 08:19:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.5.x'

Browse Source 
Closes gh-47214
This commit is contained in:
Phillip Webb
2025-09-15 13:59:16 -07:00
parent 1de09fb81d 0ad349acea
commit e9c08b8dcc
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/spring-boot-cache/src/main/java/org/springframework/boot/cache/autoconfigure/CacheCondition.java
Vendored
+8 -6
View File
@@ -27,7 +27,7 @@ import org.springframework.context.annotation.ConditionContext;
import org.springframework.core.env.Environment;
import org.springframework.core.type.AnnotatedTypeMetadata;
import org.springframework.core.type.AnnotationMetadata;
import org.springframework.core.type.ClassMetadata;
import org.springframework.util.Assert;
/**
* General cache condition used with all cache configuration classes.
@@ -40,10 +40,12 @@ class CacheCondition extends SpringBootCondition {
@Override
public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeMetadata metadata) {
String sourceClass = "";
if (metadata instanceof ClassMetadata classMetadata) {
sourceClass = classMetadata.getClassName();
}
Assert.isInstanceOf(AnnotationMetadata.class, metadata);
return extracted(context, (AnnotationMetadata) metadata);
}
private ConditionOutcome extracted(ConditionContext context, AnnotationMetadata metadata) {
String sourceClass = metadata.getClassName();
ConditionMessage.Builder message = ConditionMessage.forCondition("Cache", sourceClass);
Environment environment = context.getEnvironment();
try {
@@ -51,7 +53,7 @@ class CacheCondition extends SpringBootCondition {
if (!specified.isBound()) {
return ConditionOutcome.match(message.because("automatic cache type"));
}
CacheType required = CacheConfigurations.getType(((AnnotationMetadata) metadata).getClassName());
CacheType required = CacheConfigurations.getType(metadata.getClassName());
if (specified.get() == required) {
return ConditionOutcome.match(message.because(specified.get() + " cache type"));
}