Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderCommentDAO.java =================================================================== diff -u -r15045d0b9b0dbb930f42a9da7757207e7a325341 -r609de47524a22e460997c27b4169db460482b9ae --- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderCommentDAO.java (.../VideoRecorderCommentDAO.java) (revision 15045d0b9b0dbb930f42a9da7757207e7a325341) +++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderCommentDAO.java (.../VideoRecorderCommentDAO.java) (revision 609de47524a22e460997c27b4169db460482b9ae) @@ -25,16 +25,17 @@ package org.lamsfoundation.lams.tool.videoRecorder.dao.hibernate; import java.util.List; -import java.util.Set; -import org.lamsfoundation.lams.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.videoRecorder.dao.IVideoRecorderCommentDAO; import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderComment; +import org.springframework.stereotype.Repository; /** * DAO for accessing the VideoRecorderRecording objects - Hibernate specific code. */ -public class VideoRecorderCommentDAO extends BaseDAO implements IVideoRecorderCommentDAO { +@Repository +public class VideoRecorderCommentDAO extends LAMSBaseDAO implements IVideoRecorderCommentDAO { private static final String SQL_QUERY_FIND_BY_COMMENT_ID = "from " + VideoRecorderComment.class.getName() + " as c" @@ -53,7 +54,7 @@ + " where c.createBy.userId=? and c.videoRecorderSession.sessionId=?"; public VideoRecorderComment getCommentById(Long recordingId) { - List list = this.getHibernateTemplate().find( + List list = this.doFind( SQL_QUERY_FIND_BY_COMMENT_ID , recordingId); @@ -64,24 +65,24 @@ } public List getCommentsByUserId(Long userId){ - return (List)(this.getHibernateTemplate().find(SQL_QUERY_BY_USER_ID, userId)); + return (List)(this.doFind(SQL_QUERY_BY_USER_ID, userId)); } public List getCommentsByToolSessionId(Long toolSessionId){ - return (List)(this.getHibernateTemplate().find(SQL_QUERY_BY_TOOL_SESSION_ID, toolSessionId)); + return (List)(this.doFind(SQL_QUERY_BY_TOOL_SESSION_ID, toolSessionId)); } public List getCommentsByRecordingId(Long recordingId) { - return (List)(this.getHibernateTemplate().find(SQL_QUERY_BY_TOOL_RECORDING_ID, recordingId)); + return (List)(this.doFind(SQL_QUERY_BY_TOOL_RECORDING_ID, recordingId)); } public void saveOrUpdate(VideoRecorderComment videoRecorderComment) { - this.getHibernateTemplate().saveOrUpdate(videoRecorderComment); - this.getHibernateTemplate().flush(); + getSession().saveOrUpdate(videoRecorderComment); + getSession().flush(); } public Long getNbComments(Long userID, Long sessionId) { - List list = this.getHibernateTemplate().find(SQL_QUERY_NB_COMMENTS_BY_USER, new Object[]{userID,sessionId}); + List list = this.doFind(SQL_QUERY_NB_COMMENTS_BY_USER, new Object[]{userID,sessionId}); if(list != null && list.size() > 0) return ((Number)list.get(0)).longValue(); else Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderDAO.java =================================================================== diff -u -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 -r609de47524a22e460997c27b4169db460482b9ae --- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderDAO.java (.../VideoRecorderDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) +++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderDAO.java (.../VideoRecorderDAO.java) (revision 609de47524a22e460997c27b4169db460482b9ae) @@ -26,19 +26,21 @@ import java.util.List; -import org.lamsfoundation.lams.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.videoRecorder.dao.IVideoRecorderDAO; import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorder; +import org.springframework.stereotype.Repository; /** * DAO for accessing the VideoRecorder objects - Hibernate specific code. */ -public class VideoRecorderDAO extends BaseDAO implements IVideoRecorderDAO { +@Repository +public class VideoRecorderDAO extends LAMSBaseDAO implements IVideoRecorderDAO { private static final String FIND_FORUM_BY_CONTENTID = "from VideoRecorder videoRecorder where videoRecorder.toolContentId=?"; public VideoRecorder getByContentId(Long toolContentId) { - List list = getHibernateTemplate().find(VideoRecorderDAO.FIND_FORUM_BY_CONTENTID, toolContentId); + List list = doFind(VideoRecorderDAO.FIND_FORUM_BY_CONTENTID, toolContentId); if (list != null && list.size() > 0) { return (VideoRecorder) list.get(0); } else { @@ -47,8 +49,8 @@ } public void saveOrUpdate(VideoRecorder videoRecorder) { - this.getHibernateTemplate().saveOrUpdate(videoRecorder); - this.getHibernateTemplate().flush(); + getSession().saveOrUpdate(videoRecorder); + getSession().flush(); } public void releaseFromCache(Object o) { Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderRatingDAO.java =================================================================== diff -u -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 -r609de47524a22e460997c27b4169db460482b9ae --- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderRatingDAO.java (.../VideoRecorderRatingDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) +++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderRatingDAO.java (.../VideoRecorderRatingDAO.java) (revision 609de47524a22e460997c27b4169db460482b9ae) @@ -25,21 +25,19 @@ package org.lamsfoundation.lams.tool.videoRecorder.dao.hibernate; import java.util.List; -import java.util.Set; -import org.lamsfoundation.lams.dao.hibernate.BaseDAO; -import org.lamsfoundation.lams.tool.videoRecorder.dao.IVideoRecorderCommentDAO; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.videoRecorder.dao.IVideoRecorderRatingDAO; -import org.lamsfoundation.lams.tool.videoRecorder.dao.IVideoRecorderRecordingDAO; import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderComment; import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderRating; import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderRecording; -import org.springframework.orm.hibernate4.HibernateTemplate; +import org.springframework.stereotype.Repository; /** * DAO for accessing the VideoRecorderRating objects - Hibernate specific code. */ -public class VideoRecorderRatingDAO extends BaseDAO implements IVideoRecorderRatingDAO { +@Repository +public class VideoRecorderRatingDAO extends LAMSBaseDAO implements IVideoRecorderRatingDAO { private static final String SQL_QUERY_FIND_BY_RATING_ID = "from " + VideoRecorderRating.class.getName() + " as r" @@ -55,7 +53,7 @@ + " where r.createBy.userId=? and r.videoRecorderSession.sessionId=?"; public VideoRecorderRating getRatingById(Long ratingId) { - List list = this.getHibernateTemplate().find( + List list = this.doFind( SQL_QUERY_FIND_BY_RATING_ID , ratingId); @@ -66,20 +64,20 @@ } public List getRatingsByUserId(Long userId){ - return (List)(this.getHibernateTemplate().find(SQL_QUERY_BY_USER_ID, userId)); + return (List)(this.doFind(SQL_QUERY_BY_USER_ID, userId)); } public List getRatingsByToolSessionId(Long toolSessionId){ - return (List)(this.getHibernateTemplate().find(SQL_QUERY_BY_TOOL_SESSION_ID, toolSessionId)); + return (List)(this.doFind(SQL_QUERY_BY_TOOL_SESSION_ID, toolSessionId)); } public void saveOrUpdate(VideoRecorderRating videoRecorderRating) { - this.getHibernateTemplate().saveOrUpdate(videoRecorderRating); - this.getHibernateTemplate().flush(); + getSession().saveOrUpdate(videoRecorderRating); + getSession().flush(); } public Long getNbRatings(Long userID, Long sessionId) { - List list = this.getHibernateTemplate().find(SQL_QUERY_NB_RATINGS_BY_USER, new Object[]{userID,sessionId}); + List list = this.doFind(SQL_QUERY_NB_RATINGS_BY_USER, new Object[]{userID,sessionId}); if(list != null && list.size() > 0) return ((Number)list.get(0)).longValue(); else Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderRecordingDAO.java =================================================================== diff -u -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 -r609de47524a22e460997c27b4169db460482b9ae --- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderRecordingDAO.java (.../VideoRecorderRecordingDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) +++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderRecordingDAO.java (.../VideoRecorderRecordingDAO.java) (revision 609de47524a22e460997c27b4169db460482b9ae) @@ -26,15 +26,16 @@ import java.util.List; -import org.lamsfoundation.lams.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.videoRecorder.dao.IVideoRecorderRecordingDAO; import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderRecording; -import org.springframework.orm.hibernate4.HibernateTemplate; +import org.springframework.stereotype.Repository; /** * DAO for accessing the VideoRecorderRecording objects - Hibernate specific code. */ -public class VideoRecorderRecordingDAO extends BaseDAO implements IVideoRecorderRecordingDAO { +@Repository +public class VideoRecorderRecordingDAO extends LAMSBaseDAO implements IVideoRecorderRecordingDAO { private static final String SQL_QUERY_FIND_BY_RECORDING_ID = "from " + VideoRecorderRecording.class.getName() + " as f" @@ -56,7 +57,7 @@ + " where vrr.createBy.userId=? and vrr.videoRecorderSession.sessionId=?"; public VideoRecorderRecording getRecordingById(Long recordingId) { - List list = this.getHibernateTemplate().find( + List list = this.doFind( SQL_QUERY_FIND_BY_RECORDING_ID, recordingId); @@ -67,28 +68,28 @@ } public List getByToolSessionId(Long toolSessionId){ - return (List)(this.getHibernateTemplate().find(SQL_QUERY_BY_SESSION_ID, toolSessionId)); + return (List)(this.doFind(SQL_QUERY_BY_SESSION_ID, toolSessionId)); } public List getBySessionAndUserUid(Long toolSessionId, Long userUid){ - return (List)(this.getHibernateTemplate().find(SQL_QUERY_BY_SESSION_ID_AND_USER_UID, new Object[] {toolSessionId, userUid})); + return (List)(this.doFind(SQL_QUERY_BY_SESSION_ID_AND_USER_UID, new Object[] {toolSessionId, userUid})); } public List getBySessionAndUserId(Long toolSessionId, Long userId){ - return (List)(this.getHibernateTemplate().find(SQL_QUERY_BY_SESSION_ID_AND_USER_ID, new Object[] {toolSessionId, userId})); + return (List)(this.doFind(SQL_QUERY_BY_SESSION_ID_AND_USER_ID, new Object[] {toolSessionId, userId})); } public List getByToolContentId(Long toolContentId){ - return (List)(this.getHibernateTemplate().find(SQL_QUERY_BY_TOOL_CONTENT_ID, toolContentId)); + return (List)(this.doFind(SQL_QUERY_BY_TOOL_CONTENT_ID, toolContentId)); } public void saveOrUpdate(VideoRecorderRecording videoRecorderRecording) { - this.getHibernateTemplate().saveOrUpdate(videoRecorderRecording); - this.getHibernateTemplate().flush(); + getSession().saveOrUpdate(videoRecorderRecording); + getSession().flush(); } public Long getNbRecordings(Long userID, Long sessionId) { - List list = this.getHibernateTemplate().find(SQL_QUERY_NB_RECORDINGS_BY_USER, new Object[]{userID,sessionId}); + List list = this.doFind(SQL_QUERY_NB_RECORDINGS_BY_USER, new Object[]{userID,sessionId}); if(list != null && list.size() > 0) return ((Number)list.get(0)).longValue(); else Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderSessionDAO.java =================================================================== diff -u -r3d081de4a45da632ee6029251318fac795d41813 -r609de47524a22e460997c27b4169db460482b9ae --- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderSessionDAO.java (.../VideoRecorderSessionDAO.java) (revision 3d081de4a45da632ee6029251318fac795d41813) +++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderSessionDAO.java (.../VideoRecorderSessionDAO.java) (revision 609de47524a22e460997c27b4169db460482b9ae) @@ -26,25 +26,27 @@ import java.util.List; -import org.lamsfoundation.lams.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.videoRecorder.dao.IVideoRecorderSessionDAO; import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderSession; +import org.springframework.stereotype.Repository; /** * DAO for accessing the VideoRecorderSession objects - Hibernate specific code. */ -public class VideoRecorderSessionDAO extends BaseDAO implements IVideoRecorderSessionDAO { +@Repository +public class VideoRecorderSessionDAO extends LAMSBaseDAO implements IVideoRecorderSessionDAO { public static final String SQL_QUERY_FIND_BY_SESSION_ID = "from " + VideoRecorderSession.class.getName() + " where session_id=?"; public void saveOrUpdate(VideoRecorderSession session) { - this.getHibernateTemplate().saveOrUpdate(session); - this.getHibernateTemplate().flush(); + getSession().saveOrUpdate(session); + getSession().flush(); } public VideoRecorderSession getBySessionId(Long toolSessionId) { - List list = this.getHibernateTemplate().find( + List list = this.doFind( SQL_QUERY_FIND_BY_SESSION_ID, toolSessionId); if (list == null || list.isEmpty()) return null; @@ -54,8 +56,8 @@ public void deleteBySessionID(Long toolSessionID) { VideoRecorderSession session = getBySessionId(toolSessionID); if(session != null){ - this.getHibernateTemplate().delete(session); - this.getHibernateTemplate().flush(); + getSession().delete(session); + getSession().flush(); } } } Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderUserDAO.java =================================================================== diff -u -r3d081de4a45da632ee6029251318fac795d41813 -r609de47524a22e460997c27b4169db460482b9ae --- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderUserDAO.java (.../VideoRecorderUserDAO.java) (revision 3d081de4a45da632ee6029251318fac795d41813) +++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderUserDAO.java (.../VideoRecorderUserDAO.java) (revision 609de47524a22e460997c27b4169db460482b9ae) @@ -26,14 +26,16 @@ import java.util.List; -import org.lamsfoundation.lams.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.videoRecorder.dao.IVideoRecorderUserDAO; import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderUser; +import org.springframework.stereotype.Repository; /** * DAO for accessing the VideoRecorderUser objects - Hibernate specific code. */ -public class VideoRecorderUserDAO extends BaseDAO implements IVideoRecorderUserDAO { +@Repository +public class VideoRecorderUserDAO extends LAMSBaseDAO implements IVideoRecorderUserDAO { public static final String SQL_QUERY_FIND_BY_USER_ID_SESSION_ID = "from " + VideoRecorderUser.class.getName() + " as f" @@ -47,7 +49,7 @@ + VideoRecorderUser.class.getName() + " where uid=?"; public VideoRecorderUser getByUserIdAndSessionId(Long userId, Long toolSessionId) { - List list = this.getHibernateTemplate().find( + List list = this.doFind( SQL_QUERY_FIND_BY_USER_ID_SESSION_ID, new Object[] { userId, toolSessionId }); @@ -60,7 +62,7 @@ public VideoRecorderUser getByLoginNameAndSessionId(String loginName, Long toolSessionId) { - List list = this.getHibernateTemplate().find( + List list = this.doFind( SQL_QUERY_FIND_BY_LOGIN_NAME_SESSION_ID, new Object[] { loginName, toolSessionId }); @@ -72,12 +74,12 @@ } public void saveOrUpdate(VideoRecorderUser videoRecorderUser) { - this.getHibernateTemplate().saveOrUpdate(videoRecorderUser); - this.getHibernateTemplate().flush(); + getSession().saveOrUpdate(videoRecorderUser); + getSession().flush(); } public VideoRecorderUser getByUID(Long uid) { - List list = this.getHibernateTemplate().find(SQL_QUERY_FIND_BY_UID, + List list = this.doFind(SQL_QUERY_FIND_BY_UID, new Object[] { uid }); if (list == null || list.isEmpty())