Author: tchemit Date: 2008-01-24 10:36:35 +0000 (Thu, 24 Jan 2008) New Revision: 481 Modified: trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoSecurityImpl.java trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/service/AuthenticationServiceImpl.java Log: tip : ne pas faire d'appel "string1" == "string2", m?\195?\170me si cela fonctionne, fortement d?\195?\169conseill?\195?\169... + nettoyage code Modified: trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoSecurityImpl.java =================================================================== --- trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoSecurityImpl.java 2008-01-24 10:33:53 UTC (rev 480) +++ trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoSecurityImpl.java 2008-01-24 10:36:35 UTC (rev 481) @@ -46,7 +46,7 @@ return o; } - private Object find(Class clazz, Object arg) { + private Object find(Class<?> clazz, Object arg) { Object o; try { o = em.find(clazz, arg); Modified: trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/service/AuthenticationServiceImpl.java =================================================================== --- trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/service/AuthenticationServiceImpl.java 2008-01-24 10:33:53 UTC (rev 480) +++ trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/service/AuthenticationServiceImpl.java 2008-01-24 10:36:35 UTC (rev 481) @@ -22,8 +22,8 @@ import java.util.Date; import java.util.List; import java.util.UUID; +import java.util.Arrays; -import javax.annotation.PostConstruct; import javax.annotation.Resource; import javax.ejb.EJB; import javax.ejb.Remote; @@ -34,7 +34,6 @@ import javax.ejb.TimerService; import javax.ejb.TransactionAttribute; import javax.ejb.TransactionAttributeType; -import javax.interceptor.InvocationContext; import org.jboss.annotation.ejb.RemoteBinding; @@ -83,7 +82,8 @@ } messageDigest.reset(); messageDigest.update(clearString.getBytes()); - String hashedPassword = new String(messageDigest.digest()); + String hashedPassword; + hashedPassword = new String(messageDigest.digest()); return hashedPassword; } @@ -95,7 +95,7 @@ private void removeUserFromGroup(User user, Group group) { List<Group> toRemove = new ArrayList<Group>(); for (Group testGroup : user.getGroups()) { - if (testGroup.getId() == group.getId()) { + if (testGroup.getId().equals(group.getId())) { toRemove.add(testGroup); } } @@ -161,7 +161,8 @@ } public User getLoggedUser(String token) { - User loggedUser = dao.getLoggedUser(token); + User loggedUser; + loggedUser = dao.getLoggedUser(token); return loggedUser; } @@ -239,28 +240,29 @@ public Group[] getGroups(String token) { List<Group> groups = dao.getGroups(); - Group[] result = groups.toArray(new Group[groups.size()]); + Group[] result; + result = groups.toArray(new Group[groups.size()]); return result; } public Group[] getGroupsOwnedBy(String token, User user) { - return dao.getGroupsOwnedBy(user).toArray(new Group[0]); + List<Group> list = dao.getGroupsOwnedBy(user); + return list.toArray(new Group[list.size()]); } public User[] getUsers(String token) { - return dao.getUsers().toArray(new User[0]); + return dao.getUsers().toArray(new User[dao.getUsers().size()]); } public User[] getUsersOfGroup(String token, Group group) { - return dao.getUsersOfGroup(group).toArray(new User[0]); + List<User> usersOfGroup = dao.getUsersOfGroup(group); + return usersOfGroup.toArray(new User[usersOfGroup.size()]); } public void setUsersOfGroup(String token, Group group, Integer[] usersInGroup) { List<Integer> newUsers = new ArrayList<Integer>(); - for (int i = 0; i < usersInGroup.length; i++) { - newUsers.add(usersInGroup[i]); - } + newUsers.addAll(Arrays.asList(usersInGroup)); List<Integer> usersToAdd = new ArrayList<Integer>(); List<Integer> usersToRemove = new ArrayList<Integer>(); @@ -298,8 +300,8 @@ public void setGroupsOfUser(String token, User user, Integer[] groupsIds) { User realUser = dao.getUser(user.getId()); realUser.getGroups().clear(); - for (int i = 0; i < groupsIds.length; i++) { - Group group = dao.getGroup(groupsIds[i]); + for (Integer groupsId : groupsIds) { + Group group = dao.getGroup(groupsId); realUser.getGroups().add(group); } dao.updateUser(realUser); @@ -307,18 +309,20 @@ } public Group[] getGroupsOfUser(String token, User user) { - return dao.getGroupsOfUser(user).toArray(new Group[0]); + List<Group> list = dao.getGroupsOfUser(user); + return list.toArray(new Group[list.size()]); } public Group[] getGroupsOfGroup(String token, Group group) { - return dao.getGroupsOfGroup(group).toArray(new Group[0]); + List<Group> groupsOfGroup = dao.getGroupsOfGroup(group); + return groupsOfGroup.toArray(new Group[groupsOfGroup.size()]); } public void setGroupsOfGroup(String token, Group group, Integer[] groupsIds) { Group realGroup = dao.getGroup(group.getId()); realGroup.getGroups().clear(); - for (int i = 0; i < groupsIds.length; i++) { - Group groupOwned = dao.getGroup(groupsIds[i]); + for (Integer groupsId : groupsIds) { + Group groupOwned = dao.getGroup(groupsId); realGroup.getGroups().add(groupOwned); } dao.updateGroup(realGroup);