From 556afa8f63e0a09cc6d0eb2a51ba34231370b038 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 6 May 2016 13:06:52 +0200 Subject: [PATCH] Introduced createUserLogin() (safe to cherry-pick) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../login/PizzaUserLoginWebSessionBean.java | 2 +- .../beans/user/PizzaUserWebSessionBean.java | 27 +++++++++++++++++++ .../user/PizzaUserWebSessionController.java | 7 +++++ 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/src/java/org/mxchange/pizzaapplication/beans/login/PizzaUserLoginWebSessionBean.java b/src/java/org/mxchange/pizzaapplication/beans/login/PizzaUserLoginWebSessionBean.java index 264d7a9b..e4d5ecb7 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/login/PizzaUserLoginWebSessionBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/login/PizzaUserLoginWebSessionBean.java @@ -113,7 +113,7 @@ public class PizzaUserLoginWebSessionBean implements PizzaUserLoginWebSessionCon @Override public String doLogin () { // Get user instance - User user = this.userController.createUserInstance(); + User user = this.userController.createUserLogin(); // Create login container LoginContainer container = new UserLoginContainer(user, this.userController.getUserPassword()); diff --git a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaUserWebSessionBean.java b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaUserWebSessionBean.java index 483c1314..de9ef070 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaUserWebSessionBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaUserWebSessionBean.java @@ -365,6 +365,33 @@ public class PizzaUserWebSessionBean implements PizzaUserWebSessionController { return localUser; } + @Override + public User createUserLogin () { + // Trace message + //* NOISY-DEBUG */ System.out.println(MessageFormat.format("{0}.createUserLogin: CALLED!", this.getClass().getSimpleName())); + + // Is all data set? + if (this.getUserName() == null) { + // Throw NPE + throw new NullPointerException("recruiterName is null"); //NOI18N + } else if (this.getUserName().isEmpty()) { + // Is empty + throw new IllegalStateException("recruiterName is empty."); //NOI18N + } + + // Create new recruiter instance + User recruiter = new LoginUser(); + + // Update all data ... + recruiter.setUserName(this.getUserName()); + + // Trace message + //* NOISY-DEBUG */ System.out.println(MessageFormat.format("{0}.createUserLogin: recruiter={1} - EXIT!", this.getClass().getSimpleName(), recruiter)); + + // Return the new instance + return recruiter; + } + @Override public String doChangePersonalData () { // This method shall only be called if the user is logged-in diff --git a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaUserWebSessionController.java b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaUserWebSessionController.java index 4edcd87a..1821a808 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaUserWebSessionController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaUserWebSessionController.java @@ -149,6 +149,13 @@ public interface PizzaUserWebSessionController extends Serializable { */ User createUserInstance (); + /** + * Creates a user instance for login phase + *

+ * @return User instance + */ + User createUserLogin (); + /** * Getter for user id *

-- 2.39.5