Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteContentDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteContentDAO.java,v diff -u -r1.10.2.2 -r1.10.2.3 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteContentDAO.java 12 Sep 2014 22:43:35 -0000 1.10.2.2 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteContentDAO.java 1 Dec 2014 21:08:29 -0000 1.10.2.3 @@ -26,15 +26,12 @@ import java.util.Set; import org.hibernate.FlushMode; -import org.hibernate.HibernateException; -import org.hibernate.Session; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.vote.dao.IVoteContentDAO; import org.lamsfoundation.lams.tool.vote.pojos.VoteContent; import org.lamsfoundation.lams.tool.vote.pojos.VoteQueContent; import org.lamsfoundation.lams.tool.vote.pojos.VoteSession; -import org.springframework.orm.hibernate4.HibernateCallback; -import org.springframework.orm.hibernate4.HibernateTemplate; -import org.springframework.orm.hibernate4.support.HibernateDaoSupport; +import org.springframework.stereotype.Repository; /** * @author Ozgur Demirtas @@ -43,27 +40,26 @@ * voting tool. *

*/ +@Repository +public class VoteContentDAO extends LAMSBaseDAO implements IVoteContentDAO { -public class VoteContentDAO extends HibernateDaoSupport implements IVoteContentDAO { - private static final String FIND_VOTE_CONTENT = "from " + VoteContent.class.getName() + " as vote where content_id=?"; private static final String LOAD_VOTE_BY_SESSION = "select vote from VoteContent vote left join fetch " + "vote.voteSessions session where session.voteSessionId=:sessionId"; public VoteContent getVoteContentByUID(Long uid) { - return (VoteContent) this.getHibernateTemplate().get(VoteContent.class, uid); + return (VoteContent) this.getSession().get(VoteContent.class, uid); } public void saveOrUpdateVote(VoteContent vote) { getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); - this.getHibernateTemplate().saveOrUpdate(vote); + this.getSession().saveOrUpdate(vote); } public VoteContent getVoteContentByContentId(Long voteContentId) { String query = "from VoteContent as vote where vote.voteContentId = ?"; - HibernateTemplate templ = this.getHibernateTemplate(); List list = getSessionFactory().getCurrentSession().createQuery(query).setLong(0, voteContentId.longValue()).list(); if (list != null && list.size() > 0) { @@ -73,70 +69,64 @@ return null; } - public VoteContent getVoteContentBySession(final Long voteSessionId) { - return (VoteContent) getHibernateTemplate().execute(new HibernateCallback() { + public VoteContent getVoteContentBySession(final Long voteSessionId) { + return (VoteContent) getSession().createQuery(VoteContentDAO.LOAD_VOTE_BY_SESSION) + .setLong("sessionId", voteSessionId.longValue()).uniqueResult(); + } - public Object doInHibernate(Session session) throws HibernateException { - return session.createQuery(VoteContentDAO.LOAD_VOTE_BY_SESSION).setLong("sessionId", - voteSessionId.longValue()).uniqueResult(); - } - }); - } - public void saveVoteContent(VoteContent voteContent) { getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); - this.getHibernateTemplate().saveOrUpdate(voteContent); + this.getSession().saveOrUpdate(voteContent); } public void updateVoteContent(VoteContent voteContent) { getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); - this.getHibernateTemplate().update(voteContent); + this.getSession().update(voteContent); } public void removeVoteById(Long voteContentId) { - HibernateTemplate templ = this.getHibernateTemplate(); if (voteContentId != null) { List list = getSessionFactory().getCurrentSession().createQuery(VoteContentDAO.FIND_VOTE_CONTENT) .setLong(0, voteContentId.longValue()).list(); if (list != null && list.size() > 0) { VoteContent vote = (VoteContent) list.get(0); getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); - templ.delete(vote); - templ.flush(); + getSession().delete(vote); + getSession().flush(); } } } public void removeVoteSessions(VoteContent voteContent) { - this.getHibernateTemplate().deleteAll(voteContent.getVoteSessions()); + deleteAll(voteContent.getVoteSessions()); } public void addVoteSession(Long voteContentId, VoteSession voteSession) { VoteContent content = getVoteContentByContentId(voteContentId); voteSession.setVoteContent(content); content.getVoteSessions().add(voteSession); - this.getHibernateTemplate().saveOrUpdate(voteSession); - this.getHibernateTemplate().saveOrUpdate(content); + this.getSession().saveOrUpdate(voteSession); + this.getSession().saveOrUpdate(content); } public void removeQuestionsFromCache(VoteContent voteContent) { if (voteContent != null) { for (VoteQueContent question : (Set) voteContent.getVoteQueContents()) { - getHibernateTemplate().evict(question); + getSession().evict(question); } } } public void removeVoteContentFromCache(VoteContent voteContent) { if (voteContent != null) { - getHibernateTemplate().evict(voteContent); + getSession().evict(voteContent); } } @Override public void delete(Object object) { - getHibernateTemplate().delete(object); + getSession().delete(object); } } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteQueContentDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteQueContentDAO.java,v diff -u -r1.10.2.2 -r1.10.2.3 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteQueContentDAO.java 12 Sep 2014 22:43:34 -0000 1.10.2.2 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteQueContentDAO.java 1 Dec 2014 21:08:29 -0000 1.10.2.3 @@ -24,17 +24,19 @@ import java.util.List; import org.hibernate.FlushMode; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.vote.dao.IVoteQueContentDAO; import org.lamsfoundation.lams.tool.vote.pojos.VoteQueContent; -import org.springframework.orm.hibernate4.support.HibernateDaoSupport; +import org.springframework.stereotype.Repository; /** * Hibernate implementation for database access to VoteQueContent for the vote * tool. * * @author Ozgur Demirtas */ -public class VoteQueContentDAO extends HibernateDaoSupport implements IVoteQueContentDAO { +@Repository +public class VoteQueContentDAO extends LAMSBaseDAO implements IVoteQueContentDAO { private static final String CLEAN_QUESTION_CONTENT_BY_CONTENT_ID_SIMPLE = "from voteQueContent in class VoteQueContent where voteQueContent.voteContentId=:voteContentId"; @@ -46,7 +48,7 @@ @Override public VoteQueContent getQuestionByUid(Long uid) { - return (VoteQueContent) this.getHibernateTemplate().get(VoteQueContent.class, uid); + return (VoteQueContent) this.getSession().get(VoteQueContent.class, uid); } @Override @@ -84,12 +86,12 @@ @Override public void saveOrUpdateQuestion(VoteQueContent voteQueContent) { - this.getHibernateTemplate().saveOrUpdate(voteQueContent); + this.getSession().saveOrUpdate(voteQueContent); } @Override public void removeQuestion(VoteQueContent voteQueContent) { getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); - this.getHibernateTemplate().delete(voteQueContent); + this.getSession().delete(voteQueContent); } } \ No newline at end of file Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteSessionDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteSessionDAO.java,v diff -u -r1.10.2.3 -r1.10.2.4 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteSessionDAO.java 12 Sep 2014 22:43:34 -0000 1.10.2.3 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteSessionDAO.java 1 Dec 2014 21:08:29 -0000 1.10.2.4 @@ -25,25 +25,22 @@ import java.util.List; import org.hibernate.FlushMode; -import org.hibernate.HibernateException; -import org.hibernate.Session; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.vote.dao.IVoteSessionDAO; import org.lamsfoundation.lams.tool.vote.pojos.VoteContent; import org.lamsfoundation.lams.tool.vote.pojos.VoteQueUsr; import org.lamsfoundation.lams.tool.vote.pojos.VoteSession; -import org.springframework.orm.hibernate4.HibernateCallback; -import org.springframework.orm.hibernate4.HibernateTemplate; -import org.springframework.orm.hibernate4.support.HibernateDaoSupport; +import org.springframework.stereotype.Repository; /** * @author ozgurd *

* Hibernate implementation for database access to Vote sessions for the voting tool. *

*/ +@Repository +public class VoteSessionDAO extends LAMSBaseDAO implements IVoteSessionDAO { -public class VoteSessionDAO extends HibernateDaoSupport implements IVoteSessionDAO { - private static final String FIND_VOTE_SESSION_CONTENT = "from " + VoteSession.class.getName() + " as votes where vote_session_id=?"; @@ -55,7 +52,7 @@ private static final String COUNT_SESSION_COMPLETE = "from voteSession in class VoteSession where voteSession.sessionStatus='COMPLETE'"; public VoteSession getVoteSessionByUID(Long sessionUid) { - return (VoteSession) this.getHibernateTemplate().get(VoteSession.class, sessionUid); + return (VoteSession) this.getSession().get(VoteSession.class, sessionUid); } public VoteSession getSessionBySessionId(Long voteSessionId) { @@ -80,66 +77,60 @@ } public void saveVoteSession(VoteSession voteSession) { - this.getHibernateTemplate().save(voteSession); + this.getSession().save(voteSession); } public void updateVoteSession(VoteSession voteSession) { getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); - this.getHibernateTemplate().update(voteSession); + this.getSession().update(voteSession); } public void removeVoteSessionByUID(Long uid) { - VoteSession votes = (VoteSession) getHibernateTemplate().get(VoteSession.class, uid); - this.getHibernateTemplate().delete(votes); + VoteSession votes = (VoteSession) getSession().get(VoteSession.class, uid); + this.getSession().delete(votes); } public void removeVoteSessionById(Long voteSessionId) { - HibernateTemplate templ = this.getHibernateTemplate(); if (voteSessionId != null) { List list = getSessionFactory().getCurrentSession().createQuery(FIND_VOTE_SESSION_CONTENT).setLong(0, voteSessionId.longValue()) .list(); if (list != null && list.size() > 0) { VoteSession vote = (VoteSession) list.get(0); getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); - templ.delete(vote); - templ.flush(); + getSession().delete(vote); + getSession().flush(); } } } public void removeVoteSession(VoteSession voteSession) { getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); - this.getHibernateTemplate().delete(voteSession); + this.getSession().delete(voteSession); } - public VoteSession getVoteSessionByUser(final Long userId) { - return (VoteSession) getHibernateTemplate().execute(new HibernateCallback() { + public VoteSession getVoteSessionByUser(final Long userId) { + return (VoteSession) getSession().createQuery(LOAD_VOTESESSION_BY_USER).setLong("userId", userId.longValue()) + .uniqueResult(); + } - public Object doInHibernate(Session session) throws HibernateException { - return session.createQuery(LOAD_VOTESESSION_BY_USER).setLong("userId", userId.longValue()) - .uniqueResult(); - } - }); - } - public void removeVoteUsers(VoteSession voteSession) { - this.getHibernateTemplate().deleteAll(voteSession.getVoteQueUsers()); + deleteAll(voteSession.getVoteQueUsers()); } public void addVoteUsers(Long voteSessionId, VoteQueUsr user) { VoteSession session = getSessionBySessionId(voteSessionId); user.setVoteSession(session); session.getVoteQueUsers().add(user); - this.getHibernateTemplate().saveOrUpdate(user); - this.getHibernateTemplate().saveOrUpdate(session); + this.getSession().saveOrUpdate(user); + this.getSession().saveOrUpdate(session); } @SuppressWarnings("unchecked") public List getSessionsFromContent(VoteContent voteContent) { - return (List) (getHibernateTemplate().findByNamedParam(GET_SESSIONS_FROM_CONTENT, "voteContent", voteContent)); + return (List) (doFindByNamedParam(GET_SESSIONS_FROM_CONTENT, new String[]{"voteContent"}, new Object[]{voteContent})); } } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUserDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUserDAO.java,v diff -u -r1.12.2.2 -r1.12.2.3 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUserDAO.java 12 Sep 2014 22:43:35 -0000 1.12.2.2 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUserDAO.java 1 Dec 2014 21:08:29 -0000 1.12.2.3 @@ -26,11 +26,11 @@ import java.util.List; import org.hibernate.FlushMode; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.vote.dao.IVoteUserDAO; import org.lamsfoundation.lams.tool.vote.pojos.VoteQueUsr; import org.lamsfoundation.lams.tool.vote.pojos.VoteSession; -import org.springframework.orm.hibernate4.HibernateTemplate; -import org.springframework.orm.hibernate4.support.HibernateDaoSupport; +import org.springframework.stereotype.Repository; /** *

@@ -39,7 +39,8 @@ * * @author Ozgur Demirtas */ -public class VoteUserDAO extends HibernateDaoSupport implements IVoteUserDAO { +@Repository +public class VoteUserDAO extends LAMSBaseDAO implements IVoteUserDAO { private static final String LOAD_USER_FOR_SESSION = "from voteQueUsr in class VoteQueUsr where voteQueUsr.voteSessionId= :voteSessionId"; @@ -99,11 +100,11 @@ } public void saveVoteUser(VoteQueUsr voteUser) { - this.getHibernateTemplate().save(voteUser); + this.getSession().save(voteUser); } public void updateVoteUser(VoteQueUsr voteUser) { - this.getHibernateTemplate().update(voteUser); + this.getSession().update(voteUser); } public List getUserBySessionOnly(final VoteSession voteSession) { @@ -114,12 +115,12 @@ public void removeVoteUser(VoteQueUsr voteUser) { getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); - this.getHibernateTemplate().delete(voteUser); + this.getSession().delete(voteUser); } public int getTotalNumberOfUsers() { String query = "from obj in class VoteQueUsr"; - return this.getHibernateTemplate().find(query).size(); + return this.doFind(query).size(); } } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java,v diff -u -r1.40.2.2 -r1.40.2.3 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java 12 Sep 2014 22:43:35 -0000 1.40.2.2 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java 1 Dec 2014 21:08:29 -0000 1.40.2.3 @@ -29,17 +29,18 @@ import java.util.Set; import org.hibernate.FlushMode; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.vote.dao.IVoteUsrAttemptDAO; import org.lamsfoundation.lams.tool.vote.pojos.VoteUsrAttempt; -import org.springframework.orm.hibernate4.HibernateTemplate; -import org.springframework.orm.hibernate4.support.HibernateDaoSupport; +import org.springframework.stereotype.Repository; /** * Hibernate implementation for database access to VoteUsrAttemptDAO for the voting tool. * * @author Ozgur Demirtas repaired by lfoxton */ -public class VoteUsrAttemptDAO extends HibernateDaoSupport implements IVoteUsrAttemptDAO { +@Repository +public class VoteUsrAttemptDAO extends LAMSBaseDAO implements IVoteUsrAttemptDAO { private static final String LOAD_ATTEMPT_FOR_USER = "from voteUsrAttempt in class VoteUsrAttempt where voteUsrAttempt.queUsrId=:queUsrId"; @@ -81,7 +82,7 @@ @Override public void saveVoteUsrAttempt(VoteUsrAttempt voteUsrAttempt) { - this.getHibernateTemplate().save(voteUsrAttempt); + this.getSession().save(voteUsrAttempt); } @Override @@ -137,7 +138,6 @@ @Override public void removeAttemptsForUserandSession(final Long queUsrId, final Long sessionUid) { String strGetUser = "from voteUsrAttempt in class VoteUsrAttempt where voteUsrAttempt.queUsrId=:queUsrId and voteUsrAttempt.voteQueUsr.voteSession.uid=:sessionUid"; - HibernateTemplate templ = this.getHibernateTemplate(); List list = getSessionFactory().getCurrentSession().createQuery(strGetUser).setLong("queUsrId", queUsrId.longValue()) .setLong("sessionUid", sessionUid).list(); @@ -146,8 +146,8 @@ while (listIterator.hasNext()) { VoteUsrAttempt attempt = listIterator.next(); getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); - templ.delete(attempt); - templ.flush(); + getSession().delete(attempt); + getSession().flush(); } } } @@ -268,12 +268,12 @@ @Override public void updateVoteUsrAttempt(VoteUsrAttempt voteUsrAttempt) { getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); - this.getHibernateTemplate().update(voteUsrAttempt); + this.getSession().update(voteUsrAttempt); } @Override public void removeVoteUsrAttempt(VoteUsrAttempt voteUsrAttempt) { getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); - this.getHibernateTemplate().delete(voteUsrAttempt); + this.getSession().delete(voteUsrAttempt); } } \ No newline at end of file