X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2Fjava%2Forg%2Fmxchange%2Fjjobs%2Fbeans%2Fuser%2FJobsAdminUserWebRequestBean.java;h=682bdb2b9a84e2585e9dabb5840ec1e0b0310248;hb=fe57297eeb81553d228fe9ee795992216479cdd2;hp=0517694c9888c4a972d773214941d615102c890a;hpb=84a67513898d5d8d524b34eced3ee81651445ad9;p=jjobs-war.git diff --git a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java index 0517694c..682bdb2b 100644 --- a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java @@ -17,15 +17,12 @@ package org.mxchange.jjobs.beans.user; import java.text.MessageFormat; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; import java.util.Objects; -import javax.annotation.PostConstruct; import javax.enterprise.context.RequestScoped; import javax.enterprise.event.Event; import javax.enterprise.event.Observes; import javax.enterprise.inject.Any; +import javax.faces.FacesException; import javax.faces.view.facelets.FaceletException; import javax.inject.Inject; import javax.inject.Named; @@ -33,21 +30,26 @@ import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; import org.mxchange.jcontacts.contact.Contact; +import org.mxchange.jcoreee.utils.FacesUtils; +import org.mxchange.jjobs.beans.BaseJobsController; +import org.mxchange.jjobs.beans.contact.JobsAdminContactWebRequestController; import org.mxchange.jjobs.beans.contact.JobsContactWebSessionController; -import org.mxchange.jjobs.beans.helper.JobsAdminWebRequestController; -import org.mxchange.jjobs.beans.login.JobsUserLoginWebSessionController; +import org.mxchange.jjobs.beans.helper.JobsWebRequestController; import org.mxchange.jusercore.container.login.UserLoginContainer; -import org.mxchange.jusercore.events.login.UserLoggedInEvent; import org.mxchange.jusercore.events.registration.UserRegisteredEvent; import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent; import org.mxchange.jusercore.events.user.add.AdminUserAddedEvent; +import org.mxchange.jusercore.events.user.linked.AdminUserLinkedEvent; import org.mxchange.jusercore.events.user.update.AdminUpdatedUserDataEvent; import org.mxchange.jusercore.events.user.update.AdminUserDataUpdatedEvent; -import org.mxchange.jusercore.events.user.update.UpdatedUserPersonalDataEvent; import org.mxchange.jusercore.exceptions.EmailAddressAlreadyRegisteredException; import org.mxchange.jusercore.exceptions.UserNameAlreadyRegisteredException; import org.mxchange.jusercore.exceptions.UserNotFoundException; import org.mxchange.jusercore.exceptions.UserPasswordRepeatMismatchException; +import org.mxchange.jusercore.exceptions.UserStatusConfirmedException; +import org.mxchange.jusercore.exceptions.UserStatusLockedException; +import org.mxchange.jusercore.exceptions.UserStatusUnconfirmedException; +import org.mxchange.jusercore.model.user.AdminUserSessionBeanRemote; import org.mxchange.jusercore.model.user.LoginUser; import org.mxchange.jusercore.model.user.User; import org.mxchange.jusercore.model.user.UserSessionBeanRemote; @@ -62,7 +64,7 @@ import org.mxchange.jusercore.model.user.status.UserAccountStatus; */ @Named ("adminUserController") @RequestScoped -public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestController { +public class JobsAdminUserWebRequestBean extends BaseJobsController implements JobsAdminUserWebRequestController { /** * Serial number @@ -77,21 +79,27 @@ public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestContr private Event addedUserEvent; /** - * Admin helper instance + * Regular contact controller */ @Inject - private JobsAdminWebRequestController adminHelper; + private JobsAdminContactWebRequestController adminContactController; /** - * Regular contact controller + * Administrative user EJB + */ + private final AdminUserSessionBeanRemote adminUserBean; + + /** + * Admin helper instance */ @Inject - private JobsContactWebSessionController contactController; + private JobsWebRequestController beanHelper; /** - * A list of all selectable contacts + * Regular contact controller */ - private List selectableContacts; + @Inject + private JobsContactWebSessionController contactController; /** * An event fired when the administrator has updated a new user @@ -101,7 +109,7 @@ public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestContr private Event updatedUserDataEvent; /** - * Remote user bean + * General user EJB */ private final UserSessionBeanRemote userBean; @@ -112,26 +120,20 @@ public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestContr private JobsUserWebSessionController userController; /** - * A list of all user profiles + * User lock reason */ - private List userList; + private String userLockReason; /** - * Login bean (controller) + * Flag whether user must change password after login */ - @Inject - private JobsUserLoginWebSessionController userLoginController; + private Boolean userMustChangePassword; /** * User name */ private String userName; - /** - * User name list - */ - private List userNameList; - /** * User password (unencrypted from web form) */ @@ -142,11 +144,6 @@ public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestContr */ private String userPasswordRepeat; - /** - * A list of all public user profiles - */ - private List visibleUserList; - /** * Default constructor */ @@ -158,6 +155,7 @@ public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestContr // Try to lookup this.userBean = (UserSessionBeanRemote) context.lookup("java:global/jjobs-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote"); //NOI18N + this.adminUserBean = (AdminUserSessionBeanRemote) context.lookup("java:global/jjobs-ejb/user!org.mxchange.jusercore.model.user.AdminUserSessionBeanRemote"); //NOI18N } catch (final NamingException e) { // Throw again throw new FaceletException(e); @@ -173,7 +171,7 @@ public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestContr } else if (this.getUserName().isEmpty()) { // Is empty throw new IllegalArgumentException("userName is null"); //NOI18N - } else if (this.adminHelper.getContact() == null) { + } else if (this.beanHelper.getContact() == null) { // No contact instance set, so test required fields: gender, first name and family name if (this.contactController.getGender() == null) { // Throw NPE again @@ -183,8 +181,8 @@ public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestContr throw new NullPointerException("contactController.firstName is null"); //NOI18N //NOI18N } else if (this.contactController.getFirstName().isEmpty()) { // ... and again - throw new IllegalArgumentException("contactController.firstName is empty"); - } else if (this.contactController.getFamilyName() == null) { + throw new IllegalArgumentException("contactController.firstName is empty"); //NOI18N + } else if (this.adminContactController.getFamilyName() == null) { // ... and again throw new NullPointerException("contactController.familyName is null"); //NOI18N } else if (this.contactController.getFamilyName().isEmpty()) { @@ -192,8 +190,8 @@ public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestContr throw new IllegalArgumentException("contactController.familyName is empty"); //NOI18N //NOI18N } else if (this.contactController.getEmailAddress() == null) { // ... and again - throw new NullPointerException("contactController.emailAddress is null"); - } else if (this.contactController.getEmailAddress().isEmpty()) { + throw new NullPointerException("contactController.emailAddress is null"); //NOI18N + } else if (this.adminContactController.getEmailAddress().isEmpty()) { // ... and again throw new IllegalArgumentException("contactController.emailAddress is empty"); //NOI18N //NOI18N } else if (this.contactController.getEmailAddressRepeat() == null) { @@ -216,8 +214,17 @@ public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestContr user.setUserAccountStatus(UserAccountStatus.CONFIRMED); user.setUserProfileMode(ProfileMode.INVISIBLE); - // Create contact instance - Contact contact = this.contactController.createContactInstance(); + // Init instance + Contact contact; + + // Is a contact instance in helper set? + if (this.beanHelper.getContact() instanceof Contact) { + // Then use it for contact linking + contact = this.beanHelper.getContact(); + } else { + // Create contact instance + contact = this.contactController.createContactInstance(); + } // Set contact in user user.setUserContact(contact); @@ -227,10 +234,10 @@ public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestContr // Is the user name or email address used already? // @TODO Add password length check - if (this.isUserNameRegistered(user)) { + if (this.userController.isUserNameRegistered(user)) { // User name is already used throw new FaceletException(new UserNameAlreadyRegisteredException(user)); - } else if ((this.adminHelper.getContact() == null) && (this.contactController.isEmailAddressRegistered(user.getUserContact()))) { + } else if ((this.beanHelper.getContact() == null) && (this.contactController.isEmailAddressRegistered(user.getUserContact()))) { // Email address is already used throw new FaceletException(new EmailAddressAlreadyRegisteredException(user)); } else if ((this.getUserPassword() == null && (this.getUserPasswordRepeat() == null)) || ((this.getUserPassword().isEmpty()) && (this.getUserPasswordRepeat().isEmpty()))) { @@ -251,31 +258,31 @@ public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestContr // Encrypt password and set it user.setUserEncryptedPassword(UserUtils.encryptPassword(password)); - // Init updated user instance - User updatedUser = null; - try { // Now, that all is set, call EJB - if (this.adminHelper.getContact() instanceof Contact) { + if (this.beanHelper.getContact() instanceof Contact) { // Link contact with this user - updatedUser = this.userBean.linkUser(user); + User updatedUser = this.adminUserBean.linkUser(user); + + // Fire event + this.userLinkedEvent.fire(new AdminUserLinkedEvent(updatedUser)); + + // Remove contact instance + this.beanHelper.setContact(null); } else { // Add new contact - updatedUser = this.userBean.addUser(user); + User updatedUser = this.adminUserBean.addUser(user); + + // Fire event + this.addedUserEvent.fire(new AdminUserAddedEvent(updatedUser)); } } catch (final UserNameAlreadyRegisteredException | EmailAddressAlreadyRegisteredException ex) { // Throw again throw new FaceletException(ex); } - // Fire event - this.addedUserEvent.fire(new AdminUserAddedEvent(updatedUser)); - - // Add user to local list - this.userList.add(updatedUser); - - // Clear contact instance - this.contactController.clear(); + // Clear helper + this.beanHelper.setContact(null); // Return to user list (for now) return "admin_list_user"; //NOI18N @@ -306,89 +313,18 @@ public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestContr // Debug message //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("UserWebBean:afterRegistration: registeredUser={0}", registeredUser)); //NOI18N - // Add user name - this.addUserName(registeredUser); // Clear all data this.clear(); - // Add user to local list - this.userList.add(registeredUser); - - // Is the account public? - if (Objects.equals(registeredUser.getUserProfileMode(), ProfileMode.PUBLIC)) { - // Also add it to this list - this.visibleUserList.add(registeredUser); - } - // Trace message //* NOISY-DEBUG: */ System.out.println("UserWebBean:afterRegistration: EXIT!"); //NOI18N } - @Override - public void afterUserLogin (final @Observes UserLoggedInEvent event) { - // Trace message - //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("UserWebBean:afterUserLogin: event={0} - CALLED!", event)); //NOI18N - - // event should not be null - if (null == event) { - // Throw NPE - throw new NullPointerException("event is null"); //NOI18N - } else if (event.getLoggedInUser() == null) { - // Throw NPE again - throw new NullPointerException("event.user is null"); //NOI18N - } else if (event.getLoggedInUser().getUserId() == null) { - // userId is null - throw new NullPointerException("event.user.userId is null"); //NOI18N - } else if (event.getLoggedInUser().getUserId() < 1) { - // Not avalid id - throw new IllegalArgumentException(MessageFormat.format("userId of user={0} is not valid: {1}", event.getLoggedInUser(), event.getLoggedInUser().getUserId())); //NOI18N - } - - // Re-initialize list - this.visibleUserList = this.userBean.allMemberPublicVisibleUsers(); - - // Trace message - //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("UserWebBean:afterUserLogin: this.visibleUserList.size()={0} - EXIT!", this.visibleUserList.size())); //NOI18N - } - - @Override - public void afterUserUpdatedPersonalData (@Observes final UpdatedUserPersonalDataEvent event) { - // Check parameter - if (null == event) { - // Throw NPE - throw new NullPointerException("event is null"); //NOI18N - } else if (event.getUpdatedUser() == null) { - // Throw NPE again - throw new NullPointerException("event.updatedUser is null"); //NOI18N - } else if (event.getUpdatedUser().getUserId() == null) { - // ... and again - throw new NullPointerException("event.updatedUser.userId is null"); //NOI18N - } else if (event.getUpdatedUser().getUserId() < 1) { - // Invalid value - throw new IllegalArgumentException(MessageFormat.format("event.updatedUser.userId={0} is in valid", event.getUpdatedUser().getUserId())); //NOI18N - } - - // All fine, so update list - this.updateList(event.getUpdatedUser()); - } - - @Override - public List allUsers () { - // Return it - return Collections.unmodifiableList(this.userList); - } - - @Override - public List allVisibleUsers () { - // Return it - return Collections.unmodifiableList(this.visibleUserList); - } - @Override public String editUserData () { // Get user instance - User user = this.adminHelper.getUser(); + User user = this.beanHelper.getUser(); // Null password means not setting it String encryptedPassword = null; @@ -396,13 +332,13 @@ public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestContr // Check if user instance is in helper and valid if (null == user) { // Throw NPE - throw new NullPointerException("adminHelper.user is null"); //NOI18N + throw new NullPointerException("beanHelper.user is null"); //NOI18N } else if (user.getUserId() == null) { // Throw NPE again - throw new NullPointerException("adminHelper.user.userId is null"); //NOI18N //NOI18N + throw new NullPointerException("beanHelper.user.userId is null"); //NOI18N //NOI18N } else if (user.getUserId() < 1) { // Invalid id - throw new IllegalStateException(MessageFormat.format("adminHelper.user.userId={0} is invalid", user.getUserId())); //NOI18N + throw new IllegalStateException(MessageFormat.format("beanHelper.user.userId={0} is invalid", user.getUserId())); //NOI18N } else if (this.getUserName() == null) { // Not all required fields are set throw new NullPointerException("this.userName is null"); //NOI18N @@ -430,8 +366,9 @@ public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestContr encryptedPassword = UserUtils.encryptPassword(this.getUserPassword()); } - // Set user name + // Set user name and flag user.setUserName(this.getUserName()); + user.setUserMustChangePassword(this.getUserMustChangePassword()); // Is a password set? if (encryptedPassword != null) { @@ -442,9 +379,6 @@ public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestContr // Call EJB for updating user data User updatedUser = this.userBean.updateUserData(user); - // Update list - this.updateList(updatedUser); - // Fire event this.updatedUserDataEvent.fire(new AdminUserDataUpdatedEvent(updatedUser)); @@ -452,6 +386,26 @@ public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestContr return "admin_list_user"; //NOI18N } + @Override + public String getUserLockReason () { + return this.userLockReason; + } + + @Override + public void setUserLockReason (final String userLockReason) { + this.userLockReason = userLockReason; + } + + @Override + public Boolean getUserMustChangePassword () { + return this.userMustChangePassword; + } + + @Override + public void setUserMustChangePassword (final Boolean userMustChangePassword) { + this.userMustChangePassword = userMustChangePassword; + } + @Override public String getUserName () { return this.userName; @@ -483,172 +437,79 @@ public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestContr } @Override - public boolean hasUsers () { - return (!this.allUsers().isEmpty()); - } - - /** - * Post-initialization of this class - */ - @PostConstruct - public void init () { - // Initialize user list - this.userList = this.userBean.allUsers(); - - // Get full user name list for reducing EJB calls - this.userNameList = this.userBean.getUserNameList(); - - // Is the user logged-in? - if (this.userLoginController.isUserLoggedIn()) { - // Is logged-in, so load also users visible to memebers - this.visibleUserList = this.userBean.allMemberPublicVisibleUsers(); - } else { - // Initialize user list - this.visibleUserList = this.userBean.allPublicUsers(); - } - - // Get all users - List allUsers = this.allUsers(); - - // Get all contacts - List allContacts = this.contactController.allContacts(); - - // Get iterator - Iterator iterator = allContacts.iterator(); - - // Loop through it - while (iterator.hasNext()) { - // Get next element - Contact next = iterator.next(); - - // Get iterator - Iterator userIterator = allUsers.iterator(); - - // Loop through all users - while (userIterator.hasNext()) { - // Get user instance - User nextUser = userIterator.next(); - - // Is contact same? - if (Objects.equals(next, nextUser.getUserContact())) { - // Found same - iterator.remove(); - break; - } - } - } - - // Set contact list - this.selectableContacts = allContacts; - } - - @Override - public boolean isContactFound (final Contact contact) { - // The contact must be valid - if (null == contact) { + public String lockUserAccount (final User user) { + // Is the user instance valid and CONFIRMED? + if (null == user) { // Throw NPE - throw new NullPointerException("contact is null"); //NOI18N - } else if (contact.getContactId() == null) { - // Throw again ... - throw new NullPointerException("contact.contactId is null"); //NOI18N - } else if (contact.getContactId() < 1) { - // Not valid - throw new IllegalArgumentException(MessageFormat.format("contact.contactId={0} is not valid", contact.getContactId())); //NOI18N + throw new NullPointerException("user is null"); //NOI18N + } else if (user.getUserId() == null) { + // Throw again + throw new NullPointerException("user.userId is null"); //NOI18N + } else if (user.getUserId() < 1) { + // Invalid id number + throw new IllegalArgumentException(MessageFormat.format("user.userId={0} is not valid", user.getUserId())); //NOI18N + } else if (user.getUserAccountStatus() == UserAccountStatus.LOCKED) { + // User account is locked + throw new FacesException(new UserStatusLockedException(user)); + } else if (user.getUserAccountStatus() == UserAccountStatus.UNCONFIRMED) { + // User account is locked + throw new FaceletException(new UserStatusUnconfirmedException(user)); + } else if (this.getUserLockReason() == null) { + // Throw NPE again + throw new NullPointerException("this.userLockReason is null"); //NOI18N + } else if (this.getUserLockReason().isEmpty()) { + // Empty lock reason + throw new IllegalArgumentException("this.userLockReason is empty"); //NOI18N } - // Default is not found - boolean isFound = false; - - // Get iterator - Iterator iterator = this.allUsers().iterator(); - - // Loop through all entries - while (iterator.hasNext()) { - // Get user - User next = iterator.next(); + try { + // Get base URL + String baseUrl = FacesUtils.generateBaseUrl(); - // Compare both objects - if (Objects.equals(contact, next.getUserContact())) { - // Found it - isFound = true; - break; - } + // Call EJB to lock account + this.adminUserBean.lockUserAccount(user, this.getUserLockReason(), baseUrl); + } catch (final UserStatusLockedException | UserStatusUnconfirmedException | UserNotFoundException ex) { + // Throw again + throw new FaceletException(ex); } - // Return status - return isFound; + // Should go fine at this point, redirect to user profile + return "admin_show_user?faces-redirect=true&includeViewParams=true"; //NOI18N } @Override - public boolean isUserNameRegistered (final User user) { - return ((this.userNameList instanceof List) && (this.userNameList.contains(user.getUserName()))); - } - - @Override - public boolean isVisibleUserFound () { - return ((this.visibleUserList instanceof List) && (this.visibleUserList.size() > 0)); - } - - @Override - public User lookupUserById (final Long userId) throws UserNotFoundException { - // Parameter must be valid - if (null == userId) { - // Throw NPE - throw new NullPointerException("userId is null"); //NOI18N - } else if (userId < 1) { - // Not valid - throw new IllegalArgumentException(MessageFormat.format("userId={0} is not valid.", userId)); //NOI18N - } - - // Init variable - User user = null; - - // Try to lookup it in visible user list - for (final Iterator iterator = this.userList.iterator(); iterator.hasNext();) { - // Get next user - User next = iterator.next(); - - // Is the user id found? - if (Objects.equals(next.getUserId(), userId)) { - // Copy to other variable - user = next; - break; - } - } - - // Is it still null? + public String unlockUserAccount (final User user) { + // Is the user instance valid and CONFIRMED? if (null == user) { - // Not visible for the current user - throw new UserNotFoundException(userId); + // Throw NPE + throw new NullPointerException("user is null"); //NOI18N + } else if (user.getUserId() == null) { + // Throw again + throw new NullPointerException("user.userId is null"); //NOI18N + } else if (user.getUserId() < 1) { + // Invalid id number + throw new IllegalArgumentException(MessageFormat.format("user.userId={0} is not valid", user.getUserId())); //NOI18N + } else if (user.getUserAccountStatus() == UserAccountStatus.CONFIRMED) { + // User account is locked + throw new FacesException(new UserStatusConfirmedException(user)); + } else if (user.getUserAccountStatus() == UserAccountStatus.UNCONFIRMED) { + // User account is locked + throw new FaceletException(new UserStatusUnconfirmedException(user)); } - // Return it - return user; - } - - @Override - public List selectableContacts () { - return Collections.unmodifiableList(this.selectableContacts); - } + try { + // Get base URL + String baseUrl = FacesUtils.generateBaseUrl(); - /** - * Adds user's name to bean's internal list. It also updates the public user - * list if the user has decided to have a public account, - *

- * @param user User instance - */ - private void addUserName (final User user) { - // Make sure the entry is not added yet - if (this.userNameList.contains(user.getUserName())) { - // Abort here - throw new IllegalArgumentException(MessageFormat.format("User name {0} already added.", user.getUserName())); //NOI18N - } else if (this.contactController.isEmailAddressRegistered(user.getUserContact())) { - // Already added - throw new IllegalArgumentException(MessageFormat.format("Email address {0} already added.", user.getUserContact().getContactEmailAddress())); //NOI18N + // Call EJB to unlock account + this.adminUserBean.unlockUserAccount(user, baseUrl); + } catch (final UserStatusConfirmedException | UserStatusUnconfirmedException | UserNotFoundException ex) { + // Throw again + throw new FaceletException(ex); } - // Add user name - this.userNameList.add(user.getUserName()); + // Should go fine at this point, redirect to user profile + return "admin_show_user?faces-redirect=true&includeViewParams=true"; //NOI18N } /** @@ -660,6 +521,7 @@ public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestContr this.setUserName(null); this.setUserPassword(null); this.setUserPasswordRepeat(null); + this.setUserMustChangePassword(null); } /** @@ -671,42 +533,4 @@ public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestContr return ((!this.getUserPassword().isEmpty()) && (Objects.equals(this.getUserPassword(), this.getUserPasswordRepeat()))); } - /** - * Updates list with given user instance - *

- * @param user User instance - */ - private void updateList (final User user) { - // The user should be valid - if (null == user) { - // Throw NPE - throw new NullPointerException("user is null"); //NOI18N - } else if (user.getUserId() == null) { - // ... again NPE - throw new NullPointerException("user.userId is null"); //NOI18N - } else if (user.getUserId() < 1) { - // Invalid id - throw new IllegalArgumentException(MessageFormat.format("user.userId={0} is invalid", user.getUserId())); //NOI18N - } - - // Get iterator - Iterator iterator = this.userList.iterator(); - - // Look whole list - while (iterator.hasNext()) { - // Get next element - User next = iterator.next(); - - // Is the same user id? - if (Objects.equals(user.getUserId(), next.getUserId())) { - // Found it, so remove it - this.userList.remove(next); - break; - } - } - - // Re-add item - this.userList.add(user); - } - }