From a8e96ac933a066b2b6ed9703b756e09c6a8a947a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 19 Jul 2016 14:02:18 +0200 Subject: [PATCH] Minor: log message had old name "id" for user id (please cherry-pick this) --- .../model/user/PizzaUserSessionBean.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/java/org/mxchange/jusercore/model/user/PizzaUserSessionBean.java b/src/java/org/mxchange/jusercore/model/user/PizzaUserSessionBean.java index feaf6a4..41ddd30 100644 --- a/src/java/org/mxchange/jusercore/model/user/PizzaUserSessionBean.java +++ b/src/java/org/mxchange/jusercore/model/user/PizzaUserSessionBean.java @@ -107,7 +107,7 @@ public class PizzaUserSessionBean extends BasePizzaDatabaseBean implements UserS this.getEntityManager().flush(); // Trace message - this.getLoggerBeanLocal().logTrace(MessageFormat.format("addUser: user={0},user.id={1} - EXIT!", user, user.getUserId())); //NOI18N + this.getLoggerBeanLocal().logTrace(MessageFormat.format("addUser: user={0},user.userId={1} - EXIT!", user, user.getUserId())); //NOI18N // Return it return user; @@ -193,7 +193,7 @@ public class PizzaUserSessionBean extends BasePizzaDatabaseBean implements UserS throw new NullPointerException("user.userId is null"); //NOI18N } else if (user.getUserId() < 1) { // Invalid number - throw new IllegalArgumentException(MessageFormat.format("userId is not valid: {0}", user.getUserId())); //NOI18N + throw new IllegalArgumentException(MessageFormat.format("user.userId={0} is not valid", user.getUserId())); //NOI18N } else if (user.getUserAccountStatus() == UserAccountStatus.CONFIRMED) { // Account is already confirmed throw new UserStatusConfirmedException(user); @@ -281,7 +281,7 @@ public class PizzaUserSessionBean extends BasePizzaDatabaseBean implements UserS 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 + throw new IllegalArgumentException(MessageFormat.format("userId={0} is not valid", userId)); //NOI18N } else if (!this.ifUserIdExists(userId)) { // Does not exist throw new UserNotFoundException(userId); @@ -367,7 +367,7 @@ public class PizzaUserSessionBean extends BasePizzaDatabaseBean implements UserS throw new NullPointerException("user.userId is null"); //NOI18N } else if (user.getUserId() < 1) { // Invalid number - throw new IllegalArgumentException(MessageFormat.format("userId is not valid: {0}", user.getUserId())); //NOI18N + throw new IllegalArgumentException(MessageFormat.format("user.userId={0} is not valid", user.getUserId())); //NOI18N } // Generate query @@ -381,7 +381,7 @@ public class PizzaUserSessionBean extends BasePizzaDatabaseBean implements UserS User dummy = (User) query.getSingleResult(); // Debug message - this.getLoggerBeanLocal().logDebug(MessageFormat.format("ifUserExists: dummy.id={0} found.", dummy.getUserId())); //NOI18N + this.getLoggerBeanLocal().logDebug(MessageFormat.format("ifUserExists: dummy.userId={0} found.", dummy.getUserId())); //NOI18N } catch (final NoResultException ex) { // Log it this.getLoggerBeanLocal().logDebug(MessageFormat.format("ifUserExists: getSingleResult() returned no result: {0}", ex)); //NOI18N @@ -414,7 +414,7 @@ public class PizzaUserSessionBean extends BasePizzaDatabaseBean implements UserS throw new NullPointerException("userId is null"); //NOI18N } else if (userId < 1) { // Invalid number - throw new IllegalArgumentException(MessageFormat.format("userId is not valid: {0}", userId)); //NOI18N + throw new IllegalArgumentException(MessageFormat.format("userId={0} is not valid", userId)); //NOI18N } // Generate query @@ -428,7 +428,7 @@ public class PizzaUserSessionBean extends BasePizzaDatabaseBean implements UserS User dummy = (User) query.getSingleResult(); // Debug message - this.getLoggerBeanLocal().logDebug(MessageFormat.format("ifUserIdExists: dummy.id={0} found.", dummy.getUserId())); //NOI18N + this.getLoggerBeanLocal().logDebug(MessageFormat.format("ifUserIdExists: dummy.userId={0} found.", dummy.getUserId())); //NOI18N } catch (final NoResultException ex) { // Log it this.getLoggerBeanLocal().logDebug(MessageFormat.format("ifUserIdExists: getSingleResult() returned no result: {0}", ex)); //NOI18N @@ -475,7 +475,7 @@ public class PizzaUserSessionBean extends BasePizzaDatabaseBean implements UserS User dummy = (User) query.getSingleResult(); // Debug message - this.getLoggerBeanLocal().logDebug(MessageFormat.format("ifUserNameExists: dummy.id={0} found.", dummy.getUserId())); //NOI18N + this.getLoggerBeanLocal().logDebug(MessageFormat.format("ifUserNameExists: dummy.userId={0} found.", dummy.getUserId())); //NOI18N } catch (final NoResultException ex) { // Log it this.getLoggerBeanLocal().logDebug(MessageFormat.format("ifUserNameExists: getSingleResult() returned no result: {0}", ex)); //NOI18N @@ -513,7 +513,7 @@ public class PizzaUserSessionBean extends BasePizzaDatabaseBean implements UserS User dummy = (User) query.getSingleResult(); // Debug message - this.getLoggerBeanLocal().logDebug(MessageFormat.format("isEmailAddressRegistered: dummy.id={0} found.", dummy.getUserId())); //NOI18N + this.getLoggerBeanLocal().logDebug(MessageFormat.format("isEmailAddressRegistered: dummy.userId={0} found.", dummy.getUserId())); //NOI18N } catch (final NoResultException ex) { // Log it this.getLoggerBeanLocal().logDebug(MessageFormat.format("isEmailAddressRegistered: getSingleResult() returned no result: {0}", ex)); //NOI18N @@ -554,7 +554,7 @@ public class PizzaUserSessionBean extends BasePizzaDatabaseBean implements UserS User dummy = (User) query.getSingleResult(); // Debug message - this.getLoggerBeanLocal().logDebug(MessageFormat.format("isUserNameRegistered: dummy.id={0} found.", dummy.getUserId())); //NOI18N + this.getLoggerBeanLocal().logDebug(MessageFormat.format("isUserNameRegistered: dummy.userId={0} found.", dummy.getUserId())); //NOI18N } catch (final NoResultException ex) { // Log it this.getLoggerBeanLocal().logDebug(MessageFormat.format("isUserNameRegistered: getSingleResult() returned no result: {0}", ex)); //NOI18N @@ -638,7 +638,7 @@ public class PizzaUserSessionBean extends BasePizzaDatabaseBean implements UserS throw new NullPointerException("user.userId is null"); //NOI18N } else if (user.getUserId() < 1) { // Not valid - throw new IllegalArgumentException(MessageFormat.format("user.userId={0} is not valid.", user.getUserId())); //NOI18N + throw new IllegalArgumentException(MessageFormat.format("user.userId={0} is not valid", user.getUserId())); //NOI18N } else if (user.getUserAccountStatus() == null) { // Throw NPE again throw new NullPointerException("user.userAccountStatus is null"); //NOI18N @@ -686,7 +686,7 @@ public class PizzaUserSessionBean extends BasePizzaDatabaseBean implements UserS throw new NullPointerException("user.userId is null"); //NOI18N } else if (user.getUserId() < 1) { // Not valid - throw new IllegalArgumentException(MessageFormat.format("user.userId={0} is not valid.", user.getUserId())); //NOI18N + throw new IllegalArgumentException(MessageFormat.format("user.userId={0} is not valid", user.getUserId())); //NOI18N } else if (user.getUserAccountStatus() == null) { // Throw NPE again throw new NullPointerException("user.userAccountStatus is null"); //NOI18N -- 2.39.5