Author: tv
Date: Fri Aug 31 12:14:54 2012
New Revision: 1379429
URL: http://svn.apache.org/viewvc?rev=1379429&view=rev
Log:
Second chunk of generifications
Added:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineTurbineSecurityEntity.java
(with props)
Modified:
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/dynamic/TorqueDynamicGroupManagerImpl.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicPermissionManagerImpl.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicRoleManagerImpl.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicUserManagerImpl.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineGroup.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbinePermission.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineRole.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineUser.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineGroupManagerImpl.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerImpl.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbinePermissionManagerImpl.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineRoleManagerImpl.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineUserManagerImpl.java
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=1379429&r1=1379428&r2=1379429&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
Fri Aug 31 12:14:54 2012
@@ -47,7 +47,7 @@ public abstract class TorqueAbstractPerm
*
* @throws TorqueException if any database error occurs
*/
- protected abstract List<Permission> doSelectAllPermissions(Connection con)
+ protected abstract <T extends Permission> List<T>
doSelectAllPermissions(Connection con)
throws TorqueException;
/**
@@ -191,7 +191,6 @@ public abstract class TorqueAbstractPerm
{
// Add attached objects if they exist
((TorqueAbstractSecurityEntity)p).retrieveAttachedObjects(con);
-
permissionSet.add(p);
}
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=1379429&r1=1379428&r2=1379429&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
Fri Aug 31 12:14:54 2012
@@ -47,7 +47,7 @@ public abstract class TorqueAbstractRole
*
* @throws TorqueException if any database error occurs
*/
- protected abstract List<Role> doSelectAllRoles(Connection con)
+ protected abstract <T extends Role> List<T> doSelectAllRoles(Connection
con)
throws TorqueException;
/**
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicGroupManagerImpl.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicGroupManagerImpl.java?rev=1379429&r1=1379428&r2=1379429&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicGroupManagerImpl.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicGroupManagerImpl.java
Fri Aug 31 12:14:54 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.TorqueDynamicGroup;
import org.apache.fulcrum.security.torque.om.TorqueDynamicGroupPeer;
import org.apache.torque.NoRowsException;
import org.apache.torque.TooManyRowsException;
@@ -38,11 +39,12 @@ public class TorqueDynamicGroupManagerIm
/**
* @see
org.apache.fulcrum.security.torque.TorqueAbstractGroupManager#doSelectAllGroups(java.sql.Connection)
*/
- protected List doSelectAllGroups(Connection con) throws TorqueException
+ @SuppressWarnings("unchecked")
+ protected <T extends Group> List<T> doSelectAllGroups(Connection con)
throws TorqueException
{
Criteria criteria = new Criteria(TorqueDynamicGroupPeer.DATABASE_NAME);
- return TorqueDynamicGroupPeer.doSelect(criteria, con);
+ return (List<T>)TorqueDynamicGroupPeer.doSelect(criteria, con);
}
/**
@@ -63,13 +65,13 @@ public class TorqueDynamicGroupManagerIm
criteria.setIgnoreCase(true);
criteria.setSingleRecord(true);
- List groups = TorqueDynamicGroupPeer.doSelect(criteria, con);
+ List<TorqueDynamicGroup> groups =
TorqueDynamicGroupPeer.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/dynamic/TorqueDynamicPermissionManagerImpl.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicPermissionManagerImpl.java?rev=1379429&r1=1379428&r2=1379429&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicPermissionManagerImpl.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicPermissionManagerImpl.java
Fri Aug 31 12:14:54 2012
@@ -22,6 +22,7 @@ import java.util.List;
import org.apache.fulcrum.security.entity.Permission;
import org.apache.fulcrum.security.torque.TorqueAbstractPermissionManager;
+import org.apache.fulcrum.security.torque.om.TorqueDynamicPermission;
import org.apache.fulcrum.security.torque.om.TorqueDynamicPermissionPeer;
import org.apache.torque.NoRowsException;
import org.apache.torque.TooManyRowsException;
@@ -38,11 +39,12 @@ public class TorqueDynamicPermissionMana
/**
* @see
org.apache.fulcrum.security.torque.TorqueAbstractPermissionManager#doSelectAllPermissions(java.sql.Connection)
*/
- protected List doSelectAllPermissions(Connection con) throws
TorqueException
+ @SuppressWarnings("unchecked")
+ protected <T extends Permission> List<T>
doSelectAllPermissions(Connection con) throws TorqueException
{
Criteria criteria = new
Criteria(TorqueDynamicPermissionPeer.DATABASE_NAME);
- return TorqueDynamicPermissionPeer.doSelect(criteria, con);
+ return (List<T>)TorqueDynamicPermissionPeer.doSelect(criteria, con);
}
/**
@@ -63,13 +65,13 @@ public class TorqueDynamicPermissionMana
criteria.setIgnoreCase(true);
criteria.setSingleRecord(true);
- List permissions = TorqueDynamicPermissionPeer.doSelect(criteria, con);
+ List<TorqueDynamicPermission> permissions =
TorqueDynamicPermissionPeer.doSelect(criteria, con);
if (permissions.isEmpty())
{
throw new NoRowsException(name);
}
- return (Permission)permissions.get(0);
+ return permissions.get(0);
}
}
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicRoleManagerImpl.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicRoleManagerImpl.java?rev=1379429&r1=1379428&r2=1379429&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicRoleManagerImpl.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicRoleManagerImpl.java
Fri Aug 31 12:14:54 2012
@@ -22,6 +22,7 @@ import java.util.List;
import org.apache.fulcrum.security.entity.Role;
import org.apache.fulcrum.security.torque.TorqueAbstractRoleManager;
+import org.apache.fulcrum.security.torque.om.TorqueDynamicRole;
import org.apache.fulcrum.security.torque.om.TorqueDynamicRolePeer;
import org.apache.torque.NoRowsException;
import org.apache.torque.TooManyRowsException;
@@ -38,11 +39,12 @@ public class TorqueDynamicRoleManagerImp
/**
* @see
org.apache.fulcrum.security.torque.TorqueAbstractRoleManager#doSelectAllRoles(java.sql.Connection)
*/
- protected List doSelectAllRoles(Connection con) throws TorqueException
+ @SuppressWarnings("unchecked")
+ protected <T extends Role> List<T> doSelectAllRoles(Connection con)
throws TorqueException
{
Criteria criteria = new Criteria(TorqueDynamicRolePeer.DATABASE_NAME);
- return TorqueDynamicRolePeer.doSelect(criteria, con);
+ return (List<T>)TorqueDynamicRolePeer.doSelect(criteria, con);
}
/**
@@ -63,13 +65,13 @@ public class TorqueDynamicRoleManagerImp
criteria.setIgnoreCase(true);
criteria.setSingleRecord(true);
- List roles = TorqueDynamicRolePeer.doSelect(criteria, con);
+ List<TorqueDynamicRole> roles =
TorqueDynamicRolePeer.doSelect(criteria, con);
if (roles.isEmpty())
{
throw new NoRowsException(name);
}
- return (Role)roles.get(0);
+ return roles.get(0);
}
}
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicUserManagerImpl.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicUserManagerImpl.java?rev=1379429&r1=1379428&r2=1379429&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicUserManagerImpl.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicUserManagerImpl.java
Fri Aug 31 12:14:54 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.TorqueDynamicUser;
import org.apache.fulcrum.security.torque.om.TorqueDynamicUserPeer;
import org.apache.torque.NoRowsException;
import org.apache.torque.TooManyRowsException;
@@ -38,11 +39,12 @@ public class TorqueDynamicUserManagerImp
/**
* @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(TorqueDynamicUserPeer.DATABASE_NAME);
- return TorqueDynamicUserPeer.doSelect(criteria, con);
+ return (List<T>)TorqueDynamicUserPeer.doSelect(criteria, con);
}
/**
@@ -63,13 +65,13 @@ public class TorqueDynamicUserManagerImp
criteria.setIgnoreCase(true);
criteria.setSingleRecord(true);
- List users = TorqueDynamicUserPeer.doSelect(criteria, con);
+ List<TorqueDynamicUser> users =
TorqueDynamicUserPeer.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/turbine/TorqueAbstractTurbineGroup.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineGroup.java?rev=1379429&r1=1379428&r2=1379429&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineGroup.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineGroup.java
Fri Aug 31 12:14:54 2012
@@ -19,13 +19,11 @@ package org.apache.fulcrum.security.torq
*/
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.model.turbine.entity.TurbineGroup;
import org.apache.fulcrum.security.model.turbine.entity.TurbineUserGroupRole;
-import org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity;
import org.apache.fulcrum.security.torque.om.TorqueTurbineGroupPeer;
import org.apache.fulcrum.security.torque.om.TorqueTurbineUserGroupRole;
import org.apache.fulcrum.security.torque.om.TorqueTurbineUserGroupRolePeer;
@@ -38,11 +36,11 @@ import org.apache.torque.util.Criteria;
* @author <a href="mailto:[email protected]";>Thomas Vandahl</a>
* @version $Id:$
*/
-public abstract class TorqueAbstractTurbineGroup extends
TorqueAbstractSecurityEntity
+public abstract class TorqueAbstractTurbineGroup extends
TorqueAbstractTurbineTurbineSecurityEntity
implements TurbineGroup
{
- /** a cache of user_group_role objects */
- private Set userGroupRoleSet = null;
+ /** Serial version */
+ private static final long serialVersionUID = -6230312046016785990L;
/**
* Forward reference to generated code
@@ -55,54 +53,10 @@ public abstract class TorqueAbstractTurb
*
* @return a list of User/Group/Role relations
*/
- protected abstract List
getTorqueTurbineUserGroupRolesJoinTorqueTurbineRole(Criteria criteria)
+ protected abstract List<TorqueTurbineUserGroupRole>
getTorqueTurbineUserGroupRolesJoinTorqueTurbineRole(Criteria criteria)
throws TorqueException;
/**
- * @see
org.apache.fulcrum.security.model.turbine.entity.TurbineGroup#addUserGroupRole(org.apache.fulcrum.security.model.turbine.entity.TurbineUserGroupRole)
- */
- public void addUserGroupRole(TurbineUserGroupRole userGroupRole)
- {
- getUserGroupRoleSet().add(userGroupRole);
- }
-
- /**
- * @see
org.apache.fulcrum.security.model.turbine.entity.TurbineGroup#getUserGroupRoleSet()
- */
- public Set getUserGroupRoleSet()
- {
- if (userGroupRoleSet == null)
- {
- userGroupRoleSet = new HashSet();
- }
-
- return userGroupRoleSet;
- }
-
- /**
- * @see
org.apache.fulcrum.security.model.turbine.entity.TurbineGroup#removeUserGroupRole(org.apache.fulcrum.security.model.turbine.entity.TurbineUserGroupRole)
- */
- public void removeUserGroupRole(TurbineUserGroupRole userGroupRole)
- {
- getUserGroupRoleSet().remove(userGroupRole);
- }
-
- /**
- * @see
org.apache.fulcrum.security.model.turbine.entity.TurbineGroup#setUserGroupRoleSet(java.util.Set)
- */
- public void setUserGroupRoleSet(Set userGroupRoleSet)
- {
- if (userGroupRoleSet != null)
- {
- this.userGroupRoleSet = userGroupRoleSet;
- }
- else
- {
- this.userGroupRoleSet = new HashSet();
- }
- }
-
- /**
* @see
org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity#getDatabaseName()
*/
public String getDatabaseName()
@@ -115,21 +69,21 @@ public abstract class TorqueAbstractTurb
*/
public void retrieveAttachedObjects(Connection con) throws TorqueException
{
- this.userGroupRoleSet = new HashSet();
+ Set<TurbineUserGroupRole> userGroupRoleSet = new
HashSet<TurbineUserGroupRole>();
// the generated method that allows a Connection parameter is missing
- List ugrs = getTorqueTurbineUserGroupRolesJoinTorqueTurbineRole(new
Criteria());
+ List<TorqueTurbineUserGroupRole> ugrs =
getTorqueTurbineUserGroupRolesJoinTorqueTurbineRole(new Criteria());
- for (Iterator i = ugrs.iterator(); i.hasNext();)
+ for (TorqueTurbineUserGroupRole ttugr : ugrs)
{
- TorqueTurbineUserGroupRole ttugr =
(TorqueTurbineUserGroupRole)i.next();
-
TurbineUserGroupRole ugr = new TurbineUserGroupRole();
ugr.setGroup(this);
ugr.setRole(ttugr.getTorqueTurbineRole());
ugr.setUser(ttugr.getTorqueTurbineUser(con));
userGroupRoleSet.add(ugr);
}
+
+ setUserGroupRoleSet(userGroupRoleSet);
}
/**
@@ -137,6 +91,7 @@ public abstract class TorqueAbstractTurb
*/
public void update(Connection con) throws TorqueException
{
+ Set<TurbineUserGroupRole> userGroupRoleSet = getUserGroupRoleSet();
if (userGroupRoleSet != null)
{
Criteria criteria = new Criteria();
@@ -145,10 +100,8 @@ public abstract class TorqueAbstractTurb
criteria.add(TorqueTurbineUserGroupRolePeer.GROUP_ID,
getEntityId());
TorqueTurbineUserGroupRolePeer.doDelete(criteria, con);
- for (Iterator i = userGroupRoleSet.iterator(); i.hasNext();)
+ for (TurbineUserGroupRole ugr : userGroupRoleSet)
{
- TurbineUserGroupRole ugr = (TurbineUserGroupRole)i.next();
-
TorqueTurbineUserGroupRole ttugr = new
TorqueTurbineUserGroupRole();
ttugr.setGroupId((Integer)ugr.getGroup().getId());
ttugr.setUserId((Integer)ugr.getUser().getId());
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbinePermission.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbinePermission.java?rev=1379429&r1=1379428&r2=1379429&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbinePermission.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbinePermission.java
Fri Aug 31 12:14:54 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.turbine.entity.TurbinePermission;
import org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity;
import org.apache.fulcrum.security.torque.om.TorqueTurbinePermissionPeer;
-import org.apache.fulcrum.security.torque.om.TorqueTurbineRole;
import org.apache.fulcrum.security.torque.om.TorqueTurbineRolePermission;
import org.apache.fulcrum.security.torque.om.TorqueTurbineRolePermissionPeer;
import org.apache.fulcrum.security.util.RoleSet;
@@ -42,8 +40,11 @@ import org.apache.torque.util.Criteria;
public abstract class TorqueAbstractTurbinePermission extends
TorqueAbstractSecurityEntity
implements TurbinePermission
{
- /** a cache of role objects */
- private Set roleSet = null;
+ /** Serial version */
+ private static final long serialVersionUID = -5313324873688923207L;
+
+ /** a cache of role objects */
+ private Set<Role> roleSet = null;
/**
* Forward reference to generated code
@@ -56,7 +57,7 @@ public abstract class TorqueAbstractTurb
*
* @return a list of Role/Permission relations
*/
- protected abstract List
getTorqueTurbineRolePermissionsJoinTorqueTurbineRole(Criteria criteria)
+ protected abstract List<TorqueTurbineRolePermission>
getTorqueTurbineRolePermissionsJoinTorqueTurbineRole(Criteria criteria)
throws TorqueException;
/**
@@ -87,9 +88,10 @@ public abstract class TorqueAbstractTurb
/**
* @see
org.apache.fulcrum.security.model.turbine.entity.TurbinePermission#getRolesAsSet()
*/
- public Set getRolesAsSet()
+ @SuppressWarnings("unchecked")
+ public <T extends Role> Set<T> getRolesAsSet()
{
- return roleSet;
+ return (Set<T>)roleSet;
}
/**
@@ -118,7 +120,7 @@ public abstract class TorqueAbstractTurb
/**
* @see
org.apache.fulcrum.security.model.turbine.entity.TurbinePermission#setRolesAsSet(java.util.Set)
*/
- public void setRolesAsSet(Set roles)
+ public <T extends Role> void setRolesAsSet(Set<T> roles)
{
setRoles(new RoleSet(roles));
}
@@ -139,11 +141,10 @@ public abstract class TorqueAbstractTurb
this.roleSet = new RoleSet();
// the generated method that allows a Connection parameter is missing
- List rolepermissions =
getTorqueTurbineRolePermissionsJoinTorqueTurbineRole(new Criteria());
+ List<TorqueTurbineRolePermission> rolepermissions =
getTorqueTurbineRolePermissionsJoinTorqueTurbineRole(new Criteria());
- for (Iterator i = rolepermissions.iterator(); i.hasNext();)
+ for (TorqueTurbineRolePermission ttrp : rolepermissions)
{
- TorqueTurbineRolePermission ttrp =
(TorqueTurbineRolePermission)i.next();
roleSet.add(ttrp.getTorqueTurbineRole());
}
}
@@ -161,12 +162,10 @@ public abstract class TorqueAbstractTurb
criteria.add(TorqueTurbineRolePermissionPeer.PERMISSION_ID,
getEntityId());
TorqueTurbineRolePermissionPeer.doDelete(criteria, con);
- for (Iterator i = roleSet.iterator(); i.hasNext();)
+ for (Role r : roleSet)
{
- TorqueTurbineRole role = (TorqueTurbineRole)i.next();
-
TorqueTurbineRolePermission rp = new
TorqueTurbineRolePermission();
- 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/turbine/TorqueAbstractTurbineRole.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineRole.java?rev=1379429&r1=1379428&r2=1379429&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineRole.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineRole.java
Fri Aug 31 12:14:54 2012
@@ -19,15 +19,12 @@ package org.apache.fulcrum.security.torq
*/
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.Permission;
import org.apache.fulcrum.security.model.turbine.entity.TurbineRole;
import org.apache.fulcrum.security.model.turbine.entity.TurbineUserGroupRole;
-import org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity;
-import org.apache.fulcrum.security.torque.om.TorqueTurbinePermission;
import org.apache.fulcrum.security.torque.om.TorqueTurbineRolePeer;
import org.apache.fulcrum.security.torque.om.TorqueTurbineRolePermission;
import org.apache.fulcrum.security.torque.om.TorqueTurbineRolePermissionPeer;
@@ -43,14 +40,14 @@ import org.apache.torque.util.Criteria;
* @author <a href="mailto:[email protected]";>Thomas Vandahl</a>
* @version $Id:$
*/
-public abstract class TorqueAbstractTurbineRole extends
TorqueAbstractSecurityEntity
+public abstract class TorqueAbstractTurbineRole extends
TorqueAbstractTurbineTurbineSecurityEntity
implements TurbineRole
{
- /** a cache of permission objects */
- private Set permissionSet = null;
+ /** Serial version */
+ private static final long serialVersionUID = -1782236723198646728L;
- /** a cache of user_group_role objects */
- private Set userGroupRoleSet = null;
+ /** a cache of permission objects */
+ private Set<Permission> permissionSet = null;
/**
* Forward reference to generated code
@@ -63,7 +60,7 @@ public abstract class TorqueAbstractTurb
*
* @return a list of Role/Permission relations
*/
- protected abstract List
getTorqueTurbineRolePermissionsJoinTorqueTurbinePermission(Criteria criteria)
+ protected abstract List<TorqueTurbineRolePermission>
getTorqueTurbineRolePermissionsJoinTorqueTurbinePermission(Criteria criteria)
throws TorqueException;
/**
@@ -77,7 +74,7 @@ public abstract class TorqueAbstractTurb
*
* @return a list of User/Group/Role relations
*/
- protected abstract List
getTorqueTurbineUserGroupRolesJoinTorqueTurbineGroup(Criteria criteria)
+ protected abstract List<TorqueTurbineUserGroupRole>
getTorqueTurbineUserGroupRolesJoinTorqueTurbineGroup(Criteria criteria)
throws TorqueException;
/**
@@ -89,14 +86,6 @@ public abstract class TorqueAbstractTurb
}
/**
- * @see
org.apache.fulcrum.security.model.turbine.entity.TurbineRole#addUserGroupRole(org.apache.fulcrum.security.model.turbine.entity.TurbineUserGroupRole)
- */
- public void addUserGroupRole(TurbineUserGroupRole userGroupRole)
- {
- getUserGroupRoleSet().add(userGroupRole);
- }
-
- /**
* @see
org.apache.fulcrum.security.model.turbine.entity.TurbineRole#getPermissions()
*/
public PermissionSet getPermissions()
@@ -116,22 +105,10 @@ public abstract class TorqueAbstractTurb
/**
* @see
org.apache.fulcrum.security.model.turbine.entity.TurbineRole#getPermissionsAsSet()
*/
- public Set getPermissionsAsSet()
+ @SuppressWarnings("unchecked")
+ public <T extends Permission> Set<T> getPermissionsAsSet()
{
- return permissionSet;
- }
-
- /**
- * @see
org.apache.fulcrum.security.model.turbine.entity.TurbineRole#getUserGroupRoleSet()
- */
- public Set getUserGroupRoleSet()
- {
- if (userGroupRoleSet == null)
- {
- userGroupRoleSet = new HashSet();
- }
-
- return userGroupRoleSet;
+ return (Set<T>)permissionSet;
}
/**
@@ -143,14 +120,6 @@ public abstract class TorqueAbstractTurb
}
/**
- * @see
org.apache.fulcrum.security.model.turbine.entity.TurbineRole#removeUserGroupRole(org.apache.fulcrum.security.model.turbine.entity.TurbineUserGroupRole)
- */
- public void removeUserGroupRole(TurbineUserGroupRole userGroupRole)
- {
- getUserGroupRoleSet().remove(userGroupRole);
- }
-
- /**
* @see
org.apache.fulcrum.security.model.turbine.entity.TurbineRole#setPermissions(org.apache.fulcrum.security.util.PermissionSet)
*/
public void setPermissions(PermissionSet permissionSet)
@@ -168,27 +137,12 @@ public abstract class TorqueAbstractTurb
/**
* @see
org.apache.fulcrum.security.model.turbine.entity.TurbineRole#setPermissionsAsSet(java.util.Set)
*/
- public void setPermissionsAsSet(Set permissions)
+ public <T extends Permission> void setPermissionsAsSet(Set<T> permissions)
{
setPermissions(new PermissionSet(permissions));
}
/**
- * @see
org.apache.fulcrum.security.model.turbine.entity.TurbineRole#setUserGroupRoleSet(java.util.Set)
- */
- public void setUserGroupRoleSet(Set userGroupRoleSet)
- {
- if (userGroupRoleSet != null)
- {
- this.userGroupRoleSet = userGroupRoleSet;
- }
- else
- {
- this.userGroupRoleSet = new HashSet();
- }
- }
-
- /**
* @see
org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity#getDatabaseName()
*/
public String getDatabaseName()
@@ -204,29 +158,28 @@ public abstract class TorqueAbstractTurb
this.permissionSet = new PermissionSet();
// the generated method that allows a Connection parameter is missing
- List rolepermissions =
getTorqueTurbineRolePermissionsJoinTorqueTurbinePermission(new Criteria());
+ List<TorqueTurbineRolePermission> rolepermissions =
getTorqueTurbineRolePermissionsJoinTorqueTurbinePermission(new Criteria());
- for (Iterator i = rolepermissions.iterator(); i.hasNext();)
+ for (TorqueTurbineRolePermission ttrp : rolepermissions)
{
- TorqueTurbineRolePermission ttrp =
(TorqueTurbineRolePermission)i.next();
permissionSet.add(ttrp.getTorqueTurbinePermission());
}
- this.userGroupRoleSet = new HashSet();
+ Set<TurbineUserGroupRole> userGroupRoleSet = new
HashSet<TurbineUserGroupRole>();
// the generated method that allows a Connection parameter is missing
- List ugrs = getTorqueTurbineUserGroupRolesJoinTorqueTurbineGroup(new
Criteria());
+ List<TorqueTurbineUserGroupRole> ugrs =
getTorqueTurbineUserGroupRolesJoinTorqueTurbineGroup(new Criteria());
- for (Iterator i = ugrs.iterator(); i.hasNext();)
+ for (TorqueTurbineUserGroupRole ttugr : ugrs)
{
- TorqueTurbineUserGroupRole ttugr =
(TorqueTurbineUserGroupRole)i.next();
-
TurbineUserGroupRole ugr = new TurbineUserGroupRole();
ugr.setRole(this);
ugr.setGroup(ttugr.getTorqueTurbineGroup());
ugr.setUser(ttugr.getTorqueTurbineUser(con));
userGroupRoleSet.add(ugr);
}
+
+ setUserGroupRoleSet(userGroupRoleSet);
}
/**
@@ -242,17 +195,16 @@ public abstract class TorqueAbstractTurb
criteria.add(TorqueTurbineRolePermissionPeer.ROLE_ID,
getEntityId());
TorqueTurbineRolePermissionPeer.doDelete(criteria, con);
- for (Iterator i = permissionSet.iterator(); i.hasNext();)
+ for (Permission p : permissionSet)
{
- TorqueTurbinePermission permission =
(TorqueTurbinePermission)i.next();
-
TorqueTurbineRolePermission rp = new
TorqueTurbineRolePermission();
- rp.setPermissionId(permission.getEntityId());
+ rp.setPermissionId((Integer)p.getId());
rp.setRoleId(getEntityId());
rp.save(con);
}
}
+ Set<TurbineUserGroupRole> userGroupRoleSet = getUserGroupRoleSet();
if (userGroupRoleSet != null)
{
Criteria criteria = new Criteria();
@@ -261,10 +213,8 @@ public abstract class TorqueAbstractTurb
criteria.add(TorqueTurbineUserGroupRolePeer.ROLE_ID,
getEntityId());
TorqueTurbineUserGroupRolePeer.doDelete(criteria, con);
- for (Iterator i = userGroupRoleSet.iterator(); i.hasNext();)
+ for (TurbineUserGroupRole ugr : userGroupRoleSet)
{
- TurbineUserGroupRole ugr = (TurbineUserGroupRole)i.next();
-
TorqueTurbineUserGroupRole ttugr = new
TorqueTurbineUserGroupRole();
ttugr.setGroupId((Integer)ugr.getGroup().getId());
ttugr.setUserId((Integer)ugr.getUser().getId());
Added:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineTurbineSecurityEntity.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineTurbineSecurityEntity.java?rev=1379429&view=auto
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineTurbineSecurityEntity.java
(added)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineTurbineSecurityEntity.java
Fri Aug 31 12:14:54 2012
@@ -0,0 +1,85 @@
+package org.apache.fulcrum.security.torque.turbine;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.fulcrum.security.model.turbine.entity.TurbineUserGroupRole;
+import
org.apache.fulcrum.security.model.turbine.entity.TurbineUserGroupRoleEntity;
+import org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity;
+/**
+ * This abstract class provides the SecurityInterface to the managers.
+ *
+ * @author <a href="mailto:[email protected]";>Thomas Vandahl</a>
+ * @version $Id:$
+ */
+public abstract class TorqueAbstractTurbineTurbineSecurityEntity extends
TorqueAbstractSecurityEntity
+ implements TurbineUserGroupRoleEntity
+{
+ /** Serial version */
+ private static final long serialVersionUID = -6230312046016785990L;
+
+ /** a cache of user_group_role objects */
+ private Set<? extends TurbineUserGroupRole> userGroupRoleSet = null;
+
+ /**
+ * @see
org.apache.fulcrum.security.model.turbine.entity.TurbineGroup#addUserGroupRole(org.apache.fulcrum.security.model.turbine.entity.TurbineUserGroupRole)
+ */
+ public void addUserGroupRole(TurbineUserGroupRole userGroupRole)
+ {
+ getUserGroupRoleSet().add(userGroupRole);
+ }
+
+ /**
+ * @see
org.apache.fulcrum.security.model.turbine.entity.TurbineGroup#getUserGroupRoleSet()
+ */
+ @SuppressWarnings("unchecked")
+ public <T extends TurbineUserGroupRole> Set<T> getUserGroupRoleSet()
+ {
+ if (userGroupRoleSet == null)
+ {
+ userGroupRoleSet = new HashSet<TurbineUserGroupRole>();
+ }
+
+ return (Set<T>)userGroupRoleSet;
+ }
+
+ /**
+ * @see
org.apache.fulcrum.security.model.turbine.entity.TurbineGroup#removeUserGroupRole(org.apache.fulcrum.security.model.turbine.entity.TurbineUserGroupRole)
+ */
+ public void removeUserGroupRole(TurbineUserGroupRole userGroupRole)
+ {
+ getUserGroupRoleSet().remove(userGroupRole);
+ }
+
+ /**
+ * @see
org.apache.fulcrum.security.model.turbine.entity.TurbineGroup#setUserGroupRoleSet(java.util.Set)
+ */
+ public <T extends TurbineUserGroupRole> void setUserGroupRoleSet(Set<T>
userGroupRoleSet)
+ {
+ if (userGroupRoleSet != null)
+ {
+ this.userGroupRoleSet = userGroupRoleSet;
+ }
+ else
+ {
+ this.userGroupRoleSet = new HashSet<TurbineUserGroupRole>();
+ }
+ }
+}
Propchange:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineTurbineSecurityEntity.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineUser.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineUser.java?rev=1379429&r1=1379428&r2=1379429&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineUser.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineUser.java
Fri Aug 31 12:14:54 2012
@@ -19,13 +19,11 @@ package org.apache.fulcrum.security.torq
*/
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.model.turbine.entity.TurbineUser;
import org.apache.fulcrum.security.model.turbine.entity.TurbineUserGroupRole;
-import org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity;
import org.apache.fulcrum.security.torque.om.TorqueTurbineUserGroupRole;
import org.apache.fulcrum.security.torque.om.TorqueTurbineUserGroupRolePeer;
import org.apache.fulcrum.security.torque.om.TorqueTurbineUserPeer;
@@ -38,11 +36,11 @@ import org.apache.torque.util.Criteria;
* @author <a href="mailto:[email protected]";>Thomas Vandahl</a>
* @version $Id:$
*/
-public abstract class TorqueAbstractTurbineUser extends
TorqueAbstractSecurityEntity
+public abstract class TorqueAbstractTurbineUser extends
TorqueAbstractTurbineTurbineSecurityEntity
implements TurbineUser
{
- /** a cache of user_group_role objects */
- private Set userGroupRoleSet = null;
+ /** Serial version */
+ private static final long serialVersionUID = -7255623655281852566L;
/**
* Forward reference to generated code
@@ -55,54 +53,10 @@ public abstract class TorqueAbstractTurb
*
* @return a list of User/Group/Role relations
*/
- protected abstract List
getTorqueTurbineUserGroupRolesJoinTorqueTurbineRole(Criteria criteria)
+ protected abstract List<TorqueTurbineUserGroupRole>
getTorqueTurbineUserGroupRolesJoinTorqueTurbineRole(Criteria criteria)
throws TorqueException;
/**
- * @see
org.apache.fulcrum.security.model.turbine.entity.TurbineUser#addUserGroupRole(org.apache.fulcrum.security.model.turbine.entity.TurbineUserGroupRole)
- */
- public void addUserGroupRole(TurbineUserGroupRole userGroupRole)
- {
- getUserGroupRoleSet().add(userGroupRole);
- }
-
- /**
- * @see
org.apache.fulcrum.security.model.turbine.entity.TurbineUser#getUserGroupRoleSet()
- */
- public Set getUserGroupRoleSet()
- {
- if (userGroupRoleSet == null)
- {
- userGroupRoleSet = new HashSet();
- }
-
- return userGroupRoleSet;
- }
-
- /**
- * @see
org.apache.fulcrum.security.model.turbine.entity.TurbineUser#removeUserGroupRole(org.apache.fulcrum.security.model.turbine.entity.TurbineUserGroupRole)
- */
- public void removeUserGroupRole(TurbineUserGroupRole userGroupRole)
- {
- getUserGroupRoleSet().remove(userGroupRole);
- }
-
- /**
- * @see
org.apache.fulcrum.security.model.turbine.entity.TurbineUser#setUserGroupRoleSet(java.util.Set)
- */
- public void setUserGroupRoleSet(Set userGroupRoleSet)
- {
- if (userGroupRoleSet != null)
- {
- this.userGroupRoleSet = userGroupRoleSet;
- }
- else
- {
- this.userGroupRoleSet = new HashSet();
- }
- }
-
- /**
* @see
org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity#getDatabaseName()
*/
public String getDatabaseName()
@@ -115,21 +69,21 @@ public abstract class TorqueAbstractTurb
*/
public void retrieveAttachedObjects(Connection con) throws TorqueException
{
- this.userGroupRoleSet = new HashSet();
+ Set<TurbineUserGroupRole> userGroupRoleSet = new
HashSet<TurbineUserGroupRole>();
// the generated method that allows a Connection parameter is missing
- List ugrs = getTorqueTurbineUserGroupRolesJoinTorqueTurbineRole(new
Criteria());
+ List<TorqueTurbineUserGroupRole> ugrs =
getTorqueTurbineUserGroupRolesJoinTorqueTurbineRole(new Criteria());
- for (Iterator i = ugrs.iterator(); i.hasNext();)
+ for (TorqueTurbineUserGroupRole ttugr : ugrs)
{
- TorqueTurbineUserGroupRole ttugr =
(TorqueTurbineUserGroupRole)i.next();
-
TurbineUserGroupRole ugr = new TurbineUserGroupRole();
ugr.setUser(this);
ugr.setRole(ttugr.getTorqueTurbineRole());
ugr.setGroup(ttugr.getTorqueTurbineGroup(con));
userGroupRoleSet.add(ugr);
}
+
+ setUserGroupRoleSet(userGroupRoleSet);
}
/**
@@ -137,6 +91,7 @@ public abstract class TorqueAbstractTurb
*/
public void update(Connection con) throws TorqueException
{
+ Set<TurbineUserGroupRole> userGroupRoleSet = getUserGroupRoleSet();
if (userGroupRoleSet != null)
{
Criteria criteria = new Criteria();
@@ -145,10 +100,8 @@ public abstract class TorqueAbstractTurb
criteria.add(TorqueTurbineUserGroupRolePeer.USER_ID,
getEntityId());
TorqueTurbineUserGroupRolePeer.doDelete(criteria, con);
- for (Iterator i = userGroupRoleSet.iterator(); i.hasNext();)
+ for (TurbineUserGroupRole ugr : userGroupRoleSet)
{
- TurbineUserGroupRole ugr = (TurbineUserGroupRole)i.next();
-
TorqueTurbineUserGroupRole ttugr = new
TorqueTurbineUserGroupRole();
ttugr.setGroupId((Integer)ugr.getGroup().getId());
ttugr.setUserId((Integer)ugr.getUser().getId());
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineGroupManagerImpl.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineGroupManagerImpl.java?rev=1379429&r1=1379428&r2=1379429&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineGroupManagerImpl.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineGroupManagerImpl.java
Fri Aug 31 12:14:54 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.TorqueTurbineGroup;
import org.apache.fulcrum.security.torque.om.TorqueTurbineGroupPeer;
import org.apache.torque.NoRowsException;
import org.apache.torque.TooManyRowsException;
@@ -38,11 +39,12 @@ public class TorqueTurbineGroupManagerIm
/**
* @see
org.apache.fulcrum.security.torque.TorqueAbstractGroupManager#doSelectAllGroups(java.sql.Connection)
*/
- protected List doSelectAllGroups(Connection con) throws TorqueException
+ @SuppressWarnings("unchecked")
+ protected <T extends Group> List<T> doSelectAllGroups(Connection con)
throws TorqueException
{
Criteria criteria = new Criteria(TorqueTurbineGroupPeer.DATABASE_NAME);
- return TorqueTurbineGroupPeer.doSelect(criteria, con);
+ return (List<T>)TorqueTurbineGroupPeer.doSelect(criteria, con);
}
/**
@@ -63,13 +65,13 @@ public class TorqueTurbineGroupManagerIm
criteria.setIgnoreCase(true);
criteria.setSingleRecord(true);
- List groups = TorqueTurbineGroupPeer.doSelect(criteria, con);
+ List<TorqueTurbineGroup> groups =
TorqueTurbineGroupPeer.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/turbine/TorqueTurbineModelManagerImpl.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerImpl.java?rev=1379429&r1=1379428&r2=1379429&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerImpl.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerImpl.java
Fri Aug 31 12:14:54 2012
@@ -18,7 +18,6 @@ package org.apache.fulcrum.security.torq
* under the License.
*/
import java.sql.Connection;
-import java.util.Iterator;
import org.apache.fulcrum.security.entity.Group;
import org.apache.fulcrum.security.entity.Permission;
@@ -231,17 +230,17 @@ public class TorqueTurbineModelManagerIm
if (roleExists && groupExists && userExists)
{
boolean ugrFound = false;
- TurbineUserGroupRole user_group_role = null;
- for (Iterator i = ((TurbineUser) user).getUserGroupRoleSet()
- .iterator(); i.hasNext();)
+ for (TurbineUserGroupRole user_group_role : ((TurbineUser)
user).getUserGroupRoleSet())
{
- user_group_role = (TurbineUserGroupRole) i.next();
if (user_group_role.getUser().equals(user)
&& user_group_role.getGroup().equals(group)
&& user_group_role.getRole().equals(role))
{
ugrFound = true;
+ ((TurbineUser)user).removeUserGroupRole(user_group_role);
+ ((TurbineGroup)group).removeUserGroupRole(user_group_role);
+ ((TurbineRole)role).removeUserGroupRole(user_group_role);
break;
}
}
@@ -251,10 +250,6 @@ public class TorqueTurbineModelManagerIm
throw new UnknownEntityException("Could not find
User/Group/Role");
}
- ((TurbineUser)user).removeUserGroupRole(user_group_role);
- ((TurbineGroup)group).removeUserGroupRole(user_group_role);
- ((TurbineRole)role).removeUserGroupRole(user_group_role);
-
Connection con = null;
try
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbinePermissionManagerImpl.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbinePermissionManagerImpl.java?rev=1379429&r1=1379428&r2=1379429&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbinePermissionManagerImpl.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbinePermissionManagerImpl.java
Fri Aug 31 12:14:54 2012
@@ -22,6 +22,7 @@ import java.util.List;
import org.apache.fulcrum.security.entity.Permission;
import org.apache.fulcrum.security.torque.TorqueAbstractPermissionManager;
+import org.apache.fulcrum.security.torque.om.TorqueTurbinePermission;
import org.apache.fulcrum.security.torque.om.TorqueTurbinePermissionPeer;
import org.apache.torque.NoRowsException;
import org.apache.torque.TooManyRowsException;
@@ -38,11 +39,12 @@ public class TorqueTurbinePermissionMana
/**
* @see
org.apache.fulcrum.security.torque.TorqueAbstractPermissionManager#doSelectAllPermissions(java.sql.Connection)
*/
- protected List doSelectAllPermissions(Connection con) throws
TorqueException
+ @SuppressWarnings("unchecked")
+ protected <T extends Permission> List<T>
doSelectAllPermissions(Connection con) throws TorqueException
{
Criteria criteria = new
Criteria(TorqueTurbinePermissionPeer.DATABASE_NAME);
- return TorqueTurbinePermissionPeer.doSelect(criteria, con);
+ return (List<T>)TorqueTurbinePermissionPeer.doSelect(criteria, con);
}
/**
@@ -63,13 +65,13 @@ public class TorqueTurbinePermissionMana
criteria.setIgnoreCase(true);
criteria.setSingleRecord(true);
- List permissions = TorqueTurbinePermissionPeer.doSelect(criteria, con);
+ List<TorqueTurbinePermission> permissions =
TorqueTurbinePermissionPeer.doSelect(criteria, con);
if (permissions.isEmpty())
{
throw new NoRowsException(name);
}
- return (Permission)permissions.get(0);
+ return permissions.get(0);
}
}
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineRoleManagerImpl.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineRoleManagerImpl.java?rev=1379429&r1=1379428&r2=1379429&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineRoleManagerImpl.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineRoleManagerImpl.java
Fri Aug 31 12:14:54 2012
@@ -22,6 +22,7 @@ import java.util.List;
import org.apache.fulcrum.security.entity.Role;
import org.apache.fulcrum.security.torque.TorqueAbstractRoleManager;
+import org.apache.fulcrum.security.torque.om.TorqueTurbineRole;
import org.apache.fulcrum.security.torque.om.TorqueTurbineRolePeer;
import org.apache.torque.NoRowsException;
import org.apache.torque.TooManyRowsException;
@@ -38,11 +39,12 @@ public class TorqueTurbineRoleManagerImp
/**
* @see
org.apache.fulcrum.security.torque.TorqueAbstractRoleManager#doSelectAllRoles(java.sql.Connection)
*/
- protected List doSelectAllRoles(Connection con) throws TorqueException
+ @SuppressWarnings("unchecked")
+ protected <T extends Role> List<T> doSelectAllRoles(Connection con)
throws TorqueException
{
Criteria criteria = new Criteria(TorqueTurbineRolePeer.DATABASE_NAME);
- return TorqueTurbineRolePeer.doSelect(criteria, con);
+ return (List<T>)TorqueTurbineRolePeer.doSelect(criteria, con);
}
/**
@@ -63,13 +65,13 @@ public class TorqueTurbineRoleManagerImp
criteria.setIgnoreCase(true);
criteria.setSingleRecord(true);
- List roles = TorqueTurbineRolePeer.doSelect(criteria, con);
+ List<TorqueTurbineRole> roles =
TorqueTurbineRolePeer.doSelect(criteria, con);
if (roles.isEmpty())
{
throw new NoRowsException(name);
}
- return (Role)roles.get(0);
+ return roles.get(0);
}
}
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineUserManagerImpl.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineUserManagerImpl.java?rev=1379429&r1=1379428&r2=1379429&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineUserManagerImpl.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineUserManagerImpl.java
Fri Aug 31 12:14:54 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.TorqueTurbineUser;
import org.apache.fulcrum.security.torque.om.TorqueTurbineUserPeer;
import org.apache.torque.NoRowsException;
import org.apache.torque.TooManyRowsException;
@@ -38,11 +39,12 @@ public class TorqueTurbineUserManagerImp
/**
* @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(TorqueTurbineUserPeer.DATABASE_NAME);
- return TorqueTurbineUserPeer.doSelect(criteria, con);
+ return (List<T>)TorqueTurbineUserPeer.doSelect(criteria, con);
}
/**
@@ -63,13 +65,13 @@ public class TorqueTurbineUserManagerImp
criteria.setIgnoreCase(true);
criteria.setSingleRecord(true);
- List users = TorqueTurbineUserPeer.doSelect(criteria, con);
+ List<TorqueTurbineUser> users =
TorqueTurbineUserPeer.doSelect(criteria, con);
if (users.isEmpty())
{
throw new NoRowsException(name);
}
- return (User)users.get(0);
+ return users.get(0);
}
}
