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

IDEA inspection refactorings.

Browse Source
This commit is contained in:
Luke Taylor
2010-08-05 22:47:42 +01:00
parent a3d27a9863
commit 85c4c91e0e
175 changed files with 428 additions and 551 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
acl/src/main/java/org/springframework/security/acls/AclEntryVoter.java
View File

@@ -145,11 +145,7 @@ public class AclEntryVoter extends AbstractAclVoter {
}
public boolean supports(ConfigAttribute attribute) {
if ((attribute.getAttribute() != null) && attribute.getAttribute().equals(getProcessConfigAttribute())) {
return true;
} else {
return false;
}
return (attribute.getAttribute() != null) && attribute.getAttribute().equals(getProcessConfigAttribute());
}
public int vote(Authentication authentication, Object object, Collection<ConfigAttribute> attributes) {
@@ -177,7 +173,7 @@ public class AclEntryVoter extends AbstractAclVoter {
try {
Class<?> clazz = domainObject.getClass();
Method method = clazz.getMethod(internalMethod, new Class[0]);
domainObject = method.invoke(domainObject, new Object[0]);
domainObject = method.invoke(domainObject);
} catch (NoSuchMethodException nsme) {
throw new AuthorizationServiceException("Object of class '" + domainObject.getClass()
+ "' does not provide the requested internalMethod: " + internalMethod);

4
acl/src/main/java/org/springframework/security/acls/AclPermissionEvaluator.java
View File

@@ -34,7 +34,7 @@ public class AclPermissionEvaluator implements PermissionEvaluator {
private final Log logger = LogFactory.getLog(getClass());
private AclService aclService;
private final AclService aclService;
private ObjectIdentityRetrievalStrategy objectIdentityRetrievalStrategy = new ObjectIdentityRetrievalStrategyImpl();
private ObjectIdentityGenerator objectIdentityGenerator = new ObjectIdentityRetrievalStrategyImpl();
private SidRetrievalStrategy sidRetrievalStrategy = new SidRetrievalStrategyImpl();
@@ -117,7 +117,7 @@ public class AclPermissionEvaluator implements PermissionEvaluator {
if (permission instanceof String) {
String permString = (String)permission;
Permission p = null;
Permission p;
try {
p = permissionFactory.buildFromName(permString);

8
acl/src/main/java/org/springframework/security/acls/afterinvocation/AbstractAclProvider.java
View File

@@ -43,12 +43,12 @@ import org.springframework.util.Assert;
public abstract class AbstractAclProvider implements AfterInvocationProvider {
//~ Instance fields ================================================================================================
protected AclService aclService;
protected final AclService aclService;
protected Class<?> processDomainObjectClass = Object.class;
protected ObjectIdentityRetrievalStrategy objectIdentityRetrievalStrategy = new ObjectIdentityRetrievalStrategyImpl();
protected SidRetrievalStrategy sidRetrievalStrategy = new SidRetrievalStrategyImpl();
protected String processConfigAttribute;
protected List<Permission> requirePermission = Arrays.asList(BasePermission.READ);
protected final List<Permission> requirePermission;
//~ Constructors ===================================================================================================
@@ -78,11 +78,9 @@ public abstract class AbstractAclProvider implements AfterInvocationProvider {
// Obtain the SIDs applicable to the principal
List<Sid> sids = sidRetrievalStrategy.getSids(authentication);
Acl acl = null;
try {
// Lookup only ACLs for SIDs we're interested in
acl = aclService.readAclById(objectIdentity, sids);
Acl acl = aclService.readAclById(objectIdentity, sids);
return acl.isGranted(requirePermission, sids, false);
} catch (NotFoundException ignore) {

2
acl/src/main/java/org/springframework/security/acls/afterinvocation/ArrayFilterer.java
View File

@@ -95,7 +95,7 @@ class ArrayFilterer<T> implements Filterer<T> {
}
public T next() {
if (hasNext() == false) {
if (!hasNext()) {
throw new NoSuchElementException();
}
return list[index++];

11
acl/src/main/java/org/springframework/security/acls/afterinvocation/CollectionFilterer.java
View File

@@ -37,12 +37,9 @@ class CollectionFilterer<T> implements Filterer<T> {
//~ Instance fields ================================================================================================
private Collection<T> collection;
private final Collection<T> collection;
// collectionIter offers significant performance optimisations (as
// per security-developer mailing list conversation 19/5/05)
private Iterator<T> collectionIter;
private Set<T> removeList;
private final Set<T> removeList;
//~ Constructors ===================================================================================================
@@ -88,9 +85,7 @@ class CollectionFilterer<T> implements Filterer<T> {
* @see org.springframework.security.acls.afterinvocation.Filterer#iterator()
*/
public Iterator<T> iterator() {
collectionIter = collection.iterator();
return collectionIter;
return collection.iterator();
}
/**

2
acl/src/main/java/org/springframework/security/acls/domain/AbstractPermission.java
View File

@@ -12,7 +12,7 @@ public abstract class AbstractPermission implements Permission {
//~ Instance fields ================================================================================================
protected char code;
protected final char code;
protected int mask;
//~ Constructors ===================================================================================================

8
acl/src/main/java/org/springframework/security/acls/domain/AccessControlEntryImpl.java
View File

@@ -33,13 +33,13 @@ import java.io.Serializable;
public class AccessControlEntryImpl implements AccessControlEntry, AuditableAccessControlEntry {
//~ Instance fields ================================================================================================
private Acl acl;
private final Acl acl;
private Permission permission;
private Serializable id;
private Sid sid;
private final Serializable id;
private final Sid sid;
private boolean auditFailure = false;
private boolean auditSuccess = false;
private boolean granting;
private final boolean granting;
//~ Constructors ===================================================================================================

8
acl/src/main/java/org/springframework/security/acls/domain/AclAuthorizationStrategyImpl.java
View File

@@ -41,9 +41,9 @@ import org.springframework.util.Assert;
public class AclAuthorizationStrategyImpl implements AclAuthorizationStrategy {
//~ Instance fields ================================================================================================
private GrantedAuthority gaGeneralChanges;
private GrantedAuthority gaModifyAuditing;
private GrantedAuthority gaTakeOwnership;
private final GrantedAuthority gaGeneralChanges;
private final GrantedAuthority gaModifyAuditing;
private final GrantedAuthority gaTakeOwnership;
private SidRetrievalStrategy sidRetrievalStrategy = new SidRetrievalStrategyImpl();
//~ Constructors ===================================================================================================
@@ -84,7 +84,7 @@ public class AclAuthorizationStrategyImpl implements AclAuthorizationStrategy {
}
// Not authorized by ACL ownership; try via adminstrative permissions
GrantedAuthority requiredAuthority = null;
GrantedAuthority requiredAuthority;
if (changeType == CHANGE_AUDITING) {
requiredAuthority = this.gaModifyAuditing;

2
acl/src/main/java/org/springframework/security/acls/domain/AclImpl.java
View File

@@ -43,7 +43,7 @@ public class AclImpl implements Acl, MutableAcl, AuditableAcl, OwnershipAcl {
private Acl parentAcl;
private transient AclAuthorizationStrategy aclAuthorizationStrategy;
private transient PermissionGrantingStrategy permissionGrantingStrategy;
private List<AccessControlEntry> aces = new ArrayList<AccessControlEntry>();
private final List<AccessControlEntry> aces = new ArrayList<AccessControlEntry>();
private ObjectIdentity objectIdentity;
private Serializable id;
private Sid owner; // OwnershipAcl

9
acl/src/main/java/org/springframework/security/acls/domain/DefaultPermissionFactory.java
View File

@@ -64,18 +64,19 @@ public class DefaultPermissionFactory implements PermissionFactory {
Field[] fields = clazz.getFields();
for (int i = 0; i < fields.length; i++) {
for (Field field : fields) {
try {
Object fieldValue = fields[i].get(null);
Object fieldValue = field.get(null);
if (Permission.class.isAssignableFrom(fieldValue.getClass())) {
// Found a Permission static field
Permission perm = (Permission) fieldValue;
String permissionName = fields[i].getName();
String permissionName = field.getName();
registerPermission(perm, permissionName);
}
} catch (Exception ignore) {}
} catch (Exception ignore) {
}
}
}

2
acl/src/main/java/org/springframework/security/acls/domain/DefaultPermissionGrantingStrategy.java
View File

@@ -12,7 +12,7 @@ import org.springframework.util.Assert;
public class DefaultPermissionGrantingStrategy implements PermissionGrantingStrategy {
private transient AuditLogger auditLogger;
private final transient AuditLogger auditLogger;
/**
* Creates an instance with the logger which will be used to record granting and denial of requested permissions.

2
acl/src/main/java/org/springframework/security/acls/domain/EhCacheBasedAclCache.java
View File

@@ -40,7 +40,7 @@ import org.springframework.util.Assert;
public class EhCacheBasedAclCache implements AclCache {
//~ Instance fields ================================================================================================
private Ehcache cache;
private final Ehcache cache;
private PermissionGrantingStrategy permissionGrantingStrategy;
private AclAuthorizationStrategy aclAuthorizationStrategy;

2
acl/src/main/java/org/springframework/security/acls/domain/GrantedAuthoritySid.java
View File

@@ -30,7 +30,7 @@ import org.springframework.util.Assert;
public class GrantedAuthoritySid implements Sid {
//~ Instance fields ================================================================================================
private String grantedAuthority;
private final String grantedAuthority;
//~ Constructors ===================================================================================================

2
acl/src/main/java/org/springframework/security/acls/domain/ObjectIdentityImpl.java
View File

@@ -78,7 +78,7 @@ public class ObjectIdentityImpl implements ObjectIdentity {
try {
Method method = typeClass.getMethod("getId", new Class[] {});
result = method.invoke(object, new Object[] {});
result = method.invoke(object);
} catch (Exception e) {
throw new IdentityUnavailableException("Could not extract identity from object " + object, e);
}

2
acl/src/main/java/org/springframework/security/acls/domain/PrincipalSid.java
View File

@@ -32,7 +32,7 @@ import org.springframework.util.Assert;
public class PrincipalSid implements Sid {
//~ Instance fields ================================================================================================
private String principal;
private final String principal;
//~ Constructors ===================================================================================================

14
acl/src/main/java/org/springframework/security/acls/jdbc/BasicLookupStrategy.java
View File

@@ -107,11 +107,11 @@ public final class BasicLookupStrategy implements LookupStrategy {
//~ Instance fields ================================================================================================
private AclAuthorizationStrategy aclAuthorizationStrategy;
private final AclAuthorizationStrategy aclAuthorizationStrategy;
private PermissionFactory permissionFactory = new DefaultPermissionFactory();
private AclCache aclCache;
private PermissionGrantingStrategy grantingStrategy;
private JdbcTemplate jdbcTemplate;
private final AclCache aclCache;
private final PermissionGrantingStrategy grantingStrategy;
private final JdbcTemplate jdbcTemplate;
private int batchSize = 50;
private final Field fieldAces = FieldUtils.getField(AclImpl.class, "aces");
@@ -476,8 +476,8 @@ public final class BasicLookupStrategy implements LookupStrategy {
//~ Inner Classes ==================================================================================================
private class ProcessResultSet implements ResultSetExtractor<Set<Long>> {
private Map<Serializable, Acl> acls;
private List<Sid> sids;
private final Map<Serializable, Acl> acls;
private final List<Sid> sids;
public ProcessResultSet(Map<Serializable, Acl> acls, List<Sid> sids) {
Assert.notNull(acls, "ACLs cannot be null");
@@ -603,7 +603,7 @@ public final class BasicLookupStrategy implements LookupStrategy {
}
private class StubAclParent implements Acl {
private Long id;
private final Long id;
public StubAclParent(Long id) {
this.id = id;

11
acl/src/main/java/org/springframework/security/acls/jdbc/JdbcAclService.java
View File

@@ -56,8 +56,8 @@ public class JdbcAclService implements AclService {
//~ Instance fields ================================================================================================
protected JdbcTemplate jdbcTemplate;
private LookupStrategy lookupStrategy;
protected final JdbcTemplate jdbcTemplate;
private final LookupStrategy lookupStrategy;
private String findChildrenSql = DEFAULT_SELECT_ACL_WITH_PARENT_SQL;
//~ Constructors ===================================================================================================
@@ -109,10 +109,9 @@ public class JdbcAclService implements AclService {
Map<ObjectIdentity, Acl> result = lookupStrategy.readAclsById(objects, sids);
// Check every requested object identity was found (throw NotFoundException if needed)
for (int i = 0; i < objects.size(); i++) {
if (!result.containsKey(objects.get(i))) {
throw new NotFoundException("Unable to find ACL information for object identity '"
+ objects.get(i) + "'");
for (ObjectIdentity oid : objects) {
if (!result.containsKey(oid)) {
throw new NotFoundException("Unable to find ACL information for object identity '" + oid + "'");
}
}

24
acl/src/main/java/org/springframework/security/acls/jdbc/JdbcMutableAclService.java
View File

@@ -61,7 +61,7 @@ public class JdbcMutableAclService extends JdbcAclService implements MutableAclS
//~ Instance fields ================================================================================================
private boolean foreignKeysInDatabase = true;
private AclCache aclCache;
private final AclCache aclCache;
private String deleteEntryByObjectIdentityForeignKey = "delete from acl_entry where acl_object_identity=?";
private String deleteObjectIdentityByPrimaryKey = "delete from acl_object_identity where id=?";
private String classIdentityQuery = "call identity()";
@@ -194,7 +194,7 @@ public class JdbcMutableAclService extends JdbcAclService implements MutableAclS
protected Long createOrRetrieveSidPrimaryKey(Sid sid, boolean allowCreate) {
Assert.notNull(sid, "Sid required");
String sidName = null;
String sidName;
boolean sidIsPrincipal = true;
if (sid instanceof PrincipalSid) {
@@ -214,7 +214,7 @@ public class JdbcMutableAclService extends JdbcAclService implements MutableAclS
}
if (allowCreate) {
jdbcTemplate.update(insertSid, new Object[] {Boolean.valueOf(sidIsPrincipal), sidName});
jdbcTemplate.update(insertSid, Boolean.valueOf(sidIsPrincipal), sidName);
Assert.isTrue(TransactionSynchronizationManager.isSynchronizationActive(), "Transaction must be running");
return new Long(jdbcTemplate.queryForLong(sidIdentityQuery));
}
@@ -229,8 +229,8 @@ public class JdbcMutableAclService extends JdbcAclService implements MutableAclS
if (deleteChildren) {
List<ObjectIdentity> children = findChildren(objectIdentity);
if (children != null) {
for (int i = 0; i < children.size(); i++) {
deleteAcl(children.get(i), true);
for (ObjectIdentity child : children) {
deleteAcl(child, true);
}
}
} else {
@@ -263,8 +263,7 @@ public class JdbcMutableAclService extends JdbcAclService implements MutableAclS
* @param oidPrimaryKey the rows in acl_entry to delete
*/
protected void deleteEntries(Long oidPrimaryKey) {
jdbcTemplate.update(deleteEntryByObjectIdentityForeignKey,
new Object[] {oidPrimaryKey});
jdbcTemplate.update(deleteEntryByObjectIdentityForeignKey, oidPrimaryKey);
}
/**
@@ -277,7 +276,7 @@ public class JdbcMutableAclService extends JdbcAclService implements MutableAclS
*/
protected void deleteObjectIdentity(Long oidPrimaryKey) {
// Delete the acl_object_identity row
jdbcTemplate.update(deleteObjectIdentityByPrimaryKey, new Object[] {oidPrimaryKey});
jdbcTemplate.update(deleteObjectIdentityByPrimaryKey, oidPrimaryKey);
}
/**
@@ -291,8 +290,7 @@ public class JdbcMutableAclService extends JdbcAclService implements MutableAclS
*/
protected Long retrieveObjectIdentityPrimaryKey(ObjectIdentity oid) {
try {
return new Long(jdbcTemplate.queryForLong(selectObjectIdentityPrimaryKey,
new Object[] {oid.getType(), oid.getIdentifier()}));
return new Long(jdbcTemplate.queryForLong(selectObjectIdentityPrimaryKey, oid.getType(), oid.getIdentifier()));
} catch (DataAccessException notFound) {
return null;
}
@@ -326,8 +324,8 @@ public class JdbcMutableAclService extends JdbcAclService implements MutableAclS
Assert.notNull(objectIdentity, "ObjectIdentity required");
List<ObjectIdentity> children = findChildren(objectIdentity);
if (children != null) {
for (int i = 0; i < children.size(); i++) {
clearCacheIncludingChildren(children.get(i));
for (ObjectIdentity child : children) {
clearCacheIncludingChildren(child);
}
}
aclCache.evictFromCache(objectIdentity);
@@ -356,7 +354,7 @@ public class JdbcMutableAclService extends JdbcAclService implements MutableAclS
Long ownerSid = createOrRetrieveSidPrimaryKey(acl.getOwner(), true);
int count = jdbcTemplate.update(updateObjectIdentity,
new Object[] {parentId, ownerSid, new Boolean(acl.isEntriesInheriting()), acl.getId()});
parentId, ownerSid, Boolean.valueOf(acl.isEntriesInheriting()), acl.getId());
if (count != 1) {
throw new NotFoundException("Unable to locate ACL to update");