From 99a6303f6b9a4e546ed9476056476372c9e94419 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 21 Apr 2016 14:38:35 +0200 Subject: [PATCH] Added redirect outcome + updated jar(s) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../user/JobsAdminUserWebRequestBean.java | 44 ++++++++++++------- .../JobsAdminUserWebRequestController.java | 8 +++- web/admin/user/admin_user_edit.xhtml | 4 +- 3 files changed, 37 insertions(+), 19 deletions(-) diff --git a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java index 62979e53..3196ecb9 100644 --- a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java @@ -34,8 +34,12 @@ import javax.naming.InitialContext; import javax.naming.NamingException; import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jjobs.beans.contact.JobsContactWebSessionController; +import org.mxchange.jusercore.container.login.UserLoginContainer; import org.mxchange.jusercore.events.user.AdminAddedUserEvent; import org.mxchange.jusercore.events.user.AdminUserAddedEvent; +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; @@ -46,6 +50,8 @@ import org.mxchange.jusercore.model.user.UserSessionBeanRemote; import org.mxchange.jusercore.model.user.UserUtils; import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; import org.mxchange.jusercore.model.user.status.UserAccountStatus; +import org.mxchange.pizzaapplication.beans.contact.PizzaContactWebSessionController; +import org.mxchange.pizzaapplication.beans.helper.PizzaAdminWebRequestController; /** * A user bean (controller) @@ -72,7 +78,7 @@ public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestContr * Admin helper instance */ @Inject - private RateCalcAdminWebRequestController adminHelper; + private PizzaAdminWebRequestController adminHelper; /** * Regular contact controller @@ -136,7 +142,7 @@ public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestContr } @Override - public void addUser () { + public String addUser () { // Create new user instance User localUser = new LoginUser(); @@ -199,6 +205,9 @@ public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestContr // Clear contact instance this.contactController.clear(); + + // Return to user list (for now) + return "admin_list_user"; //NOI18N } @Override @@ -206,16 +215,16 @@ public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestContr // Check parameter if (null == event) { // Throw NPE - throw new NullPointerException("event is null"); + throw new NullPointerException("event is null"); //NOI18N } else if (event.getUpdatedUser() == null) { // Throw NPE again - throw new NullPointerException("event.updatedUser is null"); + throw new NullPointerException("event.updatedUser is null"); //NOI18N } else if (event.getUpdatedUser().getUserId() == null) { // ... and again - throw new NullPointerException("event.updatedUser.userId is null"); + 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())); + throw new IllegalArgumentException(MessageFormat.format("event.updatedUser.userId={0} is in valid", event.getUpdatedUser().getUserId())); //NOI18N } // All fine, so update list @@ -229,7 +238,7 @@ public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestContr } @Override - public void editUserData () { + public String editUserData () { // Get user instance User user = this.adminHelper.getUser(); @@ -239,31 +248,31 @@ 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"); + throw new NullPointerException("adminHelper.user is null"); //NOI18N } else if (user.getUserId() == null) { // Throw NPE again - throw new NullPointerException("adminHelper.user.userId is null"); + throw new NullPointerException("adminHelper.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())); } else if (this.getUserName() == null) { // Not all required fields are set - throw new NullPointerException("this.userName is null"); + throw new NullPointerException("this.userName is null"); //NOI18N } else if (this.getUserName().isEmpty()) { // Not all required fields are set - throw new IllegalArgumentException("this.userName is empty"); + throw new IllegalArgumentException("this.userName is empty"); //NOI18N } else if (((!this.getUserPassword().isEmpty()) || (!this.getUserPasswordRepeat().isEmpty())) && (!this.isSamePasswordEntered())) { // Not same password entered this.setUserPassword(null); this.setUserPasswordRepeat(null); // Throw exception - throw new FaceletException("Not same password entered"); + throw new FaceletException("Not same password entered"); //NOI18N } else if (this.isSamePasswordEntered()) { // Same password entered, create container if (UserUtils.ifPasswordMatches(new UserLoginContainer(user, this.getUserPassword()))) { // Same password entered - throw new FaceletException("Same password as stored entered."); + throw new FaceletException("Same password as stored entered."); //NOI18N } // Encrypt password @@ -287,6 +296,9 @@ public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestContr // Fire event this.updatedUserDataEvent.fire(new AdminUserDataUpdatedEvent(updatedUser)); + + // Return to user list (for now) + return "admin_list_user"; //NOI18N } @Override @@ -388,13 +400,13 @@ public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestContr // The user should be valid if (null == user) { // Throw NPE - throw new NullPointerException("user is null"); + throw new NullPointerException("user is null"); //NOI18N } else if (user.getUserId() == null) { // ... again NPE - throw new NullPointerException("user.userId is null"); + 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())); + throw new IllegalArgumentException(MessageFormat.format("user.userId={0} is invalid", user.getUserId())); //NOI18N } // Get iterator diff --git a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestController.java b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestController.java index 1dba6ca6..a3893561 100644 --- a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestController.java +++ b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestController.java @@ -66,13 +66,17 @@ public interface JobsAdminUserWebRequestController extends Serializable { * Adds user instance to database by preparing a complete user instance and * sending it to the EJB. The data set in the controller is being verified, * e.g. if the user name or email address is not used yet. + *

+ * @return Redirect outcome */ - void addUser (); + String addUser (); /** * Edits cuirrently loaded user's data in database. + *

+ * @return Redirect outcome */ - void editUserData(); + String editUserData(); /** * Getter for user name diff --git a/web/admin/user/admin_user_edit.xhtml b/web/admin/user/admin_user_edit.xhtml index 2adfb62b..9c0ca9a9 100644 --- a/web/admin/user/admin_user_edit.xhtml +++ b/web/admin/user/admin_user_edit.xhtml @@ -32,7 +32,9 @@ #{msg.ADMIN_PERSONAL_DATA_MINIMUM_NOTICE} - + + +

-- 2.39.5