Fisheye: Tag ceeb83235b4187f29543399d17414d15d7fd4df3 refers to a dead (removed) revision in file `lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/BaseDAOHibernate.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoAnswerDAOHibernate.java =================================================================== diff -u -r2aaccb954583cd8431759dca8e912a8fe863aa0e -rceeb83235b4187f29543399d17414d15d7fd4df3 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoAnswerDAOHibernate.java (.../DacoAnswerDAOHibernate.java) (revision 2aaccb954583cd8431759dca8e912a8fe863aa0e) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoAnswerDAOHibernate.java (.../DacoAnswerDAOHibernate.java) (revision ceeb83235b4187f29543399d17414d15d7fd4df3) @@ -2,15 +2,22 @@ import java.util.List; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.daco.DacoConstants; import org.lamsfoundation.lams.tool.daco.dao.DacoAnswerDAO; import org.lamsfoundation.lams.tool.daco.dto.QuestionSummaryDTO; import org.lamsfoundation.lams.tool.daco.dto.QuestionSummarySingleAnswerDTO; import org.lamsfoundation.lams.tool.daco.model.DacoAnswer; import org.lamsfoundation.lams.tool.daco.model.DacoUser; +import org.springframework.stereotype.Repository; -public class DacoAnswerDAOHibernate extends BaseDAOHibernate implements DacoAnswerDAO { +@Repository +public class DacoAnswerDAOHibernate extends LAMSBaseDAO implements DacoAnswerDAO { + protected final Log log = LogFactory.getLog(getClass()); + private static final String FIND_USER_NUMBER_SUMMARY = "SELECT a.question.uid, " + "SUM(a.answer),AVG(a.answer) FROM " + DacoAnswer.class.getName() + " AS a WHERE a.question.type=:numberQuestionType AND a.user.uid=:userUid AND a.answer IS NOT NULL " @@ -45,23 +52,23 @@ @SuppressWarnings("unchecked") public List getQuestionSummaries(Long userUid, List summaries) { - List result = (List) getHibernateTemplate().findByNamedParam( + List result = (List) doFindByNamedParam( DacoAnswerDAOHibernate.FIND_USER_NUMBER_SUMMARY, new String[] { "userUid", "numberQuestionType" }, new Object[] { userUid, DacoConstants.QUESTION_TYPE_NUMBER }); for (Object[] objectRow : result) { addNumberSummary(summaries, objectRow, true); } - result = (List) getHibernateTemplate().findByNamedParam(DacoAnswerDAOHibernate.FIND_GROUP_NUMBER_SUMMARY, + result = (List) doFindByNamedParam(DacoAnswerDAOHibernate.FIND_GROUP_NUMBER_SUMMARY, new String[] { "userUid", "numberQuestionType" }, new Object[] { userUid, DacoConstants.QUESTION_TYPE_NUMBER }); for (Object[] objectRow : result) { addNumberSummary(summaries, objectRow, false); } - result = (List) getHibernateTemplate().findByNamedParam( + result = (List) doFindByNamedParam( DacoAnswerDAOHibernate.FIND_USER_ANSWER_ENUMERATION_QUERY, new String[] { "userUid", "numberQuestionType", "radioQuestionType", "dropdownQuestionType", "checkboxQuestionType" }, @@ -72,7 +79,7 @@ addAnswerEnumerationSummary(summaries, objectRow, true); } - result = (List) getHibernateTemplate().findByNamedParam( + result = (List) doFindByNamedParam( DacoAnswerDAOHibernate.FIND_GROUP_ANSWER_ENUMERATION_QUERY, new String[] { "userUid", "numberQuestionType", "radioQuestionType", "dropdownQuestionType", "checkboxQuestionType" }, @@ -93,7 +100,7 @@ QuestionSummarySingleAnswerDTO singleAnswer = new QuestionSummarySingleAnswerDTO(); singleAnswer.setAnswer(row[DacoConstants.QUESTION_DB_ANSWER_ENUMERATION_SUMMARY_ANSWER]); singleAnswer.setCount(row[DacoConstants.QUESTION_DB_ANSWER_ENUMERATION_SUMMARY_COUNT]); - Long answerCount = (Long) getHibernateTemplate().find(DacoAnswerDAOHibernate.FIND_ANSWER_COUNT, currentUid) + Long answerCount = (Long) doFind(DacoAnswerDAOHibernate.FIND_ANSWER_COUNT, currentUid) .get(0); singleAnswer.setAverage(Math.round(Float.parseFloat(singleAnswer.getCount()) / answerCount * 100) + "%"); @@ -156,7 +163,7 @@ } public Integer getUserRecordCount(Long userId, Long sessionId) { - return ((Number) getHibernateTemplate().findByNamedParam(DacoAnswerDAOHibernate.FIND_USER_RECORD_COUNT, + return ((Number) doFindByNamedParam(DacoAnswerDAOHibernate.FIND_USER_RECORD_COUNT, new String[] { "userId", "sessionId" }, new Object[] { userId, sessionId }).get(0)).intValue(); } } \ No newline at end of file Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoDAOHibernate.java =================================================================== diff -u -r3bdebf472590492a1e54e2495e1b566449e5ea4a -rceeb83235b4187f29543399d17414d15d7fd4df3 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoDAOHibernate.java (.../DacoDAOHibernate.java) (revision 3bdebf472590492a1e54e2495e1b566449e5ea4a) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoDAOHibernate.java (.../DacoDAOHibernate.java) (revision ceeb83235b4187f29543399d17414d15d7fd4df3) @@ -25,20 +25,23 @@ import java.util.List; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.daco.dao.DacoDAO; import org.lamsfoundation.lams.tool.daco.model.Daco; +import org.springframework.stereotype.Repository; /** * * @author Marcin Cieslak * * @version $Revision$ */ -public class DacoDAOHibernate extends BaseDAOHibernate implements DacoDAO { +@Repository +public class DacoDAOHibernate extends LAMSBaseDAO implements DacoDAO { private static final String FIND_BY_CONTENT_ID = "from " + Daco.class.getName() + " as r where r.contentId=?"; public Daco getByContentId(Long contentId) { - List list = getHibernateTemplate().find(DacoDAOHibernate.FIND_BY_CONTENT_ID, contentId); + List list = doFind(DacoDAOHibernate.FIND_BY_CONTENT_ID, contentId); if (list.size() > 0) { return (Daco) list.get(0); } Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoQuestionDAOHibernate.java =================================================================== diff -u -r843648563725cffa91af1dfd96dce9682d39b410 -rceeb83235b4187f29543399d17414d15d7fd4df3 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoQuestionDAOHibernate.java (.../DacoQuestionDAOHibernate.java) (revision 843648563725cffa91af1dfd96dce9682d39b410) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoQuestionDAOHibernate.java (.../DacoQuestionDAOHibernate.java) (revision ceeb83235b4187f29543399d17414d15d7fd4df3) @@ -23,10 +23,13 @@ /* $$Id$$ */ package org.lamsfoundation.lams.tool.daco.dao.hibernate; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.daco.dao.DacoQuestionDAO; import org.lamsfoundation.lams.tool.daco.model.DacoQuestion; +import org.springframework.stereotype.Repository; -public class DacoQuestionDAOHibernate extends BaseDAOHibernate implements DacoQuestionDAO { +@Repository +public class DacoQuestionDAOHibernate extends LAMSBaseDAO implements DacoQuestionDAO { public DacoQuestion getByUid(Long dacoQuestionUid) { return (DacoQuestion) this.getObject(DacoQuestion.class, dacoQuestionUid); Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoSessionDAOHibernate.java =================================================================== diff -u -r2aaccb954583cd8431759dca8e912a8fe863aa0e -rceeb83235b4187f29543399d17414d15d7fd4df3 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoSessionDAOHibernate.java (.../DacoSessionDAOHibernate.java) (revision 2aaccb954583cd8431759dca8e912a8fe863aa0e) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoSessionDAOHibernate.java (.../DacoSessionDAOHibernate.java) (revision ceeb83235b4187f29543399d17414d15d7fd4df3) @@ -25,17 +25,20 @@ import java.util.List; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.daco.dao.DacoSessionDAO; import org.lamsfoundation.lams.tool.daco.model.DacoSession; +import org.springframework.stereotype.Repository; -public class DacoSessionDAOHibernate extends BaseDAOHibernate implements DacoSessionDAO { +@Repository +public class DacoSessionDAOHibernate extends LAMSBaseDAO implements DacoSessionDAO { private static final String FIND_BY_SESSION_ID = "from " + DacoSession.class.getName() + " as p where p.sessionId=?"; private static final String FIND_BY_CONTENT_ID = "from " + DacoSession.class.getName() + " as p where p.daco.contentId=? ORDER BY p.sessionId"; public DacoSession getSessionBySessionId(Long sessionId) { - List list = getHibernateTemplate().find(DacoSessionDAOHibernate.FIND_BY_SESSION_ID, sessionId); + List list = doFind(DacoSessionDAOHibernate.FIND_BY_SESSION_ID, sessionId); if (list == null || list.size() == 0) { return null; } @@ -44,7 +47,7 @@ @SuppressWarnings("unchecked") public List getByContentId(Long toolContentId) { - return (List) getHibernateTemplate().find(DacoSessionDAOHibernate.FIND_BY_CONTENT_ID, toolContentId); + return (List) doFind(DacoSessionDAOHibernate.FIND_BY_CONTENT_ID, toolContentId); } public void deleteBySessionId(Long toolSessionId) { Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoUserDAOHibernate.java =================================================================== diff -u -r2aaccb954583cd8431759dca8e912a8fe863aa0e -rceeb83235b4187f29543399d17414d15d7fd4df3 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoUserDAOHibernate.java (.../DacoUserDAOHibernate.java) (revision 2aaccb954583cd8431759dca8e912a8fe863aa0e) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoUserDAOHibernate.java (.../DacoUserDAOHibernate.java) (revision ceeb83235b4187f29543399d17414d15d7fd4df3) @@ -25,10 +25,13 @@ import java.util.List; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.daco.dao.DacoUserDAO; import org.lamsfoundation.lams.tool.daco.model.DacoUser; +import org.springframework.stereotype.Repository; -public class DacoUserDAOHibernate extends BaseDAOHibernate implements DacoUserDAO { +@Repository +public class DacoUserDAOHibernate extends LAMSBaseDAO implements DacoUserDAO { private static final String FIND_BY_USER_ID_AND_CONTENT_ID = "from " + DacoUser.class.getName() + " as u where u.userId =? and u.daco.contentId=?"; @@ -38,7 +41,7 @@ private static final String FIND_BY_CONTENT_ID = "from " + DacoUser.class.getName() + " as u where u.daco.contentId=?"; public DacoUser getUserByUserIdAndSessionId(Long userID, Long sessionId) { - List list = this.getHibernateTemplate().find(DacoUserDAOHibernate.FIND_BY_USER_ID_AND_SESSION_ID, + List list = doFind(DacoUserDAOHibernate.FIND_BY_USER_ID_AND_SESSION_ID, new Object[] { userID, sessionId }); if (list == null || list.size() == 0) { return null; @@ -47,7 +50,7 @@ } public DacoUser getUserByUserIdAndContentId(Long userId, Long contentId) { - List list = this.getHibernateTemplate().find(DacoUserDAOHibernate.FIND_BY_USER_ID_AND_CONTENT_ID, + List list = doFind(DacoUserDAOHibernate.FIND_BY_USER_ID_AND_CONTENT_ID, new Object[] { userId, contentId }); if (list == null || list.size() == 0) { return null; @@ -57,6 +60,6 @@ @SuppressWarnings("unchecked") public List getBySessionId(Long sessionId) { - return (List) this.getHibernateTemplate().find(DacoUserDAOHibernate.FIND_BY_SESSION_ID, sessionId); + return (List) doFind(DacoUserDAOHibernate.FIND_BY_SESSION_ID, sessionId); } } \ No newline at end of file