Author: tv
Date: Wed Aug 29 14:39:39 2012
New Revision: 1378583
URL: http://svn.apache.org/viewvc?rev=1378583&view=rev
Log:
First chunk of generifications
Modified:
turbine/fulcrum/trunk/security/torque/pom.xml
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractGroupManager.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractPermissionManager.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractRoleManager.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractSecurityEntity.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractUserManager.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueAbstractBasicGroup.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueAbstractBasicUser.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueBasicGroupManagerImpl.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueBasicModelManagerImpl.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueBasicUserManagerImpl.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicGroup.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicPermission.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicRole.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicUser.java
Modified: turbine/fulcrum/trunk/security/torque/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/pom.xml?rev=1378583&r1=1378582&r2=1378583&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/pom.xml (original)
+++ turbine/fulcrum/trunk/security/torque/pom.xml Wed Aug 29 14:39:39 2012
@@ -251,8 +251,6 @@
</profiles>
<properties>
- <maven.compile.source>1.5</maven.compile.source>
- <maven.compile.target>1.5</maven.compile.target>
<!-- This bits are used for the staging directory -->
<fulcrum.release.version>1.1.0</fulcrum.release.version>
<fulcrum.rc.version>RC1</fulcrum.rc.version>
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractGroupManager.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractGroupManager.java?rev=1378583&r1=1378582&r2=1378583&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractGroupManager.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractGroupManager.java
Wed Aug 29 14:39:39 2012
@@ -18,12 +18,12 @@ package org.apache.fulcrum.security.torq
* under the License.
*/
import java.sql.Connection;
-import java.util.Iterator;
import java.util.List;
import org.apache.fulcrum.security.entity.Group;
import org.apache.fulcrum.security.spi.AbstractGroupManager;
import org.apache.fulcrum.security.util.DataBackendException;
+import org.apache.fulcrum.security.util.EntityExistsException;
import org.apache.fulcrum.security.util.GroupSet;
import org.apache.fulcrum.security.util.UnknownEntityException;
import org.apache.torque.NoRowsException;
@@ -48,7 +48,7 @@ public abstract class TorqueAbstractGrou
*
* @throws TorqueException if any database error occurs
*/
- protected abstract List doSelectAllGroups(Connection con)
+ protected abstract <T extends Group> List<T> doSelectAllGroups(Connection
con)
throws TorqueException;
/**
@@ -221,12 +221,10 @@ public abstract class TorqueAbstractGrou
{
con =
Transaction.begin(((TorqueAbstractSecurityEntity)getGroupInstance()).getDatabaseName());
- List groups = doSelectAllGroups(con);
+ List<Group> groups = doSelectAllGroups(con);
- for (Iterator i = groups.iterator(); i.hasNext();)
+ for (Group group : groups)
{
- Group group = (Group)i.next();
-
// Add dependent objects if they exist
((TorqueAbstractSecurityEntity)group).retrieveAttachedObjects(con);
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractPermissionManager.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractPermissionManager.java?rev=1378583&r1=1378582&r2=1378583&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractPermissionManager.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractPermissionManager.java
Wed Aug 29 14:39:39 2012
@@ -18,7 +18,6 @@ package org.apache.fulcrum.security.torq
* under the License.
*/
import java.sql.Connection;
-import java.util.Iterator;
import java.util.List;
import org.apache.fulcrum.security.entity.Permission;
@@ -48,7 +47,7 @@ public abstract class TorqueAbstractPerm
*
* @throws TorqueException if any database error occurs
*/
- protected abstract List doSelectAllPermissions(Connection con)
+ protected abstract List<Permission> doSelectAllPermissions(Connection con)
throws TorqueException;
/**
@@ -186,12 +185,10 @@ public abstract class TorqueAbstractPerm
{
con =
Transaction.begin(((TorqueAbstractSecurityEntity)getPermissionInstance()).getDatabaseName());
- List permissions = doSelectAllPermissions(con);
+ List<Permission> permissions = doSelectAllPermissions(con);
- for (Iterator i = permissions.iterator(); i.hasNext();)
+ for (Permission p : permissions)
{
- Permission p = (Permission)i.next();
-
// Add attached objects if they exist
((TorqueAbstractSecurityEntity)p).retrieveAttachedObjects(con);
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractRoleManager.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractRoleManager.java?rev=1378583&r1=1378582&r2=1378583&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractRoleManager.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractRoleManager.java
Wed Aug 29 14:39:39 2012
@@ -18,7 +18,6 @@ package org.apache.fulcrum.security.torq
* under the License.
*/
import java.sql.Connection;
-import java.util.Iterator;
import java.util.List;
import org.apache.fulcrum.security.entity.Role;
@@ -48,7 +47,7 @@ public abstract class TorqueAbstractRole
*
* @throws TorqueException if any database error occurs
*/
- protected abstract List doSelectAllRoles(Connection con)
+ protected abstract List<Role> doSelectAllRoles(Connection con)
throws TorqueException;
/**
@@ -228,12 +227,10 @@ public abstract class TorqueAbstractRole
{
con =
Transaction.begin(((TorqueAbstractSecurityEntity)getRoleInstance()).getDatabaseName());
- List roles = doSelectAllRoles(con);
+ List<Role> roles = doSelectAllRoles(con);
- for (Iterator i = roles.iterator(); i.hasNext();)
+ for (Role role : roles)
{
- Role role = (Role)i.next();
-
// Add attached objects if they exist
((TorqueAbstractSecurityEntity)role).retrieveAttachedObjects(con);
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractSecurityEntity.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractSecurityEntity.java?rev=1378583&r1=1378582&r2=1378583&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractSecurityEntity.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractSecurityEntity.java
Wed Aug 29 14:39:39 2012
@@ -31,7 +31,10 @@ import org.apache.torque.om.BaseObject;
public abstract class TorqueAbstractSecurityEntity extends BaseObject
implements SecurityEntity
{
- /**
+ /** Serial version */
+ private static final long serialVersionUID = -4052254585021044275L;
+
+ /**
* Get a numeric entity id
*
* @return numeric id of this entity
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractUserManager.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractUserManager.java?rev=1378583&r1=1378582&r2=1378583&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractUserManager.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractUserManager.java
Wed Aug 29 14:39:39 2012
@@ -18,7 +18,6 @@ package org.apache.fulcrum.security.torq
* under the License.
*/
import java.sql.Connection;
-import java.util.Iterator;
import java.util.List;
import org.apache.fulcrum.security.entity.User;
@@ -48,7 +47,7 @@ public abstract class TorqueAbstractUser
*
* @throws TorqueException if any database error occurs
*/
- protected abstract List doSelectAllUsers(Connection con)
+ protected abstract <T extends User> List<T> doSelectAllUsers(Connection
con)
throws TorqueException;
/**
@@ -271,12 +270,10 @@ public abstract class TorqueAbstractUser
{
con =
Transaction.begin(((TorqueAbstractSecurityEntity)getUserInstance()).getDatabaseName());
- List users = doSelectAllUsers(con);
+ List<User> users = doSelectAllUsers(con);
- for (Iterator i = users.iterator(); i.hasNext();)
+ for (User user : users)
{
- User user = (User)i.next();
-
// Add attached objects if they exist
((TorqueAbstractSecurityEntity)user).retrieveAttachedObjects(con);
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueAbstractBasicGroup.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueAbstractBasicGroup.java?rev=1378583&r1=1378582&r2=1378583&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueAbstractBasicGroup.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueAbstractBasicGroup.java
Wed Aug 29 14:39:39 2012
@@ -18,7 +18,6 @@ package org.apache.fulcrum.security.torq
* under the License.
*/
import java.sql.Connection;
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -26,7 +25,6 @@ import org.apache.fulcrum.security.entit
import org.apache.fulcrum.security.model.basic.entity.BasicGroup;
import org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity;
import org.apache.fulcrum.security.torque.om.TorqueBasicGroupPeer;
-import org.apache.fulcrum.security.torque.om.TorqueBasicUser;
import org.apache.fulcrum.security.torque.om.TorqueBasicUserGroup;
import org.apache.fulcrum.security.torque.om.TorqueBasicUserGroupPeer;
import org.apache.fulcrum.security.util.UserSet;
@@ -42,8 +40,11 @@ import org.apache.torque.util.Criteria;
public abstract class TorqueAbstractBasicGroup extends
TorqueAbstractSecurityEntity
implements BasicGroup
{
- /** a cache of user objects */
- private Set userSet = null;
+ /** Serial version */
+ private static final long serialVersionUID = -3639383219058996135L;
+
+ /** a cache of user objects */
+ private Set<User> userSet = null;
/**
* Forward reference to generated code
@@ -56,7 +57,7 @@ public abstract class TorqueAbstractBasi
*
* @return a list of User/Group relations
*/
- protected abstract List
getTorqueBasicUserGroupsJoinTorqueBasicUser(Criteria criteria)
+ protected abstract List<TorqueBasicUserGroup>
getTorqueBasicUserGroupsJoinTorqueBasicUser(Criteria criteria)
throws TorqueException;
/**
@@ -87,9 +88,10 @@ public abstract class TorqueAbstractBasi
/**
* @see
org.apache.fulcrum.security.model.basic.entity.BasicGroup#getUsersAsSet()
*/
- public Set getUsersAsSet()
+ @SuppressWarnings("unchecked")
+ public <T extends User> Set<T> getUsersAsSet()
{
- return userSet;
+ return (Set<T>)userSet;
}
/**
@@ -118,7 +120,7 @@ public abstract class TorqueAbstractBasi
/**
* @see
org.apache.fulcrum.security.model.basic.entity.BasicGroup#setUsersAsSet(java.util.Set)
*/
- public void setUsersAsSet(Set users)
+ public <T extends User> void setUsersAsSet(Set<T> users)
{
setUsers(new UserSet(users));
}
@@ -131,17 +133,17 @@ public abstract class TorqueAbstractBasi
this.userSet = new UserSet();
// the generated method that allows a Connection parameter is missing
- List usergroups = getTorqueBasicUserGroupsJoinTorqueBasicUser(new
Criteria());
+ List<TorqueBasicUserGroup> usergroups =
+ getTorqueBasicUserGroupsJoinTorqueBasicUser(new Criteria());
- for (Iterator i = usergroups.iterator(); i.hasNext();)
+ for (TorqueBasicUserGroup tbug : usergroups)
{
- TorqueBasicUserGroup tbug = (TorqueBasicUserGroup)i.next();
userSet.add(tbug.getTorqueBasicUser());
}
}
/**
- * Update this instance to the database with all dependend objects
+ * Update this instance to the database with all dependent objects
*
* @param con A database connection
*/
@@ -155,12 +157,10 @@ public abstract class TorqueAbstractBasi
criteria.add(TorqueBasicUserGroupPeer.GROUP_ID, getEntityId());
TorqueBasicUserGroupPeer.doDelete(criteria, con);
- for (Iterator i = userSet.iterator(); i.hasNext();)
+ for (User u : userSet)
{
- TorqueBasicUser user = (TorqueBasicUser)i.next();
-
TorqueBasicUserGroup ug = new TorqueBasicUserGroup();
- ug.setUserId(user.getEntityId());
+ ug.setUserId((Integer)u.getId());
ug.setGroupId(getEntityId());
ug.save(con);
}
@@ -177,7 +177,7 @@ public abstract class TorqueAbstractBasi
}
/**
- * Get the name of the connnection pool associated to this object
+ * Get the name of the connection pool associated to this object
*
* @return the logical Torque database name
*/
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueAbstractBasicUser.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueAbstractBasicUser.java?rev=1378583&r1=1378582&r2=1378583&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueAbstractBasicUser.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueAbstractBasicUser.java
Wed Aug 29 14:39:39 2012
@@ -18,14 +18,12 @@ package org.apache.fulcrum.security.torq
* under the License.
*/
import java.sql.Connection;
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
import org.apache.fulcrum.security.entity.Group;
import org.apache.fulcrum.security.model.basic.entity.BasicUser;
import org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity;
-import org.apache.fulcrum.security.torque.om.TorqueBasicGroup;
import org.apache.fulcrum.security.torque.om.TorqueBasicUserGroup;
import org.apache.fulcrum.security.torque.om.TorqueBasicUserGroupPeer;
import org.apache.fulcrum.security.torque.om.TorqueBasicUserPeer;
@@ -42,8 +40,10 @@ import org.apache.torque.util.Criteria;
public abstract class TorqueAbstractBasicUser extends
TorqueAbstractSecurityEntity
implements BasicUser
{
- /** a cache of group objects */
- private Set groupSet = null;
+ /** Serial version */
+ private static final long serialVersionUID = 7669398253522416329L;
+ /** a cache of group objects */
+ private Set<Group> groupSet = null;
/**
* Forward reference to generated code
@@ -56,7 +56,7 @@ public abstract class TorqueAbstractBasi
*
* @return a list of User/Group relations
*/
- protected abstract List
getTorqueBasicUserGroupsJoinTorqueBasicGroup(Criteria criteria)
+ protected abstract List<TorqueBasicUserGroup>
getTorqueBasicUserGroupsJoinTorqueBasicGroup(Criteria criteria)
throws TorqueException;
/**
@@ -87,9 +87,10 @@ public abstract class TorqueAbstractBasi
/**
* @see
org.apache.fulcrum.security.model.basic.entity.BasicUser#getGroupsAsSet()
*/
- public Set getGroupsAsSet()
+ @SuppressWarnings("unchecked")
+ public <T extends Group> Set<T> getGroupsAsSet()
{
- return groupSet;
+ return (Set<T>)groupSet;
}
/**
@@ -118,7 +119,7 @@ public abstract class TorqueAbstractBasi
/**
* @see
org.apache.fulcrum.security.model.basic.entity.BasicUser#setGroupsAsSet(java.util.Set)
*/
- public void setGroupsAsSet(Set groups)
+ public <T extends Group> void setGroupsAsSet(Set<T> groups)
{
setGroups(new GroupSet(groups));
}
@@ -130,17 +131,16 @@ public abstract class TorqueAbstractBasi
{
this.groupSet = new GroupSet();
- List usergroups = getTorqueBasicUserGroupsJoinTorqueBasicGroup(new
Criteria());
+ List<TorqueBasicUserGroup> usergroups =
getTorqueBasicUserGroupsJoinTorqueBasicGroup(new Criteria());
- for (Iterator i = usergroups.iterator(); i.hasNext();)
+ for (TorqueBasicUserGroup tbug : usergroups)
{
- TorqueBasicUserGroup tbug = (TorqueBasicUserGroup)i.next();
groupSet.add(tbug.getTorqueBasicGroup());
}
}
/**
- * Update this instance to the database with all dependend objects
+ * Update this instance to the database with all dependent objects
*
* @param con A database connection
*/
@@ -154,13 +154,11 @@ public abstract class TorqueAbstractBasi
criteria.add(TorqueBasicUserGroupPeer.USER_ID, getEntityId());
TorqueBasicUserGroupPeer.doDelete(criteria, con);
- for (Iterator i = groupSet.iterator(); i.hasNext();)
+ for (Group g : groupSet)
{
- TorqueBasicGroup group = (TorqueBasicGroup)i.next();
-
TorqueBasicUserGroup ug = new TorqueBasicUserGroup();
ug.setUserId(getEntityId());
- ug.setGroupId(group.getEntityId());
+ ug.setGroupId((Integer)g.getId());
ug.save(con);
}
}
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueBasicGroupManagerImpl.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueBasicGroupManagerImpl.java?rev=1378583&r1=1378582&r2=1378583&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueBasicGroupManagerImpl.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueBasicGroupManagerImpl.java
Wed Aug 29 14:39:39 2012
@@ -22,6 +22,7 @@ import java.util.List;
import org.apache.fulcrum.security.entity.Group;
import org.apache.fulcrum.security.torque.TorqueAbstractGroupManager;
+import org.apache.fulcrum.security.torque.om.TorqueBasicGroup;
import org.apache.fulcrum.security.torque.om.TorqueBasicGroupPeer;
import org.apache.torque.NoRowsException;
import org.apache.torque.TooManyRowsException;
@@ -38,12 +39,13 @@ public class TorqueBasicGroupManagerImpl
/**
* @see
org.apache.fulcrum.security.torque.TorqueAbstractGroupManager#doSelectAllGroups(java.sql.Connection)
*/
- protected List doSelectAllGroups(Connection con)
+ @SuppressWarnings("unchecked")
+ protected <T extends Group> List<T> doSelectAllGroups(Connection con)
throws TorqueException
{
Criteria criteria = new Criteria(TorqueBasicGroupPeer.DATABASE_NAME);
- return TorqueBasicGroupPeer.doSelect(criteria, con);
+ return (List<T>)TorqueBasicGroupPeer.doSelect(criteria, con);
}
/**
@@ -66,13 +68,13 @@ public class TorqueBasicGroupManagerImpl
criteria.setIgnoreCase(true);
criteria.setSingleRecord(true);
- List groups = TorqueBasicGroupPeer.doSelect(criteria, con);
+ List<TorqueBasicGroup> groups =
TorqueBasicGroupPeer.doSelect(criteria, con);
if (groups.isEmpty())
{
throw new NoRowsException(name);
}
- return (Group)groups.get(0);
+ return groups.get(0);
}
}
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueBasicModelManagerImpl.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueBasicModelManagerImpl.java?rev=1378583&r1=1378582&r2=1378583&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueBasicModelManagerImpl.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueBasicModelManagerImpl.java
Wed Aug 29 14:39:39 2012
@@ -19,7 +19,6 @@ package org.apache.fulcrum.security.torq
*/
import java.sql.Connection;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import org.apache.fulcrum.security.entity.Group;
@@ -174,11 +173,10 @@ public class TorqueBasicModelManagerImpl
BasicUser u = (BasicUser) user;
// copy to avoid ConcurrentModificationException
- List groups = new ArrayList(u.getGroups());
+ List<Group> groups = new ArrayList<Group>(u.getGroups());
- for (Iterator i = groups.iterator(); i.hasNext();)
+ for (Group group : groups)
{
- Group group = (Group)i.next();
u.removeGroup(group);
}
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueBasicUserManagerImpl.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueBasicUserManagerImpl.java?rev=1378583&r1=1378582&r2=1378583&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueBasicUserManagerImpl.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueBasicUserManagerImpl.java
Wed Aug 29 14:39:39 2012
@@ -22,6 +22,7 @@ import java.util.List;
import org.apache.fulcrum.security.entity.User;
import org.apache.fulcrum.security.torque.TorqueAbstractUserManager;
+import org.apache.fulcrum.security.torque.om.TorqueBasicUser;
import org.apache.fulcrum.security.torque.om.TorqueBasicUserPeer;
import org.apache.torque.NoRowsException;
import org.apache.torque.TooManyRowsException;
@@ -38,11 +39,12 @@ public class TorqueBasicUserManagerImpl
/**
* @see
org.apache.fulcrum.security.torque.TorqueAbstractUserManager#doSelectAllUsers(java.sql.Connection)
*/
- protected List doSelectAllUsers(Connection con) throws TorqueException
+ @SuppressWarnings("unchecked")
+ protected <T extends User> List<T> doSelectAllUsers(Connection con)
throws TorqueException
{
Criteria criteria = new Criteria(TorqueBasicUserPeer.DATABASE_NAME);
- return TorqueBasicUserPeer.doSelect(criteria, con);
+ return (List<T>)TorqueBasicUserPeer.doSelect(criteria, con);
}
/**
@@ -63,13 +65,13 @@ public class TorqueBasicUserManagerImpl
criteria.setIgnoreCase(true);
criteria.setSingleRecord(true);
- List users = TorqueBasicUserPeer.doSelect(criteria, con);
+ List<TorqueBasicUser> users = TorqueBasicUserPeer.doSelect(criteria,
con);
if (users.isEmpty())
{
throw new NoRowsException(name);
}
- return (User)users.get(0);
+ return users.get(0);
}
}
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicGroup.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicGroup.java?rev=1378583&r1=1378582&r2=1378583&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicGroup.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicGroup.java
Wed Aug 29 14:39:39 2012
@@ -18,7 +18,6 @@ package org.apache.fulcrum.security.torq
* under the License.
*/
import java.sql.Connection;
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -29,8 +28,6 @@ import org.apache.fulcrum.security.torqu
import org.apache.fulcrum.security.torque.om.TorqueDynamicGroupPeer;
import org.apache.fulcrum.security.torque.om.TorqueDynamicGroupRole;
import org.apache.fulcrum.security.torque.om.TorqueDynamicGroupRolePeer;
-import org.apache.fulcrum.security.torque.om.TorqueDynamicRole;
-import org.apache.fulcrum.security.torque.om.TorqueDynamicUser;
import org.apache.fulcrum.security.torque.om.TorqueDynamicUserGroup;
import org.apache.fulcrum.security.torque.om.TorqueDynamicUserGroupPeer;
import org.apache.fulcrum.security.util.RoleSet;
@@ -47,11 +44,14 @@ import org.apache.torque.util.Criteria;
public abstract class TorqueAbstractDynamicGroup extends
TorqueAbstractSecurityEntity
implements DynamicGroup
{
- /** a cache of user objects */
- private Set userSet = null;
+ /** Serial version */
+ private static final long serialVersionUID = -122088742532595477L;
+
+ /** a cache of user objects */
+ private Set<User> userSet = null;
/** a cache of role objects */
- private Set roleSet = null;
+ private Set<Role> roleSet = null;
/**
* Forward reference to generated code
@@ -64,7 +64,7 @@ public abstract class TorqueAbstractDyna
*
* @return a list of User/Group relations
*/
- protected abstract List
getTorqueDynamicUserGroupsJoinTorqueDynamicUser(Criteria criteria)
+ protected abstract List<TorqueDynamicUserGroup>
getTorqueDynamicUserGroupsJoinTorqueDynamicUser(Criteria criteria)
throws TorqueException;
/**
@@ -78,7 +78,7 @@ public abstract class TorqueAbstractDyna
*
* @return a list of Role/Group relations
*/
- protected abstract List
getTorqueDynamicGroupRolesJoinTorqueDynamicRole(Criteria criteria)
+ protected abstract List<TorqueDynamicGroupRole>
getTorqueDynamicGroupRolesJoinTorqueDynamicRole(Criteria criteria)
throws TorqueException;
/**
@@ -109,9 +109,10 @@ public abstract class TorqueAbstractDyna
/**
* @see
org.apache.fulcrum.security.model.basic.entity.BasicGroup#getUsersAsSet()
*/
- public Set getUsersAsSet()
+ @SuppressWarnings("unchecked")
+ public <T extends User> Set<T> getUsersAsSet()
{
- return userSet;
+ return (Set<T>)userSet;
}
/**
@@ -140,7 +141,7 @@ public abstract class TorqueAbstractDyna
/**
* @see
org.apache.fulcrum.security.model.basic.entity.BasicGroup#setUsersAsSet(java.util.Set)
*/
- public void setUsersAsSet(Set users)
+ public <T extends User> void setUsersAsSet(Set<T> users)
{
setUsers(new UserSet(users));
}
@@ -173,9 +174,10 @@ public abstract class TorqueAbstractDyna
/**
* @see
org.apache.fulcrum.security.model.dynamic.entity.DynamicGroup#getRolesAsSet()
*/
- public Set getRolesAsSet()
+ @SuppressWarnings("unchecked")
+ public <T extends Role> Set<T> getRolesAsSet()
{
- return roleSet;
+ return (Set<T>)roleSet;
}
/**
@@ -204,7 +206,7 @@ public abstract class TorqueAbstractDyna
/**
* @see
org.apache.fulcrum.security.model.dynamic.entity.DynamicGroup#setRolesAsSet(java.util.Set)
*/
- public void setRolesAsSet(Set roles)
+ public <T extends Role> void setRolesAsSet(Set<T> roles)
{
setRoles(new RoleSet(roles));
}
@@ -225,22 +227,20 @@ public abstract class TorqueAbstractDyna
this.userSet = new UserSet();
// the generated method that allows a Connection parameter is missing
- List usergroups = getTorqueDynamicUserGroupsJoinTorqueDynamicUser(new
Criteria());
+ List<TorqueDynamicUserGroup> usergroups =
getTorqueDynamicUserGroupsJoinTorqueDynamicUser(new Criteria());
- for (Iterator i = usergroups.iterator(); i.hasNext();)
+ for (TorqueDynamicUserGroup tdug : usergroups)
{
- TorqueDynamicUserGroup tdug = (TorqueDynamicUserGroup)i.next();
userSet.add(tdug.getTorqueDynamicUser());
}
this.roleSet = new RoleSet();
// the generated method that allows a Connection parameter is missing
- List grouproles = getTorqueDynamicGroupRolesJoinTorqueDynamicRole(new
Criteria());
+ List<TorqueDynamicGroupRole> grouproles =
getTorqueDynamicGroupRolesJoinTorqueDynamicRole(new Criteria());
- for (Iterator i = grouproles.iterator(); i.hasNext();)
+ for (TorqueDynamicGroupRole tdgr : grouproles)
{
- TorqueDynamicGroupRole tdgr = (TorqueDynamicGroupRole)i.next();
roleSet.add(tdgr.getTorqueDynamicRole());
}
}
@@ -258,12 +258,10 @@ public abstract class TorqueAbstractDyna
criteria.add(TorqueDynamicUserGroupPeer.GROUP_ID, getEntityId());
TorqueDynamicUserGroupPeer.doDelete(criteria, con);
- for (Iterator i = userSet.iterator(); i.hasNext();)
+ for (User u : userSet)
{
- TorqueDynamicUser user = (TorqueDynamicUser)i.next();
-
TorqueDynamicUserGroup ug = new TorqueDynamicUserGroup();
- ug.setUserId(user.getEntityId());
+ ug.setUserId((Integer)u.getId());
ug.setGroupId(getEntityId());
ug.save(con);
}
@@ -277,12 +275,10 @@ public abstract class TorqueAbstractDyna
criteria.add(TorqueDynamicGroupRolePeer.GROUP_ID, getEntityId());
TorqueDynamicGroupRolePeer.doDelete(criteria, con);
- for (Iterator i = roleSet.iterator(); i.hasNext();)
+ for (Role r : roleSet)
{
- TorqueDynamicRole role = (TorqueDynamicRole)i.next();
-
TorqueDynamicGroupRole gr = new TorqueDynamicGroupRole();
- gr.setRoleId(role.getEntityId());
+ gr.setRoleId((Integer)r.getId());
gr.setGroupId(getEntityId());
gr.save(con);
}
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicPermission.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicPermission.java?rev=1378583&r1=1378582&r2=1378583&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicPermission.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicPermission.java
Wed Aug 29 14:39:39 2012
@@ -18,7 +18,6 @@ package org.apache.fulcrum.security.torq
* under the License.
*/
import java.sql.Connection;
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -26,7 +25,6 @@ import org.apache.fulcrum.security.entit
import org.apache.fulcrum.security.model.dynamic.entity.DynamicPermission;
import org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity;
import org.apache.fulcrum.security.torque.om.TorqueDynamicPermissionPeer;
-import org.apache.fulcrum.security.torque.om.TorqueDynamicRole;
import org.apache.fulcrum.security.torque.om.TorqueDynamicRolePermission;
import org.apache.fulcrum.security.torque.om.TorqueDynamicRolePermissionPeer;
import org.apache.fulcrum.security.util.RoleSet;
@@ -42,8 +40,10 @@ import org.apache.torque.util.Criteria;
public abstract class TorqueAbstractDynamicPermission extends
TorqueAbstractSecurityEntity
implements DynamicPermission
{
- /** a cache of role objects */
- private Set roleSet = null;
+ /** Serial version */
+ private static final long serialVersionUID = -6857144824327889029L;
+ /** a cache of role objects */
+ private Set<Role> roleSet = null;
/**
* Forward reference to generated code
@@ -56,7 +56,7 @@ public abstract class TorqueAbstractDyna
*
* @return a list of Role/Permission relations
*/
- protected abstract List
getTorqueDynamicRolePermissionsJoinTorqueDynamicRole(Criteria criteria)
+ protected abstract List<TorqueDynamicRolePermission>
getTorqueDynamicRolePermissionsJoinTorqueDynamicRole(Criteria criteria)
throws TorqueException;
/**
@@ -87,9 +87,10 @@ public abstract class TorqueAbstractDyna
/**
* @see
org.apache.fulcrum.security.model.dynamic.entity.DynamicPermission#getRolesAsSet()
*/
- public Set getRolesAsSet()
+ @SuppressWarnings("unchecked")
+ public <T extends Role> Set<T> getRolesAsSet()
{
- return roleSet;
+ return (Set<T>)roleSet;
}
/**
@@ -118,7 +119,7 @@ public abstract class TorqueAbstractDyna
/**
* @see
org.apache.fulcrum.security.model.dynamic.entity.DynamicPermission#setRolesAsSet(java.util.Set)
*/
- public void setRolesAsSet(Set roles)
+ public <T extends Role> void setRolesAsSet(Set<T> roles)
{
setRoles(new RoleSet(roles));
}
@@ -139,11 +140,10 @@ public abstract class TorqueAbstractDyna
this.roleSet = new RoleSet();
// the generated method that allows a Connection parameter is missing
- List rolepermissions =
getTorqueDynamicRolePermissionsJoinTorqueDynamicRole(new Criteria());
+ List<TorqueDynamicRolePermission> rolepermissions =
getTorqueDynamicRolePermissionsJoinTorqueDynamicRole(new Criteria());
- for (Iterator i = rolepermissions.iterator(); i.hasNext();)
+ for (TorqueDynamicRolePermission tdrp : rolepermissions)
{
- TorqueDynamicRolePermission tdrp =
(TorqueDynamicRolePermission)i.next();
roleSet.add(tdrp.getTorqueDynamicRole());
}
}
@@ -161,12 +161,10 @@ public abstract class TorqueAbstractDyna
criteria.add(TorqueDynamicRolePermissionPeer.PERMISSION_ID,
getEntityId());
TorqueDynamicRolePermissionPeer.doDelete(criteria, con);
- for (Iterator i = roleSet.iterator(); i.hasNext();)
+ for (Role r : roleSet)
{
- TorqueDynamicRole role = (TorqueDynamicRole)i.next();
-
TorqueDynamicRolePermission rp = new
TorqueDynamicRolePermission();
- rp.setRoleId(role.getEntityId());
+ rp.setRoleId((Integer)r.getId());
rp.setPermissionId(getEntityId());
rp.save(con);
}
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicRole.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicRole.java?rev=1378583&r1=1378582&r2=1378583&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicRole.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicRole.java
Wed Aug 29 14:39:39 2012
@@ -18,7 +18,6 @@ package org.apache.fulcrum.security.torq
* under the License.
*/
import java.sql.Connection;
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -26,10 +25,8 @@ import org.apache.fulcrum.security.entit
import org.apache.fulcrum.security.entity.Permission;
import org.apache.fulcrum.security.model.dynamic.entity.DynamicRole;
import org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity;
-import org.apache.fulcrum.security.torque.om.TorqueDynamicGroup;
import org.apache.fulcrum.security.torque.om.TorqueDynamicGroupRole;
import org.apache.fulcrum.security.torque.om.TorqueDynamicGroupRolePeer;
-import org.apache.fulcrum.security.torque.om.TorqueDynamicPermission;
import org.apache.fulcrum.security.torque.om.TorqueDynamicPermissionPeer;
import org.apache.fulcrum.security.torque.om.TorqueDynamicRolePeer;
import org.apache.fulcrum.security.torque.om.TorqueDynamicRolePermission;
@@ -48,11 +45,14 @@ import org.apache.torque.util.Criteria;
public abstract class TorqueAbstractDynamicRole extends
TorqueAbstractSecurityEntity
implements DynamicRole
{
- /** a cache of group objects */
- private Set groupSet = null;
+ /** Serial version */
+ private static final long serialVersionUID = 2163956770966574224L;
+
+ /** a cache of group objects */
+ private Set<Group> groupSet = null;
/** a cache of permission objects */
- private Set permissionSet = null;
+ private Set<Permission> permissionSet = null;
/**
* Forward reference to generated code
@@ -65,7 +65,7 @@ public abstract class TorqueAbstractDyna
*
* @return a list of Role/Permission relations
*/
- protected abstract List
getTorqueDynamicRolePermissionsJoinTorqueDynamicPermission(Criteria criteria)
+ protected abstract List<TorqueDynamicRolePermission>
getTorqueDynamicRolePermissionsJoinTorqueDynamicPermission(Criteria criteria)
throws TorqueException;
/**
@@ -79,7 +79,7 @@ public abstract class TorqueAbstractDyna
*
* @return a list of Group/Role relations
*/
- protected abstract List
getTorqueDynamicGroupRolesJoinTorqueDynamicGroup(Criteria criteria)
+ protected abstract List<TorqueDynamicGroupRole>
getTorqueDynamicGroupRolesJoinTorqueDynamicGroup(Criteria criteria)
throws TorqueException;
/**
@@ -118,9 +118,10 @@ public abstract class TorqueAbstractDyna
/**
* @see
org.apache.fulcrum.security.model.dynamic.entity.DynamicRole#getGroupsAsSet()
*/
- public Set getGroupsAsSet()
+ @SuppressWarnings("unchecked")
+ public <T extends Group> Set<T> getGroupsAsSet()
{
- return groupSet;
+ return (Set<T>)groupSet;
}
/**
@@ -143,9 +144,10 @@ public abstract class TorqueAbstractDyna
/**
* @see
org.apache.fulcrum.security.model.dynamic.entity.DynamicRole#getPermissionsAsSet()
*/
- public Set getPermissionsAsSet()
+ @SuppressWarnings("unchecked")
+ public <T extends Permission> Set<T> getPermissionsAsSet()
{
- return permissionSet;
+ return (Set<T>)permissionSet;
}
/**
@@ -182,7 +184,7 @@ public abstract class TorqueAbstractDyna
/**
* @see
org.apache.fulcrum.security.model.dynamic.entity.DynamicRole#setGroupsAsSet(java.util.Set)
*/
- public void setGroupsAsSet(Set groups)
+ public <T extends Group> void setGroupsAsSet(Set<T> groups)
{
setGroups(new GroupSet(groups));
}
@@ -205,7 +207,7 @@ public abstract class TorqueAbstractDyna
/**
* @see
org.apache.fulcrum.security.model.dynamic.entity.DynamicRole#setPermissionsAsSet(java.util.Set)
*/
- public void setPermissionsAsSet(Set permissions)
+ public <T extends Permission> void setPermissionsAsSet(Set<T> permissions)
{
setPermissions(new PermissionSet(permissions));
}
@@ -226,22 +228,20 @@ public abstract class TorqueAbstractDyna
this.permissionSet = new PermissionSet();
// the generated method that allows a Connection parameter is missing
- List rolepermissions =
getTorqueDynamicRolePermissionsJoinTorqueDynamicPermission(new Criteria());
+ List<TorqueDynamicRolePermission> rolepermissions =
getTorqueDynamicRolePermissionsJoinTorqueDynamicPermission(new Criteria());
- for (Iterator i = rolepermissions.iterator(); i.hasNext();)
+ for (TorqueDynamicRolePermission tdrp : rolepermissions)
{
- TorqueDynamicRolePermission tdrp =
(TorqueDynamicRolePermission)i.next();
permissionSet.add(tdrp.getTorqueDynamicPermission());
}
this.groupSet = new GroupSet();
// the generated method that allows a Connection parameter is missing
- List grouproles = getTorqueDynamicGroupRolesJoinTorqueDynamicGroup(new
Criteria());
+ List<TorqueDynamicGroupRole> grouproles =
getTorqueDynamicGroupRolesJoinTorqueDynamicGroup(new Criteria());
- for (Iterator i = grouproles.iterator(); i.hasNext();)
+ for (TorqueDynamicGroupRole tdgr : grouproles)
{
- TorqueDynamicGroupRole tdgr = (TorqueDynamicGroupRole)i.next();
groupSet.add(tdgr.getTorqueDynamicGroup());
}
}
@@ -259,12 +259,10 @@ public abstract class TorqueAbstractDyna
criteria.add(TorqueDynamicRolePermissionPeer.ROLE_ID,
getEntityId());
TorqueDynamicRolePermissionPeer.doDelete(criteria, con);
- for (Iterator i = permissionSet.iterator(); i.hasNext();)
+ for (Permission p : permissionSet)
{
- TorqueDynamicPermission permission =
(TorqueDynamicPermission)i.next();
-
TorqueDynamicRolePermission rp = new
TorqueDynamicRolePermission();
- rp.setPermissionId(permission.getEntityId());
+ rp.setPermissionId((Integer)p.getId());
rp.setRoleId(getEntityId());
rp.save(con);
}
@@ -278,12 +276,10 @@ public abstract class TorqueAbstractDyna
criteria.add(TorqueDynamicGroupRolePeer.ROLE_ID, getEntityId());
TorqueDynamicGroupRolePeer.doDelete(criteria, con);
- for (Iterator i = groupSet.iterator(); i.hasNext();)
+ for (Group g : groupSet)
{
- TorqueDynamicGroup group = (TorqueDynamicGroup)i.next();
-
TorqueDynamicGroupRole gr = new TorqueDynamicGroupRole();
- gr.setGroupId(group.getEntityId());
+ gr.setGroupId((Integer)g.getId());
gr.setRoleId(getEntityId());
gr.save(con);
}
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicUser.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicUser.java?rev=1378583&r1=1378582&r2=1378583&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicUser.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicUser.java
Wed Aug 29 14:39:39 2012
@@ -18,22 +18,20 @@ package org.apache.fulcrum.security.torq
* under the License.
*/
import java.sql.Connection;
-import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
import org.apache.fulcrum.security.entity.Group;
+import org.apache.fulcrum.security.entity.User;
import org.apache.fulcrum.security.model.dynamic.entity.DynamicUser;
import org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity;
-import org.apache.fulcrum.security.torque.om.TorqueDynamicGroup;
-import org.apache.fulcrum.security.torque.om.TorqueDynamicUser;
import org.apache.fulcrum.security.torque.om.TorqueDynamicUserDelegates;
import org.apache.fulcrum.security.torque.om.TorqueDynamicUserDelegatesPeer;
import org.apache.fulcrum.security.torque.om.TorqueDynamicUserGroup;
import org.apache.fulcrum.security.torque.om.TorqueDynamicUserGroupPeer;
import org.apache.fulcrum.security.torque.om.TorqueDynamicUserPeer;
import org.apache.fulcrum.security.util.GroupSet;
+import org.apache.fulcrum.security.util.UserSet;
import org.apache.torque.TorqueException;
import org.apache.torque.om.SimpleKey;
import org.apache.torque.util.Criteria;
@@ -46,14 +44,17 @@ import org.apache.torque.util.Criteria;
public abstract class TorqueAbstractDynamicUser extends
TorqueAbstractSecurityEntity
implements DynamicUser
{
- /** a cache of group objects */
- private Set groupSet = null;
+ /** Serial version */
+ private static final long serialVersionUID = -7307211992287876455L;
+
+ /** a cache of group objects */
+ private Set<Group> groupSet = null;
/** a cache of delegator (user) objects */
- private Set delegators = null;
+ private Set<User> delegators = null;
/** a cache of delegatee(user) objects */
- private Set delegatees = null;
+ private Set<User> delegatees = null;
/**
* Forward reference to generated code
@@ -66,7 +67,7 @@ public abstract class TorqueAbstractDyna
*
* @return a list of User/Group relations
*/
- protected abstract List
getTorqueDynamicUserGroupsJoinTorqueDynamicGroup(Criteria criteria)
+ protected abstract List<TorqueDynamicUserGroup>
getTorqueDynamicUserGroupsJoinTorqueDynamicGroup(Criteria criteria)
throws TorqueException;
/**
@@ -80,7 +81,7 @@ public abstract class TorqueAbstractDyna
*
* @return a list of User/Delegator relations
*/
- protected abstract List
getTorqueDynamicUserDelegatessRelatedByDelegateeUserIdJoinTorqueDynamicUserRelatedByDelegatorUserId(Criteria
criteria)
+ protected abstract List<TorqueDynamicUserDelegates>
getTorqueDynamicUserDelegatessRelatedByDelegateeUserIdJoinTorqueDynamicUserRelatedByDelegatorUserId(Criteria
criteria)
throws TorqueException;
/**
@@ -94,7 +95,7 @@ public abstract class TorqueAbstractDyna
*
* @return a list of User/Delegator relations
*/
- protected abstract List
getTorqueDynamicUserDelegatessRelatedByDelegatorUserIdJoinTorqueDynamicUserRelatedByDelegateeUserId(Criteria
criteria)
+ protected abstract List<TorqueDynamicUserDelegates>
getTorqueDynamicUserDelegatessRelatedByDelegatorUserIdJoinTorqueDynamicUserRelatedByDelegateeUserId(Criteria
criteria)
throws TorqueException;
/**
@@ -125,9 +126,10 @@ public abstract class TorqueAbstractDyna
/**
* @see
org.apache.fulcrum.security.model.basic.entity.BasicUser#getGroupsAsSet()
*/
- public Set getGroupsAsSet()
+ @SuppressWarnings("unchecked")
+ public <T extends Group> Set<T> getGroupsAsSet()
{
- return groupSet;
+ return (Set<T>)groupSet;
}
/**
@@ -156,7 +158,7 @@ public abstract class TorqueAbstractDyna
/**
* @see
org.apache.fulcrum.security.model.basic.entity.BasicUser#setGroupsAsSet(java.util.Set)
*/
- public void setGroupsAsSet(Set groups)
+ public <T extends Group> void setGroupsAsSet(Set<T> groups)
{
setGroups(new GroupSet(groups));
}
@@ -164,56 +166,58 @@ public abstract class TorqueAbstractDyna
/**
* @see
org.apache.fulcrum.security.model.dynamic.entity.DynamicUser#getDelegatees()
*/
- public Set getDelegatees()
+ @SuppressWarnings("unchecked")
+ public <T extends User> Set<T> getDelegatees()
{
if (delegatees == null)
{
- delegatees = new HashSet();
+ delegatees = new UserSet();
}
- return delegatees;
+ return (Set<T>)delegatees;
}
/**
* @see
org.apache.fulcrum.security.model.dynamic.entity.DynamicUser#getDelegators()
*/
- public Set getDelegators()
+ @SuppressWarnings("unchecked")
+ public <T extends User> Set<T> getDelegators()
{
if (delegators == null)
{
- delegators = new HashSet();
+ delegators = new UserSet();
}
- return delegators;
+ return (Set<T>)delegators;
}
/**
* @see
org.apache.fulcrum.security.model.dynamic.entity.DynamicUser#setDelegatees(java.util.Set)
*/
- public void setDelegatees(Set delegatees)
+ public <T extends User> void setDelegatees(Set<T> delegatees)
{
if (delegatees != null)
{
- this.delegatees = delegatees;
+ this.delegatees = new UserSet(delegatees);
}
else
{
- this.delegatees = new HashSet();
+ this.delegatees = new UserSet();
}
}
/**
* @see
org.apache.fulcrum.security.model.dynamic.entity.DynamicUser#setDelegators(java.util.Set)
*/
- public void setDelegators(Set delegates)
+ public <T extends User> void setDelegators(Set<T> delegates)
{
if (delegators != null)
{
- this.delegators = delegates;
+ this.delegators = new UserSet(delegates);
}
else
{
- this.delegators = new HashSet();
+ this.delegators = new UserSet();
}
}
@@ -232,31 +236,28 @@ public abstract class TorqueAbstractDyna
{
this.groupSet = new GroupSet();
- List usergroups = getTorqueDynamicUserGroupsJoinTorqueDynamicGroup(new
Criteria());
+ List<TorqueDynamicUserGroup> usergroups =
getTorqueDynamicUserGroupsJoinTorqueDynamicGroup(new Criteria());
- for (Iterator i = usergroups.iterator(); i.hasNext();)
+ for (TorqueDynamicUserGroup tdug : usergroups)
{
- TorqueDynamicUserGroup tdug = (TorqueDynamicUserGroup)i.next();
groupSet.add(tdug.getTorqueDynamicGroup());
}
- this.delegators = new HashSet();
+ this.delegators = new UserSet();
- List delegatorlist =
getTorqueDynamicUserDelegatessRelatedByDelegateeUserIdJoinTorqueDynamicUserRelatedByDelegatorUserId(new
Criteria());
+ List<TorqueDynamicUserDelegates> delegatorlist =
getTorqueDynamicUserDelegatessRelatedByDelegateeUserIdJoinTorqueDynamicUserRelatedByDelegatorUserId(new
Criteria());
- for (Iterator i = delegatorlist.iterator(); i.hasNext();)
+ for (TorqueDynamicUserDelegates tdud : delegatorlist)
{
- TorqueDynamicUserDelegates tdud =
(TorqueDynamicUserDelegates)i.next();
delegators.add(tdud.getTorqueDynamicUserRelatedByDelegatorUserId());
}
- this.delegatees = new HashSet();
+ this.delegatees = new UserSet();
- List delegateelist =
getTorqueDynamicUserDelegatessRelatedByDelegatorUserIdJoinTorqueDynamicUserRelatedByDelegateeUserId(new
Criteria());
+ List<TorqueDynamicUserDelegates> delegateelist =
getTorqueDynamicUserDelegatessRelatedByDelegatorUserIdJoinTorqueDynamicUserRelatedByDelegateeUserId(new
Criteria());
- for (Iterator i = delegateelist.iterator(); i.hasNext();)
+ for (TorqueDynamicUserDelegates tdud : delegateelist)
{
- TorqueDynamicUserDelegates tdud =
(TorqueDynamicUserDelegates)i.next();
delegatees.add(tdud.getTorqueDynamicUserRelatedByDelegateeUserId());
}
}
@@ -274,13 +275,11 @@ public abstract class TorqueAbstractDyna
criteria.add(TorqueDynamicUserGroupPeer.USER_ID, getEntityId());
TorqueDynamicUserGroupPeer.doDelete(criteria, con);
- for (Iterator i = groupSet.iterator(); i.hasNext();)
+ for (Group g : groupSet)
{
- TorqueDynamicGroup group = (TorqueDynamicGroup)i.next();
-
TorqueDynamicUserGroup ug = new TorqueDynamicUserGroup();
ug.setUserId(getEntityId());
- ug.setGroupId(group.getEntityId());
+ ug.setGroupId((Integer)g.getId());
ug.save(con);
}
}
@@ -293,13 +292,11 @@ public abstract class TorqueAbstractDyna
criteria.add(TorqueDynamicUserDelegatesPeer.DELEGATEE_USER_ID,
getEntityId());
TorqueDynamicUserDelegatesPeer.doDelete(criteria, con);
- for (Iterator i = delegators.iterator(); i.hasNext();)
+ for (User u : delegators)
{
- TorqueDynamicUser user = (TorqueDynamicUser)i.next();
-
TorqueDynamicUserDelegates ud = new
TorqueDynamicUserDelegates();
ud.setDelegateeUserId(getEntityId());
- ud.setDelegatorUserId(user.getEntityId());
+ ud.setDelegatorUserId((Integer)u.getId());
ud.save(con);
}
}
@@ -312,13 +309,11 @@ public abstract class TorqueAbstractDyna
criteria.add(TorqueDynamicUserDelegatesPeer.DELEGATOR_USER_ID,
getEntityId());
TorqueDynamicUserDelegatesPeer.doDelete(criteria, con);
- for (Iterator i = delegatees.iterator(); i.hasNext();)
+ for (User u : delegatees)
{
- TorqueDynamicUser user = (TorqueDynamicUser)i.next();
-
TorqueDynamicUserDelegates ud = new
TorqueDynamicUserDelegates();
ud.setDelegatorUserId(getEntityId());
- ud.setDelegateeUserId(user.getEntityId());
+ ud.setDelegateeUserId((Integer)u.getId());
ud.save(con);
}
}
