Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapDAO.java,v diff -u -r1.2.2.1 -r1.2.2.2 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapDAO.java 15 Aug 2014 09:58:48 -0000 1.2.2.1 +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapDAO.java 29 Nov 2014 21:40:06 -0000 1.2.2.2 @@ -26,22 +26,24 @@ import java.util.List; -import org.lamsfoundation.lams.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.mindmap.dao.IMindmapDAO; import org.lamsfoundation.lams.tool.mindmap.model.Mindmap; +import org.springframework.stereotype.Repository; /** * DAO for accessing the Mindmap objects - Hibernate specific code. */ -public class MindmapDAO extends BaseDAO implements IMindmapDAO { +@Repository +public class MindmapDAO extends LAMSBaseDAO implements IMindmapDAO { private static final String FIND_MINDMAP_BY_CONTENTID = "from Mindmap mindmap where mindmap.toolContentId = ?"; private static final String FIND_MINDMAP_BY_UID = "from Mindmap mindmap where mindmap.uid = ?"; public Mindmap getByContentId(Long toolContentId) { - List list = getHibernateTemplate().find(MindmapDAO.FIND_MINDMAP_BY_CONTENTID, toolContentId); + List list = doFind(MindmapDAO.FIND_MINDMAP_BY_CONTENTID, toolContentId); if (list != null && list.size() > 0) { return (Mindmap) list.get(0); } else { @@ -50,7 +52,7 @@ } public Mindmap getMindmapByUid(Long Uid) { - List list = getHibernateTemplate().find(MindmapDAO.FIND_MINDMAP_BY_UID, Uid); + List list = doFind(MindmapDAO.FIND_MINDMAP_BY_UID, Uid); if (list != null && list.size() > 0) { return (Mindmap) list.get(0); } else { @@ -59,8 +61,8 @@ } public void saveOrUpdate(Mindmap mindmap) { - this.getHibernateTemplate().saveOrUpdate(mindmap); - this.getHibernateTemplate().flush(); + getSession().saveOrUpdate(mindmap); + getSession().flush(); } public void releaseFromCache(Object o) { Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapNodeDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapNodeDAO.java,v diff -u -r1.3.2.1 -r1.3.2.2 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapNodeDAO.java 15 Aug 2014 09:30:46 -0000 1.3.2.1 +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapNodeDAO.java 29 Nov 2014 21:40:06 -0000 1.3.2.2 @@ -28,15 +28,17 @@ import org.hibernate.Query; import org.hibernate.Session; -import org.lamsfoundation.lams.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.mindmap.dao.IMindmapNodeDAO; import org.lamsfoundation.lams.tool.mindmap.model.MindmapNode; +import org.springframework.stereotype.Repository; /** * * @author Ruslan Kazakov */ -public class MindmapNodeDAO extends BaseDAO implements IMindmapNodeDAO { +@Repository +public class MindmapNodeDAO extends LAMSBaseDAO implements IMindmapNodeDAO { private static final String SQL_QUERY_FIND_ROOT_NODE_BY_MINDMAP_ID = "from " + MindmapNode.class.getName() + " mn where mn.parent is null and mn.mindmap.uid = ? and mn.user is null "; @@ -98,60 +100,60 @@ } public void saveOrUpdate(MindmapNode mindmapNode) { - this.getHibernateTemplate().saveOrUpdate(mindmapNode); + getSession().saveOrUpdate(mindmapNode); } public List getAuthorRootNodeByMindmapId(Long mindmapId) { - return this.getHibernateTemplate().find(SQL_QUERY_FIND_ROOT_NODE_BY_MINDMAP_ID, mindmapId); + return this.doFind(SQL_QUERY_FIND_ROOT_NODE_BY_MINDMAP_ID, mindmapId); } public List getAuthorRootNodeBySessionId(Long sessionId) { - return this.getHibernateTemplate().find(SQL_QUERY_FIND_ROOT_NODE_BY_SESSION_ID, sessionId); + return this.doFind(SQL_QUERY_FIND_ROOT_NODE_BY_SESSION_ID, sessionId); } public List getAuthorRootNodeByMindmapSession(Long mindmapId, Long toolSessionId) { - return this.getHibernateTemplate().find(SQL_QUERY_FIND_ROOT_NODE_BY_MINDMAP_SESSION, + return this.doFind(SQL_QUERY_FIND_ROOT_NODE_BY_MINDMAP_SESSION, new Object[] { mindmapId, toolSessionId }); } public List getRootNodeByMindmapIdAndUserId(Long mindmapId, Long userId) { - return this.getHibernateTemplate().find(SQL_QUERY_FIND_ROOT_NODE_BY_MINDMAP_ID_USER_ID, + return this.doFind(SQL_QUERY_FIND_ROOT_NODE_BY_MINDMAP_ID_USER_ID, new Object[] { mindmapId, userId }); } public List getRootNodeByMindmapIdAndSessionId(Long mindmapId, Long sessionId) { - return this.getHibernateTemplate().find(SQL_QUERY_FIND_ROOT_NODE_BY_MINDMAP_ID_SESSION_ID, + return this.doFind(SQL_QUERY_FIND_ROOT_NODE_BY_MINDMAP_ID_SESSION_ID, new Object[] { mindmapId, sessionId }); } public List getMindmapNodeByParentId(Long parentId, Long mindmapId) { - return this.getHibernateTemplate().find(SQL_QUERY_FIND_NODE_BY_PARENT_ID_MINDMAP_ID, + return this.doFind(SQL_QUERY_FIND_NODE_BY_PARENT_ID_MINDMAP_ID, new Object[] { parentId, mindmapId }); } public List getMindmapNodeByParentIdMindmapIdSessionId(Long parentId, Long mindmapId, Long sessionId) { - return this.getHibernateTemplate().find(SQL_QUERY_FIND_NODE_BY_PARENT_ID_MINDMAP_ID_SESSION_ID, + return this.doFind(SQL_QUERY_FIND_NODE_BY_PARENT_ID_MINDMAP_ID_SESSION_ID, new Object[] { parentId, mindmapId, sessionId }); } public List getMindmapNodeByUniqueId(Long uniqueId, Long mindmapId) { - return this.getHibernateTemplate().find(SQL_QUERY_FIND_NODE_BY_UNIQUE_ID_MINDMAP_ID, + return this.doFind(SQL_QUERY_FIND_NODE_BY_UNIQUE_ID_MINDMAP_ID, new Object[] { uniqueId, mindmapId }); } public List getMindmapNodeByUniqueIdSessionId(Long uniqueId, Long mindmapId, Long sessionId) { - return this.getHibernateTemplate().find(SQL_QUERY_FIND_NODE_BY_UNIQUE_ID_SESSION_ID, + return this.doFind(SQL_QUERY_FIND_NODE_BY_UNIQUE_ID_SESSION_ID, new Object[] { uniqueId, mindmapId, sessionId }); } public List getMindmapNodeByUniqueIdMindmapIdUserId(Long uniqueId, Long mindmapId, Long userId) { - return this.getHibernateTemplate().find(SQL_QUERY_FIND_NODE_BY_UNIQUE_MINDMAP_ID_AND_USER_ID, + return this.doFind(SQL_QUERY_FIND_NODE_BY_UNIQUE_MINDMAP_ID_AND_USER_ID, new Object[] { uniqueId, mindmapId, userId }); } // Node Unique ID public Long getNodeLastUniqueIdByMindmapUidSessionId(Long mindmapUid, Long sessionId) { - List list = this.getHibernateTemplate().find(SQL_QUERY_FIND_NODE_LAST_UNIQUEID_BY_MINDMAPUID_SESSIONID, + List list = this.doFind(SQL_QUERY_FIND_NODE_LAST_UNIQUEID_BY_MINDMAPUID_SESSIONID, new Object[] { mindmapUid, sessionId }); if (list != null && list.size() > 0) return ((Number) list.get(0)).longValue(); @@ -161,7 +163,7 @@ /** Outputs */ public int getNumNodesByUserAndSession(Long userId, Long sessionId) { - List list = this.getHibernateTemplate().find(SQL_QUERY_FIND_NODES_NUMBER_BY_USERUID_SESSIONID, + List list = this.doFind(SQL_QUERY_FIND_NODES_NUMBER_BY_USERUID_SESSIONID, new Object[] { userId }); if (list != null && list.size() > 0) return ((Number) list.get(0)).intValue(); @@ -171,7 +173,7 @@ @SuppressWarnings("unchecked") public List getMindmapNodesBySessionIdAndUserId(Long sessionId, Long userId) { - return (List) this.getHibernateTemplate().find(SQL_QUERY_FIND_NODES_BY_SESSION_ID_AND_USER_ID, + return (List) this.doFind(SQL_QUERY_FIND_NODES_BY_SESSION_ID_AND_USER_ID, new Object[] { sessionId, userId }); } } Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapRequestDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapRequestDAO.java,v diff -u -r1.5.2.2 -r1.5.2.3 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapRequestDAO.java 11 Nov 2014 22:48:36 -0000 1.5.2.2 +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapRequestDAO.java 29 Nov 2014 21:40:06 -0000 1.5.2.3 @@ -29,17 +29,18 @@ import org.hibernate.HibernateException; import org.hibernate.Query; import org.hibernate.Session; -import org.lamsfoundation.lams.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.mindmap.dao.IMindmapRequestDAO; import org.lamsfoundation.lams.tool.mindmap.model.MindmapRequest; -import org.springframework.orm.hibernate4.HibernateCallback; +import org.springframework.stereotype.Repository; /** * MindmapRequestDAO * * @author Ruslan Kazakov */ -public class MindmapRequestDAO extends BaseDAO implements IMindmapRequestDAO { +@Repository +public class MindmapRequestDAO extends LAMSBaseDAO implements IMindmapRequestDAO { private static final String SQL_QUERY_FIND_REQUESTS_AFTER_GLOBAL_ID = " from " + MindmapRequest.class.getName() + " mr where mr.globalId > ? and " + " mr.mindmap.uid = ? and mr.user.uid <> ? and mr.user.mindmapSession.sessionId = ? order by mr.globalId "; @@ -55,16 +56,16 @@ + " mr where mr.user.userId = ? "; public void saveOrUpdate(MindmapRequest mindmapRequest) { - this.getHibernateTemplate().saveOrUpdate(mindmapRequest); + getSession().saveOrUpdate(mindmapRequest); } public List getLastRequestsAfterGlobalId(Long globalId, Long mindmapId, Long userId, Long sessionId) { - return this.getHibernateTemplate().find(SQL_QUERY_FIND_REQUESTS_AFTER_GLOBAL_ID, + return this.doFind(SQL_QUERY_FIND_REQUESTS_AFTER_GLOBAL_ID, new Object[] { globalId, mindmapId, userId, sessionId }); } public MindmapRequest getRequestByUniqueId(Long uniqueId, Long userId, Long mindmapId, Long globalId) { - List list = this.getHibernateTemplate().find(SQL_QUERY_FIND_REQUEST_BY_UNIQUE_ID, + List list = this.doFind(SQL_QUERY_FIND_REQUEST_BY_UNIQUE_ID, new Object[] { uniqueId, userId, mindmapId, globalId }); if (list != null && list.size() > 0) return (MindmapRequest) list.get(list.size() - 1); @@ -73,22 +74,16 @@ } public Long getLastGlobalIdByMindmapId(Long mindmapId, Long sessionId) { - return getHibernateTemplate().execute(new HibernateCallback() { - @Override - public Long doInHibernate(Session session) throws HibernateException { - Query q = session.createQuery(SQL_QUERY_FIND_LAST_GLOBAL_ID_BY_MINDMAP); - q.setParameter(0, mindmapId); - q.setParameter(1, sessionId); - q.setMaxResults(1); - Object result = q.uniqueResult(); - return result != null ? ((Number) result).longValue() : null; - } - }); - + Query q = getSession().createQuery(SQL_QUERY_FIND_LAST_GLOBAL_ID_BY_MINDMAP); + q.setParameter(0, mindmapId); + q.setParameter(1, sessionId); + q.setMaxResults(1); + Object result = q.uniqueResult(); + return result != null ? ((Number) result).longValue() : null; } @SuppressWarnings("unchecked") public List getRequestsByUserId(Long userId) { - return (List) this.getHibernateTemplate().find(SQL_QUERY_FIND_REQUESTS_BY_USER_ID, userId); + return (List) this.doFind(SQL_QUERY_FIND_REQUESTS_BY_USER_ID, userId); } } Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapSessionDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapSessionDAO.java,v diff -u -r1.3 -r1.3.2.1 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapSessionDAO.java 12 May 2009 01:39:01 -0000 1.3 +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapSessionDAO.java 29 Nov 2014 21:40:06 -0000 1.3.2.1 @@ -26,14 +26,16 @@ import java.util.List; -import org.lamsfoundation.lams.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.mindmap.dao.IMindmapSessionDAO; import org.lamsfoundation.lams.tool.mindmap.model.MindmapSession; +import org.springframework.stereotype.Repository; /** * DAO for accessing the MindmapSession objects - Hibernate specific code. */ -public class MindmapSessionDAO extends BaseDAO implements IMindmapSessionDAO { +@Repository +public class MindmapSessionDAO extends LAMSBaseDAO implements IMindmapSessionDAO { public static final String SQL_QUERY_FIND_BY_SESSION_ID = "from " + MindmapSession.class.getName() + " where session_id = ?"; @@ -42,12 +44,12 @@ + " ms where ms.mindmap.uid = ?"; public void saveOrUpdate(MindmapSession session) { - this.getHibernateTemplate().saveOrUpdate(session); - this.getHibernateTemplate().flush(); + getSession().saveOrUpdate(session); + getSession().flush(); } public MindmapSession getBySessionId(Long toolSessionId) { - List list = this.getHibernateTemplate().find(SQL_QUERY_FIND_BY_SESSION_ID, toolSessionId); + List list = doFind(SQL_QUERY_FIND_BY_SESSION_ID, toolSessionId); if (list == null || list.isEmpty()) return null; return (MindmapSession) list.get(0); @@ -56,8 +58,8 @@ public void deleteBySessionID(Long toolSessionID) { MindmapSession session = getBySessionId(toolSessionID); if (session != null) { - this.getHibernateTemplate().delete(session); - this.getHibernateTemplate().flush(); + getSession().delete(session); + getSession().flush(); } } Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapUserDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapUserDAO.java,v diff -u -r1.1 -r1.1.8.1 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapUserDAO.java 3 Apr 2009 00:00:30 -0000 1.1 +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapUserDAO.java 29 Nov 2014 21:40:06 -0000 1.1.8.1 @@ -26,14 +26,16 @@ import java.util.List; -import org.lamsfoundation.lams.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.mindmap.dao.IMindmapUserDAO; import org.lamsfoundation.lams.tool.mindmap.model.MindmapUser; +import org.springframework.stereotype.Repository; /** * DAO for accessing the MindmapUser objects - Hibernate specific code. */ -public class MindmapUserDAO extends BaseDAO implements IMindmapUserDAO { +@Repository +public class MindmapUserDAO extends LAMSBaseDAO implements IMindmapUserDAO { public static final String SQL_QUERY_FIND_BY_USER_ID_SESSION_ID = "from " + MindmapUser.class.getName() + " as f" + " where user_id=? and f.mindmapSession.sessionId=?"; @@ -44,7 +46,7 @@ private static final String SQL_QUERY_FIND_BY_UID = "from " + MindmapUser.class.getName() + " where uid=?"; public MindmapUser getByUserIdAndSessionId(Long userId, Long toolSessionId) { - List list = this.getHibernateTemplate().find(SQL_QUERY_FIND_BY_USER_ID_SESSION_ID, + List list = doFind(SQL_QUERY_FIND_BY_USER_ID_SESSION_ID, new Object[] { userId, toolSessionId }); if (list == null || list.isEmpty()) @@ -55,7 +57,7 @@ public MindmapUser getByLoginNameAndSessionId(String loginName, Long toolSessionId) { - List list = this.getHibernateTemplate().find(SQL_QUERY_FIND_BY_LOGIN_NAME_SESSION_ID, + List list = doFind(SQL_QUERY_FIND_BY_LOGIN_NAME_SESSION_ID, new Object[] { loginName, toolSessionId }); if (list == null || list.isEmpty()) @@ -66,12 +68,12 @@ } public void saveOrUpdate(MindmapUser mindmapUser) { - this.getHibernateTemplate().saveOrUpdate(mindmapUser); - this.getHibernateTemplate().flush(); + getSession().saveOrUpdate(mindmapUser); + getSession().flush(); } public MindmapUser getByUID(Long uid) { - List list = this.getHibernateTemplate().find(SQL_QUERY_FIND_BY_UID, new Object[] { uid }); + List list = doFind(SQL_QUERY_FIND_BY_UID, new Object[] { uid }); if (list == null || list.isEmpty()) return null;