Author: tv
Date: Tue Aug 14 15:20:45 2012
New Revision: 1372919
URL: http://svn.apache.org/viewvc?rev=1372919&view=rev
Log:
Adjust to changes of the API and avoid deprecated methods
Modified:
turbine/fulcrum/trunk/security/hibernate/src/java/org/apache/fulcrum/security/hibernate/HibernateGroupManagerImpl.java
turbine/fulcrum/trunk/security/hibernate/src/java/org/apache/fulcrum/security/hibernate/HibernatePermissionManagerImpl.java
turbine/fulcrum/trunk/security/hibernate/src/java/org/apache/fulcrum/security/hibernate/HibernateRoleManagerImpl.java
turbine/fulcrum/trunk/security/hibernate/src/java/org/apache/fulcrum/security/hibernate/HibernateUserManagerImpl.java
turbine/fulcrum/trunk/security/hibernate/src/java/org/apache/fulcrum/security/hibernate/turbine/HibernateModelManagerImpl.java
Modified:
turbine/fulcrum/trunk/security/hibernate/src/java/org/apache/fulcrum/security/hibernate/HibernateGroupManagerImpl.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/hibernate/src/java/org/apache/fulcrum/security/hibernate/HibernateGroupManagerImpl.java?rev=1372919&r1=1372918&r2=1372919&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/hibernate/src/java/org/apache/fulcrum/security/hibernate/HibernateGroupManagerImpl.java
(original)
+++
turbine/fulcrum/trunk/security/hibernate/src/java/org/apache/fulcrum/security/hibernate/HibernateGroupManagerImpl.java
Tue Aug 14 15:20:45 2012
@@ -25,7 +25,6 @@ import org.apache.fulcrum.security.util.
import org.apache.fulcrum.security.util.EntityExistsException;
import org.apache.fulcrum.security.util.GroupSet;
import org.apache.fulcrum.security.util.UnknownEntityException;
-import org.hibernate.Hibernate;
import org.hibernate.HibernateException;
/**
* This implementation persists to a database via Hibernate.
@@ -33,6 +32,7 @@ import org.hibernate.HibernateException;
* @author <a href="mailto:[email protected]";>Eric Pugh</a>
* @version $Id$
*/
+@SuppressWarnings("unchecked")
public class HibernateGroupManagerImpl extends AbstractGroupManager
{
private PersistenceHelper persistenceHelper;
@@ -52,25 +52,25 @@ public class HibernateGroupManagerImpl e
Group group = null;
try
{
-
- List groups =
- getPersistenceHelper().retrieveSession().find(
- "from "
- + Group.class.getName()
- + " g where g.name=?",
- name.toLowerCase(),
- Hibernate.STRING);
+ List<Group> groups =
+ getPersistenceHelper()
+ .retrieveSession()
+ .createQuery(
+ "from "
+ + Group.class.getName()
+ + " g where g.name=:name")
+ .setString("name", name.toLowerCase())
+ .list();
if (groups.size() == 0)
{
throw new UnknownEntityException("Could not find group" +
name);
}
- group = (Group) groups.get(0);
- //session.close();
+ group = groups.get(0);
}
catch (HibernateException e)
{
throw new DataBackendException(
- "Error retriving group information",
+ "Error retrieving group information",
e);
}
return group;
@@ -89,15 +89,18 @@ public class HibernateGroupManagerImpl e
try
{
- List groups =
- getPersistenceHelper().retrieveSession().find(
- "from " + Group.class.getName() + "");
+ List<Group> groups =
+ getPersistenceHelper()
+ .retrieveSession()
+ .createQuery(
+ "from " + Group.class.getName())
+ .list();
groupSet.add(groups);
}
catch (HibernateException e)
{
throw new DataBackendException(
- "Error retriving group information",
+ "Error retrieving group information",
e);
}
return groupSet;
@@ -150,22 +153,23 @@ public class HibernateGroupManagerImpl e
*/
public boolean checkExists(String groupName) throws DataBackendException
{
- List groups;
+ List<Group> groups;
try
{
-
groups =
- getPersistenceHelper().retrieveSession().find(
+ getPersistenceHelper()
+ .retrieveSession()
+ .createQuery(
"from "
+ Group.class.getName()
- + " sg where sg.name=?",
- groupName,
- Hibernate.STRING);
+ + " sg where sg.name=:name")
+ .setString("name", groupName)
+ .list();
}
catch (HibernateException e)
{
throw new DataBackendException(
- "Error retriving user information",
+ "Error retrieving user information",
e);
}
if (groups.size() > 1)
@@ -187,7 +191,6 @@ public class HibernateGroupManagerImpl e
protected synchronized Group persistNewGroup(Group group)
throws DataBackendException
{
-
getPersistenceHelper().addEntity(group);
return group;
}
@@ -220,27 +223,28 @@ public class HibernateGroupManagerImpl e
Group group = null;
- if (id != null)
- try {
- List groups =
- getPersistenceHelper().retrieveSession().find(
- "from " + Group.class.getName()
+ " sr where sr.id=?",
- id,
- Hibernate.LONG);
+ if (id != null) {
+ try {
+ List<Group> groups =
+ getPersistenceHelper()
+ .retrieveSession()
+ .createQuery(
+ "from " + Group.class.getName()
+ " sr where sr.id=:id")
+ .setLong("id", ((Long)id).longValue())
+ .list();
if (groups.size() == 0) {
throw new UnknownEntityException(
"Could not find group by id " +
id);
}
- group = (Group) groups.get(0);
+ group = groups.get(0);
} catch (HibernateException e) {
throw new DataBackendException(
- "Error retriving group information",
+ "Error retrieving group information",
e);
}
+ }
- return group;
+ return group;
}
-
-
}
Modified:
turbine/fulcrum/trunk/security/hibernate/src/java/org/apache/fulcrum/security/hibernate/HibernatePermissionManagerImpl.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/hibernate/src/java/org/apache/fulcrum/security/hibernate/HibernatePermissionManagerImpl.java?rev=1372919&r1=1372918&r2=1372919&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/hibernate/src/java/org/apache/fulcrum/security/hibernate/HibernatePermissionManagerImpl.java
(original)
+++
turbine/fulcrum/trunk/security/hibernate/src/java/org/apache/fulcrum/security/hibernate/HibernatePermissionManagerImpl.java
Tue Aug 14 15:20:45 2012
@@ -25,7 +25,6 @@ import org.apache.fulcrum.security.util.
import org.apache.fulcrum.security.util.EntityExistsException;
import org.apache.fulcrum.security.util.PermissionSet;
import org.apache.fulcrum.security.util.UnknownEntityException;
-import org.hibernate.Hibernate;
import org.hibernate.HibernateException;
/**
* This implementation persists to a database via Hibernate.
@@ -33,6 +32,7 @@ import org.hibernate.HibernateException;
* @author <a href="mailto:[email protected]";>Eric Pugh</a>
* @version $Id$
*/
+@SuppressWarnings("unchecked")
public class HibernatePermissionManagerImpl extends AbstractPermissionManager
{
private PersistenceHelper persistenceHelper;
@@ -49,14 +49,15 @@ public class HibernatePermissionManagerI
PermissionSet permissionSet = new PermissionSet();
try
{
-
- List permissions =
getPersistenceHelper().retrieveSession().find("from " +
Permission.class.getName() + "");
+ List<Permission> permissions =
+ getPersistenceHelper()
+ .retrieveSession().createQuery("from " +
Permission.class.getName())
+ .list();
permissionSet.add(permissions);
-
}
catch (HibernateException e)
{
- throw new DataBackendException("Error retriving permission
information", e);
+ throw new DataBackendException("Error retrieving permission
information", e);
}
return permissionSet;
}
@@ -78,7 +79,6 @@ public class HibernatePermissionManagerI
{
permission.setName(name);
getPersistenceHelper().updateEntity(permission);
- return;
}
else
{
@@ -95,17 +95,19 @@ public class HibernatePermissionManagerI
*/
public boolean checkExists(String permissionName) throws
DataBackendException
{
- List permissions;
+ List<Permission> permissions;
try
{
-
permissions =
- getPersistenceHelper().retrieveSession().find("from " +
Permission.class.getName() + " sp where sp.name=?", permissionName,
Hibernate.STRING);
-
+ getPersistenceHelper()
+ .retrieveSession()
+ .createQuery("from " + Permission.class.getName() + "
sp where sp.name=:name")
+ .setString("name", permissionName)
+ .list();
}
catch (HibernateException e)
{
- throw new DataBackendException("Error retriving permission
information", e);
+ throw new DataBackendException("Error retrieving permission
information", e);
}
if (permissions.size() > 1)
{
@@ -147,7 +149,6 @@ public class HibernatePermissionManagerI
protected synchronized Permission persistNewPermission(Permission
permission)
throws DataBackendException
{
-
getPersistenceHelper().addEntity(permission);
return permission;
}
@@ -176,28 +177,32 @@ public class HibernatePermissionManagerI
* if the permission does not exist.
*/
public Permission getPermissionById(Object id)
- throws DataBackendException, UnknownEntityException {
+ throws DataBackendException, UnknownEntityException
+ {
Permission permission = null;
- if (id != null)
+ if (id != null) {
try {
- List permissions =
-
getPersistenceHelper().retrieveSession().find(
- "from " +
Permission.class.getName() + " sp where sp.id=?",
- id,
- Hibernate.LONG);
+ List<Permission> permissions =
+ getPersistenceHelper()
+ .retrieveSession()
+ .createQuery(
+ "from " +
Permission.class.getName() + " sp where sp.id=:id")
+ .setLong("id",
((Long)id).longValue())
+ .list();
if (permissions.size() == 0) {
throw new UnknownEntityException(
"Could not find
permission by id " + id);
}
- permission = (Permission) permissions.get(0);
+ permission = permissions.get(0);
} catch (HibernateException e) {
throw new DataBackendException(
- "Error retriving permission
information",
+ "Error retrieving permission
information",
e);
}
+ }
return permission;
}
Modified:
turbine/fulcrum/trunk/security/hibernate/src/java/org/apache/fulcrum/security/hibernate/HibernateRoleManagerImpl.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/hibernate/src/java/org/apache/fulcrum/security/hibernate/HibernateRoleManagerImpl.java?rev=1372919&r1=1372918&r2=1372919&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/hibernate/src/java/org/apache/fulcrum/security/hibernate/HibernateRoleManagerImpl.java
(original)
+++
turbine/fulcrum/trunk/security/hibernate/src/java/org/apache/fulcrum/security/hibernate/HibernateRoleManagerImpl.java
Tue Aug 14 15:20:45 2012
@@ -25,7 +25,6 @@ import org.apache.fulcrum.security.util.
import org.apache.fulcrum.security.util.EntityExistsException;
import org.apache.fulcrum.security.util.RoleSet;
import org.apache.fulcrum.security.util.UnknownEntityException;
-import org.hibernate.Hibernate;
import org.hibernate.HibernateException;
/**
*
@@ -34,6 +33,7 @@ import org.hibernate.HibernateException;
* @author <a href="mailto:[email protected]";>Eric Pugh</a>
* @version $Id$
*/
+@SuppressWarnings("unchecked")
public class HibernateRoleManagerImpl extends AbstractRoleManager
{
private PersistenceHelper persistenceHelper;
@@ -72,16 +72,18 @@ public class HibernateRoleManagerImpl ex
*/
public boolean checkExists(String roleName) throws DataBackendException
{
- List roles;
+ List<Role> roles;
try
{
-
- roles = getPersistenceHelper().retrieveSession().find("from " +
Role.class.getName() + " sr where sr.name=?", roleName, Hibernate.STRING);
-
+ roles = getPersistenceHelper()
+ .retrieveSession()
+ .createQuery("from " + Role.class.getName() + " sr where
sr.name=:name")
+ .setString("name", roleName)
+ .list();
}
catch (HibernateException e)
{
- throw new DataBackendException("Error retriving role information",
e);
+ throw new DataBackendException("Error retrieving role
information", e);
}
if (roles.size() > 1)
{
@@ -101,12 +103,15 @@ public class HibernateRoleManagerImpl ex
RoleSet roleSet = new RoleSet();
try
{
- List roles = getPersistenceHelper().retrieveSession().find("from "
+ Role.class.getName() + "");
+ List<Role> roles = getPersistenceHelper()
+ .retrieveSession()
+ .createQuery("from " + Role.class.getName())
+ .list();
roleSet.add(roles);
}
catch (HibernateException e)
{
- throw new DataBackendException("Error retriving role information",
e);
+ throw new DataBackendException("Error retrieving role
information", e);
}
return roleSet;
}
@@ -123,7 +128,6 @@ public class HibernateRoleManagerImpl ex
*/
protected synchronized Role persistNewRole(Role role) throws
DataBackendException
{
-
getPersistenceHelper().addEntity(role);
return role;
}
@@ -184,24 +188,27 @@ public class HibernateRoleManagerImpl ex
Role role = null;
- if (id != null)
+ if (id != null) {
try {
- List roles =
-
getPersistenceHelper().retrieveSession().find(
- "from " +
Role.class.getName() + " sr where sr.id=?",
- id,
- Hibernate.LONG);
+ List<Role> roles =
+ getPersistenceHelper()
+ .retrieveSession()
+ .createQuery(
+ "from " +
Role.class.getName() + " sr where sr.id=:id")
+ .setLong("id",
((Long)id).longValue())
+ .list();
if (roles.size() == 0) {
throw new UnknownEntityException(
"Could not find role by
id " + id);
}
- role = (Role) roles.get(0);
+ role = roles.get(0);
} catch (HibernateException e) {
throw new DataBackendException(
- "Error retriving role
information",
+ "Error retrieving role
information",
e);
}
+ }
return role;
}
Modified:
turbine/fulcrum/trunk/security/hibernate/src/java/org/apache/fulcrum/security/hibernate/HibernateUserManagerImpl.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/hibernate/src/java/org/apache/fulcrum/security/hibernate/HibernateUserManagerImpl.java?rev=1372919&r1=1372918&r2=1372919&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/hibernate/src/java/org/apache/fulcrum/security/hibernate/HibernateUserManagerImpl.java
(original)
+++
turbine/fulcrum/trunk/security/hibernate/src/java/org/apache/fulcrum/security/hibernate/HibernateUserManagerImpl.java
Tue Aug 14 15:20:45 2012
@@ -25,7 +25,6 @@ import org.apache.fulcrum.security.util.
import org.apache.fulcrum.security.util.EntityExistsException;
import org.apache.fulcrum.security.util.UnknownEntityException;
import org.apache.fulcrum.security.util.UserSet;
-import org.hibernate.Hibernate;
import org.hibernate.HibernateException;
/**
* This implementation persists to a database via Hibernate.
@@ -33,6 +32,7 @@ import org.hibernate.HibernateException;
* @author <a href="mailto:[email protected]";>Eric Pugh</a>
* @version $Id$
*/
+@SuppressWarnings("unchecked")
public class HibernateUserManagerImpl extends AbstractUserManager
{
private PersistenceHelper persistenceHelper;
@@ -49,15 +49,19 @@ public class HibernateUserManagerImpl ex
*/
public boolean checkExists(String userName) throws DataBackendException
{
- List users = null;
+ List<User> users = null;
userName = userName.toLowerCase();
try
{
- users = getPersistenceHelper().retrieveSession().find("from " +
User.class.getName() + " su where su.name=?", userName, Hibernate.STRING);
+ users = getPersistenceHelper()
+ .retrieveSession()
+ .createQuery("from " + User.class.getName() + " su where
su.name=:name")
+ .setString("name", userName)
+ .list();
}
catch (HibernateException e)
{
- throw new DataBackendException("Error retriving user information",
e);
+ throw new DataBackendException("Error retrieving user
information", e);
}
if (users.size() > 1)
{
@@ -78,18 +82,19 @@ public class HibernateUserManagerImpl ex
*/
public User getUser(String userName) throws UnknownEntityException,
DataBackendException
{
- List users = null;
+ List<User> users = null;
try
{
- users =
- getPersistenceHelper().retrieveSession().find(
- "from " + User.class.getName() + " su where su.name=?",
- userName.toLowerCase(),
- Hibernate.STRING);
+ users = getPersistenceHelper()
+ .retrieveSession()
+ .createQuery(
+ "from " + User.class.getName() + " su where su.name=:name")
+ .setString("name", userName.toLowerCase())
+ .list();
}
catch (HibernateException e)
{
- throw new DataBackendException("Error retriving user information",
e);
+ throw new DataBackendException("Error retrieving user
information", e);
}
if (users.size() > 1)
{
@@ -97,7 +102,7 @@ public class HibernateUserManagerImpl ex
}
if (users.size() == 1)
{
- return (User) users.get(0);
+ return users.get(0);
}
throw new UnknownEntityException("Unknown user '" + userName + "'");
}
@@ -114,21 +119,22 @@ public class HibernateUserManagerImpl ex
UserSet userSet = new UserSet();
try
{
-
- List users =
- getPersistenceHelper().retrieveSession().find(
- "from " + User.class.getName() + "");
+ List<User> users = getPersistenceHelper()
+ .retrieveSession()
+ .createQuery(
+ "from " + User.class.getName())
+ .list();
userSet.add(users);
}
catch (HibernateException e)
{
throw new DataBackendException(
- "Error retriving all users",
+ "Error retrieving all users",
e);
}
return userSet;
-
}
+
/**
* Removes an user account from the system.
*
@@ -141,6 +147,7 @@ public class HibernateUserManagerImpl ex
{
getPersistenceHelper().removeEntity(user);
}
+
/**
* Creates new user account with specified attributes.
*
@@ -153,10 +160,10 @@ public class HibernateUserManagerImpl ex
*/
public User persistNewUser(User user) throws DataBackendException
{
-
getPersistenceHelper().addEntity(user);
return user;
}
+
/**
* Stores User attributes. The User is required to exist in the system.
*
@@ -203,28 +210,30 @@ public class HibernateUserManagerImpl ex
* if the user does not exist.
*/
public User getUserById(Object id)
- throws DataBackendException, UnknownEntityException {
-
+ throws DataBackendException, UnknownEntityException
+ {
User user = null;
- if (id != null)
+ if (id != null) {
try {
- List users =
-
getPersistenceHelper().retrieveSession().find(
- "from " +
User.class.getName() + " su where su.id=?",
- id,
- Hibernate.LONG);
+ List<User> users = getPersistenceHelper()
+ .retrieveSession()
+ .createQuery(
+ "from " +
User.class.getName() + " su where su.id=:id")
+ .setLong("id", ((Long)id).longValue())
+ .list();
if (users.size() == 0) {
throw new UnknownEntityException(
"Could not find user by
id " + id);
}
- user = (User) users.get(0);
+ user = users.get(0);
//session.close();
} catch (HibernateException e) {
throw new DataBackendException(
- "Error retriving user
information",
+ "Error retrieving user
information",
e);
}
+ }
return user;
}
Modified:
turbine/fulcrum/trunk/security/hibernate/src/java/org/apache/fulcrum/security/hibernate/turbine/HibernateModelManagerImpl.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/hibernate/src/java/org/apache/fulcrum/security/hibernate/turbine/HibernateModelManagerImpl.java?rev=1372919&r1=1372918&r2=1372919&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/hibernate/src/java/org/apache/fulcrum/security/hibernate/turbine/HibernateModelManagerImpl.java
(original)
+++
turbine/fulcrum/trunk/security/hibernate/src/java/org/apache/fulcrum/security/hibernate/turbine/HibernateModelManagerImpl.java
Tue Aug 14 15:20:45 2012
@@ -17,8 +17,6 @@ package org.apache.fulcrum.security.hibe
* specific language governing permissions and limitations
* under the License.
*/
-import java.util.Iterator;
-
import org.apache.fulcrum.security.entity.Group;
import org.apache.fulcrum.security.entity.Permission;
import org.apache.fulcrum.security.entity.Role;
@@ -184,11 +182,20 @@ public class HibernateModelManagerImpl e
groupExists = getGroupManager().checkExists(group);
if (roleExists && groupExists && userExists) {
boolean ugrFound = false;
- TurbineUserGroupRole ugr = null;
- for(Iterator i = ((TurbineUser)
user).getUserGroupRoleSet().iterator();i.hasNext();){
- ugr = (TurbineUserGroupRole)i.next();
- if(ugr.getUser().equals(user)&&
ugr.getGroup().equals(group) && ugr.getRole().equals(role)){
+ for(TurbineUserGroupRole ugr : ((TurbineUser)
user).getUserGroupRoleSet())
+ {
+ if(ugr.getUser().equals(user)&&
ugr.getGroup().equals(group) && ugr.getRole().equals(role))
+ {
ugrFound=true;
+
+ ((TurbineUser) user).removeUserGroupRole(ugr);
+ ((TurbineGroup) group).removeUserGroupRole(ugr);
+ ((TurbineRole) role).removeUserGroupRole(ugr);
+
+ getPersistenceHelper().updateEntity(user);
+ getPersistenceHelper().updateEntity(group);
+ getPersistenceHelper().updateEntity(role);
+
break;
}
}
@@ -196,12 +203,6 @@ public class HibernateModelManagerImpl e
throw new UnknownEntityException("Could not find
User/Group/Role");
}
- ((TurbineUser) user).removeUserGroupRole(ugr);
- ((TurbineGroup) group).removeUserGroupRole(ugr);
- ((TurbineRole) role).removeUserGroupRole(ugr);
- getPersistenceHelper().updateEntity(user);
- getPersistenceHelper().updateEntity(group);
- getPersistenceHelper().updateEntity(role);
return;
}
} catch (Exception e) {
