You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by tv...@apache.org on 2012/09/10 11:40:46 UTC
svn commit: r1382720 - in
/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque:
./ basic/ dynamic/ turbine/
Author: tv
Date: Mon Sep 10 09:40:45 2012
New Revision: 1382720
URL: http://svn.apache.org/viewvc?rev=1382720&view=rev
Log:
Fix generic return types
Modified:
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/TorqueAbstractUserManager.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/TorqueBasicUserManagerImpl.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/TorqueTurbineGroupManagerImpl.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/TorqueAbstractGroupManager.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractGroupManager.java?rev=1382720&r1=1382719&r2=1382720&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 Mon Sep 10 09:40:45 2012
@@ -63,7 +63,7 @@ public abstract class TorqueAbstractGrou
* @throws TooManyRowsException if multiple groups with the given name exist
* @throws TorqueException if any other database error occurs
*/
- protected abstract Group doSelectByName(String name, Connection con)
+ protected abstract <T extends Group> T doSelectByName(String name, Connection con)
throws NoRowsException, TooManyRowsException, TorqueException;
/**
@@ -78,7 +78,7 @@ public abstract class TorqueAbstractGrou
* @throws TooManyRowsException if multiple groups with the given id exist
* @throws TorqueException if any other database error occurs
*/
- protected abstract Group doSelectById(Integer id, Connection con)
+ protected abstract <T extends Group> T doSelectById(Integer id, Connection con)
throws NoRowsException, TooManyRowsException, TorqueException;
/**
@@ -90,7 +90,7 @@ public abstract class TorqueAbstractGrou
* backend.
* @throws EntityExistsException if the group already exists.
*/
- protected synchronized Group persistNewGroup(Group group) throws DataBackendException
+ protected synchronized <T extends Group> T persistNewGroup(T group) throws DataBackendException
{
try
{
@@ -165,9 +165,9 @@ public abstract class TorqueAbstractGrou
* data backend.
* @throws UnknownEntityException if the group does not exist.
*/
- public Group getGroupByName(String name) throws DataBackendException, UnknownEntityException
+ public <T extends Group> T getGroupByName(String name) throws DataBackendException, UnknownEntityException
{
- Group group = null;
+ T group = null;
Connection con = null;
try
@@ -309,9 +309,9 @@ public abstract class TorqueAbstractGrou
* @throws UnknownEntityException
* if the group does not exist.
*/
- public Group getGroupById(Object id) throws DataBackendException, UnknownEntityException
+ public <T extends Group> T getGroupById(Object id) throws DataBackendException, UnknownEntityException
{
- Group group;
+ T group;
if (id != null && id instanceof Integer)
{
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=1382720&r1=1382719&r2=1382720&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 Mon Sep 10 09:40:45 2012
@@ -62,7 +62,7 @@ public abstract class TorqueAbstractPerm
* @throws TooManyRowsException if multiple groups with the given name exist
* @throws TorqueException if any other database error occurs
*/
- protected abstract Permission doSelectByName(String name, Connection con)
+ protected abstract <T extends Permission> T doSelectByName(String name, Connection con)
throws NoRowsException, TooManyRowsException, TorqueException;
/**
@@ -77,7 +77,7 @@ public abstract class TorqueAbstractPerm
* @throws TooManyRowsException if multiple groups with the given id exist
* @throws TorqueException if any other database error occurs
*/
- protected abstract Permission doSelectById(Integer id, Connection con)
+ protected abstract <T extends Permission> T doSelectById(Integer id, Connection con)
throws NoRowsException, TooManyRowsException, TorqueException;
/**
@@ -155,7 +155,7 @@ public abstract class TorqueAbstractPerm
* @throws EntityExistsException
* if the permission already exists.
*/
- protected synchronized Permission persistNewPermission(Permission permission) throws DataBackendException
+ protected synchronized <T extends Permission> T persistNewPermission(T permission) throws DataBackendException
{
try
{
@@ -281,9 +281,9 @@ public abstract class TorqueAbstractPerm
* @throws UnknownEntityException
* if the permission does not exist.
*/
- public Permission getPermissionById(Object id) throws DataBackendException, UnknownEntityException
+ public <T extends Permission> T getPermissionById(Object id) throws DataBackendException, UnknownEntityException
{
- Permission permission;
+ T permission;
if (id != null && id instanceof Integer)
{
@@ -334,9 +334,9 @@ public abstract class TorqueAbstractPerm
* data backend.
* @throws UnknownEntityException if the group does not exist.
*/
- public Permission getPermissionByName(String name) throws DataBackendException, UnknownEntityException
+ public <T extends Permission> T getPermissionByName(String name) throws DataBackendException, UnknownEntityException
{
- Permission permission = null;
+ T permission = null;
Connection con = null;
try
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=1382720&r1=1382719&r2=1382720&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 Mon Sep 10 09:40:45 2012
@@ -62,7 +62,7 @@ public abstract class TorqueAbstractRole
* @throws TooManyRowsException if multiple groups with the given name exist
* @throws TorqueException if any other database error occurs
*/
- protected abstract Role doSelectByName(String name, Connection con)
+ protected abstract <T extends Role> T doSelectByName(String name, Connection con)
throws NoRowsException, TooManyRowsException, TorqueException;
/**
@@ -77,7 +77,7 @@ public abstract class TorqueAbstractRole
* @throws TooManyRowsException if multiple groups with the given id exist
* @throws TorqueException if any other database error occurs
*/
- protected abstract Role doSelectById(Integer id, Connection con)
+ protected abstract <T extends Role> T doSelectById(Integer id, Connection con)
throws NoRowsException, TooManyRowsException, TorqueException;
@@ -122,7 +122,7 @@ public abstract class TorqueAbstractRole
* backend.
* @throws EntityExistsException if the role already exists.
*/
- protected synchronized Role persistNewRole(Role role) throws DataBackendException
+ protected synchronized <T extends Role> T persistNewRole(T role) throws DataBackendException
{
try
{
@@ -266,9 +266,9 @@ public abstract class TorqueAbstractRole
* @throws UnknownEntityException
* if the role does not exist.
*/
- public Role getRoleById(Object id) throws DataBackendException, UnknownEntityException
+ public <T extends Role> T getRoleById(Object id) throws DataBackendException, UnknownEntityException
{
- Role role;
+ T role;
if (id != null && id instanceof Integer)
{
@@ -319,9 +319,9 @@ public abstract class TorqueAbstractRole
* data backend.
* @throws UnknownEntityException if the role does not exist.
*/
- public Role getRoleByName(String name) throws DataBackendException, UnknownEntityException
+ public <T extends Role> T getRoleByName(String name) throws DataBackendException, UnknownEntityException
{
- Role role = null;
+ T role = null;
Connection con = null;
try
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=1382720&r1=1382719&r2=1382720&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 Mon Sep 10 09:40:45 2012
@@ -62,7 +62,7 @@ public abstract class TorqueAbstractUser
* @throws TooManyRowsException if multiple groups with the given name exist
* @throws TorqueException if any other database error occurs
*/
- protected abstract User doSelectByName(String name, Connection con)
+ protected abstract <T extends User> T doSelectByName(String name, Connection con)
throws NoRowsException, TooManyRowsException, TorqueException;
/**
@@ -77,7 +77,7 @@ public abstract class TorqueAbstractUser
* @throws TooManyRowsException if multiple groups with the given id exist
* @throws TorqueException if any other database error occurs
*/
- protected abstract User doSelectById(Integer id, Connection con)
+ protected abstract <T extends User> T doSelectById(Integer id, Connection con)
throws NoRowsException, TooManyRowsException, TorqueException;
/**
@@ -110,7 +110,7 @@ public abstract class TorqueAbstractUser
* data backend.
* @throws EntityExistsException if the user account already exists.
*/
- protected synchronized User persistNewUser(User user) throws DataBackendException
+ protected synchronized <T extends User> T persistNewUser(T user) throws DataBackendException
{
try
{
@@ -214,9 +214,9 @@ public abstract class TorqueAbstractUser
* @exception DataBackendException if there is a problem accessing the
* storage.
*/
- public User getUser(String userName) throws UnknownEntityException, DataBackendException
+ public <T extends User> T getUser(String userName) throws UnknownEntityException, DataBackendException
{
- User user = null;
+ T user = null;
Connection con = null;
try
@@ -309,9 +309,9 @@ public abstract class TorqueAbstractUser
* @throws UnknownEntityException
* if the user does not exist.
*/
- public User getUserById(Object id) throws DataBackendException, UnknownEntityException
+ public <T extends User> T getUserById(Object id) throws DataBackendException, UnknownEntityException
{
- User user;
+ T user;
if (id != null && id instanceof Integer)
{
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=1382720&r1=1382719&r2=1382720&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 Mon Sep 10 09:40:45 2012
@@ -51,16 +51,18 @@ public class TorqueBasicGroupManagerImpl
/**
* @see org.apache.fulcrum.security.torque.TorqueAbstractGroupManager#doSelectById(java.lang.Integer, java.sql.Connection)
*/
- protected Group doSelectById(Integer id, Connection con)
+ @SuppressWarnings("unchecked")
+ protected <T extends Group> T doSelectById(Integer id, Connection con)
throws NoRowsException, TooManyRowsException, TorqueException
{
- return TorqueBasicGroupPeer.retrieveByPK(id, con);
+ return (T)TorqueBasicGroupPeer.retrieveByPK(id, con);
}
/**
* @see org.apache.fulcrum.security.torque.TorqueAbstractGroupManager#doSelectByName(java.lang.String, java.sql.Connection)
*/
- protected Group doSelectByName(String name, Connection con)
+ @SuppressWarnings("unchecked")
+ protected <T extends Group> T doSelectByName(String name, Connection con)
throws NoRowsException, TooManyRowsException, TorqueException
{
Criteria criteria = new Criteria(TorqueBasicGroupPeer.DATABASE_NAME);
@@ -75,6 +77,6 @@ public class TorqueBasicGroupManagerImpl
throw new NoRowsException(name);
}
- return groups.get(0);
+ return (T)groups.get(0);
}
}
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=1382720&r1=1382719&r2=1382720&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 Mon Sep 10 09:40:45 2012
@@ -50,15 +50,17 @@ public class TorqueBasicUserManagerImpl
/**
* @see org.apache.fulcrum.security.torque.TorqueAbstractUserManager#doSelectById(java.lang.Integer, java.sql.Connection)
*/
- protected User doSelectById(Integer id, Connection con) throws NoRowsException, TooManyRowsException, TorqueException
+ @SuppressWarnings("unchecked")
+ protected <T extends User> T doSelectById(Integer id, Connection con) throws NoRowsException, TooManyRowsException, TorqueException
{
- return TorqueBasicUserPeer.retrieveByPK(id, con);
+ return (T) TorqueBasicUserPeer.retrieveByPK(id, con);
}
/**
* @see org.apache.fulcrum.security.torque.TorqueAbstractUserManager#doSelectByName(java.lang.String, java.sql.Connection)
*/
- protected User doSelectByName(String name, Connection con) throws NoRowsException, TooManyRowsException, TorqueException
+ @SuppressWarnings("unchecked")
+ protected <T extends User> T doSelectByName(String name, Connection con) throws NoRowsException, TooManyRowsException, TorqueException
{
Criteria criteria = new Criteria(TorqueBasicUserPeer.DATABASE_NAME);
criteria.add(TorqueBasicUserPeer.LOGIN_NAME, name);
@@ -72,6 +74,6 @@ public class TorqueBasicUserManagerImpl
throw new NoRowsException(name);
}
- return users.get(0);
+ return (T) users.get(0);
}
}
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=1382720&r1=1382719&r2=1382720&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 Mon Sep 10 09:40:45 2012
@@ -50,15 +50,17 @@ public class TorqueDynamicGroupManagerIm
/**
* @see org.apache.fulcrum.security.torque.TorqueAbstractGroupManager#doSelectById(java.lang.Integer, java.sql.Connection)
*/
- protected Group doSelectById(Integer id, Connection con) throws NoRowsException, TooManyRowsException, TorqueException
+ @SuppressWarnings("unchecked")
+ protected <T extends Group> T doSelectById(Integer id, Connection con) throws NoRowsException, TooManyRowsException, TorqueException
{
- return TorqueDynamicGroupPeer.retrieveByPK(id, con);
+ return (T) TorqueDynamicGroupPeer.retrieveByPK(id, con);
}
/**
* @see org.apache.fulcrum.security.torque.TorqueAbstractGroupManager#doSelectByName(java.lang.String, java.sql.Connection)
*/
- protected Group doSelectByName(String name, Connection con) throws NoRowsException, TooManyRowsException, TorqueException
+ @SuppressWarnings("unchecked")
+ protected <T extends Group> T doSelectByName(String name, Connection con) throws NoRowsException, TooManyRowsException, TorqueException
{
Criteria criteria = new Criteria(TorqueDynamicGroupPeer.DATABASE_NAME);
criteria.add(TorqueDynamicGroupPeer.GROUP_NAME, name);
@@ -72,6 +74,6 @@ public class TorqueDynamicGroupManagerIm
throw new NoRowsException(name);
}
- return groups.get(0);
+ return (T) 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=1382720&r1=1382719&r2=1382720&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 Mon Sep 10 09:40:45 2012
@@ -50,15 +50,17 @@ public class TorqueDynamicPermissionMana
/**
* @see org.apache.fulcrum.security.torque.TorqueAbstractPermissionManager#doSelectById(java.lang.Integer, java.sql.Connection)
*/
- protected Permission doSelectById(Integer id, Connection con) throws NoRowsException, TooManyRowsException, TorqueException
+ @SuppressWarnings("unchecked")
+ protected <T extends Permission> T doSelectById(Integer id, Connection con) throws NoRowsException, TooManyRowsException, TorqueException
{
- return TorqueDynamicPermissionPeer.retrieveByPK(id, con);
+ return (T) TorqueDynamicPermissionPeer.retrieveByPK(id, con);
}
/**
* @see org.apache.fulcrum.security.torque.TorqueAbstractPermissionManager#doSelectByName(java.lang.String, java.sql.Connection)
*/
- protected Permission doSelectByName(String name, Connection con) throws NoRowsException, TooManyRowsException, TorqueException
+ @SuppressWarnings("unchecked")
+ protected <T extends Permission> T doSelectByName(String name, Connection con) throws NoRowsException, TooManyRowsException, TorqueException
{
Criteria criteria = new Criteria(TorqueDynamicPermissionPeer.DATABASE_NAME);
criteria.add(TorqueDynamicPermissionPeer.PERMISSION_NAME, name);
@@ -72,6 +74,6 @@ public class TorqueDynamicPermissionMana
throw new NoRowsException(name);
}
- return permissions.get(0);
+ return (T) 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=1382720&r1=1382719&r2=1382720&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 Mon Sep 10 09:40:45 2012
@@ -50,15 +50,17 @@ public class TorqueDynamicRoleManagerImp
/**
* @see org.apache.fulcrum.security.torque.TorqueAbstractRoleManager#doSelectById(java.lang.Integer, java.sql.Connection)
*/
- protected Role doSelectById(Integer id, Connection con) throws NoRowsException, TooManyRowsException, TorqueException
+ @SuppressWarnings("unchecked")
+ protected <T extends Role> T doSelectById(Integer id, Connection con) throws NoRowsException, TooManyRowsException, TorqueException
{
- return TorqueDynamicRolePeer.retrieveByPK(id, con);
+ return (T) TorqueDynamicRolePeer.retrieveByPK(id, con);
}
/**
* @see org.apache.fulcrum.security.torque.TorqueAbstractRoleManager#doSelectByName(java.lang.String, java.sql.Connection)
*/
- protected Role doSelectByName(String name, Connection con) throws NoRowsException, TooManyRowsException, TorqueException
+ @SuppressWarnings("unchecked")
+ protected <T extends Role> T doSelectByName(String name, Connection con) throws NoRowsException, TooManyRowsException, TorqueException
{
Criteria criteria = new Criteria(TorqueDynamicRolePeer.DATABASE_NAME);
criteria.add(TorqueDynamicRolePeer.ROLE_NAME, name);
@@ -72,6 +74,6 @@ public class TorqueDynamicRoleManagerImp
throw new NoRowsException(name);
}
- return roles.get(0);
+ return (T) 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=1382720&r1=1382719&r2=1382720&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 Mon Sep 10 09:40:45 2012
@@ -50,15 +50,17 @@ public class TorqueDynamicUserManagerImp
/**
* @see org.apache.fulcrum.security.torque.TorqueAbstractUserManager#doSelectById(java.lang.Integer, java.sql.Connection)
*/
- protected User doSelectById(Integer id, Connection con) throws NoRowsException, TooManyRowsException, TorqueException
+ @SuppressWarnings("unchecked")
+ protected <T extends User> T doSelectById(Integer id, Connection con) throws NoRowsException, TooManyRowsException, TorqueException
{
- return TorqueDynamicUserPeer.retrieveByPK(id, con);
+ return (T) TorqueDynamicUserPeer.retrieveByPK(id, con);
}
/**
* @see org.apache.fulcrum.security.torque.TorqueAbstractUserManager#doSelectByName(java.lang.String, java.sql.Connection)
*/
- protected User doSelectByName(String name, Connection con) throws NoRowsException, TooManyRowsException, TorqueException
+ @SuppressWarnings("unchecked")
+ protected <T extends User> T doSelectByName(String name, Connection con) throws NoRowsException, TooManyRowsException, TorqueException
{
Criteria criteria = new Criteria(TorqueDynamicUserPeer.DATABASE_NAME);
criteria.add(TorqueDynamicUserPeer.LOGIN_NAME, name);
@@ -72,6 +74,6 @@ public class TorqueDynamicUserManagerImp
throw new NoRowsException(name);
}
- return users.get(0);
+ return (T) users.get(0);
}
}
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=1382720&r1=1382719&r2=1382720&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 Mon Sep 10 09:40:45 2012
@@ -50,15 +50,17 @@ public class TorqueTurbineGroupManagerIm
/**
* @see org.apache.fulcrum.security.torque.TorqueAbstractGroupManager#doSelectById(java.lang.Integer, java.sql.Connection)
*/
- protected Group doSelectById(Integer id, Connection con) throws NoRowsException, TooManyRowsException, TorqueException
+ @SuppressWarnings("unchecked")
+ protected <T extends Group> T doSelectById(Integer id, Connection con) throws NoRowsException, TooManyRowsException, TorqueException
{
- return TorqueTurbineGroupPeer.retrieveByPK(id, con);
+ return (T) TorqueTurbineGroupPeer.retrieveByPK(id, con);
}
/**
* @see org.apache.fulcrum.security.torque.TorqueAbstractGroupManager#doSelectByName(java.lang.String, java.sql.Connection)
*/
- protected Group doSelectByName(String name, Connection con) throws NoRowsException, TooManyRowsException, TorqueException
+ @SuppressWarnings("unchecked")
+ protected <T extends Group> T doSelectByName(String name, Connection con) throws NoRowsException, TooManyRowsException, TorqueException
{
Criteria criteria = new Criteria(TorqueTurbineGroupPeer.DATABASE_NAME);
criteria.add(TorqueTurbineGroupPeer.GROUP_NAME, name);
@@ -72,6 +74,6 @@ public class TorqueTurbineGroupManagerIm
throw new NoRowsException(name);
}
- return groups.get(0);
+ return (T) groups.get(0);
}
}
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=1382720&r1=1382719&r2=1382720&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 Mon Sep 10 09:40:45 2012
@@ -50,15 +50,17 @@ public class TorqueTurbinePermissionMana
/**
* @see org.apache.fulcrum.security.torque.TorqueAbstractPermissionManager#doSelectById(java.lang.Integer, java.sql.Connection)
*/
- protected Permission doSelectById(Integer id, Connection con) throws NoRowsException, TooManyRowsException, TorqueException
+ @SuppressWarnings("unchecked")
+ protected <T extends Permission> T doSelectById(Integer id, Connection con) throws NoRowsException, TooManyRowsException, TorqueException
{
- return TorqueTurbinePermissionPeer.retrieveByPK(id, con);
+ return (T) TorqueTurbinePermissionPeer.retrieveByPK(id, con);
}
/**
* @see org.apache.fulcrum.security.torque.TorqueAbstractPermissionManager#doSelectByName(java.lang.String, java.sql.Connection)
*/
- protected Permission doSelectByName(String name, Connection con) throws NoRowsException, TooManyRowsException, TorqueException
+ @SuppressWarnings("unchecked")
+ protected <T extends Permission> T doSelectByName(String name, Connection con) throws NoRowsException, TooManyRowsException, TorqueException
{
Criteria criteria = new Criteria(TorqueTurbinePermissionPeer.DATABASE_NAME);
criteria.add(TorqueTurbinePermissionPeer.PERMISSION_NAME, name);
@@ -72,6 +74,6 @@ public class TorqueTurbinePermissionMana
throw new NoRowsException(name);
}
- return permissions.get(0);
+ return (T) 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=1382720&r1=1382719&r2=1382720&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 Mon Sep 10 09:40:45 2012
@@ -50,15 +50,17 @@ public class TorqueTurbineRoleManagerImp
/**
* @see org.apache.fulcrum.security.torque.TorqueAbstractRoleManager#doSelectById(java.lang.Integer, java.sql.Connection)
*/
- protected Role doSelectById(Integer id, Connection con) throws NoRowsException, TooManyRowsException, TorqueException
+ @SuppressWarnings("unchecked")
+ protected <T extends Role> T doSelectById(Integer id, Connection con) throws NoRowsException, TooManyRowsException, TorqueException
{
- return TorqueTurbineRolePeer.retrieveByPK(id, con);
+ return (T) TorqueTurbineRolePeer.retrieveByPK(id, con);
}
/**
* @see org.apache.fulcrum.security.torque.TorqueAbstractRoleManager#doSelectByName(java.lang.String, java.sql.Connection)
*/
- protected Role doSelectByName(String name, Connection con) throws NoRowsException, TooManyRowsException, TorqueException
+ @SuppressWarnings("unchecked")
+ protected <T extends Role> T doSelectByName(String name, Connection con) throws NoRowsException, TooManyRowsException, TorqueException
{
Criteria criteria = new Criteria(TorqueTurbineRolePeer.DATABASE_NAME);
criteria.add(TorqueTurbineRolePeer.ROLE_NAME, name);
@@ -72,6 +74,6 @@ public class TorqueTurbineRoleManagerImp
throw new NoRowsException(name);
}
- return roles.get(0);
+ return (T) 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=1382720&r1=1382719&r2=1382720&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 Mon Sep 10 09:40:45 2012
@@ -50,15 +50,17 @@ public class TorqueTurbineUserManagerImp
/**
* @see org.apache.fulcrum.security.torque.TorqueAbstractUserManager#doSelectById(java.lang.Integer, java.sql.Connection)
*/
- protected User doSelectById(Integer id, Connection con) throws NoRowsException, TooManyRowsException, TorqueException
+ @SuppressWarnings("unchecked")
+ protected <T extends User> T doSelectById(Integer id, Connection con) throws NoRowsException, TooManyRowsException, TorqueException
{
- return TorqueTurbineUserPeer.retrieveByPK(id, con);
+ return (T) TorqueTurbineUserPeer.retrieveByPK(id, con);
}
/**
* @see org.apache.fulcrum.security.torque.TorqueAbstractUserManager#doSelectByName(java.lang.String, java.sql.Connection)
*/
- protected User doSelectByName(String name, Connection con) throws NoRowsException, TooManyRowsException, TorqueException
+ @SuppressWarnings("unchecked")
+ protected <T extends User> T doSelectByName(String name, Connection con) throws NoRowsException, TooManyRowsException, TorqueException
{
Criteria criteria = new Criteria(TorqueTurbineUserPeer.DATABASE_NAME);
criteria.add(TorqueTurbineUserPeer.LOGIN_NAME, name);
@@ -72,6 +74,6 @@ public class TorqueTurbineUserManagerImp
throw new NoRowsException(name);
}
- return users.get(0);
+ return (T) users.get(0);
}
}