Repository: openmeetings Updated Branches: refs/heads/master 43c369f15 -> 4cd226530
[OPENMEETINGS-1714] some warnings are fixed Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/4cd22653 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/4cd22653 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/4cd22653 Branch: refs/heads/master Commit: 4cd22653047d9b109493f147ee65b60352282c03 Parents: 43c369f Author: Maxim Solodovnik <[email protected]> Authored: Thu Sep 28 22:17:58 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Thu Sep 28 22:17:58 2017 +0700 ---------------------------------------------------------------------- .../db/dao/calendar/AppointmentDao.java | 26 ++----- .../db/dao/calendar/MeetingMemberDao.java | 12 +--- .../db/dao/calendar/OmCalendarDao.java | 14 +--- .../db/dao/file/BaseFileItemDao.java | 32 ++------- .../openmeetings/db/dao/file/FileItemDao.java | 19 ++--- .../db/dao/record/RecordingMetaDataDao.java | 19 +---- .../openmeetings/db/dao/room/InvitationDao.java | 16 +---- .../openmeetings/db/dao/room/PollDao.java | 75 +++++-------------- .../db/dao/server/LdapConfigDao.java | 21 +----- .../openmeetings/db/dao/server/OAuth2Dao.java | 11 +-- .../db/dao/server/SessiondataDao.java | 49 +------------ .../openmeetings/db/dao/user/GroupDao.java | 13 +--- .../db/dao/user/PrivateMessageDao.java | 12 +--- .../db/dao/user/PrivateMessageFolderDao.java | 16 ++--- .../db/dao/user/UserContactDao.java | 17 +---- .../openmeetings/db/dao/user/UserDao.java | 76 +++++++------------- 16 files changed, 91 insertions(+), 337 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/4cd22653/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java index 912c1e0..8926205 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java @@ -30,7 +30,6 @@ import java.util.Set; import java.util.TimeZone; import javax.persistence.EntityManager; -import javax.persistence.NoResultException; import javax.persistence.PersistenceContext; import javax.persistence.TypedQuery; @@ -74,28 +73,15 @@ public class AppointmentDao { */ // ----------------------------------------------------------------------------------------------- public Appointment get(Long id) { - TypedQuery<Appointment> query = em.createNamedQuery("getAppointmentById", Appointment.class); - query.setParameter("id", id); - - Appointment a = null; - try { - a = query.getSingleResult(); - } catch (NoResultException ex) { - //no-op - } - return a; + List<Appointment> list = em.createNamedQuery("getAppointmentById", Appointment.class) + .setParameter("id", id).getResultList(); + return list.size() == 1 ? list.get(0) : null; } public Appointment getAny(Long id) { - TypedQuery<Appointment> query = em.createNamedQuery("getAppointmentByIdAny", Appointment.class).setParameter("id", id); - - Appointment a = null; - try { - a = query.getSingleResult(); - } catch (NoResultException ex) { - //no-op - } - return a; + List<Appointment> list = em.createNamedQuery("getAppointmentByIdAny", Appointment.class) + .setParameter("id", id).getResultList(); + return list.size() == 1 ? list.get(0) : null; } public List<Appointment> get() { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/4cd22653/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/MeetingMemberDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/MeetingMemberDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/MeetingMemberDao.java index 87a4e01..c928a1b 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/MeetingMemberDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/MeetingMemberDao.java @@ -25,7 +25,6 @@ import java.util.List; import java.util.Set; import javax.persistence.EntityManager; -import javax.persistence.NoResultException; import javax.persistence.PersistenceContext; import org.apache.openmeetings.db.entity.calendar.MeetingMember; @@ -42,14 +41,9 @@ public class MeetingMemberDao { private EntityManager em; public MeetingMember get(Long meetingMemberId) { - MeetingMember meetingMember = null; - try { - meetingMember = em.createNamedQuery("getMeetingMemberById", MeetingMember.class) - .setParameter("id", meetingMemberId).getSingleResult(); - } catch (NoResultException ex) { - } - - return meetingMember; + List<MeetingMember> list = em.createNamedQuery("getMeetingMemberById", MeetingMember.class) + .setParameter("id", meetingMemberId).getResultList(); + return list.size() == 1 ? list.get(0) : null; } public List<MeetingMember> getMeetingMembers() { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/4cd22653/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/OmCalendarDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/OmCalendarDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/OmCalendarDao.java index 7e64906..c3cfb6d 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/OmCalendarDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/OmCalendarDao.java @@ -21,9 +21,7 @@ package org.apache.openmeetings.db.dao.calendar; import java.util.List; import javax.persistence.EntityManager; -import javax.persistence.NoResultException; import javax.persistence.PersistenceContext; -import javax.persistence.TypedQuery; import org.apache.openmeetings.db.entity.calendar.OmCalendar; import org.springframework.beans.factory.annotation.Autowired; @@ -49,15 +47,9 @@ public class OmCalendarDao { * @return Returns the Calendar if found, else returns null */ public OmCalendar get(Long calId) { - TypedQuery<OmCalendar> query = em.createNamedQuery("getCalendarbyId", OmCalendar.class) - .setParameter("calId", calId); - OmCalendar c = null; - try { - c = query.getSingleResult(); - } catch (NoResultException e) { - //no-op - } - return c; + List<OmCalendar> list = em.createNamedQuery("getCalendarbyId", OmCalendar.class) + .setParameter("calId", calId).getResultList(); + return list.size() == 1 ? list.get(0) : null; } /** http://git-wip-us.apache.org/repos/asf/openmeetings/blob/4cd22653/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/BaseFileItemDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/BaseFileItemDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/BaseFileItemDao.java index b3d76bb..f06a38a 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/BaseFileItemDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/BaseFileItemDao.java @@ -21,11 +21,10 @@ package org.apache.openmeetings.db.dao.file; import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; import java.util.Date; +import java.util.List; import javax.persistence.EntityManager; -import javax.persistence.NoResultException; import javax.persistence.PersistenceContext; -import javax.persistence.TypedQuery; import org.apache.openmeetings.db.entity.file.BaseFileItem; import org.red5.logging.Red5LoggerFactory; @@ -42,32 +41,15 @@ public class BaseFileItemDao { public BaseFileItem get(String hash) { log.debug("getByHash() started"); - BaseFileItem f = null; - TypedQuery<BaseFileItem> query = em.createNamedQuery("getFileByHash", BaseFileItem.class); - query.setParameter("hash", hash); - - try { - f = query.getSingleResult(); - } catch (NoResultException ex) { - //no-op - } - return f; + List<BaseFileItem> list = em.createNamedQuery("getFileByHash", BaseFileItem.class) + .setParameter("hash", hash).getResultList(); + return list.size() == 1 ? list.get(0) : null; } public BaseFileItem get(Long id) { - BaseFileItem f = null; - if (id != null && id > 0) { - TypedQuery<BaseFileItem> query = em.createNamedQuery("getFileById", BaseFileItem.class) - .setParameter("id", id); - - try { - f = query.getSingleResult(); - } catch (NoResultException ex) { - } - } else { - log.info("[get] " + "Info: No id given"); - } - return f; + List<BaseFileItem> list = em.createNamedQuery("getFileById", BaseFileItem.class) + .setParameter("id", id).getResultList(); + return list.size() == 1 ? list.get(0) : null; } public void delete(BaseFileItem f) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/4cd22653/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileItemDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileItemDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileItemDao.java index 10ed939..c4bc478 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileItemDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileItemDao.java @@ -27,7 +27,6 @@ import java.util.List; import java.util.UUID; import java.util.stream.Collectors; -import javax.persistence.NoResultException; import javax.persistence.TypedQuery; import org.apache.openmeetings.db.entity.file.BaseFileItem; @@ -154,22 +153,12 @@ public class FileItemDao extends BaseFileItemDao { } public FileItem get(String externalId, String externalType) { - FileItem f = null; log.debug("get started"); - try { - TypedQuery<FileItem> query = em.createNamedQuery("getFileExternal", FileItem.class) - .setParameter("externalFileId", externalId).setParameter("externalType", externalType); - - try { - f = query.getSingleResult(); - } catch (NoResultException ex) { - } - - } catch (Exception ex2) { - log.error("[get]: ", ex2); - } - return f; + List<FileItem> list = em.createNamedQuery("getFileExternal", FileItem.class) + .setParameter("externalFileId", externalId).setParameter("externalType", externalType) + .getResultList(); + return list.size() == 1 ? list.get(0) : null; } public List<FileItem> get() { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/4cd22653/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java index 7131f5a..b268c86 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java @@ -24,7 +24,6 @@ import java.util.Date; import java.util.List; import javax.persistence.EntityManager; -import javax.persistence.NoResultException; import javax.persistence.PersistenceContext; import javax.persistence.TypedQuery; @@ -46,21 +45,9 @@ public class RecordingMetaDataDao { private RecordingDao recordingDao; public RecordingMetaData get(Long id) { - try { - TypedQuery<RecordingMetaData> query = em.createNamedQuery("getMetaById", RecordingMetaData.class); - query.setParameter("id", id); - - RecordingMetaData metaData = null; - try { - metaData = query.getSingleResult(); - } catch (NoResultException ex) { - } - - return metaData; - } catch (Exception ex2) { - log.error("[get]: ", ex2); - } - return null; + List<RecordingMetaData> list = em.createNamedQuery("getMetaById", RecordingMetaData.class) + .setParameter("id", id).getResultList(); + return list.size() == 1 ? list.get(0) : null; } public List<RecordingMetaData> getByRecording(Long recordingId) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/4cd22653/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/InvitationDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/InvitationDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/InvitationDao.java index 7542862..3c2e807 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/InvitationDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/InvitationDao.java @@ -28,9 +28,7 @@ import java.util.List; import java.util.TimeZone; import javax.persistence.EntityManager; -import javax.persistence.NoResultException; import javax.persistence.PersistenceContext; -import javax.persistence.TypedQuery; import org.apache.openmeetings.db.entity.room.Invitation; import org.apache.openmeetings.util.CalendarHelper; @@ -60,17 +58,9 @@ public class InvitationDao { } public Invitation get(Long invId) { - try { - TypedQuery<Invitation> query = em.createNamedQuery("getInvitationbyId", Invitation.class); - query.setParameter("id", invId); - try { - return query.getSingleResult(); - } catch (NoResultException ex) { - } - } catch (Exception e) { - log.error("get : ", e); - } - return null; + List<Invitation> list = em.createNamedQuery("getInvitationbyId", Invitation.class) + .setParameter("id", invId).getResultList(); + return list.size() == 1 ? list.get(0) : null; } public Invitation getByHash(String hash, boolean hidePass, boolean markUsed) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/4cd22653/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java index fba91fe..903e9b1 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java @@ -24,10 +24,8 @@ import java.util.Date; import java.util.List; import javax.persistence.EntityManager; -import javax.persistence.NoResultException; import javax.persistence.PersistenceContext; import javax.persistence.Query; -import javax.persistence.TypedQuery; import org.apache.openmeetings.db.entity.room.RoomPoll; import org.apache.openmeetings.db.entity.room.RoomPollAnswer; @@ -85,73 +83,34 @@ public class PollDao { } public RoomPoll getByRoom(Long roomId) { - try { - log.debug(" :: getPoll :: " + roomId); - TypedQuery<RoomPoll> q = em.createNamedQuery("getPoll", RoomPoll.class); - q.setParameter("roomId", roomId); - return q.getSingleResult(); - } catch (NoResultException nre) { - //expected - } catch (Exception err) { - log.error("[getPoll]", err); - } - return null; + log.debug(" :: getPoll :: {}", roomId); + List<RoomPoll> list = em.createNamedQuery("getPoll", RoomPoll.class) + .setParameter("roomId", roomId).getResultList(); + return list.size() == 1 ? list.get(0) : null; } public List<RoomPoll> get() { - try { - TypedQuery<RoomPoll> q = em.createNamedQuery("getPollListBackup", RoomPoll.class); - return q.getResultList(); - } catch (NoResultException nre) { - //expected - } catch (Exception err) { - log.error("[get]", err); - } - return null; + return em.createNamedQuery("getPollListBackup", RoomPoll.class).getResultList(); } public List<RoomPoll> getArchived(Long roomId) { - try { - log.debug(" :: getArchived :: " + roomId); - TypedQuery<RoomPoll> q = em.createNamedQuery("getArchivedPollList",RoomPoll.class); - q.setParameter("roomId", roomId); - return q.getResultList(); - } catch (NoResultException nre) { - //expected - } catch (Exception err) { - log.error("[getArchived]", err); - } - return null; + log.debug(" :: getArchived :: {}", roomId); + return em.createNamedQuery("getArchivedPollList",RoomPoll.class) + .setParameter("roomId", roomId).getResultList(); } public boolean hasPoll(Long roomId) { - try { - log.debug(" :: hasPoll :: " + roomId); - TypedQuery<Long> q = em.createNamedQuery("hasPoll", Long.class); - q.setParameter("roomId", roomId); - q.setParameter("archived", false); - return q.getSingleResult() > 0; - } catch (NoResultException nre) { - //expected - } catch (Exception err) { - log.error("[hasPoll]", err); - } - return false; + log.debug(" :: hasPoll :: " + roomId); + return em.createNamedQuery("hasPoll", Long.class) + .setParameter("roomId", roomId) + .setParameter("archived", false) + .getSingleResult() > 0; } public boolean hasVoted(Long roomId, Long userId) { - try { - log.debug(" :: hasVoted :: " + roomId + ", " + userId); - TypedQuery<RoomPollAnswer> q = em.createNamedQuery("hasVoted", RoomPollAnswer.class); - q.setParameter("roomId", roomId); - q.setParameter("userId", userId); - q.getSingleResult(); - return true; - } catch (NoResultException nre) { - //expected - } catch (Exception err) { - log.error("[hasVoted]", err); - } - return false; + return !em.createNamedQuery("hasVoted", RoomPollAnswer.class) + .setParameter("roomId", roomId) + .setParameter("userId", userId) + .getResultList().isEmpty(); } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/4cd22653/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java index 7de2092..5ee87df 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java @@ -25,7 +25,6 @@ import java.util.Date; import java.util.List; import javax.persistence.EntityManager; -import javax.persistence.NoResultException; import javax.persistence.PersistenceContext; import javax.persistence.PersistenceException; import javax.persistence.TypedQuery; @@ -66,23 +65,9 @@ public class LdapConfigDao implements IDataProviderDao<LdapConfig> { @Override public LdapConfig get(Long id) { - try { - - TypedQuery<LdapConfig> query = em.createNamedQuery("getLdapConfigById", LdapConfig.class); - query.setParameter("id", id); - - LdapConfig ldapConfig = null; - try { - ldapConfig = query.getSingleResult(); - } catch (NoResultException ex) { - } - - return ldapConfig; - - } catch (Exception ex2) { - log.error("[get]: ", ex2); - } - return null; + List<LdapConfig> list = em.createNamedQuery("getLdapConfigById", LdapConfig.class) + .setParameter("id", id).getResultList(); + return list.size() == 1 ? list.get(0) : null; } public List<LdapConfig> getActive() { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/4cd22653/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/OAuth2Dao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/OAuth2Dao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/OAuth2Dao.java index 61b035c..e9bb1e7 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/OAuth2Dao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/OAuth2Dao.java @@ -21,7 +21,6 @@ package org.apache.openmeetings.db.dao.server; import java.util.List; import javax.persistence.EntityManager; -import javax.persistence.NoResultException; import javax.persistence.PersistenceContext; import javax.persistence.TypedQuery; @@ -51,13 +50,9 @@ public class OAuth2Dao implements IDataProviderDao<OAuthServer> { @Override public OAuthServer get(Long id) { - TypedQuery<OAuthServer> query = em.createNamedQuery("getOAuthServerById", OAuthServer.class); - query.setParameter("id", id); - OAuthServer result = null; - try { - result = query.getSingleResult(); - } catch (NoResultException e) {} - return result; + List<OAuthServer> list = em.createNamedQuery("getOAuthServerById", OAuthServer.class) + .setParameter("id", id).getResultList(); + return list.size() == 1 ? list.get(0) : null; } @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/4cd22653/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java index 9d07538..dea7683 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java @@ -102,11 +102,10 @@ public class SessiondataDao { List<Sessiondata> sessions = em.createNamedQuery("getSessionById", Sessiondata.class) .setParameter("sessionId", String.format("%%%s%%", SID)).getResultList(); - Sessiondata sd = null; if (sessions == null || sessions.isEmpty()) { return null; } - sd = sessions.get(0); + Sessiondata sd = sessions.get(0); if (sd == null || sd.getUserId() == null || sd.getUserId().equals(new Long(0))) { return null; } @@ -128,52 +127,6 @@ public class SessiondataDao { } /** - * update the session of a user with a new user id this is needed to see if - * the session is loggedin - * - * @param SID - * @param userId - */ - public boolean updateUser(String SID, Long userId) { - try { - log.debug("updateUser User: " + userId + " || " + SID); - - Sessiondata sd = find(SID); - if (sd == null) { - log.error("Could not find session to Update"); - return false; - } - log.debug("Found session to update: userId: {}", userId); - - sd.setUserId(userId); - update(sd); - return true; - } catch (Exception ex2) { - log.error("[updateUser]: ", ex2); - } - return false; - } - - public boolean updateUserWithoutSession(String SID, Long userId) { - try { - log.debug("updateUser User: " + userId + " || " + SID); - Sessiondata sd = find(SID); - if (sd == null) { - log.error("Could not find session to Update"); - return false; - } - log.debug("Found session to update: userId: {}", userId); - - sd.setUserId(userId); - update(sd); - return true; - } catch (Exception ex2) { - log.error("[updateUser]: ", ex2); - } - return false; - } - - /** * * @param date * @return http://git-wip-us.apache.org/repos/asf/openmeetings/blob/4cd22653/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupDao.java index c7dcdf9..c610b2e 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupDao.java @@ -23,7 +23,6 @@ import java.util.Date; import java.util.List; import javax.persistence.EntityManager; -import javax.persistence.NoResultException; import javax.persistence.PersistenceContext; import javax.persistence.TypedQuery; @@ -47,15 +46,9 @@ public class GroupDao implements IGroupAdminDataProviderDao<Group> { @Override public Group get(Long id) { - TypedQuery<Group> query = em.createNamedQuery("getGroupById", Group.class); - query.setParameter("id", id); - Group o = null; - try { - o = query.getSingleResult(); - } catch (NoResultException e) { - // o = null; - } - return o; + List<Group> list = em.createNamedQuery("getGroupById", Group.class) + .setParameter("id", id).getResultList(); + return list.size() == 1 ? list.get(0) : null; } public Group get(String name) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/4cd22653/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 d62883d..774baea 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 @@ -26,7 +26,6 @@ import java.util.Date; import java.util.List; import javax.persistence.EntityManager; -import javax.persistence.NoResultException; import javax.persistence.PersistenceContext; import javax.persistence.Query; import javax.persistence.TypedQuery; @@ -91,14 +90,9 @@ public class PrivateMessageDao implements IDataProviderDao<PrivateMessage> { @Override public PrivateMessage get(Long id) { - TypedQuery<PrivateMessage> query = em.createNamedQuery("getPrivateMessageById", PrivateMessage.class); - query.setParameter("id", id); - PrivateMessage privateMessage = null; - try { - privateMessage = query.getSingleResult(); - } catch (NoResultException ex) { - } - return privateMessage; + List<PrivateMessage> list = em.createNamedQuery("getPrivateMessageById", PrivateMessage.class) + .setParameter("id", id).getResultList(); + return list.size() == 1 ? list.get(0) : null; } @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/4cd22653/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java index b8d36bb..bf3a13e 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java @@ -24,7 +24,6 @@ import java.util.Date; import java.util.List; import javax.persistence.EntityManager; -import javax.persistence.NoResultException; import javax.persistence.PersistenceContext; import javax.persistence.TypedQuery; @@ -75,18 +74,11 @@ public class PrivateMessageFolderDao implements IDataProviderDao<PrivateMessageF @Override public PrivateMessageFolder get(Long id) { - String hql = "select c from PrivateMessageFolder c where c.id = :id "; + final String hql = "select c from PrivateMessageFolder c where c.id = :id "; - TypedQuery<PrivateMessageFolder> query = em.createQuery(hql, PrivateMessageFolder.class); - query.setParameter("id", id); - - PrivateMessageFolder folder = null; - try { - folder = query.getSingleResult(); - } catch (NoResultException ex) { - } - - return folder; + List<PrivateMessageFolder> list = em.createQuery(hql, PrivateMessageFolder.class) + .setParameter("id", id).getResultList(); + return list.size() == 1 ? list.get(0) : null; } @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/4cd22653/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java index bb35727..5de373a 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java @@ -24,7 +24,6 @@ import java.util.Date; import java.util.List; import javax.persistence.EntityManager; -import javax.persistence.NoResultException; import javax.persistence.PersistenceContext; import javax.persistence.TypedQuery; @@ -157,19 +156,9 @@ public class UserContactDao { } public UserContact get(Long id) { - try { - TypedQuery<UserContact> query = em.createNamedQuery("getUserContactsById", UserContact.class); - query.setParameter("id", id); - UserContact userContacts = null; - try { - userContacts = query.getSingleResult(); - } catch (NoResultException ex) { - } - return userContacts; - } catch (Exception e) { - log.error("[getUserContacts]",e); - } - return null; + List<UserContact> list = em.createNamedQuery("getUserContactsById", UserContact.class) + .setParameter("id", id).getResultList(); + return list.size() == 1 ? list.get(0) : null; } public List<UserContact> get() { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/4cd22653/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 8d7fcb4..80bff18 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 @@ -36,7 +36,6 @@ import java.util.TimeZone; import java.util.UUID; import javax.persistence.EntityManager; -import javax.persistence.NoResultException; import javax.persistence.PersistenceContext; import javax.persistence.TypedQuery; @@ -296,16 +295,13 @@ public class UserDao implements IGroupAdminDataProviderDao<User> { if (force) { kq.getFetchPlan().addFetchGroup("backupexport"); } - try { - u = kq.getSingleResult(); - } catch (NoResultException ne) { - //no-op - } + List<User> list = kq.getResultList(); + u = list.size() == 1 ? list.get(0) : null; } finally { oem.getFetchPlan().setQueryResultCacheEnabled(qrce); } } else { - log.info("[get] " + "Info: No user id given"); + log.info("[get]: No user id given"); } return u; } @@ -392,52 +388,43 @@ public class UserDao implements IGroupAdminDataProviderDao<User> { return !Strings.isEmpty(login) && login.length() >= UserHelper.getMinLoginLength(cfgDao); } - public User getByLogin(String login, Type type, Long domainId) { + private static User getSingle(List<User> list) { User u = null; - try { - u = em.createNamedQuery("getUserByLogin", User.class) - .setParameter("login", login) - .setParameter("type", type) - .setParameter("domainId", domainId == null ? Long.valueOf(0) : domainId) - .getSingleResult(); + if (list.size() == 1) { + u = list.get(0); u.getGroupUsers().size(); // this will initiate lazy collection - } catch (NoResultException ex) { } return u; } + public User getByLogin(String login, Type type, Long domainId) { + return getSingle(em.createNamedQuery("getUserByLogin", User.class) + .setParameter("login", login) + .setParameter("type", type) + .setParameter("domainId", domainId == null ? Long.valueOf(0) : domainId) + .getResultList()); + } + public User getByEmail(String email) { return getByEmail(email, User.Type.user, null); } public User getByEmail(String email, User.Type type, Long domainId) { - User u = null; - try { - u = em.createNamedQuery("getUserByEmail", User.class) - .setParameter("email", email) - .setParameter("type", type) - .setParameter("domainId", domainId == null ? Long.valueOf(0) : domainId) - .getSingleResult(); - } catch (NoResultException ex) { - } - return u; + return getSingle(em.createNamedQuery("getUserByEmail", User.class) + .setParameter("email", email) + .setParameter("type", type) + .setParameter("domainId", domainId == null ? Long.valueOf(0) : domainId) + .getResultList()); } public User getUserByHash(String hash) { if (Strings.isEmpty(hash)) { return null; } - User us = null; - try { - us = em.createNamedQuery("getUserByHash", User.class) + return getSingle(em.createNamedQuery("getUserByHash", User.class) .setParameter("resethash", hash) .setParameter("type", User.Type.user) - .getSingleResult(); - } catch (NoResultException ex) { - } catch (Exception e) { - log.error("[getUserByHash]", e); - } - return us; + .getResultList()); } /** @@ -534,16 +521,8 @@ public class UserDao implements IGroupAdminDataProviderDao<User> { * @return */ public User getByActivationHash(String hash) { - TypedQuery<User> query = em.createQuery("SELECT u FROM User as u WHERE u.activatehash = :activatehash" - + " AND u.deleted = false", User.class); - query.setParameter("activatehash", hash); - User u = null; - try { - u = query.getSingleResult(); - } catch (NoResultException e) { - // u=null} - } - return u; + return getSingle(em.createQuery("SELECT u FROM User as u WHERE u.activatehash = :activatehash AND u.deleted = false", User.class) + .setParameter("activatehash", hash).getResultList()); } private <T> TypedQuery<T> getUserProfileQuery(Class<T> clazz, Long userId, String text, String offers, String search, String orderBy, boolean asc) { @@ -592,15 +571,10 @@ public class UserDao implements IGroupAdminDataProviderDao<User> { } public User getExternalUser(String extId, String extType) { - User u = null; - try { - u = em.createNamedQuery("getExternalUser", User.class) + return getSingle(em.createNamedQuery("getExternalUser", User.class) .setParameter("externalId", extId) .setParameter("externalType", extType) - .getSingleResult(); - } catch (NoResultException ex) { - } - return u; + .getResultList()); } @Override
