Fisheye: Tag 1.1.4.2 refers to a dead (removed) revision in file `lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/BaseDAOHibernate.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java,v diff -u -r1.11.2.2 -r1.11.2.3 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java 11 Nov 2014 22:48:37 -0000 1.11.2.2 +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java 29 Nov 2014 21:42:16 -0000 1.11.2.3 @@ -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.scratchie.dao.ScratchieAnswerVisitDAO; import org.lamsfoundation.lams.tool.scratchie.model.ScratchieAnswer; import org.lamsfoundation.lams.tool.scratchie.model.ScratchieAnswerVisitLog; -import org.springframework.orm.hibernate4.HibernateCallback; +import org.springframework.stereotype.Repository; -public class ScratchieAnswerVisitDAOHibernate extends BaseDAOHibernate implements ScratchieAnswerVisitDAO { +@Repository +public class ScratchieAnswerVisitDAOHibernate extends LAMSBaseDAO implements ScratchieAnswerVisitDAO { private static final String FIND_BY_SESSION_AND_ANSWER = "from " + ScratchieAnswerVisitLog.class.getName() + " as r where r.sessionId = ? and r.scratchieAnswer.uid=?"; @@ -53,15 +53,15 @@ @Override public ScratchieAnswerVisitLog getLog(Long answerUid, Long sessionId) { - List list = getHibernateTemplate().find(FIND_BY_SESSION_AND_ANSWER, new Object[] { sessionId, answerUid }); + List list = doFind(FIND_BY_SESSION_AND_ANSWER, new Object[] { sessionId, answerUid }); if (list == null || list.size() == 0) return null; return (ScratchieAnswerVisitLog) list.get(0); } @Override public int getLogCountTotal(Long sessionId) { - List list = getHibernateTemplate().find(FIND_VIEW_COUNT_BY_SESSION, new Object[] { sessionId }); + List list = doFind(FIND_VIEW_COUNT_BY_SESSION, new Object[] { sessionId }); if (list == null || list.size() == 0) return 0; return ((Number) list.get(0)).intValue(); @@ -70,28 +70,23 @@ @SuppressWarnings("unchecked") @Override public List getLogsBySessionAndItem(Long sessionId, Long itemUid) { - return (List) getHibernateTemplate().find(FIND_BY_SESSION_AND_ITEM, + return (List) doFind(FIND_BY_SESSION_AND_ITEM, new Object[] { sessionId, itemUid }); } @SuppressWarnings("unchecked") @Override public List getLogsBySession(Long sessionId) { - return (List) getHibernateTemplate().find(FIND_BY_SESSION, new Object[] { sessionId }); + return (List) doFind(FIND_BY_SESSION, new Object[] { sessionId }); } @Override public ScratchieAnswer getFirstScratchedAnswerBySessionAndItem(Long sessionId, Long itemUid) { - return getHibernateTemplate().execute(new HibernateCallback() { - @Override - public ScratchieAnswer doInHibernate(Session session) throws HibernateException { - Query q = session.createQuery(FIND_FIRST_SCRATCHED_ANSWER_BY_SESSION_AND_ITEM); - q.setParameter(0, sessionId); - q.setParameter(1, itemUid); - q.setMaxResults(1); - return (ScratchieAnswer) q.uniqueResult(); - } - }); + Query q = getSession().createQuery(FIND_FIRST_SCRATCHED_ANSWER_BY_SESSION_AND_ITEM); + q.setParameter(0, sessionId); + q.setParameter(1, itemUid); + q.setMaxResults(1); + return (ScratchieAnswer) q.uniqueResult(); } } Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieConfigItemDAOHibernate.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieConfigItemDAOHibernate.java,v diff -u -r1.1.2.1 -r1.1.2.2 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieConfigItemDAOHibernate.java 15 Aug 2014 09:58:23 -0000 1.1.2.1 +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieConfigItemDAOHibernate.java 29 Nov 2014 21:42:16 -0000 1.1.2.2 @@ -23,30 +23,25 @@ /* $Id$ */ package org.lamsfoundation.lams.tool.scratchie.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.scratchie.dao.ScratchieConfigItemDAO; import org.lamsfoundation.lams.tool.scratchie.model.ScratchieConfigItem; -import org.springframework.orm.hibernate4.HibernateCallback; +import org.springframework.stereotype.Repository; -public class ScratchieConfigItemDAOHibernate extends BaseDAO implements ScratchieConfigItemDAO { +@Repository +public class ScratchieConfigItemDAOHibernate extends LAMSBaseDAO implements ScratchieConfigItemDAO { private static final String LOAD_CONFIG_ITEM_BY_KEY = "from ScratchieConfigItem configuration" + " where configuration.configKey=:key"; @Override public ScratchieConfigItem getConfigItemByKey(final String configKey) { - return (ScratchieConfigItem) getHibernateTemplate().execute(new HibernateCallback() { - public Object doInHibernate(Session session) throws HibernateException { - return session.createQuery(LOAD_CONFIG_ITEM_BY_KEY).setString("key", configKey).uniqueResult(); - } - }); + return (ScratchieConfigItem) getSession().createQuery(LOAD_CONFIG_ITEM_BY_KEY).setString("key", configKey).uniqueResult(); } @Override public void saveOrUpdate(ScratchieConfigItem mdlForumConfigItem) { - this.getHibernateTemplate().saveOrUpdate(mdlForumConfigItem); - this.getHibernateTemplate().flush(); + getSession().saveOrUpdate(mdlForumConfigItem); + getSession().flush(); } } Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieDAOHibernate.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieDAOHibernate.java,v diff -u -r1.1 -r1.1.4.1 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieDAOHibernate.java 19 Jul 2012 19:20:08 -0000 1.1 +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieDAOHibernate.java 29 Nov 2014 21:42:16 -0000 1.1.4.1 @@ -25,15 +25,18 @@ import java.util.List; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.scratchie.dao.ScratchieDAO; import org.lamsfoundation.lams.tool.scratchie.model.Scratchie; +import org.springframework.stereotype.Repository; -public class ScratchieDAOHibernate extends BaseDAOHibernate implements ScratchieDAO { +@Repository +public class ScratchieDAOHibernate extends LAMSBaseDAO implements ScratchieDAO { private static final String GET_RESOURCE_BY_CONTENTID = "from " + Scratchie.class.getName() + " as r where r.contentId=?"; public Scratchie getByContentId(Long contentId) { - List list = getHibernateTemplate().find(GET_RESOURCE_BY_CONTENTID, contentId); + List list = doFind(GET_RESOURCE_BY_CONTENTID, contentId); if (list.size() > 0) return (Scratchie) list.get(0); else @@ -45,7 +48,7 @@ } public void delete(Scratchie scratchie) { - this.getHibernateTemplate().delete(scratchie); + getSession().delete(scratchie); } } Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieItemDAOHibernate.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieItemDAOHibernate.java,v diff -u -r1.3.2.1 -r1.3.2.2 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieItemDAOHibernate.java 15 Aug 2014 09:30:59 -0000 1.3.2.1 +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieItemDAOHibernate.java 29 Nov 2014 21:42:16 -0000 1.3.2.2 @@ -25,18 +25,21 @@ import java.util.List; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.scratchie.dao.ScratchieItemDAO; import org.lamsfoundation.lams.tool.scratchie.model.ScratchieItem; +import org.springframework.stereotype.Repository; -public class ScratchieItemDAOHibernate extends BaseDAOHibernate implements ScratchieItemDAO { +@Repository +public class ScratchieItemDAOHibernate extends LAMSBaseDAO implements ScratchieItemDAO { private static final String FIND_AUTHORING_ITEMS = "from " + ScratchieItem.class.getName() + " where scratchie_uid = ? order by create_date asc"; @SuppressWarnings("unchecked") @Override public List getAuthoringItems(Long scratchieUid) { - return (List) this.getHibernateTemplate().find(FIND_AUTHORING_ITEMS, scratchieUid); + return (List) doFind(FIND_AUTHORING_ITEMS, scratchieUid); } @Override @@ -46,7 +49,7 @@ @Override public void releaseItemFromCache(ScratchieItem item) { - getHibernateTemplate().evict(item); + getSession().evict(item); } } Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieSessionDAOHibernate.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieSessionDAOHibernate.java,v diff -u -r1.2.2.1 -r1.2.2.2 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieSessionDAOHibernate.java 15 Aug 2014 09:30:59 -0000 1.2.2.1 +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieSessionDAOHibernate.java 29 Nov 2014 21:42:16 -0000 1.2.2.2 @@ -25,30 +25,33 @@ import java.util.List; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.scratchie.dao.ScratchieSessionDAO; import org.lamsfoundation.lams.tool.scratchie.model.ScratchieSession; +import org.springframework.stereotype.Repository; -public class ScratchieSessionDAOHibernate extends BaseDAOHibernate implements ScratchieSessionDAO { +@Repository +public class ScratchieSessionDAOHibernate extends LAMSBaseDAO implements ScratchieSessionDAO { private static final String FIND_BY_SESSION_ID = "from " + ScratchieSession.class.getName() + " as p where p.sessionId=?"; private static final String FIND_BY_CONTENT_ID = "from " + ScratchieSession.class.getName() + " as p where p.scratchie.contentId=? order by p.sessionName asc"; public ScratchieSession 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 (ScratchieSession) 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(ScratchieSession session) { - this.getHibernateTemplate().delete(session); + getSession().delete(session); } public void deleteBySessionId(Long toolSessionId) { Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieUserDAOHibernate.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieUserDAOHibernate.java,v diff -u -r1.1.4.1 -r1.1.4.2 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieUserDAOHibernate.java 15 Aug 2014 09:30:59 -0000 1.1.4.1 +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieUserDAOHibernate.java 29 Nov 2014 21:42:16 -0000 1.1.4.2 @@ -25,10 +25,13 @@ import java.util.List; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.scratchie.dao.ScratchieUserDAO; import org.lamsfoundation.lams.tool.scratchie.model.ScratchieUser; +import org.springframework.stereotype.Repository; -public class ScratchieUserDAOHibernate extends BaseDAOHibernate implements ScratchieUserDAO { +@Repository +public class ScratchieUserDAOHibernate extends LAMSBaseDAO implements ScratchieUserDAO { private static final String FIND_BY_USER_ID_CONTENT_ID = "from " + ScratchieUser.class.getName() + " as u where u.userId =? and u.scratchie.contentId=?"; @@ -38,22 +41,22 @@ + " as u where u.session.sessionId=?"; public ScratchieUser 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 (ScratchieUser) list.get(0); } public ScratchieUser 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 (ScratchieUser) 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); } }