change role to enum

This commit is contained in:
Athou
2013-03-30 19:06:32 +01:00
parent 06aa9c4a6f
commit d8b8f6617a
15 changed files with 77 additions and 86 deletions

View File

@@ -7,6 +7,7 @@ import javax.ejb.Stateless;
import com.commafeed.backend.model.User;
import com.commafeed.backend.model.UserRole;
import com.commafeed.backend.model.UserRole.Role;
import com.commafeed.frontend.utils.ModelFactory.MF;
import com.google.common.collect.Sets;
@@ -18,8 +19,8 @@ public class UserRoleService extends GenericDAO<UserRole> {
return findByField(MF.i(MF.p(UserRole.class).getUser()), user);
}
public Set<String> getRoles(User user) {
Set<String> list = Sets.newHashSet();
public Set<Role> getRoles(User user) {
Set<Role> list = Sets.newHashSet();
for (UserRole role : findByField(MF.i(proxy().getUser()), user)) {
list.add(role.getRole());
}