Cwikius-Spring/spring-security
1
0
Fork 0
mirror of synced 2026-05-22 21:33:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Interpret Expression Templates by Default

Browse Source 
Closes gh-17763
This commit is contained in:
Josh Cummings
2025-08-18 15:45:57 -06:00
parent 4da98dde2b
commit c45bc384da
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/org/springframework/security/core/annotation/SecurityAnnotationScanners.java
+1 -7
View File
@@ -31,8 +31,6 @@ import java.util.concurrent.ConcurrentHashMap;
*/ */
public final class SecurityAnnotationScanners { public final class SecurityAnnotationScanners {
private static final Map<Class<? extends Annotation>, SecurityAnnotationScanner<? extends Annotation>> uniqueScanners = new ConcurrentHashMap<>();
private static final Map<Class<? extends Annotation>, SecurityAnnotationScanner<? extends Annotation>> uniqueTemplateScanners = new ConcurrentHashMap<>(); private static final Map<Class<? extends Annotation>, SecurityAnnotationScanner<? extends Annotation>> uniqueTemplateScanners = new ConcurrentHashMap<>();
private static final Map<List<Class<? extends Annotation>>, SecurityAnnotationScanner<? extends Annotation>> uniqueTypesScanners = new ConcurrentHashMap<>(); private static final Map<List<Class<? extends Annotation>>, SecurityAnnotationScanner<? extends Annotation>> uniqueTypesScanners = new ConcurrentHashMap<>();
@@ -48,8 +46,7 @@ public final class SecurityAnnotationScanners {
* @return the default {@link SecurityAnnotationScanner} * @return the default {@link SecurityAnnotationScanner}
*/ */
public static <A extends Annotation> SecurityAnnotationScanner<A> requireUnique(Class<A> type) { public static <A extends Annotation> SecurityAnnotationScanner<A> requireUnique(Class<A> type) {
return (SecurityAnnotationScanner<A>) uniqueScanners.computeIfAbsent(type, return requireUnique(type, new AnnotationTemplateExpressionDefaults());
(t) -> new UniqueSecurityAnnotationScanner<>(type));
} }
/** /**
@@ -68,9 +65,6 @@ public final class SecurityAnnotationScanners {
*/ */
public static <A extends Annotation> SecurityAnnotationScanner<A> requireUnique(Class<A> type, public static <A extends Annotation> SecurityAnnotationScanner<A> requireUnique(Class<A> type,
AnnotationTemplateExpressionDefaults templateDefaults) { AnnotationTemplateExpressionDefaults templateDefaults) {
if (templateDefaults == null) {
return requireUnique(type);
}
return (SecurityAnnotationScanner<A>) uniqueTemplateScanners.computeIfAbsent(type, return (SecurityAnnotationScanner<A>) uniqueTemplateScanners.computeIfAbsent(type,
(t) -> new ExpressionTemplateSecurityAnnotationScanner<>(t, templateDefaults)); (t) -> new ExpressionTemplateSecurityAnnotationScanner<>(t, templateDefaults));
} }