From 9799dbe19e8b4f240b8450503a46dbf23b6beb88 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 19 Nov 2017 02:36:20 +0100 Subject: [PATCH] Continued: - removed no longer used named queries for type(s) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../model/user/activity/UserActivityLog.java | 30 ++++++++----------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/src/org/mxchange/jusercore/model/user/activity/UserActivityLog.java b/src/org/mxchange/jusercore/model/user/activity/UserActivityLog.java index a5e56ce..33ccdb5 100644 --- a/src/org/mxchange/jusercore/model/user/activity/UserActivityLog.java +++ b/src/org/mxchange/jusercore/model/user/activity/UserActivityLog.java @@ -53,11 +53,7 @@ import org.mxchange.jusercore.model.user.User; @NamedQueries ( { @NamedQuery (name = "AllUserActivityLog", query = "SELECT a FROM user_activity_log AS a ORDER BY a.activityId DESC"), - @NamedQuery (name = "SearchAllUsersActivity", query = "SELECT a FROM user_activity_log AS a WHERE a.activityUser = :activityUser ORDER BY a.activityId DESC"), - @NamedQuery (name = "SearchAllActivityByType", query = "SELECT a FROM user_activity_log AS a WHERE a.activityType LIKE :activityType ORDER BY a.activityId DESC"), - @NamedQuery (name = "SearchUsersActivityByType", query = "SELECT a FROM user_activity_log AS a WHERE a.activityUser = :activityUser AND a.activityType LIKE :activityType ORDER BY a.activityId DESC"), - @NamedQuery (name = "SearchAllActivityByMultipleTypes", query = "SELECT a FROM user_activity_log AS a WHERE a.activityType IN :activityTypes ORDER BY a.activityId DESC"), - @NamedQuery (name = "SearchUsersActivityByMultipleTypes", query = "SELECT a FROM user_activity_log AS a WHERE a.activityUser = :activityUser AND a.activityType IN :activityTypes ORDER BY a.activityId DESC") + @NamedQuery (name = "SearchAllUsersActivity", query = "SELECT a FROM user_activity_log AS a WHERE a.activityUser = :activityUser ORDER BY a.activityId DESC") } ) @SuppressWarnings ("PersistenceUnitPresent") @@ -150,9 +146,9 @@ public class UserActivityLog implements LogableUserActivity { /** * Constructor with message, type and user *

- * @param activityMessage Message - * @param activityType Type - * @param activityUser User instance + * @param activityMessage Message + * @param activityType Type + * @param activityUser User instance * @param activityTimestamp imestamp */ public UserActivityLog (final String activityMessage, final String activityType, final User activityUser, final Date activityTimestamp) { @@ -175,8 +171,8 @@ public class UserActivityLog implements LogableUserActivity { /** * Constructor with type, user and timestamp *

- * @param activityType Type - * @param activityUser User instance + * @param activityType Type + * @param activityUser User instance * @param activityTimestamp imestamp */ public UserActivityLog (final String activityType, final User activityUser, final Date activityTimestamp) { @@ -225,11 +221,11 @@ public class UserActivityLog implements LogableUserActivity { /** * Constructor with message, type, user, timestamp and principal name *

- * @param activityMessage Message - * @param activityType Type - * @param activityUser User instance + * @param activityMessage Message + * @param activityType Type + * @param activityUser User instance * @param activityTimestamp imestamp - * @param principalName Principal name + * @param principalName Principal name */ public UserActivityLog (final String activityMessage, final String activityType, final User activityUser, final Date activityTimestamp, final String principalName) { // Call other constructor @@ -242,10 +238,10 @@ public class UserActivityLog implements LogableUserActivity { /** * Consctructor with type, user, timestamp and principal name *

- * @param activityType Type - * @param activityUser User instance + * @param activityType Type + * @param activityUser User instance * @param activityTimestamp imestamp - * @param principalName Principal name + * @param principalName Principal name */ public UserActivityLog (final String activityType, final User activityUser, final Date activityTimestamp, final String principalName) { // Call other constructor -- 2.39.5