Repository: openmeetings Updated Branches: refs/heads/master fcc300c57 -> 440e0f08b
[OPENMEETINGS-1714] more issues are fixed Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/440e0f08 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/440e0f08 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/440e0f08 Branch: refs/heads/master Commit: 440e0f08b190e19fb14f253a39fc9b155e81c297 Parents: fcc300c Author: Maxim Solodovnik <[email protected]> Authored: Wed Oct 4 13:41:15 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Wed Oct 4 13:41:15 2017 +0700 ---------------------------------------------------------------------- .../db/dao/user/PrivateMessageDao.java | 21 +++++++++++--------- .../openmeetings/db/dao/user/UserDao.java | 5 +---- .../org/apache/openmeetings/util/DaoHelper.java | 4 ++++ .../openmeetings/AbstractWicketTester.java | 2 +- 4 files changed, 18 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/440e0f08/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java index 2217261..df6491b 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java @@ -19,6 +19,7 @@ package org.apache.openmeetings.db.dao.user; import static org.apache.openmeetings.db.entity.user.PrivateMessage.INBOX_FOLDER_ID; +import static org.apache.openmeetings.util.DaoHelper.getStringParam; import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import java.util.Collection; @@ -30,11 +31,11 @@ import javax.persistence.PersistenceContext; import javax.persistence.Query; import javax.persistence.TypedQuery; -import org.apache.commons.lang3.StringUtils; import org.apache.openmeetings.db.dao.IDataProviderDao; import org.apache.openmeetings.db.entity.room.Room; import org.apache.openmeetings.db.entity.user.PrivateMessage; import org.apache.openmeetings.db.entity.user.User; +import org.apache.wicket.util.string.Strings; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; import org.springframework.stereotype.Repository; @@ -112,7 +113,7 @@ public class PrivateMessageDao implements IDataProviderDao<PrivateMessage> { .append(" FROM PrivateMessage m WHERE m.owner.id = :ownerId ") .append(" AND m.folderId = :folderId "); - if (!StringUtils.isEmpty(search)) { + if (!Strings.isEmpty(search)) { hql.append(" AND ( ") .append("lower(m.subject) LIKE :search ") .append("OR lower(m.message) LIKE :search ") @@ -123,18 +124,22 @@ public class PrivateMessageDao implements IDataProviderDao<PrivateMessage> { .append(" ) "); } - if (!isCount && !StringUtils.isEmpty(orderBy)) { + if (!isCount && !Strings.isEmpty(orderBy)) { hql.append(" ORDER BY ").append(orderBy).append(asc ? " ASC" : " DESC"); } return hql.toString(); } + private <T> void setSearch(TypedQuery<T> query, String search) { + if (!Strings.isEmpty(search)) { + query.setParameter("search", getStringParam(search)); + } + } + public Long count(Long ownerId, Long folderId, String search) { TypedQuery<Long> query = em.createQuery(getQuery(true, search, null, true), Long.class); query.setParameter("ownerId", ownerId); - if (!StringUtils.isEmpty(search)) { - query.setParameter("search", StringUtils.lowerCase("%" + search + "%")); - } + setSearch(query, search); query.setParameter("folderId", folderId); return query.getSingleResult(); } @@ -143,9 +148,7 @@ public class PrivateMessageDao implements IDataProviderDao<PrivateMessage> { TypedQuery<PrivateMessage> query = em.createQuery(getQuery(false, search, orderBy, asc), PrivateMessage.class); query.setParameter("ownerId", ownerId); query.setParameter("folderId", folderId); - if (!StringUtils.isEmpty(search)) { - query.setParameter("search", StringUtils.lowerCase("%" + search + "%")); - } + setSearch(query, search); query.setFirstResult(start); query.setMaxResults(max); return query.getResultList(); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/440e0f08/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java index 8537178..a4cab6b 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java @@ -19,6 +19,7 @@ package org.apache.openmeetings.db.dao.user; import static org.apache.openmeetings.db.util.UserHelper.getMinLoginLength; +import static org.apache.openmeetings.util.DaoHelper.getStringParam; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_LANG; import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; @@ -544,10 +545,6 @@ public class UserDao implements IGroupAdminDataProviderDao<User> { return query; } - private static String getStringParam(String param) { - return param == null ? "%" : "%" + StringUtils.lowerCase(param) + "%"; - } - public List<User> searchUserProfile(Long userId, String text, String offers, String search, String orderBy, int start, int max, boolean asc) { return getUserProfileQuery(User.class, userId, text, offers, search, orderBy, asc).setFirstResult(start).setMaxResults(max).getResultList(); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/440e0f08/openmeetings-util/src/main/java/org/apache/openmeetings/util/DaoHelper.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/DaoHelper.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/DaoHelper.java index 05b5748..bc7e766 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/DaoHelper.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/DaoHelper.java @@ -105,4 +105,8 @@ public class DaoHelper { } } } + + public static String getStringParam(String param) { + return param == null ? "%" : "%" + StringUtils.lowerCase(param) + "%"; + } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/440e0f08/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractWicketTester.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractWicketTester.java b/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractWicketTester.java index 701842c..15c46a3 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractWicketTester.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractWicketTester.java @@ -82,7 +82,7 @@ public class AbstractWicketTester extends AbstractJUnitDefaults { } public String getEscapedString(String lbl) { - return escapeMarkup(getString(lbl), false, false).toString(); + return escapeMarkup(getString(lbl)).toString(); } @Override
