Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SEC-43: Eliminate id column.

This commit is contained in:
Ben Alex 2005-10-21 07:32:48 +00:00
parent 41202112bc
commit d49198a944
1 changed files with 20 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
core/src/main/java/org/acegisecurity/acl/basic/jdbc/JdbcExtendedDaoImpl.java
View File

@ -12,7 +12,6 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package net.sf.acegisecurity.acl.basic.jdbc; package net.sf.acegisecurity.acl.basic.jdbc;
import net.sf.acegisecurity.acl.basic.AclObjectIdentity; import net.sf.acegisecurity.acl.basic.AclObjectIdentity;
@ -65,18 +64,13 @@ import javax.sql.DataSource;
*/ */
public class JdbcExtendedDaoImpl extends JdbcDaoImpl public class JdbcExtendedDaoImpl extends JdbcDaoImpl
implements BasicAclExtendedDao { implements BasicAclExtendedDao {
//~ Static fields/initializers =============================================
private static final Log logger = LogFactory.getLog(JdbcExtendedDaoImpl.class); private static final Log logger = LogFactory.getLog(JdbcExtendedDaoImpl.class);
public static final String DEF_ACL_OBJECT_IDENTITY_DELETE_STATEMENT = "DELETE FROM acl_object_identity WHERE id = ?"; public static final String DEF_ACL_OBJECT_IDENTITY_DELETE_STATEMENT = "DELETE FROM acl_object_identity WHERE id = ?";
public static final String DEF_ACL_OBJECT_IDENTITY_INSERT_STATEMENT = "INSERT INTO acl_object_identity (id, object_identity, parent_object, acl_class) VALUES (?, ?, ?, ?)"; public static final String DEF_ACL_OBJECT_IDENTITY_INSERT_STATEMENT = "INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES (?, ?, ?)";
public static final String DEF_ACL_PERMISSION_DELETE_STATEMENT = "DELETE FROM acl_permission WHERE acl_object_identity = ? AND recipient = ?"; public static final String DEF_ACL_PERMISSION_DELETE_STATEMENT = "DELETE FROM acl_permission WHERE acl_object_identity = ? AND recipient = ?";
public static final String DEF_ACL_PERMISSION_INSERT_STATEMENT = "INSERT INTO acl_permission (id, acl_object_identity, recipient, mask) VALUES (?, ?, ?, ?)"; public static final String DEF_ACL_PERMISSION_INSERT_STATEMENT = "INSERT INTO acl_permission (acl_object_identity, recipient, mask) VALUES (?, ?, ?)";
public static final String DEF_ACL_PERMISSION_UPDATE_STATEMENT = "UPDATE acl_permission SET mask = ? WHERE id = ?"; public static final String DEF_ACL_PERMISSION_UPDATE_STATEMENT = "UPDATE acl_permission SET mask = ? WHERE id = ?";
public static final String DEF_LOOKUP_PERMISSION_ID_QUERY = "SELECT id FROM acl_permission WHERE acl_object_identity = ? AND recipient = ?"; public static final String DEF_LOOKUP_PERMISSION_ID_QUERY = "SELECT id FROM acl_permission WHERE acl_object_identity = ? AND recipient = ?";
//~ Instance fields ========================================================
private AclObjectIdentityDelete aclObjectIdentityDelete; private AclObjectIdentityDelete aclObjectIdentityDelete;
private AclObjectIdentityInsert aclObjectIdentityInsert; private AclObjectIdentityInsert aclObjectIdentityInsert;
private AclPermissionDelete aclPermissionDelete; private AclPermissionDelete aclPermissionDelete;
@ -90,8 +84,6 @@ public class JdbcExtendedDaoImpl extends JdbcDaoImpl
private String aclPermissionUpdateStatement; private String aclPermissionUpdateStatement;
private String lookupPermissionIdQuery; private String lookupPermissionIdQuery;
//~ Constructors ===========================================================
public JdbcExtendedDaoImpl() { public JdbcExtendedDaoImpl() {
aclObjectIdentityDeleteStatement = DEF_ACL_OBJECT_IDENTITY_DELETE_STATEMENT; aclObjectIdentityDeleteStatement = DEF_ACL_OBJECT_IDENTITY_DELETE_STATEMENT;
aclObjectIdentityInsertStatement = DEF_ACL_OBJECT_IDENTITY_INSERT_STATEMENT; aclObjectIdentityInsertStatement = DEF_ACL_OBJECT_IDENTITY_INSERT_STATEMENT;
@ -101,8 +93,6 @@ public class JdbcExtendedDaoImpl extends JdbcDaoImpl
lookupPermissionIdQuery = DEF_LOOKUP_PERMISSION_ID_QUERY; lookupPermissionIdQuery = DEF_LOOKUP_PERMISSION_ID_QUERY;
} }
//~ Methods ================================================================
public void setAclObjectIdentityDelete( public void setAclObjectIdentityDelete(
AclObjectIdentityDelete aclObjectIdentityDelete) { AclObjectIdentityDelete aclObjectIdentityDelete) {
this.aclObjectIdentityDelete = aclObjectIdentityDelete; this.aclObjectIdentityDelete = aclObjectIdentityDelete;
@ -218,8 +208,8 @@ public class JdbcExtendedDaoImpl extends JdbcDaoImpl
if (permissionId == -1) { if (permissionId == -1) {
throw new DataRetrievalFailureException( throw new DataRetrievalFailureException(
"Could not locate existing acl_permission for aclObjectIdentity: " "Could not locate existing acl_permission for aclObjectIdentity: " +
+ aclObjectIdentity + ", recipient: " + recipient.toString()); aclObjectIdentity + ", recipient: " + recipient.toString());
} }
// Change permission // Change permission
@ -237,8 +227,7 @@ public class JdbcExtendedDaoImpl extends JdbcDaoImpl
} }
// Retrieve acl_object_identity record details // Retrieve acl_object_identity record details
AclDetailsHolder aclDetailsHolder = lookupAclDetailsHolder(basicAclEntry AclDetailsHolder aclDetailsHolder = lookupAclDetailsHolder(basicAclEntry.getAclObjectIdentity());
.getAclObjectIdentity());
// Ensure there isn't an existing record for this recipient // Ensure there isn't an existing record for this recipient
if (lookupPermissionId(aclDetailsHolder.getForeignKeyId(), if (lookupPermissionId(aclDetailsHolder.getForeignKeyId(),
@ -260,8 +249,8 @@ public class JdbcExtendedDaoImpl extends JdbcDaoImpl
AclDetailsHolder aclDetailsHolder = lookupAclDetailsHolder(aclObjectIdentity); AclDetailsHolder aclDetailsHolder = lookupAclDetailsHolder(aclObjectIdentity);
// Retrieve all acl_permissions applying to this acl_object_identity // Retrieve all acl_permissions applying to this acl_object_identity
Iterator acls = aclsByObjectIdentity.execute(aclDetailsHolder Iterator acls = aclsByObjectIdentity.execute(aclDetailsHolder.getForeignKeyId())
.getForeignKeyId()).iterator(); .iterator();
// Delete all existing acl_permissions applying to this acl_object_identity // Delete all existing acl_permissions applying to this acl_object_identity
while (acls.hasNext()) { while (acls.hasNext()) {
@ -305,16 +294,14 @@ public class JdbcExtendedDaoImpl extends JdbcDaoImpl
*/ */
private void createAclObjectIdentityIfRequired(BasicAclEntry basicAclEntry) private void createAclObjectIdentityIfRequired(BasicAclEntry basicAclEntry)
throws DataAccessException { throws DataAccessException {
String aclObjectIdentityString = convertAclObjectIdentityToString(basicAclEntry String aclObjectIdentityString = convertAclObjectIdentityToString(basicAclEntry.getAclObjectIdentity());
.getAclObjectIdentity());
// Lookup the object's main properties from the RDBMS (guaranteed no nulls) // Lookup the object's main properties from the RDBMS (guaranteed no nulls)
List objects = objectProperties.execute(aclObjectIdentityString); List objects = objectProperties.execute(aclObjectIdentityString);
if (objects.size() == 0) { if (objects.size() == 0) {
if (basicAclEntry.getAclObjectParentIdentity() != null) { if (basicAclEntry.getAclObjectParentIdentity() != null) {
AclDetailsHolder parentDetails = lookupAclDetailsHolder(basicAclEntry AclDetailsHolder parentDetails = lookupAclDetailsHolder(basicAclEntry.getAclObjectParentIdentity());
.getAclObjectParentIdentity());
// Must create the acl_object_identity record // Must create the acl_object_identity record
aclObjectIdentityInsert.insert(aclObjectIdentityString, aclObjectIdentityInsert.insert(aclObjectIdentityString,
@ -367,8 +354,9 @@ public class JdbcExtendedDaoImpl extends JdbcDaoImpl
*/ */
private int lookupPermissionId(int aclObjectIdentityId, Object recipient) private int lookupPermissionId(int aclObjectIdentityId, Object recipient)
throws DataAccessException { throws DataAccessException {
List list = lookupPermissionIdMapping.execute(new Object[] {new Integer( List list = lookupPermissionIdMapping.execute(new Object[] {
aclObjectIdentityId), recipient}); new Integer(aclObjectIdentityId), recipient
});
if (list.size() == 0) { if (list.size() == 0) {
return -1; return -1;
@ -377,8 +365,6 @@ public class JdbcExtendedDaoImpl extends JdbcDaoImpl
return ((Integer) list.get(0)).intValue(); return ((Integer) list.get(0)).intValue();
} }
//~ Inner Classes ==========================================================
protected class AclObjectIdentityDelete extends SqlUpdate { protected class AclObjectIdentityDelete extends SqlUpdate {
protected AclObjectIdentityDelete(DataSource ds) { protected AclObjectIdentityDelete(DataSource ds) {
super(ds, aclObjectIdentityDeleteStatement); super(ds, aclObjectIdentityDeleteStatement);
@ -395,7 +381,6 @@ public class JdbcExtendedDaoImpl extends JdbcDaoImpl
protected class AclObjectIdentityInsert extends SqlUpdate { protected class AclObjectIdentityInsert extends SqlUpdate {
protected AclObjectIdentityInsert(DataSource ds) { protected AclObjectIdentityInsert(DataSource ds) {
super(ds, aclObjectIdentityInsertStatement); super(ds, aclObjectIdentityInsertStatement);
declareParameter(new SqlParameter(Types.INTEGER));
declareParameter(new SqlParameter(Types.VARCHAR)); declareParameter(new SqlParameter(Types.VARCHAR));
declareParameter(new SqlParameter(Types.INTEGER)); declareParameter(new SqlParameter(Types.INTEGER));
declareParameter(new SqlParameter(Types.VARCHAR)); declareParameter(new SqlParameter(Types.VARCHAR));
@ -405,7 +390,9 @@ public class JdbcExtendedDaoImpl extends JdbcDaoImpl
protected void insert(String objectIdentity, protected void insert(String objectIdentity,
Integer parentAclObjectIdentity, String aclClass) Integer parentAclObjectIdentity, String aclClass)
throws DataAccessException { throws DataAccessException {
Object[] objs = new Object[] {null, objectIdentity, parentAclObjectIdentity, aclClass}; Object[] objs = new Object[] {
objectIdentity, parentAclObjectIdentity, aclClass
};
super.update(objs); super.update(objs);
} }
} }
@ -428,7 +415,6 @@ public class JdbcExtendedDaoImpl extends JdbcDaoImpl
protected AclPermissionInsert(DataSource ds) { protected AclPermissionInsert(DataSource ds) {
super(ds, aclPermissionInsertStatement); super(ds, aclPermissionInsertStatement);
declareParameter(new SqlParameter(Types.INTEGER)); declareParameter(new SqlParameter(Types.INTEGER));
declareParameter(new SqlParameter(Types.INTEGER));
declareParameter(new SqlParameter(Types.VARCHAR)); declareParameter(new SqlParameter(Types.VARCHAR));
declareParameter(new SqlParameter(Types.INTEGER)); declareParameter(new SqlParameter(Types.INTEGER));
compile(); compile();
@ -436,7 +422,7 @@ public class JdbcExtendedDaoImpl extends JdbcDaoImpl
protected void insert(Integer aclObjectIdentity, String recipient, protected void insert(Integer aclObjectIdentity, String recipient,
Integer mask) throws DataAccessException { Integer mask) throws DataAccessException {
Object[] objs = new Object[] {null, aclObjectIdentity, recipient, mask}; Object[] objs = new Object[] { aclObjectIdentity, recipient, mask };
super.update(objs); super.update(objs);
} }
} }