Index: lams_common/src/java/org/lamsfoundation/lams/dao/IBaseDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/dao/IBaseDAO.java,v diff -u -r1.10.4.3 -r1.10.4.4 --- lams_common/src/java/org/lamsfoundation/lams/dao/IBaseDAO.java 11 May 2016 07:07:26 -0000 1.10.4.3 +++ lams_common/src/java/org/lamsfoundation/lams/dao/IBaseDAO.java 24 Nov 2016 11:26:42 -0000 1.10.4.4 @@ -75,33 +75,10 @@ */ public void insertOrUpdateAll(Collection objects); - /** - * Just a wrapper of the method in HibernateTemplate - * shouldn't be used unless a complicated query needed - * - * @param queryString - * @return void - */ public void update(String queryString); - /** - * Just a wrapper of the method in HibernateTemplate - * shouldn't be used unless a complicated query needed - * - * @param queryString - * @param value - * @return void - */ public void update(String queryString, Object value); - /** - * Just a wrapper of the method in HibernateTemplate - * shouldn't be used unless a complicated query needed - * - * @param queryString - * @param values - * @return void - */ public void update(String queryString, Object[] values); /** @@ -259,62 +236,16 @@ */ public List findAnythingLike(Object object); - /** - * Just a wrapper of the method in HibernateTemplate - * shouldn't be used unless a complicated query needed - * - * @param queryString - * @return void - */ public List find(String queryString); - /** - * Just a wrapper of the method in HibernateTemplate - * shouldn't be used unless a complicated query needed - * - * @param queryString - * @param value - * @return void - */ public List find(String queryString, Object value); - /** - * Just a wrapper of the method in HibernateTemplate - * shouldn't be used unless a complicated query needed - * - * @param queryString - * @param values - * @return void - */ public List find(String queryString, Object[] values); - /** - * Just a wrapper of the method in HibernateTemplate - * shouldn't be used unless a complicated query needed - * - * @param queryName - * @return void - */ public List findByNamedQuery(String queryName); - /** - * Just a wrapper of the method in HibernateTemplate - * shouldn't be used unless a complicated query needed - * - * @param queryName - * @param value - * @return void - */ public List findByNamedQuery(String queryName, Object value); - /** - * Just a wrapper of the method in HibernateTemplate - * shouldn't be used unless a complicated query needed - * - * @param queryName - * @param values - * @return void - */ public List findByNamedQuery(String queryName, Object[] values); /** Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IActivityDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IActivityDAO.java,v diff -u -r1.16.24.3 -r1.16.24.4 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IActivityDAO.java 11 May 2016 07:07:27 -0000 1.16.24.3 +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IActivityDAO.java 24 Nov 2016 11:26:42 -0000 1.16.24.4 @@ -28,7 +28,6 @@ import org.lamsfoundation.lams.dao.IBaseDAO; import org.lamsfoundation.lams.learningdesign.Activity; import org.lamsfoundation.lams.learningdesign.LearningDesign; -import org.springframework.dao.DataRetrievalFailureException; /** * @author Manpreet Minhas Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java,v diff -u -r1.23.12.4 -r1.23.12.5 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java 11 May 2016 07:07:27 -0000 1.23.12.4 +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java 24 Nov 2016 11:26:42 -0000 1.23.12.5 @@ -45,7 +45,7 @@ import org.lamsfoundation.lams.learningdesign.ToolActivity; import org.lamsfoundation.lams.learningdesign.ToolBranchingActivity; import org.lamsfoundation.lams.learningdesign.dao.IActivityDAO; -import org.springframework.dao.DataRetrievalFailureException; +import org.lamsfoundation.lams.tool.exception.DataMissingException; import org.springframework.stereotype.Repository; /** @@ -121,7 +121,7 @@ break; } } - throw new DataRetrievalFailureException( + throw new DataMissingException( "Unable to get activity as the activity type is unknown or missing. Activity type is " + activityType); } Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/GroupingDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/GroupingDAO.java,v diff -u -r1.14.14.3 -r1.14.14.4 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/GroupingDAO.java 11 May 2016 07:07:27 -0000 1.14.14.3 +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/GroupingDAO.java 24 Nov 2016 11:26:42 -0000 1.14.14.4 @@ -28,6 +28,7 @@ import java.util.Iterator; import java.util.List; +import org.hibernate.HibernateException; import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.learningdesign.Activity; import org.lamsfoundation.lams.learningdesign.ChosenGrouping; @@ -36,7 +37,6 @@ import org.lamsfoundation.lams.learningdesign.LearnerChoiceGrouping; import org.lamsfoundation.lams.learningdesign.RandomGrouping; import org.lamsfoundation.lams.learningdesign.dao.IGroupingDAO; -import org.springframework.dao.DataRetrievalFailureException; import org.springframework.stereotype.Repository; /** @@ -101,11 +101,10 @@ } else if (grouping.isLearnerChoiceGrouping()) { return (Grouping) super.find(LearnerChoiceGrouping.class, grouping.getGroupingId()); } - throw new DataRetrievalFailureException( + throw new HibernateException( "Unable to get grouping as the grouping type is unknown or missing. Grouping object is " + grouping); } return null; } - -} +} \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingCommentDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingCommentDAO.java,v diff -u -r1.4.2.7 -r1.4.2.8 --- lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingCommentDAO.java 10 Oct 2016 00:53:43 -0000 1.4.2.7 +++ lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingCommentDAO.java 24 Nov 2016 11:26:42 -0000 1.4.2.8 @@ -145,15 +145,4 @@ return null; } } - -// @Override -// public boolean isUserCommentedItem(Long toolContentId, Long itemId, Integer userId) { -// List list = getHibernateTemplate().find(COUNT_COMMENTS_BY_ITEM_AND_USER, -// new Object[] { toolContentId, itemId, userId }); -// if (list == null || list.size() == 0) { -// return false; -// } else { -// return ((Number) list.get(0)).intValue() > 0; -// } -// } -} +} \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingCriteriaDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingCriteriaDAO.java,v diff -u -r1.1.2.7 -r1.1.2.8 --- lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingCriteriaDAO.java 10 Oct 2016 00:53:43 -0000 1.1.2.7 +++ lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingCriteriaDAO.java 24 Nov 2016 11:26:42 -0000 1.1.2.8 @@ -20,7 +20,6 @@ * **************************************************************** */ - package org.lamsfoundation.lams.rating.dao.hibernate; import java.util.List; @@ -32,7 +31,7 @@ import org.lamsfoundation.lams.rating.model.LessonRatingCriteria; import org.lamsfoundation.lams.rating.model.RatingCriteria; import org.lamsfoundation.lams.rating.model.ToolActivityRatingCriteria; -import org.springframework.dao.DataRetrievalFailureException; +import org.lamsfoundation.lams.tool.exception.DataMissingException; public class RatingCriteriaDAO extends LAMSBaseDAO implements IRatingCriteriaDAO { @@ -89,7 +88,7 @@ break; } } - throw new DataRetrievalFailureException( + throw new DataMissingException( "Unable to get RatingCriteria as the RatingCriteria type is unknown or missing. RatingCriteria type is " + criteriaType); } Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/IWorkspaceDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/IWorkspaceDAO.java,v diff -u -r1.7.14.2 -r1.7.14.3 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/IWorkspaceDAO.java 11 May 2016 07:07:42 -0000 1.7.14.2 +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/IWorkspaceDAO.java 24 Nov 2016 11:26:33 -0000 1.7.14.3 @@ -60,16 +60,4 @@ * @return first (and expected only) workspace with this name. */ public List findWorkspaceNodes(Long workspaceId); - - /** - * Finds an object. Return null if not found (note: this - * is not the standard behaviour for Spring and Hibernate combined.) - * - * @param objClass - * @param id - * @return object built from database - */ - @Override - public Object find(Class objClass, Serializable id); - -} +} \ No newline at end of file Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/WorkspaceDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/WorkspaceDAO.java,v diff -u -r1.7.14.4 -r1.7.14.5 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/WorkspaceDAO.java 11 May 2016 07:07:42 -0000 1.7.14.4 +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/WorkspaceDAO.java 24 Nov 2016 11:26:33 -0000 1.7.14.5 @@ -21,7 +21,6 @@ * **************************************************************** */ - package org.lamsfoundation.lams.contentrepository.dao.hibernate; import java.io.Serializable; @@ -34,7 +33,6 @@ import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException; import org.lamsfoundation.lams.contentrepository.dao.IWorkspaceDAO; import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; -import org.springframework.orm.hibernate4.HibernateObjectRetrievalFailureException; import org.springframework.stereotype.Repository; /** @@ -92,15 +90,6 @@ return new ArrayList(nodes); } - @Override - public Object find(Class objClass, Serializable id) { - try { - return super.find(objClass, id); - } catch (HibernateObjectRetrievalFailureException e) { - return null; - } - } - public void flushSession() throws RepositoryCheckedException { try { getSessionFactory().getCurrentSession().flush(); @@ -109,5 +98,4 @@ throw new RepositoryCheckedException("Unable to write changes to db successfully (flush).", e); } } - -} +} \ No newline at end of file Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/DAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/DAO.java,v diff -u -r1.1.10.2 -r1.1.10.3 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/DAO.java 11 May 2016 07:15:06 -0000 1.1.10.2 +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/DAO.java 24 Nov 2016 11:26:37 -0000 1.1.10.3 @@ -52,7 +52,6 @@ * @param id * the identifier (primary key) of the class * @return a populated object - * @see org.springframework.orm.ObjectRetrievalFailureException */ public Object getObject(Class clazz, Serializable id); Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/DAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/DAO.java,v diff -u -r1.3.12.2 -r1.3.12.3 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/DAO.java 11 May 2016 07:14:28 -0000 1.3.12.2 +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/DAO.java 24 Nov 2016 11:26:43 -0000 1.3.12.3 @@ -54,7 +54,6 @@ * @param id * the identifier (primary key) of the class * @return a populated object - * @see org.springframework.orm.ObjectRetrievalFailureException */ public Object getObject(Class clazz, Serializable id); Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/DAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/DAO.java,v diff -u -r1.1.12.2 -r1.1.12.3 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/DAO.java 11 May 2016 07:15:20 -0000 1.1.12.2 +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/DAO.java 24 Nov 2016 11:26:34 -0000 1.1.12.3 @@ -54,7 +54,6 @@ * @param id * the identifier (primary key) of the class * @return a populated object - * @see org.springframework.orm.ObjectRetrievalFailureException */ public Object getObject(Class clazz, Serializable id); Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/DAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/DAO.java,v diff -u -r1.1.2.2 -r1.1.2.3 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/DAO.java 11 May 2016 07:15:13 -0000 1.1.2.2 +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/DAO.java 24 Nov 2016 11:26:41 -0000 1.1.2.3 @@ -52,7 +52,6 @@ * @param id * the identifier (primary key) of the class * @return a populated object - * @see org.springframework.orm.ObjectRetrievalFailureException */ public Object getObject(Class clazz, Serializable id); Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/DAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/DAO.java,v diff -u -r1.3.16.2 -r1.3.16.3 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/DAO.java 11 May 2016 07:35:28 -0000 1.3.16.2 +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/DAO.java 24 Nov 2016 11:26:39 -0000 1.3.16.3 @@ -54,7 +54,6 @@ * @param id * the identifier (primary key) of the class * @return a populated object - * @see org.springframework.orm.ObjectRetrievalFailureException */ public Object getObject(Class clazz, Serializable id); Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/DAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/DAO.java,v diff -u -r1.1.2.2 -r1.1.2.3 --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/DAO.java 11 May 2016 07:37:53 -0000 1.1.2.2 +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/DAO.java 24 Nov 2016 11:26:34 -0000 1.1.2.3 @@ -54,7 +54,6 @@ * @param id * the identifier (primary key) of the class * @return a populated object - * @see org.springframework.orm.ObjectRetrievalFailureException */ public Object getObject(Class clazz, Serializable id); Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/DAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/DAO.java,v diff -u -r1.1.4.2 -r1.1.4.3 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/DAO.java 11 May 2016 07:38:00 -0000 1.1.4.2 +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/DAO.java 24 Nov 2016 11:26:36 -0000 1.1.4.3 @@ -54,7 +54,6 @@ * @param id * the identifier (primary key) of the class * @return a populated object - * @see org.springframework.orm.ObjectRetrievalFailureException */ public Object getObject(Class clazz, Serializable id); Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieBurningQuestionDAOHibernate.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieBurningQuestionDAOHibernate.java,v diff -u -r1.2.2.6 -r1.2.2.7 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieBurningQuestionDAOHibernate.java 11 May 2016 07:38:00 -0000 1.2.2.6 +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieBurningQuestionDAOHibernate.java 24 Nov 2016 11:26:36 -0000 1.2.2.7 @@ -48,11 +48,6 @@ private static final String FIND_BY_ITEM_UID = "from " + ScratchieBurningQuestion.class.getName() + " as r where r.scratchieItem.uid=? order by r.sessionId asc"; -// @Override -// public List getBurningQuestionsByContentId(Long contentId) { -// return getHibernateTemplate().find(FIND_BY_CONTENT_ID, new Object[] { contentId}); -// } - @Override @SuppressWarnings("unchecked") public List getBurningQuestionsByContentId(Long scratchieUid, Long sessionId) { Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/DAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/DAO.java,v diff -u -r1.1.12.2 -r1.1.12.3 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/DAO.java 11 May 2016 07:37:36 -0000 1.1.12.2 +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/DAO.java 24 Nov 2016 11:26:40 -0000 1.1.12.3 @@ -54,7 +54,6 @@ * @param id * the identifier (primary key) of the class * @return a populated object - * @see org.springframework.orm.ObjectRetrievalFailureException */ public Object getObject(Class clazz, Serializable id); Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/DAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/DAO.java,v diff -u -r1.2.14.2 -r1.2.14.3 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/DAO.java 11 May 2016 07:37:32 -0000 1.2.14.2 +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/DAO.java 24 Nov 2016 11:26:44 -0000 1.2.14.3 @@ -54,7 +54,6 @@ * @param id * the identifier (primary key) of the class * @return a populated object - * @see org.springframework.orm.ObjectRetrievalFailureException */ public Object getObject(Class clazz, Serializable id); Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/DAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/DAO.java,v diff -u -r1.1.12.2 -r1.1.12.3 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/DAO.java 11 May 2016 07:35:22 -0000 1.1.12.2 +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/DAO.java 24 Nov 2016 11:26:35 -0000 1.1.12.3 @@ -54,7 +54,6 @@ * @param id * the identifier (primary key) of the class * @return a populated object - * @see org.springframework.orm.ObjectRetrievalFailureException */ public Object getObject(Class clazz, Serializable id); Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dao/hibernate/WikiDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dao/hibernate/WikiDAO.java,v diff -u -r1.3.2.4 -r1.3.2.5 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dao/hibernate/WikiDAO.java 11 May 2016 07:37:40 -0000 1.3.2.4 +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dao/hibernate/WikiDAO.java 24 Nov 2016 11:26:38 -0000 1.3.2.5 @@ -61,7 +61,6 @@ // Removing duplicate pages removeDuplicatePages(wiki); getSession().saveOrUpdate(wiki); - //this.getHibernateTemplate().flush(); } /**