Cwikius-Spring/spring-security
1
0
Fork 0
mirror of synced 2026-08-05 17:57:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

SEC-1465: Change DelegatingMethodSecurityMetadataSource to use constructor injection to get round the problem of it being invoked before it has been initialized properly. Also changed the contacts tests to use the same app context and loading order as the actual webapp, to give better reassurance that the app will run successfully.

Browse Source
This commit is contained in:
Luke Taylor
2010-04-25 22:00:25 +01:00
parent 3bbbf07235
commit a421370a3d
7 changed files with 14 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSource.java
+8 -11
View File
@@ -9,7 +9,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.security.access.ConfigAttribute;
import org.springframework.util.Assert;
import org.springframework.util.ObjectUtils;
@@ -21,19 +20,22 @@ import org.springframework.util.ObjectUtils;
* @author Ben Alex
* @author Luke Taylor
*/
public final class DelegatingMethodSecurityMetadataSource extends AbstractMethodSecurityMetadataSource implements InitializingBean {
public final class DelegatingMethodSecurityMetadataSource extends AbstractMethodSecurityMetadataSource {
private final static List<ConfigAttribute> NULL_CONFIG_ATTRIBUTE = Collections.emptyList();
private List<MethodSecurityMetadataSource> methodSecurityMetadataSources;
private final List<MethodSecurityMetadataSource> methodSecurityMetadataSources;
private final Map<DefaultCacheKey, Collection<ConfigAttribute>> attributeCache =
new HashMap<DefaultCacheKey, Collection<ConfigAttribute>>();
//~ Methods ========================================================================================================
//~ Constructor ====================================================================================================
public void afterPropertiesSet() throws Exception {
Assert.notNull(methodSecurityMetadataSources, "A list of MethodSecurityMetadataSources is required");
public DelegatingMethodSecurityMetadataSource(List<MethodSecurityMetadataSource> methodSecurityMetadataSources) {
Assert.notEmpty(methodSecurityMetadataSources, "MethodSecurityMetadataSources cannot be null or empty");
this.methodSecurityMetadataSources = methodSecurityMetadataSources;
}
//~ Methods ========================================================================================================
public Collection<ConfigAttribute> getAttributes(Method method, Class<?> targetClass) {
DefaultCacheKey cacheKey = new DefaultCacheKey(method, targetClass);
synchronized (attributeCache) {
@@ -83,11 +85,6 @@ public final class DelegatingMethodSecurityMetadataSource extends AbstractMethod
return set;
}
@SuppressWarnings("unchecked")
public void setMethodSecurityMetadataSources(List methodSecurityMetadataSources) {
this.methodSecurityMetadataSources = methodSecurityMetadataSources;
}
//~ Inner Classes ==================================================================================================
private static class DefaultCacheKey {