Fisheye: Tag 4754486f832fd32e8456943aa277d7b65c7520af refers to a dead (removed) revision in file `lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/BaseDAOHibernate.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyAnswerDAOHibernate.java =================================================================== diff -u -r098d686653002409f33aff0f69b1183e07c1eab3 -r4754486f832fd32e8456943aa277d7b65c7520af --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyAnswerDAOHibernate.java (.../SurveyAnswerDAOHibernate.java) (revision 098d686653002409f33aff0f69b1183e07c1eab3) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyAnswerDAOHibernate.java (.../SurveyAnswerDAOHibernate.java) (revision 4754486f832fd32e8456943aa277d7b65c7520af) @@ -24,14 +24,14 @@ import java.util.List; -import org.hibernate.HibernateException; -import org.hibernate.Session; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.survey.SurveyConstants; import org.lamsfoundation.lams.tool.survey.dao.SurveyAnswerDAO; import org.lamsfoundation.lams.tool.survey.model.SurveyAnswer; -import org.springframework.orm.hibernate4.HibernateCallback; +import org.springframework.stereotype.Repository; -public class SurveyAnswerDAOHibernate extends BaseDAOHibernate implements SurveyAnswerDAO { +@Repository +public class SurveyAnswerDAOHibernate extends LAMSBaseDAO implements SurveyAnswerDAO { private static final String GET_LEARNER_ANSWER = "FROM " + SurveyAnswer.class.getName() + " AS a WHERE a.surveyQuestion.uid=? AND a.user.uid=?"; private static final String GET_SESSION_ANSWER = "FROM " + SurveyAnswer.class.getName() + " AS a " @@ -50,7 +50,7 @@ @Override public SurveyAnswer getAnswer(Long questionUid, Long userUid) { - List list = getHibernateTemplate().find(GET_LEARNER_ANSWER, new Object[] { questionUid, userUid }); + List list = doFind(GET_LEARNER_ANSWER, new Object[] { questionUid, userUid }); if (list.size() > 0) return (SurveyAnswer) list.get(0); else @@ -59,46 +59,41 @@ @SuppressWarnings("unchecked") public List getSessionAnswer(Long sessionId, Long questionUid) { - return (List) getHibernateTemplate().find(GET_SESSION_ANSWER, + return (List) doFind(GET_SESSION_ANSWER, new Object[] { sessionId, questionUid }); } @SuppressWarnings("unchecked") public List getByToolContentIdAndUserId(Long toolContentId, Long userId) { - return (List) getHibernateTemplate().find(GET_BY_TOOL_CONTENT_ID_AND_USER_ID, + return (List) doFind(GET_BY_TOOL_CONTENT_ID_AND_USER_ID, new Object[] { toolContentId, userId }); } - @Override - public List getOpenResponsesForTablesorter(final Long sessionId, final Long questionUid, final int page, - final int size, final int sorting) { - String sortingOrder = ""; - switch (sorting) { - case SurveyConstants.SORT_BY_DEAFAULT: - sortingOrder = "r.updateDate"; - break; - case SurveyConstants.SORT_BY_ANSWER_ASC: - sortingOrder = "r.answerText ASC"; - break; - case SurveyConstants.SORT_BY_ANSWER_DESC: - sortingOrder = "r.answerText DESC"; - break; + @Override + public List getOpenResponsesForTablesorter(final Long sessionId, final Long questionUid, final int page, + final int size, final int sorting) { + String sortingOrder = ""; + switch (sorting) { + case SurveyConstants.SORT_BY_DEAFAULT: + sortingOrder = "r.updateDate"; + break; + case SurveyConstants.SORT_BY_ANSWER_ASC: + sortingOrder = "r.answerText ASC"; + break; + case SurveyConstants.SORT_BY_ANSWER_DESC: + sortingOrder = "r.answerText DESC"; + break; + } + final String sqlQuery = LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION_LIMIT + sortingOrder; + + return (List) getSession().createQuery(sqlQuery).setLong("sessionId", sessionId.longValue()) + .setLong("questionUid", questionUid.longValue()).setFirstResult(page * size).setMaxResults(size).list(); } - final String sqlQuery = LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION_LIMIT + sortingOrder; - return (List) getHibernateTemplate().execute(new HibernateCallback() { - public Object doInHibernate(Session session) throws HibernateException { - return session.createQuery(sqlQuery).setLong("sessionId", sessionId.longValue()) - .setLong("questionUid", questionUid.longValue()).setFirstResult(page * size) - .setMaxResults(size).list(); - } - }); - } - @Override public int getCountResponsesBySessionAndQuestion(final Long sessionId, final Long questionId) { - List list = getHibernateTemplate().find(GET_COUNT_RESPONSES_FOR_SESSION_AND_QUESTION, + List list = doFind(GET_COUNT_RESPONSES_FOR_SESSION_AND_QUESTION, new Object[] { sessionId, questionId }); if (list == null || list.size() == 0) { return 0; Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyDAOHibernate.java =================================================================== diff -u -r625dccc46218d5cf4648d73a139af38f21c222ce -r4754486f832fd32e8456943aa277d7b65c7520af --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyDAOHibernate.java (.../SurveyDAOHibernate.java) (revision 625dccc46218d5cf4648d73a139af38f21c222ce) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyDAOHibernate.java (.../SurveyDAOHibernate.java) (revision 4754486f832fd32e8456943aa277d7b65c7520af) @@ -25,22 +25,25 @@ import java.util.List; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.survey.dao.SurveyDAO; import org.lamsfoundation.lams.tool.survey.model.Survey; import org.lamsfoundation.lams.tool.survey.model.SurveyCondition; +import org.springframework.stereotype.Repository; /** * * @author Steve.Ni * * @version $Revision$ */ -public class SurveyDAOHibernate extends BaseDAOHibernate implements SurveyDAO { +@Repository +public class SurveyDAOHibernate extends LAMSBaseDAO implements SurveyDAO { private static final String GET_RESOURCE_BY_CONTENTID = "from " + Survey.class.getName() + " as r where r.contentId=?"; public Survey getByContentId(Long contentId) { - List list = getHibernateTemplate().find(SurveyDAOHibernate.GET_RESOURCE_BY_CONTENTID, contentId); + List list = doFind(SurveyDAOHibernate.GET_RESOURCE_BY_CONTENTID, contentId); if (list.size() > 0) { return (Survey) list.get(0); } else { @@ -53,12 +56,12 @@ } public void delete(Survey survey) { - this.getHibernateTemplate().delete(survey); + getSession().delete(survey); } public void deleteCondition(SurveyCondition condition) { if (condition != null && condition.getConditionId() != null) { - this.getHibernateTemplate().delete(condition); + getSession().delete(condition); } } } Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyQuestionDAOHibernate.java =================================================================== diff -u -rc856a18bf4731ff3a9ba197b01e278b65549acb0 -r4754486f832fd32e8456943aa277d7b65c7520af --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyQuestionDAOHibernate.java (.../SurveyQuestionDAOHibernate.java) (revision c856a18bf4731ff3a9ba197b01e278b65549acb0) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyQuestionDAOHibernate.java (.../SurveyQuestionDAOHibernate.java) (revision 4754486f832fd32e8456943aa277d7b65c7520af) @@ -22,15 +22,17 @@ */ package org.lamsfoundation.lams.tool.survey.dao.hibernate; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.survey.dao.SurveyQuestionDAO; import org.lamsfoundation.lams.tool.survey.model.SurveyQuestion; +import org.springframework.stereotype.Repository; -public class SurveyQuestionDAOHibernate extends BaseDAOHibernate implements SurveyQuestionDAO { +@Repository +public class SurveyQuestionDAOHibernate extends LAMSBaseDAO implements SurveyQuestionDAO { + public SurveyQuestion getByUid(Long questionUid) { return (SurveyQuestion) this.getObject(SurveyQuestion.class, questionUid); } - - } Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveySessionDAOHibernate.java =================================================================== diff -u -r2aaccb954583cd8431759dca8e912a8fe863aa0e -r4754486f832fd32e8456943aa277d7b65c7520af --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveySessionDAOHibernate.java (.../SurveySessionDAOHibernate.java) (revision 2aaccb954583cd8431759dca8e912a8fe863aa0e) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveySessionDAOHibernate.java (.../SurveySessionDAOHibernate.java) (revision 4754486f832fd32e8456943aa277d7b65c7520af) @@ -25,28 +25,30 @@ import java.util.List; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.survey.dao.SurveySessionDAO; import org.lamsfoundation.lams.tool.survey.model.SurveySession; +import org.springframework.stereotype.Repository; - -public class SurveySessionDAOHibernate extends BaseDAOHibernate implements SurveySessionDAO{ +@Repository +public class SurveySessionDAOHibernate extends LAMSBaseDAO implements SurveySessionDAO{ private static final String FIND_BY_SESSION_ID = "from " + SurveySession.class.getName() + " as p where p.sessionId=?"; private static final String FIND_BY_CONTENT_ID = "from " + SurveySession.class.getName() + " as p where p.survey.contentId=?"; public SurveySession getSessionBySessionId(Long sessionId) { - List list = getHibernateTemplate().find(FIND_BY_SESSION_ID,sessionId); + List list = doFind(FIND_BY_SESSION_ID,sessionId); if(list == null || list.size() == 0) return null; return (SurveySession) list.get(0); } @SuppressWarnings("unchecked") public List getByContentId(Long toolContentId) { - return (List) getHibernateTemplate().find(FIND_BY_CONTENT_ID,toolContentId); + return (List) doFind(FIND_BY_CONTENT_ID,toolContentId); } public void delete(SurveySession session) { - this.getHibernateTemplate().delete(session); + getSession().delete(session); } public void deleteBySessionId(Long toolSessionId) { this.removeObject(SurveySession.class,toolSessionId); Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyUserDAOHibernate.java =================================================================== diff -u -r098d686653002409f33aff0f69b1183e07c1eab3 -r4754486f832fd32e8456943aa277d7b65c7520af --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyUserDAOHibernate.java (.../SurveyUserDAOHibernate.java) (revision 098d686653002409f33aff0f69b1183e07c1eab3) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyUserDAOHibernate.java (.../SurveyUserDAOHibernate.java) (revision 4754486f832fd32e8456943aa277d7b65c7520af) @@ -25,10 +25,13 @@ import java.util.List; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.survey.dao.SurveyUserDAO; import org.lamsfoundation.lams.tool.survey.model.SurveyUser; +import org.springframework.stereotype.Repository; -public class SurveyUserDAOHibernate extends BaseDAOHibernate implements SurveyUserDAO { +@Repository +public class SurveyUserDAOHibernate extends LAMSBaseDAO implements SurveyUserDAO { private static final String FIND_BY_USER_ID_CONTENT_ID = "FROM " + SurveyUser.class.getName() + " AS u WHERE u.userId =? AND u.survey.contentId=?"; @@ -41,26 +44,26 @@ + " AS u WHERE u.session.sessionId=? AND (u.sessionFinished is true OR u.responseFinalized is true)"; public SurveyUser getUserByUserIDAndSessionID(Long userID, Long sessionId) { - List list = this.getHibernateTemplate().find(FIND_BY_USER_ID_SESSION_ID, new Object[] { userID, sessionId }); + List list = this.doFind(FIND_BY_USER_ID_SESSION_ID, new Object[] { userID, sessionId }); if (list == null || list.size() == 0) return null; return (SurveyUser) list.get(0); } public SurveyUser getUserByUserIDAndContentID(Long userId, Long contentId) { - List list = this.getHibernateTemplate().find(FIND_BY_USER_ID_CONTENT_ID, new Object[] { userId, contentId }); + List list = this.doFind(FIND_BY_USER_ID_CONTENT_ID, new Object[] { userId, contentId }); if (list == null || list.size() == 0) return null; return (SurveyUser) list.get(0); } @SuppressWarnings("unchecked") public List getBySessionID(Long sessionId) { - return (List) this.getHibernateTemplate().find(FIND_BY_SESSION_ID, sessionId); + return (List) this.doFind(FIND_BY_SESSION_ID, sessionId); } public int getCountFinishedUsers(Long sessionId) { - List list = getHibernateTemplate().find(GET_COUNT_FINISHED_USERS_FOR_SESSION, new Object[] { sessionId }); + List list = doFind(GET_COUNT_FINISHED_USERS_FOR_SESSION, new Object[] { sessionId }); if (list == null || list.size() == 0) { return 0; }