Simplify logic working with add/remove roles sets when editing user profile

Author: petergeneric

user-manager/service/src/main/java/com/peterphi/usermanager/ui/impl/UserUIServiceImpl.java

@@ -173,28 +173,23 @@ public Response editUserProfile(final int userId,
 			delRoles.removeAll(roles);
 
 			// Add roles as necessary
-			if (addRoles.size() > 0)
+			for (String role : addRoles)
 			{
-				for (String role : addRoles)
-				{
-					RoleEntity entity = roleDao.getById(role);
-					entity.getMembers().add(user);
+				RoleEntity entity = roleDao.getById(role);
+				entity.getMembers().add(user);
 
-					roleDao.update(entity);
-				}
+				roleDao.update(entity);
 			}
 
+
 			// Remove roles as necessary
-			if (delRoles.size() > 0)
+			for (String role : delRoles)
 			{
-				for (String role : delRoles)
-				{
-					RoleEntity entity = roleDao.getById(role);
+				RoleEntity entity = roleDao.getById(role);
 
-					entity.getMembers().removeIf(u -> u.getId() == user.getId());
+				entity.getMembers().removeIf(u -> u.getId() == user.getId());
 
-					roleDao.update(entity);
-				}
+				roleDao.update(entity);
 			}
 		}