Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaConfigItemDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaConfigItemDAO.java,v diff -u -r1.2.2.1 -r1.2.2.2 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaConfigItemDAO.java 15 Aug 2014 09:58:31 -0000 1.2.2.1 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaConfigItemDAO.java 29 Nov 2014 20:03:17 -0000 1.2.2.2 @@ -23,30 +23,25 @@ /* $Id$ */ package org.lamsfoundation.lams.tool.qa.dao.hibernate; -import org.hibernate.HibernateException; -import org.hibernate.Session; -import org.lamsfoundation.lams.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.qa.QaConfigItem; import org.lamsfoundation.lams.tool.qa.dao.IQaConfigItemDAO; -import org.springframework.orm.hibernate4.HibernateCallback; +import org.springframework.stereotype.Repository; -public class QaConfigItemDAO extends BaseDAO implements IQaConfigItemDAO { +@Repository +public class QaConfigItemDAO extends LAMSBaseDAO implements IQaConfigItemDAO { private static final String LOAD_CONFIG_ITEM_BY_KEY = "from QaConfigItem configuration" + " where configuration.configKey=:key"; public QaConfigItem getConfigItemByKey(final String configKey) { - return (QaConfigItem) getHibernateTemplate().execute(new HibernateCallback() { - public Object doInHibernate(Session session) throws HibernateException { - return session.createQuery(LOAD_CONFIG_ITEM_BY_KEY).setString("key", configKey).uniqueResult(); - } - }); + return (QaConfigItem) getSession().createQuery(LOAD_CONFIG_ITEM_BY_KEY).setString("key", configKey) + .uniqueResult(); + } - } + public void saveOrUpdate(QaConfigItem qaConfigItem) { + getSession().saveOrUpdate(qaConfigItem); + getSession().flush(); + } - public void saveOrUpdate(QaConfigItem qaConfigItem) { - this.getHibernateTemplate().saveOrUpdate(qaConfigItem); - this.getHibernateTemplate().flush(); - } - } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaContentDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaContentDAO.java,v diff -u -r1.26.2.2 -r1.26.2.3 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaContentDAO.java 2 Sep 2014 17:19:45 -0000 1.26.2.2 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaContentDAO.java 29 Nov 2014 20:03:17 -0000 1.26.2.3 @@ -27,23 +27,22 @@ import java.util.Set; import org.hibernate.FlushMode; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.qa.QaCondition; import org.lamsfoundation.lams.tool.qa.QaContent; import org.lamsfoundation.lams.tool.qa.QaQueContent; import org.lamsfoundation.lams.tool.qa.dao.IQaContentDAO; -import org.springframework.orm.hibernate4.HibernateTemplate; -import org.springframework.orm.hibernate4.support.HibernateDaoSupport; +import org.springframework.stereotype.Repository; /** * @author Ozgur Demirtas * */ +@Repository +public class QaContentDAO extends LAMSBaseDAO implements IQaContentDAO { -public class QaContentDAO extends HibernateDaoSupport implements IQaContentDAO { - public QaContent getQaByContentId(long qaId) { String query = "from QaContent as qa where qa.qaContentId = ?"; - HibernateTemplate templ = this.getHibernateTemplate(); List list = getSessionFactory().getCurrentSession().createQuery(query).setLong(0, qaId).list(); if (list != null && list.size() > 0) { @@ -55,40 +54,40 @@ public void updateQa(QaContent qa) { getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); - this.getHibernateTemplate().update(qa); + getSession().update(qa); } public void saveQa(QaContent qa) { getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); - this.getHibernateTemplate().save(qa); + getSession().save(qa); } public void saveOrUpdateQa(QaContent qa) { getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); - this.getHibernateTemplate().saveOrUpdate(qa); + getSession().saveOrUpdate(qa); } public void createQa(QaContent qa) { getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); - this.getHibernateTemplate().save(qa); + getSession().save(qa); } public void removeAllQaSession(QaContent qaContent) { - this.getHibernateTemplate().deleteAll(qaContent.getQaSessions()); + deleteAll(qaContent.getQaSessions()); } public void removeQa(Long qaContentId) { if (qaContentId != null) { String query = "from qa in class org.lamsfoundation.lams.tool.qa.QaContent" + " where qa.qaContentId = ?"; Object obj = getSessionFactory().getCurrentSession().createQuery(query).setLong(0, qaContentId.longValue()).uniqueResult(); getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); - getHibernateTemplate().delete(obj); + getSession().delete(obj); } } public void deleteQa(QaContent qaContent) { getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); - this.getHibernateTemplate().delete(qaContent); + getSession().delete(qaContent); } public void removeQaById(Long qaId) { @@ -97,19 +96,19 @@ } public void flush() { - this.getHibernateTemplate().flush(); + getSession().flush(); } public void deleteCondition(QaCondition condition) { if (condition != null && condition.getConditionId() != null) { getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); - this.getHibernateTemplate().delete(condition); + getSession().delete(condition); } } public void removeQaContentFromCache(QaContent qaContent) { if (qaContent != null) { - getHibernateTemplate().evict(qaContent); + getSession().evict(qaContent); } } @@ -118,14 +117,14 @@ if (qaContent != null) { for (QaQueContent question : (Set) qaContent.getQaQueContents()) { - getHibernateTemplate().evict(question); + getSession().evict(question); } } } @Override public void delete(Object object) { - getHibernateTemplate().delete(object); + getSession().delete(object); } } \ No newline at end of file Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueUsrDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueUsrDAO.java,v diff -u -r1.26.2.2 -r1.26.2.3 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueUsrDAO.java 12 Sep 2014 22:43:06 -0000 1.26.2.2 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueUsrDAO.java 29 Nov 2014 20:03:17 -0000 1.26.2.3 @@ -28,31 +28,30 @@ import org.apache.log4j.Logger; import org.hibernate.FlushMode; -import org.lamsfoundation.lams.tool.qa.QaContent; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.qa.QaQueUsr; import org.lamsfoundation.lams.tool.qa.QaSession; import org.lamsfoundation.lams.tool.qa.dao.IQaQueUsrDAO; -import org.springframework.orm.hibernate4.HibernateTemplate; -import org.springframework.orm.hibernate4.support.HibernateDaoSupport; +import org.springframework.stereotype.Repository; /** * @author Ozgur Demirtas */ -public class QaQueUsrDAO extends HibernateDaoSupport implements IQaQueUsrDAO { +@Repository +public class QaQueUsrDAO extends LAMSBaseDAO implements IQaQueUsrDAO { private static Logger logger = Logger.getLogger(QaQueUsrDAO.class.getName()); private static final String COUNT_SESSION_USER = "select qaQueUsr.queUsrId from QaQueUsr qaQueUsr where qaQueUsr.qaSession.qaSessionId= :qaSession"; private static final String LOAD_USER_FOR_SESSION = "from qaQueUsr in class QaQueUsr where qaQueUsr.qaSession.qaSessionId= :qaSessionId"; public int countSessionUser(QaSession qaSession) { - return (getHibernateTemplate().findByNamedParam(COUNT_SESSION_USER, "qaSession", qaSession)).size(); + return doFindByNamedParam(COUNT_SESSION_USER, new String[]{"qaSession"}, new Object[]{qaSession}).size(); } public QaQueUsr getQaUserBySession(final Long queUsrId, final Long qaSessionId) { String strGetUser = "from qaQueUsr in class QaQueUsr where qaQueUsr.queUsrId=:queUsrId and qaQueUsr.qaSession.qaSessionId=:qaSessionId"; - HibernateTemplate templ = this.getHibernateTemplate(); - List list = getSessionFactory().getCurrentSession().createQuery(strGetUser).setLong("queUsrId", queUsrId.longValue()).setLong( + List list = getSession().createQuery(strGetUser).setLong("queUsrId", queUsrId.longValue()).setLong( "qaSessionId", qaSessionId.longValue()).list(); if (list != null && list.size() > 0) { @@ -63,25 +62,24 @@ } public List getUserBySessionOnly(final QaSession qaSession) { - HibernateTemplate templ = this.getHibernateTemplate(); - List list = getSessionFactory().getCurrentSession().createQuery(LOAD_USER_FOR_SESSION).setLong("qaSessionId", + List list = getSession().createQuery(LOAD_USER_FOR_SESSION).setLong("qaSessionId", qaSession.getQaSessionId().longValue()).list(); return list; } public void createUsr(QaQueUsr usr) { getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); - this.getHibernateTemplate().save(usr); + getSession().save(usr); } public void updateUsr(QaQueUsr usr) { getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); - this.getHibernateTemplate().update(usr); + getSession().update(usr); } public void deleteQaQueUsr(QaQueUsr qaQueUsr) { getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); - this.getHibernateTemplate().delete(qaQueUsr); + getSession().delete(qaQueUsr); } } \ No newline at end of file Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQuestionDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQuestionDAO.java,v diff -u -r1.5.2.1 -r1.5.2.2 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQuestionDAO.java 15 Aug 2014 09:58:31 -0000 1.5.2.1 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQuestionDAO.java 29 Nov 2014 20:03:17 -0000 1.5.2.2 @@ -27,15 +27,17 @@ import java.util.List; import org.hibernate.FlushMode; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.qa.QaQueContent; import org.lamsfoundation.lams.tool.qa.dao.IQaQuestionDAO; -import org.springframework.orm.hibernate4.support.HibernateDaoSupport; +import org.springframework.stereotype.Repository; /** * @author Ozgur Demirtas * */ -public class QaQuestionDAO extends HibernateDaoSupport implements IQaQuestionDAO { +@Repository +public class QaQuestionDAO extends LAMSBaseDAO implements IQaQuestionDAO { private static final String LOAD_QUESTION_BY_CONTENT_UID = "from qaQuestion in class QaQueContent where qaQuestion.qaContent.uid=:uid"; private static final String LOAD_QUESTION_BY_DISPLAY_ORDER = "from qaQuestion in class QaQueContent where qaQuestion.displayOrder=:displayOrder and qaQuestion.qaContent.uid=:uid"; private static final String LOAD_QUESTION_BY_QUESTION_UID = "from qaQuestion in class QaQueContent where qaQuestion.uid=:uid"; @@ -79,23 +81,23 @@ public void createQueContent(QaQueContent queContent) { getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); - this.getHibernateTemplate().save(queContent); + getSession().save(queContent); } public void saveOrUpdateQaQueContent(QaQueContent qaQuestion) { getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); - this.getHibernateTemplate().saveOrUpdate(qaQuestion); + getSession().saveOrUpdate(qaQuestion); } public void removeQueContent(long qaQueContentId) { - QaQueContent qaQuestion = (QaQueContent) this.getHibernateTemplate().load(QaQueContent.class, + QaQueContent qaQuestion = (QaQueContent) getSession().load(QaQueContent.class, new Long(qaQueContentId)); getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); - this.getHibernateTemplate().delete(qaQuestion); + getSession().delete(qaQuestion); } public void removeQaQueContent(QaQueContent qaQuestion) { getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); - this.getHibernateTemplate().delete(qaQuestion); + getSession().delete(qaQuestion); } } \ No newline at end of file Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaSessionDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaSessionDAO.java,v diff -u -r1.22.2.2 -r1.22.2.3 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaSessionDAO.java 12 Sep 2014 22:43:07 -0000 1.22.2.2 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaSessionDAO.java 29 Nov 2014 20:03:17 -0000 1.22.2.3 @@ -26,16 +26,17 @@ import java.util.List; import org.hibernate.FlushMode; -import org.lamsfoundation.lams.tool.qa.QaContent; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.qa.QaSession; import org.lamsfoundation.lams.tool.qa.dao.IQaSessionDAO; -import org.springframework.orm.hibernate4.support.HibernateDaoSupport; +import org.springframework.stereotype.Repository; /** * @author Ozgur Demirtas * */ -public class QaSessionDAO extends HibernateDaoSupport implements IQaSessionDAO { +@Repository +public class QaSessionDAO extends LAMSBaseDAO implements IQaSessionDAO { /** * @see org.lamsfoundation.lams.tool.survey.dao.interfaces.ISurveySessionDAO#getSurveySessionById(long) @@ -56,23 +57,23 @@ */ public void createSession(QaSession session) { getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); - this.getHibernateTemplate().save(session); + getSession().save(session); } /** * @see org.lamsfoundation.lams.tool.survey.dao.interfaces.ISurveySessionDAO#UpdateSurveySession(com.lamsinternational.tool.survey.domain.SurveySession) */ public void UpdateQaSession(QaSession session) { getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); - this.getHibernateTemplate().update(session); + getSession().update(session); } /** * @see org.lamsfoundation.lams.tool.survey.dao.interfaces.ISurveySessionDAO#deleteSurveySession(com.lamsinternational.tool.survey.domain.SurveySession) */ public void deleteQaSession(QaSession qaSession) { getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); - this.getHibernateTemplate().delete(qaSession); + getSession().delete(qaSession); } } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java,v diff -u -r1.18.2.3 -r1.18.2.4 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java 12 Sep 2014 22:43:07 -0000 1.18.2.3 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java 29 Nov 2014 20:03:17 -0000 1.18.2.4 @@ -25,18 +25,18 @@ import java.util.List; -import org.apache.poi.ss.formula.functions.Rate; import org.hibernate.FlushMode; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.qa.QaAppConstants; import org.lamsfoundation.lams.tool.qa.QaUsrResp; -import org.lamsfoundation.lams.tool.qa.ResponseRating; import org.lamsfoundation.lams.tool.qa.dao.IQaUsrRespDAO; -import org.springframework.orm.hibernate4.support.HibernateDaoSupport; +import org.springframework.stereotype.Repository; /** * @author Ozgur Demirtas */ -public class QaUsrRespDAO extends HibernateDaoSupport implements IQaUsrRespDAO { +@Repository +public class QaUsrRespDAO extends LAMSBaseDAO implements IQaUsrRespDAO { private static final String LOAD_ATTEMPT_FOR_USER_AND_QUESTION = "from qaUsrResp in class QaUsrResp " + "where qaUsrResp.qaQueUser.queUsrId=:queUsrId and qaUsrResp.qaQuestion.uid=:questionId"; @@ -61,25 +61,25 @@ + " as r where r.qaQueUser.qaSession.qaSessionId=? and r.qaQuestion.uid=? AND r.qaQueUser.queUsrId!=?"; public void createUserResponse(QaUsrResp qaUsrResp) { - getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); - this.getHibernateTemplate().save(qaUsrResp); + getSession().setFlushMode(FlushMode.AUTO); + getSession().save(qaUsrResp); } public QaUsrResp getResponseById(Long responseId) { - return (QaUsrResp) this.getHibernateTemplate().get(QaUsrResp.class, responseId); + return (QaUsrResp) getSession().get(QaUsrResp.class, responseId); } /** * @see org.lamsfoundation.lams.tool.qa.dao.IQaUsrRespDAO#updateUserResponse(org.lamsfoundation.lams.tool.qa.QaUsrResp) */ public void updateUserResponse(QaUsrResp resp) { getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); - this.getHibernateTemplate().update(resp); + getSession().update(resp); } public void removeUserResponse(QaUsrResp resp) { getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); - this.getHibernateTemplate().delete(resp); + getSession().delete(resp); } @Override @@ -151,7 +151,7 @@ public int getCountResponsesByQaContent(final Long qaContentId) { - List list = getHibernateTemplate().find(GET_COUNT_RESPONSES_BY_QACONTENT, new Object[] { qaContentId }); + List list = doFind(GET_COUNT_RESPONSES_BY_QACONTENT, new Object[] { qaContentId }); if (list == null || list.size() == 0) { return 0; } @@ -160,7 +160,7 @@ public int getCountResponsesBySessionAndQuestion(final Long qaSessionId, final Long questionId, final Long excludeUserId) { - List list = getHibernateTemplate().find(GET_COUNT_RESPONSES_FOR_SESSION_AND_QUESTION, + List list = doFind(GET_COUNT_RESPONSES_FOR_SESSION_AND_QUESTION, new Object[] { qaSessionId, questionId, excludeUserId }); if (list == null || list.size() == 0) { return 0; Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaWizardDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaWizardDAO.java,v diff -u -r1.3.10.2 -r1.3.10.3 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaWizardDAO.java 15 Aug 2014 10:03:08 -0000 1.3.10.2 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaWizardDAO.java 29 Nov 2014 20:03:17 -0000 1.3.10.3 @@ -27,18 +27,20 @@ import java.util.SortedSet; import java.util.TreeSet; -import org.lamsfoundation.lams.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.qa.QaWizardCategory; import org.lamsfoundation.lams.tool.qa.QaWizardCognitiveSkill; import org.lamsfoundation.lams.tool.qa.QaWizardQuestion; import org.lamsfoundation.lams.tool.qa.dao.IQaWizardDAO; +import org.springframework.stereotype.Repository; /** * * @author edited by lfoxton * */ -public class QaWizardDAO extends BaseDAO implements IQaWizardDAO { +@Repository +public class QaWizardDAO extends LAMSBaseDAO implements IQaWizardDAO { private static final String QUERY_FIND_ALL_CATEGORIES = "from " + QaWizardCategory.class.getName(); private static final String QUERY_GET_CATEGORY = "from " + QaWizardCategory.class.getName() + " c where c.uid=?"; @@ -48,15 +50,15 @@ public void saveOrUpdateCategories(SortedSet categories) { if (categories != null) { for (QaWizardCategory category : categories) { - getHibernateTemplate().saveOrUpdate(category); + getSession().saveOrUpdate(category); } } } @SuppressWarnings("unchecked") public SortedSet getWizardCategories() { SortedSet ret = new TreeSet(); - List list = (List) getHibernateTemplate().find(QUERY_FIND_ALL_CATEGORIES); + List list = (List) doFind(QUERY_FIND_ALL_CATEGORIES); for (QaWizardCategory category : list) { ret.add(category); } @@ -67,29 +69,29 @@ QaWizardCategory cat = getWizardCategoryByUID(uid); if (cat != null) { - getHibernateTemplate().delete(cat); + getSession().delete(cat); } } public void deleteWizardSkillByUID(Long uid){ QaWizardCognitiveSkill skill = getWizardSkillByUID(uid); if (skill != null) { - getHibernateTemplate().delete(skill); + getSession().delete(skill); } } public void deleteWizardQuestionByUID(Long uid){ QaWizardQuestion question = getWizardQuestionByUID(uid); if (question != null) { - getHibernateTemplate().delete(question); + getSession().delete(question); } } @SuppressWarnings("unchecked") public QaWizardCategory getWizardCategoryByUID(Long uid) { - List result = getHibernateTemplate().find(QUERY_GET_CATEGORY, uid); + List result = doFind(QUERY_GET_CATEGORY, uid); if (result.size() > 0) { return (QaWizardCategory)result.get(0); @@ -102,7 +104,7 @@ @SuppressWarnings("unchecked") public QaWizardCognitiveSkill getWizardSkillByUID(Long uid){ - List result = getHibernateTemplate().find(QUERY_GET_SKILL, uid); + List result = doFind(QUERY_GET_SKILL, uid); if (result.size() > 0) { return (QaWizardCognitiveSkill)result.get(0); @@ -116,7 +118,7 @@ @SuppressWarnings("unchecked") public QaWizardQuestion getWizardQuestionByUID(Long uid){ - List result = getHibernateTemplate().find(QUERY_GET_QUESTION, uid); + List result = doFind(QUERY_GET_QUESTION, uid); if (result.size() > 0) { return (QaWizardQuestion)result.get(0); @@ -129,7 +131,7 @@ public void deleteAllWizardCategories() { - this.getHibernateTemplate().deleteAll(getWizardCategories()); + deleteAll(getWizardCategories()); } } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/ResponseRatingDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/Attic/ResponseRatingDAO.java,v diff -u -r1.5.2.3 -r1.5.2.4 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/ResponseRatingDAO.java 2 Sep 2014 20:25:32 -0000 1.5.2.3 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/ResponseRatingDAO.java 29 Nov 2014 20:03:17 -0000 1.5.2.4 @@ -30,18 +30,20 @@ import java.util.Map; import org.hibernate.FlushMode; -import org.lamsfoundation.lams.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.qa.ResponseRating; import org.lamsfoundation.lams.tool.qa.dao.IResponseRatingDAO; import org.lamsfoundation.lams.tool.qa.dto.AverageRatingDTO; +import org.springframework.stereotype.Repository; /** * Hibernate implementation of ImageCommentDAO. * * @author Andrey Balan * @see org.lamsfoundation.lams.tool.qa.dao.IResponseRatingDAO */ -public class ResponseRatingDAO extends BaseDAO implements IResponseRatingDAO { +@Repository +public class ResponseRatingDAO extends LAMSBaseDAO implements IResponseRatingDAO { private static final String FIND_BY_RESPONSE_AND_USER = "from " + ResponseRating.class.getName() + " as r where r.user.queUsrId = ? and r.response.responseId=?"; @@ -62,20 +64,20 @@ + " as r where r.user.uid = ?"; public ResponseRating getRatingByResponseAndUser(Long responseId, Long userId) { - List list = getHibernateTemplate().find(FIND_BY_RESPONSE_AND_USER, new Object[] { userId, responseId }); + List list = doFind(FIND_BY_RESPONSE_AND_USER, new Object[] { userId, responseId }); if (list == null || list.size() == 0) return null; return (ResponseRating) list.get(0); } @SuppressWarnings("unchecked") public List getRatingsByResponse(Long responseId) { - return (List) getHibernateTemplate().find(FIND_BY_RESPONSE_ID, responseId); + return (List) doFind(FIND_BY_RESPONSE_ID, responseId); } @SuppressWarnings("unchecked") public AverageRatingDTO getAverageRatingDTOByResponse(Long responseId) { - List list = (List) getHibernateTemplate().find(FIND_AVERAGE_RATING_BY_RESPONSE, new Object[] { responseId }); + List list = (List) doFind(FIND_AVERAGE_RATING_BY_RESPONSE, new Object[] { responseId }); Object[] results = list.get(0); Object averageRatingObj = (results[0] == null) ? 0 : results[0]; @@ -88,7 +90,7 @@ } public Map getAverageRatingDTOByQuestionAndSession(Long questionUid, Long qaSessionId) { - List list = (List) getHibernateTemplate().find(FIND_AVERAGE_RATING_BY_QUESTION_AND_SESSION, new Object[] { questionUid, qaSessionId }); + List list = (List) doFind(FIND_AVERAGE_RATING_BY_QUESTION_AND_SESSION, new Object[] { questionUid, qaSessionId }); Map mapResponseIdToAverageRating = new HashMap(); for (Object[] results : list) { @@ -114,7 +116,7 @@ } public Map getAverageRatingDTOByUserAndContentId(Long userUid, Long contentId) { - List list = (List) getHibernateTemplate().find(FIND_AVERAGE_RATING_BY_USER_AND_CONTENT, new Object[] {userUid, contentId}); + List list = (List) doFind(FIND_AVERAGE_RATING_BY_USER_AND_CONTENT, new Object[] {userUid, contentId}); Map mapResponseIdToAverageRating = new HashMap(); for (Object[] results : list) { @@ -143,13 +145,13 @@ super.insertOrUpdate(o); } - public void removeResponseRating(ResponseRating rating) { - getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); - this.getHibernateTemplate().delete(rating); - } + public void removeResponseRating(ResponseRating rating) { + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); + getSession().delete(rating); + } - @SuppressWarnings("unchecked") - public List getRatingsByUser(Long userUid) { - return (List) getHibernateTemplate().find(FIND_BY_USER_UID, userUid); - } + @SuppressWarnings("unchecked") + public List getRatingsByUser(Long userUid) { + return (List) doFind(FIND_BY_USER_UID, userUid); + } } \ No newline at end of file