Index: lams_common/src/java/org/lamsfoundation/lams/dao/hibernate/LAMSBaseDAO.java =================================================================== diff -u -r960247c083ad773763e34eb4f12f4a41748bd427 -r4b2ee37c3271b4bbfd17604063031fff036ade22 --- lams_common/src/java/org/lamsfoundation/lams/dao/hibernate/LAMSBaseDAO.java (.../LAMSBaseDAO.java) (revision 960247c083ad773763e34eb4f12f4a41748bd427) +++ lams_common/src/java/org/lamsfoundation/lams/dao/hibernate/LAMSBaseDAO.java (.../LAMSBaseDAO.java) (revision 4b2ee37c3271b4bbfd17604063031fff036ade22) @@ -553,4 +553,35 @@ return queryObject.list(); } + + + /** + * @see com.edgenius.paradise.dao.DAO#saveObject(java.lang.Object) + */ + public void saveObject(Object o) { + getSession().saveOrUpdate(o); + } + + /** + * @see com.edgenius.paradise.dao.DAO#getObject(java.lang.Class, java.io.Serializable) + */ + public Object getObject(Class clazz, Serializable id) { + Object o = getSession().get(clazz, id); + return o; + } + + /** + * @see com.edgenius.paradise.dao.DAO#getObjects(java.lang.Class) + */ + public List getObjects(Class clazz) { + return loadAll(clazz); + } + + /** + * @see com.edgenius.paradise.dao.DAO#removeObject(java.lang.Class, java.io.Serializable) + */ + public void removeObject(Class clazz, Serializable id) { + getSession().delete(getObject(clazz, id)); + } + } Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentDAOHibernate.java =================================================================== diff -u -rc56857991e269aa7f5bd250a05b52c767a9957ad -r4b2ee37c3271b4bbfd17604063031fff036ade22 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentDAOHibernate.java (.../AssessmentDAOHibernate.java) (revision c56857991e269aa7f5bd250a05b52c767a9957ad) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentDAOHibernate.java (.../AssessmentDAOHibernate.java) (revision 4b2ee37c3271b4bbfd17604063031fff036ade22) @@ -25,33 +25,36 @@ import java.util.List; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.assessment.dao.AssessmentDAO; import org.lamsfoundation.lams.tool.assessment.model.Assessment; +import org.springframework.stereotype.Repository; /** * * @author Andrey Balan * * @version $Revision$ */ -public class AssessmentDAOHibernate extends BaseDAOHibernate implements AssessmentDAO { +@Repository +public class AssessmentDAOHibernate extends LAMSBaseDAO implements AssessmentDAO { private static final String GET_RESOURCE_BY_CONTENTID = "from " + Assessment.class.getName() + " as r where r.contentId=?"; - public Assessment getByContentId(Long contentId) { - List list = getHibernateTemplate().find(GET_RESOURCE_BY_CONTENTID, contentId); - if (list.size() > 0) - return (Assessment) list.get(0); - else - return null; - } + public Assessment getByContentId(Long contentId) { + List list = doFind(GET_RESOURCE_BY_CONTENTID, contentId); + if (list.size() > 0) + return (Assessment) list.get(0); + else + return null; + } - public Assessment getByUid(Long assessmentUid) { - return (Assessment) getObject(Assessment.class, assessmentUid); - } + public Assessment getByUid(Long assessmentUid) { + return (Assessment) getObject(Assessment.class, assessmentUid); + } public void delete(Assessment assessment) { - this.getHibernateTemplate().delete(assessment); + getSession().delete(assessment); } } Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentQuestionDAOHibernate.java =================================================================== diff -u -r2a68a250e3ae88b708a9a2a91e9f3439a4b6d7a9 -r4b2ee37c3271b4bbfd17604063031fff036ade22 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentQuestionDAOHibernate.java (.../AssessmentQuestionDAOHibernate.java) (revision 2a68a250e3ae88b708a9a2a91e9f3439a4b6d7a9) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentQuestionDAOHibernate.java (.../AssessmentQuestionDAOHibernate.java) (revision 4b2ee37c3271b4bbfd17604063031fff036ade22) @@ -25,25 +25,27 @@ import java.util.List; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.assessment.dao.AssessmentQuestionDAO; import org.lamsfoundation.lams.tool.assessment.model.AssessmentQuestion; +import org.springframework.stereotype.Repository; -public class AssessmentQuestionDAOHibernate extends BaseDAOHibernate implements AssessmentQuestionDAO { +@Repository +public class AssessmentQuestionDAOHibernate extends LAMSBaseDAO implements AssessmentQuestionDAO { private static final String FIND_AUTHORING_QUESTIONS = "from " + AssessmentQuestion.class.getName() + " where assessment_uid = ? order by create_date asc"; - public List getAuthoringQuestions(Long assessmentUid) { + public List getAuthoringQuestions(Long assessmentUid) { + return doFind(FIND_AUTHORING_QUESTIONS, assessmentUid); + } - return this.getHibernateTemplate().find(FIND_AUTHORING_QUESTIONS, assessmentUid); - } - - public AssessmentQuestion getByUid(Long assessmentQuestionUid) { - return (AssessmentQuestion) this.getObject(AssessmentQuestion.class, assessmentQuestionUid); - } + public AssessmentQuestion getByUid(Long assessmentQuestionUid) { + return (AssessmentQuestion) this.getObject(AssessmentQuestion.class, assessmentQuestionUid); + } - public void evict(Object o) { - getHibernateTemplate().evict(o); - } + public void evict(Object o) { + getSession().evict(o); + } } Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentQuestionResultDAOHibernate.java =================================================================== diff -u -rdddbf25808c13f826def546984fe6835a4782a0a -r4b2ee37c3271b4bbfd17604063031fff036ade22 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentQuestionResultDAOHibernate.java (.../AssessmentQuestionResultDAOHibernate.java) (revision dddbf25808c13f826def546984fe6835a4782a0a) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentQuestionResultDAOHibernate.java (.../AssessmentQuestionResultDAOHibernate.java) (revision 4b2ee37c3271b4bbfd17604063031fff036ade22) @@ -25,15 +25,15 @@ import java.util.List; -import org.hibernate.HibernateException; import org.hibernate.Query; -import org.hibernate.Session; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.assessment.dao.AssessmentQuestionResultDAO; import org.lamsfoundation.lams.tool.assessment.model.AssessmentQuestionResult; import org.lamsfoundation.lams.tool.assessment.model.AssessmentResult; -import org.springframework.orm.hibernate4.HibernateCallback; +import org.springframework.stereotype.Repository; -public class AssessmentQuestionResultDAOHibernate extends BaseDAOHibernate implements AssessmentQuestionResultDAO { +@Repository +public class AssessmentQuestionResultDAOHibernate extends LAMSBaseDAO implements AssessmentQuestionResultDAO { private static final String FIND_BY_UID = "FROM " + AssessmentQuestionResult.class.getName() + " AS r WHERE r.uid = ?"; @@ -61,7 +61,7 @@ @Override public int getNumberWrongAnswersDoneBefore(Long assessmentUid, Long userId, Long questionUid) { - List list = getHibernateTemplate().find(FIND_WRONG_ANSWERS_NUMBER, + List list = doFind(FIND_WRONG_ANSWERS_NUMBER, new Object[] { assessmentUid, userId, questionUid }); if (list == null || list.size() == 0) { return 0; @@ -73,33 +73,27 @@ @Override @SuppressWarnings("unchecked") public List getAssessmentQuestionResultList(Long assessmentUid, Long userId, Long questionUid) { - return (List) getHibernateTemplate().find(FIND_BY_ASSESSMENT_QUESTION_AND_USER, + return (List) doFind(FIND_BY_ASSESSMENT_QUESTION_AND_USER, new Object[] { assessmentUid, userId, questionUid }); } @Override public AssessmentQuestionResult getAssessmentQuestionResultByUid(Long questionResultUid) { - List list = getHibernateTemplate().find(FIND_BY_UID, new Object[] { questionResultUid }); + List list = doFind(FIND_BY_UID, new Object[] { questionResultUid }); if (list == null || list.size() == 0) return null; return (AssessmentQuestionResult) list.get(0); } @Override public Float getQuestionResultMark(Long assessmentUid, Long userId, int questionSequenceId) { - - return getHibernateTemplate().execute(new HibernateCallback() { - @Override - public Float doInHibernate(Session session) throws HibernateException { - Query q = session.createQuery(GET_ANSWER_MARK); - q.setParameter(0, assessmentUid); - q.setParameter(1, userId); - q.setParameter(2, questionSequenceId); - q.setMaxResults(1); - Object result = q.uniqueResult(); - return result != null ? ((Number) result).floatValue() : null; - } - }); - + Query q = getSession().createQuery(GET_ANSWER_MARK); + q.setParameter(0, assessmentUid); + q.setParameter(1, userId); + q.setParameter(2, questionSequenceId); + q.setMaxResults(1); + Object result = q.uniqueResult(); + return result != null ? ((Number) result).floatValue() : null; + } } Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java =================================================================== diff -u -rdddbf25808c13f826def546984fe6835a4782a0a -r4b2ee37c3271b4bbfd17604063031fff036ade22 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java (.../AssessmentResultDAOHibernate.java) (revision dddbf25808c13f826def546984fe6835a4782a0a) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java (.../AssessmentResultDAOHibernate.java) (revision 4b2ee37c3271b4bbfd17604063031fff036ade22) @@ -28,11 +28,13 @@ import org.hibernate.HibernateException; import org.hibernate.Query; import org.hibernate.Session; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.assessment.dao.AssessmentResultDAO; import org.lamsfoundation.lams.tool.assessment.model.AssessmentResult; -import org.springframework.orm.hibernate4.HibernateCallback; +import org.springframework.stereotype.Repository; -public class AssessmentResultDAOHibernate extends BaseDAOHibernate implements AssessmentResultDAO { +@Repository +public class AssessmentResultDAOHibernate extends LAMSBaseDAO implements AssessmentResultDAO { private static final String FIND_BY_ASSESSMENT_AND_USER = "FROM " + AssessmentResult.class.getName() + " AS r WHERE r.user.userId = ? AND r.assessment.uid=? ORDER BY r.startDate DESC"; @@ -69,51 +71,39 @@ @Override @SuppressWarnings("unchecked") public List getAssessmentResults(Long assessmentUid, Long userId) { - return (List) getHibernateTemplate().find(FIND_BY_ASSESSMENT_AND_USER_AND_FINISHED, - new Object[] { userId, assessmentUid }); + return (List) doFind(FIND_BY_ASSESSMENT_AND_USER_AND_FINISHED, new Object[] { userId, + assessmentUid }); } @Override @SuppressWarnings("unchecked") public List getAssessmentResultsBySession(Long sessionId, Long userId) { - return (List) getHibernateTemplate().find(FIND_BY_SESSION_AND_USER_AND_FINISHED, + return (List) doFind(FIND_BY_SESSION_AND_USER_AND_FINISHED, new Object[] { userId, sessionId }); } @Override public AssessmentResult getLastAssessmentResult(Long assessmentUid, Long userId) { - - return getHibernateTemplate().execute(new HibernateCallback() { - @Override - public AssessmentResult doInHibernate(Session session) throws HibernateException { - Query q = session.createQuery(FIND_BY_ASSESSMENT_AND_USER); - q.setParameter(0, userId); - q.setParameter(1, assessmentUid); - q.setMaxResults(1); - return (AssessmentResult) q.uniqueResult(); - } - }); + Query q = getSession().createQuery(FIND_BY_ASSESSMENT_AND_USER); + q.setParameter(0, userId); + q.setParameter(1, assessmentUid); + q.setMaxResults(1); + return (AssessmentResult) q.uniqueResult(); } @Override public AssessmentResult getLastFinishedAssessmentResult(Long assessmentUid, Long userId) { - - return getHibernateTemplate().execute(new HibernateCallback() { - @Override - public AssessmentResult doInHibernate(Session session) throws HibernateException { - Query q = session.createQuery(FIND_BY_ASSESSMENT_AND_USER_AND_FINISHED_LIMIT1); - q.setParameter(0, userId); - q.setParameter(1, assessmentUid); - q.setMaxResults(1); - return (AssessmentResult) q.uniqueResult(); - } - }); - + + Query q = getSession().createQuery(FIND_BY_ASSESSMENT_AND_USER_AND_FINISHED_LIMIT1); + q.setParameter(0, userId); + q.setParameter(1, assessmentUid); + q.setMaxResults(1); + return (AssessmentResult) q.uniqueResult(); } @Override public Float getLastFinishedAssessmentResultGrade(Long assessmentUid, Long userId) { - List list = getHibernateTemplate().find(FIND_ASSESSMENT_RESULT_GRADE, new Object[] { userId, assessmentUid }); + List list = doFind(FIND_ASSESSMENT_RESULT_GRADE, new Object[] { userId, assessmentUid }); if (list == null || list.size() == 0) { return null; } else { @@ -128,8 +118,7 @@ + AssessmentResult.class.getName() + " AS r WHERE r.user.userId=? AND r.assessment.uid=? AND (r.finishDate != null)"; - List list = getHibernateTemplate().find(FIND_ASSESSMENT_RESULT_TIME_TAKEN, - new Object[] { userId, assessmentUid }); + List list = doFind(FIND_ASSESSMENT_RESULT_TIME_TAKEN, new Object[] { userId, assessmentUid }); if (list == null || list.size() == 0) { return null; } else { @@ -139,24 +128,16 @@ @Override public AssessmentResult getLastFinishedAssessmentResultBySessionId(Long sessionId, Long userId) { - - return getHibernateTemplate().execute(new HibernateCallback() { - @Override - public AssessmentResult doInHibernate(Session session) throws HibernateException { - Query q = session.createQuery(FIND_BY_SESSION_AND_USER_AND_FINISHED_LIMIT1); - q.setParameter(0, userId); - q.setParameter(1, sessionId); - q.setMaxResults(1); - return (AssessmentResult) q.uniqueResult(); - } - }); - + Query q = getSession().createQuery(FIND_BY_SESSION_AND_USER_AND_FINISHED_LIMIT1); + q.setParameter(0, userId); + q.setParameter(1, sessionId); + q.setMaxResults(1); + return (AssessmentResult) q.uniqueResult(); } @Override public int getAssessmentResultCount(Long assessmentUid, Long userId) { - List list = getHibernateTemplate().find(FIND_ASSESSMENT_RESULT_COUNT_BY_ASSESSMENT_AND_USER, - new Object[] { userId, assessmentUid }); + List list = doFind(FIND_ASSESSMENT_RESULT_COUNT_BY_ASSESSMENT_AND_USER, new Object[] { userId, assessmentUid }); if (list == null || list.size() == 0) { return 0; } else { @@ -166,7 +147,7 @@ @Override public AssessmentResult getAssessmentResultByUid(Long assessmentResultUid) { - List list = getHibernateTemplate().find(FIND_BY_UID, new Object[] { assessmentResultUid }); + List list = doFind(FIND_BY_UID, new Object[] { assessmentResultUid }); if (list == null || list.size() == 0) return null; return (AssessmentResult) list.get(0); Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentSessionDAOHibernate.java =================================================================== diff -u -r2aaccb954583cd8431759dca8e912a8fe863aa0e -r4b2ee37c3271b4bbfd17604063031fff036ade22 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentSessionDAOHibernate.java (.../AssessmentSessionDAOHibernate.java) (revision 2aaccb954583cd8431759dca8e912a8fe863aa0e) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentSessionDAOHibernate.java (.../AssessmentSessionDAOHibernate.java) (revision 4b2ee37c3271b4bbfd17604063031fff036ade22) @@ -25,34 +25,37 @@ import java.util.List; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.assessment.dao.AssessmentSessionDAO; import org.lamsfoundation.lams.tool.assessment.model.AssessmentSession; +import org.springframework.stereotype.Repository; -public class AssessmentSessionDAOHibernate extends BaseDAOHibernate implements AssessmentSessionDAO { +@Repository +public class AssessmentSessionDAOHibernate extends LAMSBaseDAO implements AssessmentSessionDAO { private static final String FIND_BY_SESSION_ID = "from " + AssessmentSession.class.getName() + " as p where p.sessionId=?"; private static final String FIND_BY_CONTENT_ID = "from " + AssessmentSession.class.getName() + " as p where p.assessment.contentId=? order by p.sessionName asc"; - public AssessmentSession getSessionBySessionId(Long sessionId) { - List list = getHibernateTemplate().find(FIND_BY_SESSION_ID, sessionId); - if (list == null || list.size() == 0) - return null; - return (AssessmentSession) list.get(0); - } + public AssessmentSession getSessionBySessionId(Long sessionId) { + List list = doFind(FIND_BY_SESSION_ID, sessionId); + if (list == null || list.size() == 0) + return null; + return (AssessmentSession) list.get(0); + } - @SuppressWarnings("unchecked") - public List getByContentId(Long toolContentId) { - return (List) getHibernateTemplate().find(FIND_BY_CONTENT_ID, toolContentId); - } + @SuppressWarnings("unchecked") + public List getByContentId(Long toolContentId) { + return (List) doFind(FIND_BY_CONTENT_ID, toolContentId); + } - public void delete(AssessmentSession session) { - this.getHibernateTemplate().delete(session); - } + public void delete(AssessmentSession session) { + getSession().delete(session); + } - public void deleteBySessionId(Long toolSessionId) { - this.removeObject(AssessmentSession.class, toolSessionId); - } + public void deleteBySessionId(Long toolSessionId) { + this.removeObject(AssessmentSession.class, toolSessionId); + } } Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java =================================================================== diff -u -r2aaccb954583cd8431759dca8e912a8fe863aa0e -r4b2ee37c3271b4bbfd17604063031fff036ade22 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java (.../AssessmentUserDAOHibernate.java) (revision 2aaccb954583cd8431759dca8e912a8fe863aa0e) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java (.../AssessmentUserDAOHibernate.java) (revision 4b2ee37c3271b4bbfd17604063031fff036ade22) @@ -25,10 +25,13 @@ import java.util.List; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.assessment.dao.AssessmentUserDAO; import org.lamsfoundation.lams.tool.assessment.model.AssessmentUser; +import org.springframework.stereotype.Repository; -public class AssessmentUserDAOHibernate extends BaseDAOHibernate implements AssessmentUserDAO { +@Repository +public class AssessmentUserDAOHibernate extends LAMSBaseDAO implements AssessmentUserDAO { private static final String FIND_BY_USER_ID_CONTENT_ID = "from " + AssessmentUser.class.getName() + " as u where u.userId =? and u.assessment.contentId=?"; @@ -37,23 +40,23 @@ private static final String FIND_BY_SESSION_ID = "from " + AssessmentUser.class.getName() + " as u where u.session.sessionId=?"; - public AssessmentUser getUserByUserIDAndSessionID(Long userID, Long sessionId) { - List list = this.getHibernateTemplate().find(FIND_BY_USER_ID_SESSION_ID, new Object[] { userID, sessionId }); - if (list == null || list.size() == 0) - return null; - return (AssessmentUser) list.get(0); - } + public AssessmentUser getUserByUserIDAndSessionID(Long userID, Long sessionId) { + List list = doFind(FIND_BY_USER_ID_SESSION_ID, new Object[] { userID, sessionId }); + if (list == null || list.size() == 0) + return null; + return (AssessmentUser) list.get(0); + } - public AssessmentUser getUserByUserIDAndContentID(Long userId, Long contentId) { - List list = this.getHibernateTemplate().find(FIND_BY_USER_ID_CONTENT_ID, new Object[] { userId, contentId }); - if (list == null || list.size() == 0) - return null; - return (AssessmentUser) list.get(0); - } + public AssessmentUser getUserByUserIDAndContentID(Long userId, Long contentId) { + List list = doFind(FIND_BY_USER_ID_CONTENT_ID, new Object[] { userId, contentId }); + if (list == null || list.size() == 0) + return null; + return (AssessmentUser) list.get(0); + } - @SuppressWarnings("unchecked") - public List getBySessionID(Long sessionId) { - return (List) this.getHibernateTemplate().find(FIND_BY_SESSION_ID, sessionId); - } + @SuppressWarnings("unchecked") + public List getBySessionID(Long sessionId) { + return (List) this.doFind(FIND_BY_SESSION_ID, sessionId); + } } Fisheye: Tag 4b2ee37c3271b4bbfd17604063031fff036ade22 refers to a dead (removed) revision in file `lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/BaseDAOHibernate.java'. Fisheye: No comparison available. Pass `N' to diff?