mirror of
https://github.com/spring-projects/spring-security.git
synced 2025-03-09 06:50:05 +00:00
Reformat code.
This commit is contained in:
Ben Alex
parent
e675c89e28
commit
449e395181
@ -1,4 +1,4 @@
|
||||
/* Copyright 2004, 2005 Acegi Technology Pty Limited
|
||||
/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@ -159,27 +159,25 @@ public class JdbcDaoImpl extends JdbcDaoSupport implements BasicAclDao {
|
||||
*
|
||||
* <P>
|
||||
* The {@link BasicAclEntry}s returned by this method will have
|
||||
* <code>String</code>-based recipients. This will not be a problem if
|
||||
* you are using the
|
||||
* <code>GrantedAuthorityEffectiveAclsResolver</code>, which is the
|
||||
* default configured against <code>BasicAclProvider</code>.
|
||||
* <code>String</code>-based recipients. This will not be a problem if you
|
||||
* are using the <code>GrantedAuthorityEffectiveAclsResolver</code>, which
|
||||
* is the default configured against <code>BasicAclProvider</code>.
|
||||
* </p>
|
||||
*
|
||||
* <P>
|
||||
* This method will only return ACLs for requests where the
|
||||
* <code>AclObjectIdentity</code> is of type {@link
|
||||
* NamedEntityObjectIdentity}. Of course, you can subclass or replace
|
||||
* this class and support your own custom
|
||||
* <code>AclObjectIdentity</code> types.
|
||||
* NamedEntityObjectIdentity}. Of course, you can subclass or replace this
|
||||
* class and support your own custom <code>AclObjectIdentity</code> types.
|
||||
* </p>
|
||||
*
|
||||
* @param aclObjectIdentity for which ACL information is required
|
||||
* (cannot be <code>null</code> and must be an instance of
|
||||
* @param aclObjectIdentity for which ACL information is required (cannot
|
||||
* be <code>null</code> and must be an instance of
|
||||
* <code>NamedEntityObjectIdentity</code>)
|
||||
*
|
||||
* @return the ACLs that apply (without any <code>null</code>s inside
|
||||
* the array), or <code>null</code> if not found or if an
|
||||
* incompatible <code>AclObjectIdentity</code> was requested
|
||||
* @return the ACLs that apply (without any <code>null</code>s inside the
|
||||
* array), or <code>null</code> if not found or if an incompatible
|
||||
* <code>AclObjectIdentity</code> was requested
|
||||
*/
|
||||
public BasicAclEntry[] getAcls(AclObjectIdentity aclObjectIdentity) {
|
||||
String aclObjectIdentityString;
|
||||
@ -199,8 +197,7 @@ public class JdbcDaoImpl extends JdbcDaoSupport implements BasicAclDao {
|
||||
}
|
||||
|
||||
// Cast to an object properties holder (there should only be one record)
|
||||
AclDetailsHolder propertiesInformation = (AclDetailsHolder) objects
|
||||
.get(0);
|
||||
AclDetailsHolder propertiesInformation = (AclDetailsHolder) objects.get(0);
|
||||
|
||||
// Lookup the object's ACLs from RDBMS (guaranteed no nulls)
|
||||
List acls = aclsByObjectIdentity.execute(propertiesInformation
|
||||
@ -212,13 +209,12 @@ public class JdbcDaoImpl extends JdbcDaoSupport implements BasicAclDao {
|
||||
null)};
|
||||
} else {
|
||||
// return the individual ACL instances
|
||||
AclDetailsHolder[] aclHolders = (AclDetailsHolder[]) acls
|
||||
.toArray(new AclDetailsHolder[] {});
|
||||
AclDetailsHolder[] aclHolders = (AclDetailsHolder[]) acls.toArray(new AclDetailsHolder[] {});
|
||||
List toReturnAcls = new Vector();
|
||||
|
||||
for (int i = 0; i < aclHolders.length; i++) {
|
||||
toReturnAcls.add(createBasicAclEntry(
|
||||
propertiesInformation, aclHolders[i]));
|
||||
toReturnAcls.add(createBasicAclEntry(propertiesInformation,
|
||||
aclHolders[i]));
|
||||
}
|
||||
|
||||
return (BasicAclEntry[]) toReturnAcls.toArray(new BasicAclEntry[] {});
|
||||
@ -242,14 +238,12 @@ public class JdbcDaoImpl extends JdbcDaoSupport implements BasicAclDao {
|
||||
}
|
||||
|
||||
/**
|
||||
* Extension point to allow other MappingSqlQuery objects to be
|
||||
* substituted in a subclass
|
||||
* Extension point to allow other MappingSqlQuery objects to be substituted
|
||||
* in a subclass
|
||||
*/
|
||||
protected void initMappingSqlQueries() {
|
||||
setAclsByObjectIdentity(new AclsByObjectIdentityMapping(
|
||||
getDataSource()));
|
||||
setObjectProperties(new ObjectPropertiesMapping(
|
||||
getDataSource()));
|
||||
setAclsByObjectIdentity(new AclsByObjectIdentityMapping(getDataSource()));
|
||||
setObjectProperties(new ObjectPropertiesMapping(getDataSource()));
|
||||
}
|
||||
|
||||
public void setAclsByObjectIdentity(
|
||||
@ -258,12 +252,12 @@ public class JdbcDaoImpl extends JdbcDaoSupport implements BasicAclDao {
|
||||
}
|
||||
|
||||
/**
|
||||
* Allows the default query string used to retrieve ACLs based
|
||||
* on object identity to be overriden, if default table or
|
||||
* column names need to be changed. The default query is
|
||||
* {@link #DEF_ACLS_BY_OBJECT_IDENTITY_QUERY}; when modifying
|
||||
* this query, ensure that all returned columns are mapped
|
||||
* back to the same column names as in the default query.
|
||||
* Allows the default query string used to retrieve ACLs based on object
|
||||
* identity to be overriden, if default table or column names need to be
|
||||
* changed. The default query is {@link
|
||||
* #DEF_ACLS_BY_OBJECT_IDENTITY_QUERY}; when modifying this query, ensure
|
||||
* that all returned columns are mapped back to the same column names as
|
||||
* in the default query.
|
||||
*
|
||||
* @param queryString The query string to set
|
||||
*/
|
||||
@ -271,8 +265,7 @@ public class JdbcDaoImpl extends JdbcDaoSupport implements BasicAclDao {
|
||||
aclsByObjectIdentityQuery = queryString;
|
||||
}
|
||||
|
||||
public void setObjectProperties(
|
||||
MappingSqlQuery objectPropertiesQuery) {
|
||||
public void setObjectProperties(MappingSqlQuery objectPropertiesQuery) {
|
||||
this.objectProperties = objectPropertiesQuery;
|
||||
}
|
||||
|
||||
@ -283,20 +276,18 @@ public class JdbcDaoImpl extends JdbcDaoSupport implements BasicAclDao {
|
||||
//~ Inner Classes ==========================================================
|
||||
|
||||
/**
|
||||
* Used to hold details of a domain object instance's
|
||||
* properties, or an individual ACL entry.
|
||||
* Used to hold details of a domain object instance's properties, or an
|
||||
* individual ACL entry.
|
||||
*
|
||||
* <P>
|
||||
* Not all properties will be set. The actual properties set
|
||||
* will depend on which <code>MappingSqlQuery</code> creates
|
||||
* the object.
|
||||
* Not all properties will be set. The actual properties set will depend on
|
||||
* which <code>MappingSqlQuery</code> creates the object.
|
||||
* </p>
|
||||
*
|
||||
* <P>
|
||||
* Does not enforce <code>null</code>s or empty
|
||||
* <code>String</code>s as this is performed by the
|
||||
* <code>MappingSqlQuery</code> objects (or preferably the
|
||||
* backend RDBMS via schema constraints).
|
||||
* Does not enforce <code>null</code>s or empty <code>String</code>s as
|
||||
* this is performed by the <code>MappingSqlQuery</code> objects (or
|
||||
* preferably the backend RDBMS via schema constraints).
|
||||
* </p>
|
||||
*/
|
||||
protected final class AclDetailsHolder {
|
||||
@ -308,8 +299,8 @@ public class JdbcDaoImpl extends JdbcDaoSupport implements BasicAclDao {
|
||||
private long foreignKeyId;
|
||||
|
||||
/**
|
||||
* Record details of an individual ACL entry (usually from
|
||||
* the ACL_PERMISSION table)
|
||||
* Record details of an individual ACL entry (usually from the
|
||||
* ACL_PERMISSION table)
|
||||
*
|
||||
* @param recipient the recipient
|
||||
* @param mask the integer to be masked
|
||||
@ -320,25 +311,23 @@ public class JdbcDaoImpl extends JdbcDaoSupport implements BasicAclDao {
|
||||
}
|
||||
|
||||
/**
|
||||
* Record details of a domain object instance's properties
|
||||
* (usually from the ACL_OBJECT_IDENTITY table)
|
||||
* Record details of a domain object instance's properties (usually
|
||||
* from the ACL_OBJECT_IDENTITY table)
|
||||
*
|
||||
* @param foreignKeyId used by the
|
||||
* <code>AclsByObjectIdentityMapping</code> to
|
||||
* locate the individual ACL entries
|
||||
* @param aclObjectIdentity the object identity of the
|
||||
* domain object instance
|
||||
* @param aclObjectParentIdentity the object identity of
|
||||
* the domain object instance's parent
|
||||
* @param aclClass the class of which a new instance which
|
||||
* should be created for each individual ACL entry
|
||||
* (or an inheritence "holder" class if there are
|
||||
* no ACL entries)
|
||||
* <code>AclsByObjectIdentityMapping</code> to locate the
|
||||
* individual ACL entries
|
||||
* @param aclObjectIdentity the object identity of the domain object
|
||||
* instance
|
||||
* @param aclObjectParentIdentity the object identity of the domain
|
||||
* object instance's parent
|
||||
* @param aclClass the class of which a new instance which should be
|
||||
* created for each individual ACL entry (or an inheritence
|
||||
* "holder" class if there are no ACL entries)
|
||||
*/
|
||||
public AclDetailsHolder(long foreignKeyId,
|
||||
AclObjectIdentity aclObjectIdentity,
|
||||
AclObjectIdentity aclObjectParentIdentity,
|
||||
Class aclClass) {
|
||||
AclObjectIdentity aclObjectParentIdentity, Class aclClass) {
|
||||
this.foreignKeyId = foreignKeyId;
|
||||
this.aclObjectIdentity = aclObjectIdentity;
|
||||
this.aclObjectParentIdentity = aclObjectParentIdentity;
|
||||
@ -378,18 +367,16 @@ public class JdbcDaoImpl extends JdbcDaoSupport implements BasicAclDao {
|
||||
* </p>
|
||||
*
|
||||
* <P>
|
||||
* Guarantees to never return <code>null</code> (exceptions are
|
||||
* thrown in the event of any issues).
|
||||
* Guarantees to never return <code>null</code> (exceptions are thrown in
|
||||
* the event of any issues).
|
||||
* </p>
|
||||
*
|
||||
* <P>
|
||||
* The executed SQL requires the following information be made
|
||||
* available from the indicated placeholders: 1. RECIPIENT, 2.
|
||||
* MASK.
|
||||
* The executed SQL requires the following information be made available
|
||||
* from the indicated placeholders: 1. RECIPIENT, 2. MASK.
|
||||
* </p>
|
||||
*/
|
||||
protected class AclsByObjectIdentityMapping
|
||||
extends MappingSqlQuery {
|
||||
protected class AclsByObjectIdentityMapping extends MappingSqlQuery {
|
||||
protected AclsByObjectIdentityMapping(DataSource ds) {
|
||||
super(ds, aclsByObjectIdentityQuery);
|
||||
declareParameter(new SqlParameter(Types.BIGINT));
|
||||
@ -414,15 +401,14 @@ public class JdbcDaoImpl extends JdbcDaoSupport implements BasicAclDao {
|
||||
* </p>
|
||||
*
|
||||
* <P>
|
||||
* Guarantees to never return <code>null</code> (exceptions are
|
||||
* thrown in the event of any issues).
|
||||
* Guarantees to never return <code>null</code> (exceptions are thrown in
|
||||
* the event of any issues).
|
||||
* </p>
|
||||
*
|
||||
* <P>
|
||||
* The executed SQL requires the following information be made
|
||||
* available from the indicated placeholders: 1. ID, 2.
|
||||
* OBJECT_IDENTITY, 3. ACL_CLASS and 4.
|
||||
* PARENT_OBJECT_IDENTITY.
|
||||
* The executed SQL requires the following information be made available
|
||||
* from the indicated placeholders: 1. ID, 2. OBJECT_IDENTITY, 3.
|
||||
* ACL_CLASS and 4. PARENT_OBJECT_IDENTITY.
|
||||
* </p>
|
||||
*/
|
||||
protected class ObjectPropertiesMapping extends MappingSqlQuery {
|
||||
@ -459,15 +445,13 @@ public class JdbcDaoImpl extends JdbcDaoSupport implements BasicAclDao {
|
||||
Class aclClazz;
|
||||
|
||||
try {
|
||||
aclClazz = this.getClass().getClassLoader()
|
||||
.loadClass(aclClass);
|
||||
aclClazz = this.getClass().getClassLoader().loadClass(aclClass);
|
||||
} catch (ClassNotFoundException cnf) {
|
||||
throw new IllegalArgumentException(cnf.getMessage());
|
||||
}
|
||||
|
||||
return new AclDetailsHolder(id,
|
||||
buildIdentity(objectIdentity),
|
||||
return new AclDetailsHolder(id, buildIdentity(objectIdentity),
|
||||
buildIdentity(parentObjectIdentity), aclClazz);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user