From: Roland Häder <roland@mxchange.org>
Date: Wed, 16 Aug 2017 21:46:31 +0000 (+0200)
Subject: updated jar(s)
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6296360079bbac46267fa43ed3f815fbd9356e5c;p=jjobs-war.git

updated jar(s)

Signed-off-by: Roland Häder <roland@mxchange.org>
---

diff --git a/lib/juser-core.jar b/lib/juser-core.jar
index 47124fbd..a215338d 100644
Binary files a/lib/juser-core.jar and b/lib/juser-core.jar differ
diff --git a/src/java/org/mxchange/jjobs/beans/user/activity/JobsUserActivityWebApplicationBean.java b/src/java/org/mxchange/jjobs/beans/user/activity/JobsUserActivityWebApplicationBean.java
index b4b5bec4..50efcbe3 100644
--- a/src/java/org/mxchange/jjobs/beans/user/activity/JobsUserActivityWebApplicationBean.java
+++ b/src/java/org/mxchange/jjobs/beans/user/activity/JobsUserActivityWebApplicationBean.java
@@ -94,88 +94,10 @@ public class JobsUserActivityWebApplicationBean extends BaseJobsController imple
 	 */
 	@SuppressWarnings ("CollectionWithoutInitialCapacity")
 	public JobsUserActivityWebApplicationBean () {
-		// Try to get EJB instance
-		try {
-			// Get initial context
-			Context context = new InitialContext();
-
-			// Try to lookup
-			this.userActivityBean = (UserActivityLogSessionBeanRemote) context.lookup("java:global/jjobs-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<>();
 	}
 
-	@Override
-	public 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);
-	}
-
-	@Override
-	public 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
 	 * <p>
@@ -529,7 +451,14 @@ public class JobsUserActivityWebApplicationBean extends BaseJobsController imple
 		this.addUserActivity(event.getUpdatedUser(), "USER_UPDATED_PERSONAL_DATA"); //NOI18N
 	}
 
-	@Override
+
+	/**
+	 * Expands given activity type into a i18n string for administrators
+	 * <p>
+	 * @param activityType Activity type
+	 * <p>
+	 * @return Expanded i18n string
+	 */
 	public String expandAdminActivityType (final String activityType) {
 		// Is it valid?
 		if (null == activityType) {
@@ -544,7 +473,13 @@ public class JobsUserActivityWebApplicationBean extends BaseJobsController imple
 		return "ADMIN_ACTIVITY_" + activityType; //NOI18N
 	}
 
-	@Override
+	/**
+	 * Expands given activity type into a i18n string for users
+	 * <p>
+	 * @param activityType Activity type
+	 * <p>
+	 * @return Expanded i18n string
+	 */
 	public String expandUserActivityType (final String activityType) {
 		// Is it valid?
 		if (null == activityType) {
@@ -559,7 +494,11 @@ public class JobsUserActivityWebApplicationBean extends BaseJobsController imple
 		return "USER_ACTIVITY_" + activityType; //NOI18N
 	}
 
-	@Override
+	/**
+	 * Returns a list of in beanHelper set user instance's activity log
+	 * <p>
+	 * @return List of user's activity log
+	 */
 	public List<LogableUserActivity> fetchCurrentUsersActivityLog () {
 		// beanHelper.user should be set and valid
 		if (this.getUser() == null) {
@@ -613,6 +552,18 @@ public class JobsUserActivityWebApplicationBean extends BaseJobsController imple
 	 */
 	@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<LogableUserActivity> list = this.userActivityBean.fetchAllUserActivityLog();
 
@@ -632,6 +583,83 @@ public class JobsUserActivityWebApplicationBean extends BaseJobsController imple
 		}
 	}
 
+	/**
+	 * Adds user activity entry with given type
+	 * <p>
+	 * @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
+	 * <p>
+	 * @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)
 	 * <p>
diff --git a/src/java/org/mxchange/jjobs/beans/user/activity/JobsUserActivityWebApplicationController.java b/src/java/org/mxchange/jjobs/beans/user/activity/JobsUserActivityWebApplicationController.java
index 1a349957..e2234345 100644
--- a/src/java/org/mxchange/jjobs/beans/user/activity/JobsUserActivityWebApplicationController.java
+++ b/src/java/org/mxchange/jjobs/beans/user/activity/JobsUserActivityWebApplicationController.java
@@ -17,59 +17,12 @@
 package org.mxchange.jjobs.beans.user.activity;
 
 import java.io.Serializable;
-import java.util.List;
-import javax.ejb.Local;
-import org.mxchange.jusercore.model.user.User;
-import org.mxchange.jusercore.model.user.activity.LogableUserActivity;
 
 /**
  * A controller (bean) interface for user activity log
  * <p>
  * @author Roland Häder<roland@mxchange.org>
  */
-@Local
 public interface JobsUserActivityWebApplicationController extends Serializable {
 
-	/**
-	 * Adds user activity entry with given type
-	 * <p>
-	 * @param user User instance
-	 * @param activityType Activity type
-	 */
-	void addUserActivity (final User user, final String activityType);
-
-	/**
-	 * Adds user activity log with type and message
-	 * <p>
-	 * @param user User instance
-	 * @param activityType Activity type
-	 * @param message Activity message
-	 */
-	void addUserActivity (final User user, final String activityType, final String message);
-
-	/**
-	 * Returns a list of in beanHelper set user instance's activity log
-	 * <p>
-	 * @return List of user's activity log
-	 */
-	List<LogableUserActivity> fetchCurrentUsersActivityLog ();
-
-	/**
-	 * Expands given activity type into a i18n string for administrators
-	 * <p>
-	 * @param activityType Activity type
-	 * <p>
-	 * @return Expanded i18n string
-	 */
-	String expandAdminActivityType (final String activityType);
-
-	/**
-	 * Expands given activity type into a i18n string for users
-	 * <p>
-	 * @param activityType Activity type
-	 * <p>
-	 * @return Expanded i18n string
-	 */
-	String expandUserActivityType (final String activityType);
-
 }