From 7f7839190ac7724f83cc9ec9aadc4e0fdb341fd8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 16 Aug 2017 23:46:31 +0200 Subject: [PATCH] updated jar(s) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- lib/juser-core.jar | Bin 66710 -> 66710 bytes .../checkout/PizzaCheckoutWebSessionBean.java | 1 - .../PizzaAdminCustomerWebRequestBean.java | 4 +- .../PizzaUserActivityWebApplicationBean.java | 178 +++++++++--------- 4 files changed, 91 insertions(+), 92 deletions(-) diff --git a/lib/juser-core.jar b/lib/juser-core.jar index 47124fbd731e4d580c450ed628e41034bfbce6da..a215338d6eb209b93504d153752fbbac917e5236 100644 GIT binary patch delta 1241 zcmZ9LZ%9*N6vp@7d%OP6DLSf^B8F`e_$Q<3(o9NI(b7!IEy1vqmX?*7X3B^{32pk4 zi-^h(S(0UFAcc`&DIrpQ2*mmj_$A$R)2W*}UAyNDOF#Xd^PKaZ`|R$%tqojj1Lt!r zo#i}5B6pEU`OL4`N5;lEp=f1=>U%K2A`?J^NHp*`i3Q#x3BYe83E0NVsMyV$>KL9L zWjw)CGa0~67wt?k)QxNmbxeDB{r7Cz$R2j}_R=>d_jSD;T*}(HrbM^(sc9D%4_y69l5NJqdq&U+3g@a5}!+#^X^Vy}sZWel_7t&G;)gPIns=!na9_4F`k? z+F^(Q{&f06EivL}s4}KP{oIIuq0N{Lb;eW7m-A8eM=(doD~ z9clWf>s|V@DbLkE0UUPjX))vV7&0FL&wmE@X=YBlX7DOVXA7XNnau}gOiAh7EMBQd ziw3;MmI|O`t_s*PcMG^>9(~<>9n}5{7l7J@Yrv(2OTbcVHE_~;5vaCR!6$U`PMwaL ztP*Om<$$5eyKAI{HVHkuh^Yn_ufU1@OE-aiOILw=mTQ4;m$g8Jy%N}MF9U|IVA3Zm zI4@bnq)n?O&|h4|BpL@M9&?ln{{2jH88|>-k3NPFSfGDNh+63AJsAQoTVKSuoB@VF UNPR3zAcek%CGg_(Asngr3*Z*9G5`Po delta 1241 zcmZ9LZAepL6vy}6dzLxapI*ndF|2>;Fv4`EgJ@k#qb4_nMm$G`UIniTnYTC`kL)XN~ zfeuDWH6?-Trc~fc*16rBls*ghS?99COxTnoOarzH5AoFf5q4|<(c)W0K=^EIWX5FAD5d*bQZoc=I1{wqz4h@$;6A>A1sNJTP# zIv!oF`xIv8V8UzpM;3KP@)J9BBAFC7DI)qXkv&q4PF?gUI;ZwFp))BTLuW9d1)coF zM<{FuC$Tk=l833|(+W9=)}ATD)FW9-=nUt^fapIGtZ^Kv-U4o(Ltisj4|Tx&1)zHV8qhv}30P*U0Z!R20#ysu@Clu~Q?H>W zo0wV`a==jL-8Im{1u;Flh^Yn_ufU1@_M5;y`&HoXr8?l-B{fj)r~>vl%7J0anDpr~ z&Wl$tY4b`6^cPn!NvRVPk2x!N|3N0X3>+Y^M;l8BEYQ9rM8$Ws-VA}4tu12Q&HzIo Uq&AKvkV30t3A{LMC`T&)0y^OHpa1{> diff --git a/src/java/org/mxchange/pizzaapplication/beans/checkout/PizzaCheckoutWebSessionBean.java b/src/java/org/mxchange/pizzaapplication/beans/checkout/PizzaCheckoutWebSessionBean.java index 89794615..7a38bce3 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/checkout/PizzaCheckoutWebSessionBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/checkout/PizzaCheckoutWebSessionBean.java @@ -61,7 +61,6 @@ public class PizzaCheckoutWebSessionBean extends BasePizzaController implements */ private static final long serialVersionUID = 51_987_348_347_183L; - ////////////////////// Bean injections /////////////////////// /** * Basket bean */ diff --git a/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaAdminCustomerWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaAdminCustomerWebRequestBean.java index f998d3db..fc5f9019 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaAdminCustomerWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaAdminCustomerWebRequestBean.java @@ -40,7 +40,7 @@ import org.mxchange.pizzaapplication.beans.BasePizzaController; import org.mxchange.pizzaapplication.beans.contact.PizzaAdminContactWebRequestController; import org.mxchange.pizzaapplication.beans.helper.PizzaWebRequestHelperController; import org.mxchange.pizzaapplication.model.customer.PizzaAdminCustomerSessionBeanRemote; -import org.mxchange.pizzaapplication.model.customer.PizzaCustomer; +import org.mxchange.jcustomercore.model.customer.ContactCustomer; /** * Administrative customer bean (controller) @@ -126,7 +126,7 @@ public class PizzaAdminCustomerWebRequestBean extends BasePizzaController implem String customerNumber = this.adminCustomerBean.createCustomerNumber(); // Create new customer instance - Customer customer = new PizzaCustomer(CustomerAccountStatus.CONFIRMED, customerContact, customerNumber); + Customer customer = new ContactCustomer(CustomerAccountStatus.CONFIRMED, customerContact, customerNumber); // Init instance Customer updatedCustomer; diff --git a/src/java/org/mxchange/pizzaapplication/beans/user/activity/PizzaUserActivityWebApplicationBean.java b/src/java/org/mxchange/pizzaapplication/beans/user/activity/PizzaUserActivityWebApplicationBean.java index e3ba84a0..c6497085 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/user/activity/PizzaUserActivityWebApplicationBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/user/activity/PizzaUserActivityWebApplicationBean.java @@ -94,99 +94,10 @@ public class PizzaUserActivityWebApplicationBean extends BasePizzaController imp */ @SuppressWarnings ("CollectionWithoutInitialCapacity") public PizzaUserActivityWebApplicationBean () { - // Try to get EJB instance - try { - // Get initial context - Context context = new InitialContext(); - - // Try to lookup - this.userActivityBean = (UserActivityLogSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/userActivity!org.mxchange.jusercore.model.user.activity.UserActivityLogSessionBeanRemote"); //NOI18N - } catch (final NamingException e) { - // Throw again - throw new FaceletException(e); - } - // Init cache this.usersActivity = new LinkedHashMap<>(); } - /** - * Adds user activity entry with given type - *

- * @param user User instance - * @param activityType Activity type - */ - private void addUserActivity (final User user, final String activityType) { - // Better re-validate - if (null == user) { - // 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 (null == activityType) { - // Throw NPE again - throw new NullPointerException("activityType is null"); //NOI18N - } else if (activityType.isEmpty()) { - // Is empty - throw new IllegalArgumentException("activityType is empty"); //NOI18N - } - - // Create new activity object - LogableUserActivity userActivity = new UserActivityLog(activityType, user, new GregorianCalendar(), this.determinePrincipalName()); - - // Call bean to add it - this.userActivityBean.addUserActivityLog(userActivity); - - // Add to cache, too - this.addUserActivityToCache(userActivity); - } - - /** - * Adds user activity log with type and message - *

- * @param user User instance - * @param activityType Activity type - * @param message Activity message - */ - private void addUserActivity (final User user, final String activityType, final String message) { - // Better re-validate - if (null == user) { - // 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 (null == activityType) { - // Throw NPE again - throw new NullPointerException("activityType is null"); //NOI18N - } else if (activityType.isEmpty()) { - // Is empty - throw new IllegalArgumentException("activityType is empty"); //NOI18N - } else if (null == message) { - // Throw NPE again - throw new NullPointerException("message is null"); //NOI18N - } else if (message.isEmpty()) { - // Is empty - throw new IllegalArgumentException("message is empty"); //NOI18N - } - - // Create new activity object - LogableUserActivity userActivity = new UserActivityLog(message, activityType, user, new GregorianCalendar(), this.determinePrincipalName()); - - // Call bean to add it - this.userActivityBean.addUserActivityLog(userActivity); - - // Add to cache, too - this.addUserActivityToCache(userActivity); - } - /** * Event observer for newly added users by administrator *

@@ -640,6 +551,18 @@ public class PizzaUserActivityWebApplicationBean extends BasePizzaController imp */ @PostConstruct public void init () { + // Try to get EJB instance + try { + // Get initial context + Context context = new InitialContext(); + + // Try to lookup + this.userActivityBean = (UserActivityLogSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/userActivity!org.mxchange.jusercore.model.user.activity.UserActivityLogSessionBeanRemote"); //NOI18N + } catch (final NamingException e) { + // Throw again + throw new FaceletException(e); + } + // Get whole list List list = this.userActivityBean.fetchAllUserActivityLog(); @@ -659,6 +582,83 @@ public class PizzaUserActivityWebApplicationBean extends BasePizzaController imp } } + /** + * Adds user activity entry with given type + *

+ * @param user User instance + * @param activityType Activity type + */ + private void addUserActivity (final User user, final String activityType) { + // Better re-validate + if (null == user) { + // 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 (null == activityType) { + // Throw NPE again + throw new NullPointerException("activityType is null"); //NOI18N + } else if (activityType.isEmpty()) { + // Is empty + throw new IllegalArgumentException("activityType is empty"); //NOI18N + } + + // Create new activity object + LogableUserActivity userActivity = new UserActivityLog(activityType, user, new GregorianCalendar(), this.determinePrincipalName()); + + // Call bean to add it + this.userActivityBean.addUserActivityLog(userActivity); + + // Add to cache, too + this.addUserActivityToCache(userActivity); + } + + /** + * Adds user activity log with type and message + *

+ * @param user User instance + * @param activityType Activity type + * @param message Activity message + */ + private void addUserActivity (final User user, final String activityType, final String message) { + // Better re-validate + if (null == user) { + // 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 (null == activityType) { + // Throw NPE again + throw new NullPointerException("activityType is null"); //NOI18N + } else if (activityType.isEmpty()) { + // Is empty + throw new IllegalArgumentException("activityType is empty"); //NOI18N + } else if (null == message) { + // Throw NPE again + throw new NullPointerException("message is null"); //NOI18N + } else if (message.isEmpty()) { + // Is empty + throw new IllegalArgumentException("message is empty"); //NOI18N + } + + // Create new activity object + LogableUserActivity userActivity = new UserActivityLog(message, activityType, user, new GregorianCalendar(), this.determinePrincipalName()); + + // Call bean to add it + this.userActivityBean.addUserActivityLog(userActivity); + + // Add to cache, too + this.addUserActivityToCache(userActivity); + } + /** * Adds given user activity instance to "cache" (local map) *

-- 2.39.5