Spring/spring-webflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade Spring Security and switch to snapshot label

Browse Source 
Issue: SWF-1581
This commit is contained in:
Rossen Stoyanchev
2012-12-21 14:11:51 -05:00
parent 43b3862854
commit a10c0d683c
47 changed files with 466 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spring-faces/src/main/java/org/springframework/faces/security/AbstractAuthorizeTag.java
View File

@@ -134,7 +134,7 @@ public abstract class AbstractAuthorizeTag {
return false;
}
final Collection<GrantedAuthority> granted = getPrincipalAuthorities();
final Collection<? extends GrantedAuthority> granted = getPrincipalAuthorities();
if (hasTextAllGranted) {
if (!granted.containsAll(parseAuthoritiesString(getIfAllGranted()))) {
@@ -143,14 +143,14 @@ public abstract class AbstractAuthorizeTag {
}
if (hasTextAnyGranted) {
Set<GrantedAuthority> grantedCopy = retainAll(granted, parseAuthoritiesString(getIfAnyGranted()));
Set<? extends GrantedAuthority> grantedCopy = retainAll(granted, parseAuthoritiesString(getIfAnyGranted()));
if (grantedCopy.isEmpty()) {
return false;
}
}
if (hasTextNotGranted) {
Set<GrantedAuthority> grantedCopy = retainAll(granted, parseAuthoritiesString(getIfNotGranted()));
Set<? extends GrantedAuthority> grantedCopy = retainAll(granted, parseAuthoritiesString(getIfNotGranted()));
if (!grantedCopy.isEmpty()) {
return false;
}
@@ -258,7 +258,7 @@ public abstract class AbstractAuthorizeTag {
/*------------- Private helper methods -----------------*/
private Collection<GrantedAuthority> getPrincipalAuthorities() {
private Collection<? extends GrantedAuthority> getPrincipalAuthorities() {
Authentication currentUser = SecurityContextHolder.getContext().getAuthentication();
if (null == currentUser) {
return Collections.emptyList();
@@ -272,7 +272,7 @@ public abstract class AbstractAuthorizeTag {
return requiredAuthorities;
}
private Set<GrantedAuthority> retainAll(final Collection<GrantedAuthority> granted,
private Set<? extends GrantedAuthority> retainAll(final Collection<? extends GrantedAuthority> granted,
final Set<GrantedAuthority> required) {
Set<String> grantedRoles = authoritiesToRoles(granted);
Set<String> requiredRoles = authoritiesToRoles(required);
@@ -281,7 +281,7 @@ public abstract class AbstractAuthorizeTag {
return rolesToAuthorities(grantedRoles, granted);
}
private Set<String> authoritiesToRoles(Collection<GrantedAuthority> c) {
private Set<String> authoritiesToRoles(Collection<? extends GrantedAuthority> c) {
Set<String> target = new HashSet<String>();
for (GrantedAuthority authority : c) {
if (null == authority.getAuthority()) {
@@ -294,7 +294,8 @@ public abstract class AbstractAuthorizeTag {
return target;
}
private Set<GrantedAuthority> rolesToAuthorities(Set<String> grantedRoles, Collection<GrantedAuthority> granted) {
private Set<? extends GrantedAuthority> rolesToAuthorities(Set<String> grantedRoles,
Collection<? extends GrantedAuthority> granted) {
Set<GrantedAuthority> target = new HashSet<GrantedAuthority>();
for (String role : grantedRoles) {
for (GrantedAuthority authority : granted) {