You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by pa...@apache.org on 2018/11/05 22:43:28 UTC
svn commit: r1845861 [3/3] - in /turbine/fulcrum/trunk/security:
hibernate/src/java/org/apache/fulcrum/security/hibernate/ memory/
memory/src/java/org/apache/fulcrum/security/memory/
memory/src/java/org/apache/fulcrum/security/memory/basic/ memory/src/...
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/peer/PeerManagerDefaultImpl.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/peer/PeerManagerDefaultImpl.java?rev=1845861&r1=1845860&r2=1845861&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/peer/PeerManagerDefaultImpl.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/peer/PeerManagerDefaultImpl.java Mon Nov 5 22:43:28 2018
@@ -44,12 +44,18 @@ public class PeerManagerDefaultImpl exte
private static final long serialVersionUID = -3891813089694207441L;
private Map<String,Peer> peers = new ConcurrentHashMap<String,Peer>(4,0.75f,4);
+ /* (non-Javadoc)
+ * @see org.apache.fulcrum.security.torque.peer.PeerManager#getPeerInstance(java.lang.String)
+ */
@Override
public <P extends Peer> P getPeerInstance(String peerClassName) throws DataBackendException
{
return getPeerInstance( peerClassName, Peer.class, null);
}
+ /* (non-Javadoc)
+ * @see org.apache.fulcrum.security.torque.peer.PeerManager#getPeerInstance(java.lang.String, java.lang.Class, java.lang.String)
+ */
@SuppressWarnings( "unchecked" )
@Override
public <P extends Peer> P getPeerInstance( String peerClassName, Class<? extends Peer> peerInterface , String className) throws DataBackendException
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/peer/TurbineUserGroupRoleModelPeerMapper.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/peer/TurbineUserGroupRoleModelPeerMapper.java?rev=1845861&r1=1845860&r2=1845861&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/peer/TurbineUserGroupRoleModelPeerMapper.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/peer/TurbineUserGroupRoleModelPeerMapper.java Mon Nov 5 22:43:28 2018
@@ -39,7 +39,7 @@ public interface TurbineUserGroupRoleMod
* the database
*
* @return the associated TurbineUser object
- * @throws TorqueException when reading from the database fails.
+ * @throws TorqueException if any database error occurs when reading from the database fails.
*/
User getTurbineUser()
throws TorqueException;
@@ -52,7 +52,7 @@ public interface TurbineUserGroupRoleMod
* @param connection the connection used to retrieve the associated object
* from the database, if it was not retrieved before
* @return the associated TurbineUser object
- * @throws TorqueException
+ * @throws TorqueException if any database error occurs
*/
User getTurbineUser( Connection connection )
throws TorqueException;
@@ -63,7 +63,7 @@ public interface TurbineUserGroupRoleMod
* the database
*
* @return the associated TurbineGroup object
- * @throws TorqueException when reading from the database fails.
+ * @throws TorqueException if any database error occurs when reading from the database fails.
*/
Group getTurbineGroup()
throws TorqueException;
@@ -76,7 +76,7 @@ public interface TurbineUserGroupRoleMod
* @param connection the connection used to retrieve the associated object
* from the database, if it was not retrieved before
* @return the associated TurbineGroup object
- * @throws TorqueException
+ * @throws TorqueException if any database error occurs
*/
Group getTurbineGroup( Connection connection )
throws TorqueException;
@@ -87,7 +87,7 @@ public interface TurbineUserGroupRoleMod
* the database
*
* @return the associated TurbineRole object
- * @throws TorqueException when reading from the database fails.
+ * @throws TorqueException if any database error occurs when reading from the database fails.
*/
Role getTurbineRole()
throws TorqueException;
@@ -100,7 +100,7 @@ public interface TurbineUserGroupRoleMod
* @param connection the connection used to retrieve the associated object
* from the database, if it was not retrieved before
* @return the associated TurbineRole object
- * @throws TorqueException
+ * @throws TorqueException if any database error occurs
*/
Role getTurbineRole( Connection connection )
throws TorqueException;
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/security/TorqueAbstractSecurityEntity.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/security/TorqueAbstractSecurityEntity.java?rev=1845861&r1=1845860&r2=1845861&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/security/TorqueAbstractSecurityEntity.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/security/TorqueAbstractSecurityEntity.java Mon Nov 5 22:43:28 2018
@@ -46,6 +46,7 @@ public abstract class TorqueAbstractSecu
* Set a numeric entity id
*
* @param id numeric id of this entity
+ * @throws TorqueException database not found exception
*/
public abstract void setEntityId(Integer id) throws TorqueException;
@@ -67,7 +68,8 @@ public abstract class TorqueAbstractSecu
* Retrieve attached objects such as users, permissions, ...
*
* @param con A database connection
- * * @param lazy if <code>true</code>, may load some or all relationships later
+ * @param lazy if <code>true</code>, may load some or all relationships later
+ * @throws TorqueException database not found exception
*/
public abstract void retrieveAttachedObjects(Connection con, Boolean lazy) throws TorqueException;
@@ -76,6 +78,7 @@ public abstract class TorqueAbstractSecu
* old contract, lazy is set to <code>false</code>.
*
* @param con A database connection
+ * @throws TorqueException database not found exception
*/
public abstract void retrieveAttachedObjects(Connection con) throws TorqueException;
@@ -83,13 +86,14 @@ public abstract class TorqueAbstractSecu
* Update this instance to the database with all dependent objects
*
* @param con A database connection
+ * @throws TorqueException database not found exception
*/
public abstract void update(Connection con) throws TorqueException;
/**
* Delete this entity
*
- * @throws TorqueException if any database operation fails
+ * @throws TorqueException if any database error occurs if any database operation fails
*/
public abstract void delete() throws TorqueException;
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/security/turbine/TorqueAbstractTurbineTurbineSecurityEntity.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/security/turbine/TorqueAbstractTurbineTurbineSecurityEntity.java?rev=1845861&r1=1845860&r2=1845861&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/security/turbine/TorqueAbstractTurbineTurbineSecurityEntity.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/security/turbine/TorqueAbstractTurbineTurbineSecurityEntity.java Mon Nov 5 22:43:28 2018
@@ -41,15 +41,19 @@ public abstract class TorqueAbstractTurb
/** a cache of user_group_role objects */
private Set<? extends TurbineUserGroupRole> userGroupRoleSet = null;
- /**
- * @throws DataBackendException
- * @see org.apache.fulcrum.security.model.turbine.entity.TurbineGroup#addUserGroupRole(org.apache.fulcrum.security.model.turbine.entity.TurbineUserGroupRole)
+ /* (non-Javadoc)
+ * @see org.apache.fulcrum.security.model.turbine.entity.TurbineUserGroupRoleEntity#addUserGroupRole(org.apache.fulcrum.security.model.turbine.entity.TurbineUserGroupRole)
*/
public void addUserGroupRole(TurbineUserGroupRole userGroupRole) throws DataBackendException
{
getUserGroupRoleSet().add(userGroupRole);
}
+ /**
+ * @param user_group_role u/g/r to add
+ * @param isLazilyLoaded <code>true</code> for lazy loading
+ * @throws DataBackendException if the database backend is not found
+ */
public void addUserGroupRole( TurbineUserGroupRole user_group_role, boolean isLazilyLoaded ) throws DataBackendException {
if (isLazilyLoaded)
{
@@ -61,6 +65,10 @@ public abstract class TorqueAbstractTurb
}
}
+ /**
+ * @return get default u/g/r set
+ * @throws DataBackendException if the database backend is not found
+ */
@SuppressWarnings("unchecked")
private <T extends TurbineUserGroupRole> Set<T> getDefaultUserGroupRoleSet() throws DataBackendException
{
@@ -72,24 +80,28 @@ public abstract class TorqueAbstractTurb
return (Set<T>) userGroupRoleSet;
}
- /**
- * @throws DataBackendException if loaded lazily
- * @see org.apache.fulcrum.security.model.turbine.entity.TurbineGroup#getUserGroupRoleSet()
- */
+ /* (non-Javadoc)
+ * @see org.apache.fulcrum.security.model.turbine.entity.TurbineUserGroupRoleEntity#getUserGroupRoleSet()
+ * @throws DataBackendException if loaded lazily
+ */
public <T extends TurbineUserGroupRole> Set<T> getUserGroupRoleSet() throws DataBackendException
{
return getDefaultUserGroupRoleSet();
}
- /**
- * @throws DataBackendException
- * @see org.apache.fulcrum.security.model.turbine.entity.TurbineGroup#removeUserGroupRole(org.apache.fulcrum.security.model.turbine.entity.TurbineUserGroupRole)
+ /* (non-Javadoc)
+ * @see org.apache.fulcrum.security.model.turbine.entity.TurbineUserGroupRoleEntity#removeUserGroupRole(org.apache.fulcrum.security.model.turbine.entity.TurbineUserGroupRole)
*/
public void removeUserGroupRole(TurbineUserGroupRole userGroupRole) throws DataBackendException
{
getUserGroupRoleSet().remove(userGroupRole);
}
+ /**
+ * @param user_group_role u/g/r to remove
+ * @param isLazilyLoaded <code>true</code> for lazy loading
+ * @throws DataBackendException if the database backend is not found
+ */
public void removeUserGroupRole( TurbineUserGroupRole user_group_role, boolean isLazilyLoaded ) throws DataBackendException {
if (isLazilyLoaded)
{
@@ -101,8 +113,8 @@ public abstract class TorqueAbstractTurb
}
}
- /**
- * @see org.apache.fulcrum.security.model.turbine.entity.TurbineGroup#setUserGroupRoleSet(java.util.Set)
+ /* (non-Javadoc)
+ * @see org.apache.fulcrum.security.model.turbine.entity.TurbineUserGroupRoleEntity#setUserGroupRoleSet(java.util.Set)
*/
public <T extends TurbineUserGroupRole> void setUserGroupRoleSet(Set<T> userGroupRoleSet)
{
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/security/turbine/TorqueAbstractTurbineTurbineSecurityEntityDefault.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/security/turbine/TorqueAbstractTurbineTurbineSecurityEntityDefault.java?rev=1845861&r1=1845860&r2=1845861&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/security/turbine/TorqueAbstractTurbineTurbineSecurityEntityDefault.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/security/turbine/TorqueAbstractTurbineTurbineSecurityEntityDefault.java Mon Nov 5 22:43:28 2018
@@ -47,6 +47,7 @@ public abstract class TorqueAbstractTurb
* @param con A database connection
* @param lazy if <code>true</code>, fetches objects lazily
* @param ugrs The custom TurbineUserGroupRole set
+ * @throws TorqueException if data connection not found
*/
public abstract <T extends TurbineUserGroupRoleModelPeerMapper> void retrieveAttachedObjects( Connection con, Boolean lazy, List<T> ugrs ) throws TorqueException;
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineGroup.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineGroup.java?rev=1845861&r1=1845860&r2=1845861&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineGroup.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineGroup.java Mon Nov 5 22:43:28 2018
@@ -52,7 +52,7 @@ public abstract class DefaultAbstractTur
*
* @param criteria Criteria to define the selection of records
* @param con a database connection
- * @throws TorqueException
+ * @throws TorqueException if any database error occurs
*
* @return a list of User/Group/Role relations
*/
@@ -70,8 +70,8 @@ public abstract class DefaultAbstractTur
retrieveAttachedObjects( con, false );
}
- /**
- * @see TorqueAbstractTurbineTurbineSecurityEntity#retrieveAttachedObjects(Connection, boolean)
+ /* (non-Javadoc)
+ * @see org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#retrieveAttachedObjects(java.sql.Connection, java.lang.Boolean)
*/
@Override
public void retrieveAttachedObjects( Connection con, Boolean lazy ) throws TorqueException
@@ -95,6 +95,9 @@ public abstract class DefaultAbstractTur
}
+ /* (non-Javadoc)
+ * @see org.apache.fulcrum.security.torque.security.turbine.TorqueAbstractTurbineTurbineSecurityEntity#getUserGroupRoleSet()
+ */
@Override
public <T extends TurbineUserGroupRole> Set<T> getUserGroupRoleSet() throws DataBackendException
{
@@ -126,7 +129,7 @@ public abstract class DefaultAbstractTur
}
- /**
+ /* (non-Javadoc)
* @see org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#update(java.sql.Connection)
*/
@Override
@@ -160,7 +163,7 @@ public abstract class DefaultAbstractTur
}
}
- /**
+ /* (non-Javadoc)
* @see org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#delete()
*/
@Override
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbinePermission.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbinePermission.java?rev=1845861&r1=1845860&r2=1845861&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbinePermission.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbinePermission.java Mon Nov 5 22:43:28 2018
@@ -54,7 +54,7 @@ public abstract class DefaultAbstractTur
*
* @param criteria Criteria to define the selection of records
* @param con a database connection
- * @throws TorqueException
+ * @throws TorqueException if any database error occurs
*
* @return a list of Role/Permission relations
*/
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineRole.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineRole.java?rev=1845861&r1=1845860&r2=1845861&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineRole.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineRole.java Mon Nov 5 22:43:28 2018
@@ -59,7 +59,7 @@ public abstract class DefaultAbstractTur
*
* @param criteria Criteria to define the selection of records
* @param con a database connection
- * @throws TorqueException
+ * @throws TorqueException if any database error occurs
*
* @return a list of Role/Permission relations
*/
@@ -78,7 +78,7 @@ public abstract class DefaultAbstractTur
*
* @param criteria Criteria to define the selection of records
* @param con a database connection
- * @throws TorqueException
+ * @throws TorqueException if any database error occurs
*
* @return a list of User/Group/Role relations
*/
@@ -168,8 +168,8 @@ public abstract class DefaultAbstractTur
}
- /**
- * @see TorqueAbstractTurbineTurbineSecurityEntity#retrieveAttachedObjects(Connection, boolean)
+ /* (non-Javadoc)
+ * @see org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#retrieveAttachedObjects(java.sql.Connection, java.lang.Boolean)
*/
@Override
public void retrieveAttachedObjects( Connection con, Boolean lazy )
@@ -203,6 +203,9 @@ public abstract class DefaultAbstractTur
}
}
+ /* (non-Javadoc)
+ * @see org.apache.fulcrum.security.torque.security.turbine.TorqueAbstractTurbineTurbineSecurityEntity#getUserGroupRoleSet()
+ */
@Override
public <T extends TurbineUserGroupRole> Set<T> getUserGroupRoleSet() throws DataBackendException
{
@@ -234,10 +237,8 @@ public abstract class DefaultAbstractTur
}
- /**
+ /* (non-Javadoc)
* @see org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#update(java.sql.Connection)
- *
- * use for grants only!
*/
@Override
public void update(Connection con) throws TorqueException
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineUser.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineUser.java?rev=1845861&r1=1845860&r2=1845861&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineUser.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineUser.java Mon Nov 5 22:43:28 2018
@@ -60,7 +60,7 @@ public abstract class DefaultAbstractTur
*
* @param criteria Criteria to define the selection of records
* @param con a database connection
- * @throws TorqueException
+ * @throws TorqueException if any database error occurs
*
* @return a list of User/Group/Role relations
*/
@@ -71,9 +71,8 @@ public abstract class DefaultAbstractTur
return (List<T>) TurbineUserGroupRolePeer.doSelectJoinTurbineRole(criteria, con);
}
- /**
- *
- * @see TorqueAbstractTurbineTurbineSecurityEntity#retrieveAttachedObjects(Connection, Boolean, List)
+ /* (non-Javadoc)
+ * @see org.apache.fulcrum.security.torque.security.turbine.TorqueAbstractTurbineTurbineSecurityEntityDefault#retrieveAttachedObjects(java.sql.Connection, java.lang.Boolean, java.util.List)
*/
@Override
public <T extends TurbineUserGroupRoleModelPeerMapper> void retrieveAttachedObjects( Connection con, Boolean lazy, List<T> ugrs ) throws TorqueException
@@ -91,8 +90,8 @@ public abstract class DefaultAbstractTur
}
}
- /**
- * @see TorqueAbstractTurbineTurbineSecurityEntity#retrieveAttachedObjects(Connection, boolean)
+ /* (non-Javadoc)
+ * @see org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#retrieveAttachedObjects(java.sql.Connection, java.lang.Boolean)
*/
@Override
public void retrieveAttachedObjects( Connection con, Boolean lazy ) throws TorqueException
@@ -109,6 +108,9 @@ public abstract class DefaultAbstractTur
}
}
+ /* (non-Javadoc)
+ * @see org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#retrieveAttachedObjects(java.sql.Connection)
+ */
@Override
public void retrieveAttachedObjects( Connection con )
throws TorqueException
@@ -116,9 +118,7 @@ public abstract class DefaultAbstractTur
retrieveAttachedObjects( con, false ); //false
}
- /**
- * Removes all entries, then inserts, what is found in {@link #getUserGroupRoleSet()}.
- *
+ /* (non-Javadoc)
* @see org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#update(java.sql.Connection)
*/
@Override
@@ -152,7 +152,7 @@ public abstract class DefaultAbstractTur
}
}
- /**
+ /* (non-Javadoc)
* @see org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#delete()
*/
@Override
@@ -161,6 +161,12 @@ public abstract class DefaultAbstractTur
TurbineUserPeer.doDelete(SimpleKey.keyFor(getEntityId()));
}
+ /**
+ * @param con data connection
+ * @param userGroupRoleSet U/G/R set
+ * @param ugrs list of all ugrs
+ * @throws TorqueException if data connection could not be found
+ */
private <T extends TurbineUserGroupRoleModelPeerMapper> void maptoModel( Connection con, Set<TurbineUserGroupRole> userGroupRoleSet,
List<T> ugrs )
throws TorqueException
@@ -170,6 +176,7 @@ public abstract class DefaultAbstractTur
TurbineUserGroupRole ugr = new TurbineUserGroupRole();
ugr.setUser((User) this);
ugr.setRole(ttugr.getTurbineRole(con));
+
// org.apache.fulcrum.security.torque.om.TurbineGroup implements
// org.apache.fulcrum.security.model.turbine.entity.TurbineGroup
// but may be hides it?
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbineGroup.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbineGroup.java?rev=1845861&r1=1845860&r2=1845861&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbineGroup.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbineGroup.java Mon Nov 5 22:43:28 2018
@@ -53,7 +53,7 @@ public abstract class FulcrumAbstractTur
*
* @param criteria Criteria to define the selection of records
* @param con a database connection
- * @throws TorqueException
+ * @throws TorqueException if any database error occurs
*
* @return a list of User/Group/Role relations
*/
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbinePermission.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbinePermission.java?rev=1845861&r1=1845860&r2=1845861&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbinePermission.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbinePermission.java Mon Nov 5 22:43:28 2018
@@ -54,7 +54,7 @@ public abstract class FulcrumAbstractTur
*
* @param criteria Criteria to define the selection of records
* @param con a database connection
- * @throws TorqueException
+ * @throws TorqueException if any database error occurs
*
* @return a list of Role/Permission relations
*/
@@ -131,13 +131,16 @@ public abstract class FulcrumAbstractTur
}
/**
- * @see org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#getDatabaseName()
+ * @return the database name
*/
public String getDatabaseName()
{
return TorqueTurbinePermissionPeer.DATABASE_NAME;
}
+ /* (non-Javadoc)
+ * @see org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#retrieveAttachedObjects(java.sql.Connection)
+ */
@Override
public void retrieveAttachedObjects( Connection con )
throws TorqueException
@@ -145,8 +148,8 @@ public abstract class FulcrumAbstractTur
retrieveAttachedObjects( con, false );
}
- /**
- * @see org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#retrieveAttachedObjects(java.sql.Connection)
+ /* (non-Javadoc)
+ * @see org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#retrieveAttachedObjects(java.sql.Connection, java.lang.Boolean)
*/
@Override
public void retrieveAttachedObjects( Connection con, Boolean lazy )
@@ -162,7 +165,7 @@ public abstract class FulcrumAbstractTur
}
}
- /**
+ /* (non-Javadoc)
* @see org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#update(java.sql.Connection)
*/
public void update(Connection con) throws TorqueException
@@ -194,7 +197,7 @@ public abstract class FulcrumAbstractTur
}
}
- /**
+ /* (non-Javadoc)
* @see org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#delete()
*/
public void delete() throws TorqueException
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbineRole.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbineRole.java?rev=1845861&r1=1845860&r2=1845861&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbineRole.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbineRole.java Mon Nov 5 22:43:28 2018
@@ -1,4 +1,5 @@
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
@@ -37,6 +38,7 @@ import org.apache.torque.TorqueException
import org.apache.torque.criteria.Criteria;
import org.apache.torque.om.SimpleKey;
import org.apache.torque.util.Transaction;
+
/**
* This abstract class provides the SecurityInterface to the managers.
*
@@ -44,217 +46,229 @@ import org.apache.torque.util.Transactio
* @version $Id:$
*/
public abstract class FulcrumAbstractTurbineRole extends TorqueAbstractTurbineTurbineSecurityEntity
- implements TurbineRole
-{
- /** Serial version */
+ implements TurbineRole {
+ /** Serial version */
private static final long serialVersionUID = -1782236723198646728L;
/** a cache of permission objects */
- private Set<Permission> permissionSet = null;
+ private Set<Permission> permissionSet = null;
- /**
- * Forward reference to generated code
- *
- * Get a list of association objects, pre-populated with their TorqueTurbinePermission
- * objects.
- *
- * @param criteria Criteria to define the selection of records
- * @param con a database connection
- * @throws TorqueException
- *
- * @return a list of Role/Permission relations
- */
- protected List<TorqueTurbineRolePermission> getTorqueTurbineRolePermissionsJoinTorqueTurbinePermission(Criteria criteria, Connection con)
- throws TorqueException
- {
- criteria.and(TorqueTurbineRolePermissionPeer.ROLE_ID, getEntityId() );
- return TorqueTurbineRolePermissionPeer.doSelectJoinTorqueTurbinePermission(criteria, con);
- }
-
- /**
- * Forward reference to generated code
- *
- * Get a list of association objects, pre-populated with their TorqueTurbineGroup
- * objects.
- *
- * @param criteria Criteria to define the selection of records
- * @param con a database connection
- * @throws TorqueException
- *
- * @return a list of User/Group/Role relations
- */
- protected List<TorqueTurbineUserGroupRole> getTorqueTurbineUserGroupRolesJoinTorqueTurbineGroup(Criteria criteria, Connection con)
- throws TorqueException
- {
- criteria.and(TorqueTurbineUserGroupRolePeer.ROLE_ID, getEntityId() );
- return TorqueTurbineUserGroupRolePeer.doSelectJoinTorqueTurbineGroup(criteria, con);
- }
-
- /**
- * @see org.apache.fulcrum.security.model.turbine.entity.TurbineRole#addPermission(org.apache.fulcrum.security.entity.Permission)
- */
- public void addPermission(Permission permission)
- {
- getPermissions().add(permission);
- }
-
- /**
- * @see org.apache.fulcrum.security.model.turbine.entity.TurbineRole#getPermissions()
- */
- public PermissionSet getPermissions()
- {
- if (permissionSet == null)
- {
- permissionSet = new PermissionSet();
- }
- else if(!(permissionSet instanceof PermissionSet))
- {
- permissionSet = new PermissionSet(permissionSet);
- }
-
- return (PermissionSet)permissionSet;
- }
-
- /**
- * @see org.apache.fulcrum.security.model.turbine.entity.TurbineRole#getPermissionsAsSet()
- */
- @SuppressWarnings("unchecked")
- public <T extends Permission> Set<T> getPermissionsAsSet()
- {
- return (Set<T>)permissionSet;
- }
-
- /**
- * @see org.apache.fulcrum.security.model.turbine.entity.TurbineRole#removePermission(org.apache.fulcrum.security.entity.Permission)
- */
- public void removePermission(Permission permission)
- {
- getPermissions().remove(permission);
- }
-
- /**
- * @see org.apache.fulcrum.security.model.turbine.entity.TurbineRole#setPermissions(org.apache.fulcrum.security.util.PermissionSet)
- */
- public void setPermissions(PermissionSet permissionSet)
- {
- if (permissionSet != null)
- {
- this.permissionSet = permissionSet;
- }
- else
- {
- this.permissionSet = new PermissionSet();
- }
- }
-
- /**
- * @see org.apache.fulcrum.security.model.turbine.entity.TurbineRole#setPermissionsAsSet(java.util.Set)
- */
- public <T extends Permission> void setPermissionsAsSet(Set<T> permissions)
- {
- setPermissions(new PermissionSet(permissions));
- }
-
- /**
- * @see org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#getDatabaseName()
- */
- public String getDatabaseName()
- {
- return TorqueTurbineRolePeer.DATABASE_NAME;
- }
-
- @Override
- public void retrieveAttachedObjects( Connection con )
- throws TorqueException
- {
- retrieveAttachedObjects( con, false );
- }
-
- /**
- * @see org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#retrieveAttachedObjects(Connection, Boolean)
- */
-
- public void retrieveAttachedObjects(Connection con, Boolean lazy) throws TorqueException
- {
- this.permissionSet = new PermissionSet();
-
- List<TorqueTurbineRolePermission> rolepermissions = getTorqueTurbineRolePermissionsJoinTorqueTurbinePermission(new Criteria(), con);
-
- for (TorqueTurbineRolePermission ttrp : rolepermissions)
- {
- permissionSet.add(ttrp.getTorqueTurbinePermission());
- }
-
- if (!lazy) {
- Set<TurbineUserGroupRole> userGroupRoleSet = new HashSet<TurbineUserGroupRole>();
-
- List<TorqueTurbineUserGroupRole> ugrs = getTorqueTurbineUserGroupRolesJoinTorqueTurbineGroup(new Criteria(), con);
-
- for (TorqueTurbineUserGroupRole ttugr : ugrs)
- {
- TurbineUserGroupRole ugr = new TurbineUserGroupRole();
- ugr.setRole(this);
- ugr.setGroup(ttugr.getTorqueTurbineGroup());
- ugr.setUser(ttugr.getTorqueTurbineUser(con));
- userGroupRoleSet.add(ugr);
- }
-
- setUserGroupRoleSet(userGroupRoleSet);
- }
- }
-
- @Override
- public <T extends TurbineUserGroupRole> Set<T> getUserGroupRoleSet() throws DataBackendException
- {
- if (super.getUserGroupRoleSet() == null || super.getUserGroupRoleSet().isEmpty()) {
- Connection con = null;
- try
- {
- con = Transaction.begin();
-
- retrieveAttachedObjects( con, false ); // not configurable, we set it
-
- Transaction.commit(con);
- con = null;
- }
- catch (TorqueException e)
- {
- throw new DataBackendException("Error retrieving group information", e);
- }
- finally
- {
- if (con != null)
- {
- Transaction.safeRollback(con);
- }
- }
- }
-
- return super.getUserGroupRoleSet();
- }
-
- /**
- * @see org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#update(java.sql.Connection)
- */
- public void update(Connection con) throws TorqueException
- {
- if (permissionSet != null)
- {
- Criteria criteria = new Criteria();
-
- /* remove old entries */
- criteria.where(TorqueTurbineRolePermissionPeer.ROLE_ID, getEntityId());
- TorqueTurbineRolePermissionPeer.doDelete(criteria, con);
-
- for (Permission p : permissionSet)
- {
- TorqueTurbineRolePermission rp = new TorqueTurbineRolePermission();
- rp.setPermissionId((Integer)p.getId());
- rp.setRoleId(getEntityId());
- rp.save(con);
- }
- }
- // not needed
+ /**
+ * Forward reference to generated code
+ *
+ * Get a list of association objects, pre-populated with their
+ * TorqueTurbinePermission objects.
+ *
+ * @param criteria Criteria to define the selection of records
+ * @param con a database connection
+ * @throws TorqueException if any database error occurs
+ *
+ * @return a list of Role/Permission relations
+ */
+ protected List<TorqueTurbineRolePermission> getTorqueTurbineRolePermissionsJoinTorqueTurbinePermission(
+ Criteria criteria, Connection con) throws TorqueException {
+ criteria.and(TorqueTurbineRolePermissionPeer.ROLE_ID, getEntityId());
+ return TorqueTurbineRolePermissionPeer.doSelectJoinTorqueTurbinePermission(criteria, con);
+ }
+
+ /**
+ * Forward reference to generated code
+ *
+ * Get a list of association objects, pre-populated with their
+ * TorqueTurbineGroup objects.
+ *
+ * @param criteria Criteria to define the selection of records
+ * @param con a database connection
+ * @throws TorqueException if any database error occurs
+ *
+ * @return a list of User/Group/Role relations
+ */
+ protected List<TorqueTurbineUserGroupRole> getTorqueTurbineUserGroupRolesJoinTorqueTurbineGroup(Criteria criteria,
+ Connection con) throws TorqueException {
+ criteria.and(TorqueTurbineUserGroupRolePeer.ROLE_ID, getEntityId());
+ return TorqueTurbineUserGroupRolePeer.doSelectJoinTorqueTurbineGroup(criteria, con);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.apache.fulcrum.security.model.turbine.entity.TurbineRole#addPermission(
+ * org.apache.fulcrum.security.entity.Permission)
+ */
+ public void addPermission(Permission permission) {
+ getPermissions().add(permission);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.apache.fulcrum.security.model.turbine.entity.TurbineRole#getPermissions()
+ */
+ public PermissionSet getPermissions() {
+ if (permissionSet == null) {
+ permissionSet = new PermissionSet();
+ } else if (!(permissionSet instanceof PermissionSet)) {
+ permissionSet = new PermissionSet(permissionSet);
+ }
+
+ return (PermissionSet) permissionSet;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.fulcrum.security.model.turbine.entity.TurbineRole#
+ * getPermissionsAsSet()
+ */
+ @SuppressWarnings("unchecked")
+ public <T extends Permission> Set<T> getPermissionsAsSet() {
+ return (Set<T>) permissionSet;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.apache.fulcrum.security.model.turbine.entity.TurbineRole#removePermission
+ * (org.apache.fulcrum.security.entity.Permission)
+ */
+ public void removePermission(Permission permission) {
+ getPermissions().remove(permission);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.apache.fulcrum.security.model.turbine.entity.TurbineRole#setPermissions(
+ * org.apache.fulcrum.security.util.PermissionSet)
+ */
+ public void setPermissions(PermissionSet permissionSet) {
+ if (permissionSet != null) {
+ this.permissionSet = permissionSet;
+ } else {
+ this.permissionSet = new PermissionSet();
+ }
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.fulcrum.security.model.turbine.entity.TurbineRole#
+ * setPermissionsAsSet(java.util.Set)
+ */
+ public <T extends Permission> void setPermissionsAsSet(Set<T> permissions) {
+ setPermissions(new PermissionSet(permissions));
+ }
+
+ /**
+ * @return the database name
+ */
+ public String getDatabaseName() {
+ return TorqueTurbineRolePeer.DATABASE_NAME;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#
+ * retrieveAttachedObjects(java.sql.Connection)
+ */
+ @Override
+ public void retrieveAttachedObjects(Connection con) throws TorqueException {
+ retrieveAttachedObjects(con, false);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#
+ * retrieveAttachedObjects(java.sql.Connection, java.lang.Boolean)
+ */
+ public void retrieveAttachedObjects(Connection con, Boolean lazy) throws TorqueException {
+ this.permissionSet = new PermissionSet();
+
+ List<TorqueTurbineRolePermission> rolepermissions = getTorqueTurbineRolePermissionsJoinTorqueTurbinePermission(
+ new Criteria(), con);
+
+ for (TorqueTurbineRolePermission ttrp : rolepermissions) {
+ permissionSet.add(ttrp.getTorqueTurbinePermission());
+ }
+
+ if (!lazy) {
+ Set<TurbineUserGroupRole> userGroupRoleSet = new HashSet<TurbineUserGroupRole>();
+
+ List<TorqueTurbineUserGroupRole> ugrs = getTorqueTurbineUserGroupRolesJoinTorqueTurbineGroup(new Criteria(),
+ con);
+
+ for (TorqueTurbineUserGroupRole ttugr : ugrs) {
+ TurbineUserGroupRole ugr = new TurbineUserGroupRole();
+ ugr.setRole(this);
+ ugr.setGroup(ttugr.getTorqueTurbineGroup());
+ ugr.setUser(ttugr.getTorqueTurbineUser(con));
+ userGroupRoleSet.add(ugr);
+ }
+
+ setUserGroupRoleSet(userGroupRoleSet);
+ }
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.fulcrum.security.torque.security.turbine.
+ * TorqueAbstractTurbineTurbineSecurityEntity#getUserGroupRoleSet()
+ */
+ @Override
+ public <T extends TurbineUserGroupRole> Set<T> getUserGroupRoleSet() throws DataBackendException {
+ if (super.getUserGroupRoleSet() == null || super.getUserGroupRoleSet().isEmpty()) {
+ Connection con = null;
+ try {
+ con = Transaction.begin();
+
+ retrieveAttachedObjects(con, false); // not configurable, we set it
+
+ Transaction.commit(con);
+ con = null;
+ } catch (TorqueException e) {
+ throw new DataBackendException("Error retrieving group information", e);
+ } finally {
+ if (con != null) {
+ Transaction.safeRollback(con);
+ }
+ }
+ }
+
+ return super.getUserGroupRoleSet();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#
+ * update(java.sql.Connection)
+ */
+ public void update(Connection con) throws TorqueException {
+ if (permissionSet != null) {
+ Criteria criteria = new Criteria();
+
+ /* remove old entries */
+ criteria.where(TorqueTurbineRolePermissionPeer.ROLE_ID, getEntityId());
+ TorqueTurbineRolePermissionPeer.doDelete(criteria, con);
+
+ for (Permission p : permissionSet) {
+ TorqueTurbineRolePermission rp = new TorqueTurbineRolePermission();
+ rp.setPermissionId((Integer) p.getId());
+ rp.setRoleId(getEntityId());
+ rp.save(con);
+ }
+ }
+ // not needed
// try
// {
// Set<TurbineUserGroupRole> userGroupRoleSet = getUserGroupRoleSet();
@@ -281,13 +295,16 @@ public abstract class FulcrumAbstractTur
// {
// throw new TorqueException(e);
// }
- }
+ }
- /**
- * @see org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#delete()
- */
- public void delete() throws TorqueException
- {
- TorqueTurbineRolePeer.doDelete(SimpleKey.keyFor(getEntityId()));
- }
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#
+ * delete()
+ */
+ public void delete() throws TorqueException {
+ TorqueTurbineRolePeer.doDelete(SimpleKey.keyFor(getEntityId()));
+ }
}
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbineUser.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbineUser.java?rev=1845861&r1=1845860&r2=1845861&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbineUser.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbineUser.java Mon Nov 5 22:43:28 2018
@@ -53,7 +53,7 @@ public abstract class FulcrumAbstractTur
*
* @param criteria Criteria to define the selection of records
* @param con a database connection
- * @throws TorqueException
+ * @throws TorqueException if any database error occurs
*
* @return a list of User/Group/Role relations
*/
@@ -64,6 +64,9 @@ public abstract class FulcrumAbstractTur
return TorqueTurbineUserGroupRolePeer.doSelectJoinTorqueTurbineRole(criteria, con);
}
+ /* (non-Javadoc)
+ * @see org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#retrieveAttachedObjects(java.sql.Connection)
+ */
@Override
public void retrieveAttachedObjects( Connection con )
throws TorqueException
@@ -71,8 +74,8 @@ public abstract class FulcrumAbstractTur
retrieveAttachedObjects( con, false );
}
- /**
- * @see TorqueAbstractTurbineTurbineSecurityEntity#retrieveAttachedObjects(Connection, boolean)
+ /* (non-Javadoc)
+ * @see org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#retrieveAttachedObjects(java.sql.Connection, java.lang.Boolean)
*/
@Override
public void retrieveAttachedObjects(Connection con, Boolean lazy) throws TorqueException
@@ -93,9 +96,7 @@ public abstract class FulcrumAbstractTur
}
}
- /**
- * Removes all entries, then inserts, what is found in {@link #getUserGroupRoleSet()}.
- *
+ /* (non-Javadoc)
* @see org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#update(java.sql.Connection)
*/
@Override
@@ -129,10 +130,10 @@ public abstract class FulcrumAbstractTur
}
}
- /**
+
+ /* (non-Javadoc)
* @see org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#delete()
*/
-
@Override
public void delete() throws TorqueException
{