Fisheye: Tag baa130ef315718180dba06d3d553fda7234b6a3a refers to a dead (removed) revision in file `lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/BaseDAOHibernate.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/CommonCartridgeConfigItemDAOHibernate.java =================================================================== diff -u -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 -rbaa130ef315718180dba06d3d553fda7234b6a3a --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/CommonCartridgeConfigItemDAOHibernate.java (.../CommonCartridgeConfigItemDAOHibernate.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/CommonCartridgeConfigItemDAOHibernate.java (.../CommonCartridgeConfigItemDAOHibernate.java) (revision baa130ef315718180dba06d3d553fda7234b6a3a) @@ -23,28 +23,23 @@ /* $Id$ */ package org.lamsfoundation.lams.tool.commonCartridge.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.commonCartridge.dao.CommonCartridgeConfigItemDAO; import org.lamsfoundation.lams.tool.commonCartridge.model.CommonCartridgeConfigItem; -import org.springframework.orm.hibernate4.HibernateCallback; +import org.springframework.stereotype.Repository; -public class CommonCartridgeConfigItemDAOHibernate extends BaseDAO implements CommonCartridgeConfigItemDAO { +@Repository +public class CommonCartridgeConfigItemDAOHibernate extends LAMSBaseDAO implements CommonCartridgeConfigItemDAO { private static final String LOAD_CONFIG_ITEM_BY_KEY = "from CommonCartridgeConfigItem configuration" + " where configuration.configKey=:key"; public CommonCartridgeConfigItem getConfigItemByKey(final String configKey) { - return (CommonCartridgeConfigItem) getHibernateTemplate().execute(new HibernateCallback() { - public Object doInHibernate(Session session) throws HibernateException { - return session.createQuery(LOAD_CONFIG_ITEM_BY_KEY).setString("key", configKey).uniqueResult(); - } - }); + return (CommonCartridgeConfigItem) getSession().createQuery(LOAD_CONFIG_ITEM_BY_KEY) + .setString("key", configKey).uniqueResult(); + } - } - - public void saveOrUpdate(CommonCartridgeConfigItem configItem) { - this.getHibernateTemplate().saveOrUpdate(configItem); - this.getHibernateTemplate().flush(); - } + public void saveOrUpdate(CommonCartridgeConfigItem configItem) { + getSession().saveOrUpdate(configItem); + getSession().flush(); + } } Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/CommonCartridgeDAOHibernate.java =================================================================== diff -u -r7f68f72a3d80b8e24ba596d34ccea104ca285d05 -rbaa130ef315718180dba06d3d553fda7234b6a3a --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/CommonCartridgeDAOHibernate.java (.../CommonCartridgeDAOHibernate.java) (revision 7f68f72a3d80b8e24ba596d34ccea104ca285d05) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/CommonCartridgeDAOHibernate.java (.../CommonCartridgeDAOHibernate.java) (revision baa130ef315718180dba06d3d553fda7234b6a3a) @@ -25,31 +25,34 @@ import java.util.List; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.commonCartridge.dao.CommonCartridgeDAO; import org.lamsfoundation.lams.tool.commonCartridge.model.CommonCartridge; +import org.springframework.stereotype.Repository; /** * * @author Andrey Balan */ -public class CommonCartridgeDAOHibernate extends BaseDAOHibernate implements CommonCartridgeDAO { - private static final String GET_RESOURCE_BY_CONTENTID = "from " + CommonCartridge.class.getName() - + " as r where r.contentId=?"; +@Repository +public class CommonCartridgeDAOHibernate extends LAMSBaseDAO implements CommonCartridgeDAO { + private static final String GET_RESOURCE_BY_CONTENTID = "from " + CommonCartridge.class.getName() + + " as r where r.contentId=?"; - public CommonCartridge getByContentId(Long contentId) { - List list = getHibernateTemplate().find(GET_RESOURCE_BY_CONTENTID, contentId); - if (list.size() > 0) - return (CommonCartridge) list.get(0); - else - return null; - } + public CommonCartridge getByContentId(Long contentId) { + List list = doFind(GET_RESOURCE_BY_CONTENTID, contentId); + if (list.size() > 0) + return (CommonCartridge) list.get(0); + else + return null; + } - public CommonCartridge getByUid(Long commonCartridgeUid) { - return (CommonCartridge) getObject(CommonCartridge.class, commonCartridgeUid); - } + public CommonCartridge getByUid(Long commonCartridgeUid) { + return (CommonCartridge) getObject(CommonCartridge.class, commonCartridgeUid); + } - public void delete(CommonCartridge commonCartridge) { - this.getHibernateTemplate().delete(commonCartridge); - } + public void delete(CommonCartridge commonCartridge) { + getSession().delete(commonCartridge); + } } Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/CommonCartridgeItemDAOHibernate.java =================================================================== diff -u -r7f68f72a3d80b8e24ba596d34ccea104ca285d05 -rbaa130ef315718180dba06d3d553fda7234b6a3a --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/CommonCartridgeItemDAOHibernate.java (.../CommonCartridgeItemDAOHibernate.java) (revision 7f68f72a3d80b8e24ba596d34ccea104ca285d05) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/CommonCartridgeItemDAOHibernate.java (.../CommonCartridgeItemDAOHibernate.java) (revision baa130ef315718180dba06d3d553fda7234b6a3a) @@ -25,17 +25,20 @@ import java.util.List; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.commonCartridge.dao.CommonCartridgeItemDAO; import org.lamsfoundation.lams.tool.commonCartridge.model.CommonCartridgeItem; +import org.springframework.stereotype.Repository; -public class CommonCartridgeItemDAOHibernate extends BaseDAOHibernate implements CommonCartridgeItemDAO { +@Repository +public class CommonCartridgeItemDAOHibernate extends LAMSBaseDAO implements CommonCartridgeItemDAO { private static final String FIND_AUTHORING_ITEMS = "from " + CommonCartridgeItem.class.getName() + " where commonCartridge_uid = ? order by create_date asc"; public List getAuthoringItems(Long commonCartridgeUid) { - return this.getHibernateTemplate().find(FIND_AUTHORING_ITEMS, commonCartridgeUid); + return this.doFind(FIND_AUTHORING_ITEMS, commonCartridgeUid); } public CommonCartridgeItem getByUid(Long commonCartridgeItemUid) { Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/CommonCartridgeItemVisitDAOHibernate.java =================================================================== diff -u -r2aaccb954583cd8431759dca8e912a8fe863aa0e -rbaa130ef315718180dba06d3d553fda7234b6a3a --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/CommonCartridgeItemVisitDAOHibernate.java (.../CommonCartridgeItemVisitDAOHibernate.java) (revision 2aaccb954583cd8431759dca8e912a8fe863aa0e) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/CommonCartridgeItemVisitDAOHibernate.java (.../CommonCartridgeItemVisitDAOHibernate.java) (revision baa130ef315718180dba06d3d553fda7234b6a3a) @@ -27,12 +27,15 @@ import java.util.List; import java.util.Map; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.commonCartridge.dao.CommonCartridgeItemVisitDAO; import org.lamsfoundation.lams.tool.commonCartridge.model.CommonCartridge; import org.lamsfoundation.lams.tool.commonCartridge.model.CommonCartridgeItemVisitLog; import org.lamsfoundation.lams.tool.commonCartridge.model.CommonCartridgeSession; +import org.springframework.stereotype.Repository; -public class CommonCartridgeItemVisitDAOHibernate extends BaseDAOHibernate implements CommonCartridgeItemVisitDAO { +@Repository +public class CommonCartridgeItemVisitDAOHibernate extends LAMSBaseDAO implements CommonCartridgeItemVisitDAO { private static final String FIND_BY_ITEM_AND_USER = "from " + CommonCartridgeItemVisitLog.class.getName() + " as r where r.user.userId = ? and r.commonCartridgeItem.uid=?"; @@ -50,14 +53,14 @@ + " group by v.sessionId, v.commonCartridgeItem.uid "; public CommonCartridgeItemVisitLog getCommonCartridgeItemLog(Long itemUid, Long userId) { - List list = getHibernateTemplate().find(FIND_BY_ITEM_AND_USER, new Object[] { userId, itemUid }); + List list = doFind(FIND_BY_ITEM_AND_USER, new Object[] { userId, itemUid }); if (list == null || list.size() == 0) return null; return (CommonCartridgeItemVisitLog) list.get(0); } public int getUserViewLogCount(Long toolSessionId, Long userUid) { - List list = getHibernateTemplate().find(FIND_VIEW_COUNT_BY_USER, new Object[] { toolSessionId, userUid }); + List list = doFind(FIND_VIEW_COUNT_BY_USER, new Object[] { toolSessionId, userUid }); if (list == null || list.size() == 0) return 0; return ((Number) list.get(0)).intValue(); @@ -67,7 +70,7 @@ public Map getSummary(Long contentId) { // Note: Hibernate 3.1 query.uniqueResult() returns Integer, Hibernate 3.2 query.uniqueResult() returns Long - List result = (List) getHibernateTemplate().find(FIND_SUMMARY, contentId); + List result = (List) doFind(FIND_SUMMARY, contentId); Map summaryList = new HashMap(result.size()); for (Object[] list : result) { if (list[1] != null) { @@ -81,7 +84,7 @@ @SuppressWarnings("unchecked") public List getCommonCartridgeItemLogBySession(Long sessionId, Long itemUid) { - return (List) getHibernateTemplate().find(FIND_BY_ITEM_BYSESSION, new Object[] { sessionId, itemUid }); + return (List) doFind(FIND_BY_ITEM_BYSESSION, new Object[] { sessionId, itemUid }); } } Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/CommonCartridgeSessionDAOHibernate.java =================================================================== diff -u -r2aaccb954583cd8431759dca8e912a8fe863aa0e -rbaa130ef315718180dba06d3d553fda7234b6a3a --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/CommonCartridgeSessionDAOHibernate.java (.../CommonCartridgeSessionDAOHibernate.java) (revision 2aaccb954583cd8431759dca8e912a8fe863aa0e) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/CommonCartridgeSessionDAOHibernate.java (.../CommonCartridgeSessionDAOHibernate.java) (revision baa130ef315718180dba06d3d553fda7234b6a3a) @@ -25,34 +25,37 @@ import java.util.List; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.commonCartridge.dao.CommonCartridgeSessionDAO; import org.lamsfoundation.lams.tool.commonCartridge.model.CommonCartridgeSession; +import org.springframework.stereotype.Repository; -public class CommonCartridgeSessionDAOHibernate extends BaseDAOHibernate implements CommonCartridgeSessionDAO { +@Repository +public class CommonCartridgeSessionDAOHibernate extends LAMSBaseDAO implements CommonCartridgeSessionDAO { private static final String FIND_BY_SESSION_ID = "from " + CommonCartridgeSession.class.getName() + " as p where p.sessionId=?"; private static final String FIND_BY_CONTENT_ID = "from " + CommonCartridgeSession.class.getName() + " as p where p.commonCartridge.contentId=?"; - public CommonCartridgeSession getSessionBySessionId(Long sessionId) { - List list = getHibernateTemplate().find(FIND_BY_SESSION_ID, sessionId); - if (list == null || list.size() == 0) - return null; - return (CommonCartridgeSession) list.get(0); - } + public CommonCartridgeSession getSessionBySessionId(Long sessionId) { + List list = doFind(FIND_BY_SESSION_ID, sessionId); + if (list == null || list.size() == 0) + return null; + return (CommonCartridgeSession) 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(CommonCartridgeSession session) { - this.getHibernateTemplate().delete(session); - } + public void delete(CommonCartridgeSession session) { + getSession().delete(session); + } - public void deleteBySessionId(Long toolSessionId) { - this.removeObject(CommonCartridgeSession.class, toolSessionId); - } + public void deleteBySessionId(Long toolSessionId) { + this.removeObject(CommonCartridgeSession.class, toolSessionId); + } } Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/CommonCartridgeUserDAOHibernate.java =================================================================== diff -u -r2aaccb954583cd8431759dca8e912a8fe863aa0e -rbaa130ef315718180dba06d3d553fda7234b6a3a --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/CommonCartridgeUserDAOHibernate.java (.../CommonCartridgeUserDAOHibernate.java) (revision 2aaccb954583cd8431759dca8e912a8fe863aa0e) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/CommonCartridgeUserDAOHibernate.java (.../CommonCartridgeUserDAOHibernate.java) (revision baa130ef315718180dba06d3d553fda7234b6a3a) @@ -25,10 +25,13 @@ import java.util.List; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.commonCartridge.dao.CommonCartridgeUserDAO; import org.lamsfoundation.lams.tool.commonCartridge.model.CommonCartridgeUser; +import org.springframework.stereotype.Repository; -public class CommonCartridgeUserDAOHibernate extends BaseDAOHibernate implements CommonCartridgeUserDAO { +@Repository +public class CommonCartridgeUserDAOHibernate extends LAMSBaseDAO implements CommonCartridgeUserDAO { private static final String FIND_BY_USER_ID_CONTENT_ID = "from " + CommonCartridgeUser.class.getName() + " as u where u.userId =? and u.commonCartridge.contentId=?"; @@ -38,22 +41,22 @@ + " as u where u.session.sessionId=?"; public CommonCartridgeUser 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 (CommonCartridgeUser) list.get(0); } public CommonCartridgeUser 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 (CommonCartridgeUser) 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); } }