Index: lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java =================================================================== diff -u -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 -ra8bfd24410deb4e2837ce3c966adaac7ea869186 --- lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java (.../GradebookDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) +++ lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java (.../GradebookDAO.java) (revision a8bfd24410deb4e2837ce3c966adaac7ea869186) @@ -26,12 +26,14 @@ import java.util.Date; import java.util.List; -import org.lamsfoundation.lams.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.gradebook.GradebookUserActivity; import org.lamsfoundation.lams.gradebook.GradebookUserLesson; import org.lamsfoundation.lams.gradebook.dao.IGradebookDAO; +import org.springframework.stereotype.Repository; -public class GradebookDAO extends BaseDAO implements IGradebookDAO { +@Repository +public class GradebookDAO extends LAMSBaseDAO implements IGradebookDAO { private static final String GET_GRADEBOOK_USER_ACTIVITY = "from GradebookUserActivity gact where " + "gact.learner.userId=:userID and gact.activity.activityId=:activityID"; Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java =================================================================== diff -u -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 -ra8bfd24410deb4e2837ce3c966adaac7ea869186 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java (.../ActivityDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java (.../ActivityDAO.java) (revision a8bfd24410deb4e2837ce3c966adaac7ea869186) @@ -26,7 +26,7 @@ import java.util.List; import org.hibernate.Query; -import org.lamsfoundation.lams.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.learningdesign.Activity; import org.lamsfoundation.lams.learningdesign.ChosenBranchingActivity; import org.lamsfoundation.lams.learningdesign.ConditionGateActivity; @@ -46,11 +46,13 @@ import org.lamsfoundation.lams.learningdesign.ToolBranchingActivity; import org.lamsfoundation.lams.learningdesign.dao.IActivityDAO; import org.springframework.dao.DataRetrievalFailureException; +import org.springframework.stereotype.Repository; /** * @author Manpreet Minhas */ -public class ActivityDAO extends BaseDAO implements IActivityDAO { +@Repository +public class ActivityDAO extends LAMSBaseDAO implements IActivityDAO { private static final String TABLENAME = "lams_learning_activity"; @@ -134,7 +136,7 @@ * @see org.lamsfoundation.lams.learningdesign.dao.interfaces.IActivityDAO#getActivityByParentActivityId(java.lang.Long) */ public List getActivitiesByParentActivityId(Long parentActivityId) { - List list = this.getHibernateTemplate().find(ActivityDAO.FIND_BY_PARENT, parentActivityId); + List list = this.doFind(ActivityDAO.FIND_BY_PARENT, parentActivityId); return list; } @@ -149,7 +151,7 @@ * @see org.lamsfoundation.lams.learningdesign.dao.interfaces.IActivityDAO#getActivitiesByLearningDesignId(java.lang.Long) */ public List getActivitiesByLearningDesignId(Long learningDesignId) { - return this.getHibernateTemplate().find(ActivityDAO.FIND_BY_LEARNING_DESIGN_ID, learningDesignId); + return this.doFind(ActivityDAO.FIND_BY_LEARNING_DESIGN_ID, learningDesignId); } /** @@ -158,32 +160,32 @@ * @return List of GroupingActivity objects */ public List getGroupingActivitiesByLearningDesignId(Long learningDesignId) { - return this.getHibernateTemplate().find(ActivityDAO.FIND_GROUPINGACTIVITY_TYPE_BY_LEARNING_DESIGN_ID, learningDesignId); + return this.doFind(ActivityDAO.FIND_GROUPINGACTIVITY_TYPE_BY_LEARNING_DESIGN_ID, learningDesignId); } /* * @see org.lamsfoundation.lams.learningdesign.dao.interfaces.IActivityDAO#insertActivity(org.lamsfoundation.lams.learningdesign.Activity) */ public void insertActivity(Activity activity) { - this.getHibernateTemplate().save(activity); + this.getSession().save(activity); } public void insertOptActivity(OptionsActivity activity) { - this.getHibernateTemplate().save(activity); + this.getSession().save(activity); } /* * @see org.lamsfoundation.lams.learningdesign.dao.interfaces.IActivityDAO#updateActivity(org.lamsfoundation.lams.learningdesign.Activity) */ public void updateActivity(Activity activity) { - this.getHibernateTemplate().update(activity); + this.getSession().update(activity); } /* * @see org.lamsfoundation.lams.learningdesign.dao.interfaces.IActivityDAO#deleteActivity(org.lamsfoundation.lams.learningdesign.Activity) */ public void deleteActivity(Activity activity) { - this.getHibernateTemplate().delete(activity); + this.getSession().delete(activity); } /** @@ -204,13 +206,13 @@ * @see org.lamsfoundation.lams.learningdesign.dao.IActivityDAO#getActivitiesByLibraryID(java.lang.Long) */ public List getActivitiesByLibraryID(Long libraryID) { - List list = this.getHibernateTemplate().find(ActivityDAO.FIND_BY_LIBRARY_ID, libraryID); + List list = this.doFind(ActivityDAO.FIND_BY_LIBRARY_ID, libraryID); return list; } /** @see org.lamsfoundation.lams.learningdesign.dao.IActivityDAO#getTemplateActivityByLibraryID(java.lang.Long) */ public Activity getTemplateActivityByLibraryID(Long libraryID) { - List list = this.getHibernateTemplate().find(ActivityDAO.FIND_BY_LIBRARY_ID, libraryID); + List list = this.doFind(ActivityDAO.FIND_BY_LIBRARY_ID, libraryID); return list != null && list.size() != 0 ? (Activity) list.get(0) : null; } } Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/BranchActivityEntryDAO.java =================================================================== diff -u -r2aaccb954583cd8431759dca8e912a8fe863aa0e -ra8bfd24410deb4e2837ce3c966adaac7ea869186 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/BranchActivityEntryDAO.java (.../BranchActivityEntryDAO.java) (revision 2aaccb954583cd8431759dca8e912a8fe863aa0e) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/BranchActivityEntryDAO.java (.../BranchActivityEntryDAO.java) (revision a8bfd24410deb4e2837ce3c966adaac7ea869186) @@ -21,17 +21,20 @@ * **************************************************************** */ /* $$Id$$ */ + package org.lamsfoundation.lams.learningdesign.dao.hibernate; import java.util.List; -import org.lamsfoundation.lams.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.learningdesign.Activity; import org.lamsfoundation.lams.learningdesign.BranchActivityEntry; import org.lamsfoundation.lams.learningdesign.BranchCondition; import org.lamsfoundation.lams.learningdesign.dao.IBranchActivityEntryDAO; +import org.springframework.stereotype.Repository; -public class BranchActivityEntryDAO extends BaseDAO implements IBranchActivityEntryDAO { +@Repository +public class BranchActivityEntryDAO extends LAMSBaseDAO implements IBranchActivityEntryDAO { private final static String ENTRIES_FOR_LEARNING_DESIGN = "select entry from " + BranchActivityEntry.class.getName() + " entry, " + Activity.class.getName() + " branchingActivity " @@ -47,12 +50,12 @@ */ @SuppressWarnings("unchecked") public List getEntriesByLearningDesign(Long learningDesignId) { - return (List) this.getHibernateTemplate().find(BranchActivityEntryDAO.ENTRIES_FOR_LEARNING_DESIGN, learningDesignId); + return (List) this.doFind(BranchActivityEntryDAO.ENTRIES_FOR_LEARNING_DESIGN, learningDesignId); } @SuppressWarnings("unchecked") public BranchCondition getConditionByID(Long conditionID) { - List result = (List) this.getHibernateTemplate().find(BranchActivityEntryDAO.CONDITION_BY_ID, + List result = (List) this.doFind(BranchActivityEntryDAO.CONDITION_BY_ID, conditionID); if (result == null || result.isEmpty()) { return null; Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/CompetenceDAO.java =================================================================== diff -u -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 -ra8bfd24410deb4e2837ce3c966adaac7ea869186 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/CompetenceDAO.java (.../CompetenceDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/CompetenceDAO.java (.../CompetenceDAO.java) (revision a8bfd24410deb4e2837ce3c966adaac7ea869186) @@ -23,20 +23,17 @@ package org.lamsfoundation.lams.learningdesign.dao.hibernate; -import java.util.List; import java.util.Set; import org.hibernate.Query; -import org.hibernate.HibernateException; -import org.hibernate.Session; -import org.lamsfoundation.lams.learningdesign.dao.ICompetenceDAO; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.learningdesign.Competence; -import org.lamsfoundation.lams.learningdesign.CompetenceMapping; import org.lamsfoundation.lams.learningdesign.LearningDesign; -import org.lamsfoundation.lams.dao.hibernate.BaseDAO; -import org.springframework.orm.hibernate4.HibernateCallback; +import org.lamsfoundation.lams.learningdesign.dao.ICompetenceDAO; +import org.springframework.stereotype.Repository; -public class CompetenceDAO extends BaseDAO implements ICompetenceDAO +@Repository +public class CompetenceDAO extends LAMSBaseDAO implements ICompetenceDAO { private static final String LOAD_COMPETENCE_BY_LDID_AND_TITLE= "from lams_competence in class " + Competence.class.getName() + " where title=? AND learning_design_id=?"; @@ -48,7 +45,7 @@ public void saveOrUpdate(Competence competence) { - this.getHibernateTemplate().saveOrUpdate(competence); + this.getSession().saveOrUpdate(competence); } @@ -70,11 +67,11 @@ public void delete(Competence competence) { - this.getHibernateTemplate().delete(competence); + this.getSession().delete(competence); } public void deleteAll(Set competences) { - this.getHibernateTemplate().deleteAll(competences); + this.doDeleteAll(competences); } } Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/CompetenceMappingDAO.java =================================================================== diff -u -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 -ra8bfd24410deb4e2837ce3c966adaac7ea869186 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/CompetenceMappingDAO.java (.../CompetenceMappingDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/CompetenceMappingDAO.java (.../CompetenceMappingDAO.java) (revision a8bfd24410deb4e2837ce3c966adaac7ea869186) @@ -3,29 +3,31 @@ import java.util.Set; import org.hibernate.Query; -import org.lamsfoundation.lams.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.learningdesign.Competence; import org.lamsfoundation.lams.learningdesign.CompetenceMapping; import org.lamsfoundation.lams.learningdesign.ToolActivity; import org.lamsfoundation.lams.learningdesign.dao.ICompetenceMappingDAO; +import org.springframework.stereotype.Repository; -public class CompetenceMappingDAO extends BaseDAO implements ICompetenceMappingDAO +@Repository +public class CompetenceMappingDAO extends LAMSBaseDAO implements ICompetenceMappingDAO { private static final String LOAD_COMPETENCE_MAPPING_BY_ACTIVITY_AND_COMPETENCE= "from lams_competence_mapping in class " + CompetenceMapping.class.getName() + " where competence_id=? AND activity_id=?"; public void saveOrUpdate(CompetenceMapping competenceMapping) { - this.getHibernateTemplate().saveOrUpdate(competenceMapping); + this.getSession().saveOrUpdate(competenceMapping); } public CompetenceMapping getCompetenceMapping(ToolActivity toolActivity, Competence competence) { if ( toolActivity != null && competence != null ) { Long activityId = toolActivity.getActivityId(); Long competenceId = competence.getCompetenceId(); - Query query = getSessionFactory().getCurrentSession().createQuery(LOAD_COMPETENCE_MAPPING_BY_ACTIVITY_AND_COMPETENCE); + Query query = getSession().createQuery(LOAD_COMPETENCE_MAPPING_BY_ACTIVITY_AND_COMPETENCE); query.setLong(0,competenceId); query.setLong(1,activityId.longValue()); return (CompetenceMapping) query.uniqueResult(); @@ -35,11 +37,18 @@ public void delete(CompetenceMapping competenceMapping) { - this.getHibernateTemplate().delete(competenceMapping); + this.getSession().delete(competenceMapping); } public void deleteAll(Set competenceMappings) { - this.getHibernateTemplate().deleteAll(competenceMappings); + this.doDeleteAll(competenceMappings); } + + @Override + public void insert(CompetenceMapping competenceMapping) { + super.insert(competenceMapping); + } + + } Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/DataFlowDAO.java =================================================================== diff -u -r2aaccb954583cd8431759dca8e912a8fe863aa0e -ra8bfd24410deb4e2837ce3c966adaac7ea869186 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/DataFlowDAO.java (.../DataFlowDAO.java) (revision 2aaccb954583cd8431759dca8e912a8fe863aa0e) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/DataFlowDAO.java (.../DataFlowDAO.java) (revision a8bfd24410deb4e2837ce3c966adaac7ea869186) @@ -25,16 +25,18 @@ import java.util.List; -import org.lamsfoundation.lams.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.learningdesign.DataFlowObject; import org.lamsfoundation.lams.learningdesign.DataTransition; import org.lamsfoundation.lams.learningdesign.ToolActivity; import org.lamsfoundation.lams.learningdesign.dao.IDataFlowDAO; +import org.springframework.stereotype.Repository; /** * @author Marcin Cieslak */ -public class DataFlowDAO extends BaseDAO implements IDataFlowDAO { +@Repository +public class DataFlowDAO extends LAMSBaseDAO implements IDataFlowDAO { private static final String FIND_DATA_FLOW_OBJECTS_BY_TOOL_CONTENT_ID = "SELECT obj FROM " + DataFlowObject.class.getName() @@ -53,7 +55,7 @@ @SuppressWarnings("unchecked") public List getDataFlowObjectsByToolContentId(Long toolContentId) { - List result = (List) this.getHibernateTemplate().find( + List result = (List) this.doFind( DataFlowDAO.FIND_DATA_FLOW_OBJECTS_BY_TOOL_CONTENT_ID, toolContentId); if (result == null || result.isEmpty()) { return null; @@ -63,7 +65,7 @@ @SuppressWarnings("unchecked") public DataFlowObject getAssignedDataFlowObject(Long toolContentId, Integer assigmentId) { - List result = (List) this.getHibernateTemplate().findByNamedParam( + List result = (List) this.doFindByNamedParam( DataFlowDAO.FIND_ASSIGNED_DATA_FLOW_OBJECTS, new String[] { "toolContentId", "toolAssigmentId" }, new Object[] { toolContentId, assigmentId }); // There must be exactly one result Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/GroupDAO.java =================================================================== diff -u -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 -ra8bfd24410deb4e2837ce3c966adaac7ea869186 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/GroupDAO.java (.../GroupDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/GroupDAO.java (.../GroupDAO.java) (revision a8bfd24410deb4e2837ce3c966adaac7ea869186) @@ -23,25 +23,21 @@ /* $$Id$$ */ package org.lamsfoundation.lams.learningdesign.dao.hibernate; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - 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.learningdesign.Group; -import org.lamsfoundation.lams.learningdesign.Grouping; -import org.lamsfoundation.lams.learningdesign.GroupingActivity; import org.lamsfoundation.lams.learningdesign.dao.IGroupDAO; import org.springframework.orm.hibernate4.HibernateCallback; import org.springframework.orm.hibernate4.HibernateTemplate; +import org.springframework.stereotype.Repository; /** * @author Manpreet Minhas */ -public class GroupDAO extends BaseDAO implements IGroupDAO { +@Repository +public class GroupDAO extends LAMSBaseDAO implements IGroupDAO { private final static String NUM_GROUPS = "select count(*) from " + Group.class.getName() + " g join g.users u" @@ -55,11 +51,11 @@ } public void saveGroup(Group group) { - getHibernateTemplate().save(group); + getSession().save(group); } public void deleteGroup(Group group) { - getHibernateTemplate().delete(group); + getSession().delete(group); } /** Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/GroupUserDAO.java =================================================================== diff -u -r2aaccb954583cd8431759dca8e912a8fe863aa0e -ra8bfd24410deb4e2837ce3c966adaac7ea869186 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/GroupUserDAO.java (.../GroupUserDAO.java) (revision 2aaccb954583cd8431759dca8e912a8fe863aa0e) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/GroupUserDAO.java (.../GroupUserDAO.java) (revision a8bfd24410deb4e2837ce3c966adaac7ea869186) @@ -27,16 +27,18 @@ import java.util.HashMap; import java.util.List; -import org.lamsfoundation.lams.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.learningdesign.GroupUser; import org.lamsfoundation.lams.learningdesign.dao.IGroupUserDAO; import org.lamsfoundation.lams.lesson.Lesson; import org.lamsfoundation.lams.usermanagement.User; +import org.springframework.stereotype.Repository; /** * @author Andrey Balan */ -public class GroupUserDAO extends BaseDAO implements IGroupUserDAO { +@Repository +public class GroupUserDAO extends LAMSBaseDAO implements IGroupUserDAO { private static final String GET_USERS_BY_LESSON_AND_TIME = "SELECT DISTINCT gu.user FROM " + GroupUser.class.getName() @@ -64,12 +66,12 @@ */ @SuppressWarnings("unchecked") public List getUsersWithLessonEndingSoonerThan(Lesson lesson, Date timeToScheduledLessonEnd) { - return (List) getHibernateTemplate().find(GET_USERS_BY_LESSON_AND_TIME, + return (List) doFind(GET_USERS_BY_LESSON_AND_TIME, new Object[] { lesson.getLessonClass().getGroupingId(), timeToScheduledLessonEnd }); } public void saveGroupUser(GroupUser groupUser) { - getHibernateTemplate().save(groupUser); + getSession().save(groupUser); } } \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/GroupingDAO.java =================================================================== diff -u -rc209be8131f22f6fe37bd8d6c14b56425a78b766 -ra8bfd24410deb4e2837ce3c966adaac7ea869186 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/GroupingDAO.java (.../GroupingDAO.java) (revision c209be8131f22f6fe37bd8d6c14b56425a78b766) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/GroupingDAO.java (.../GroupingDAO.java) (revision a8bfd24410deb4e2837ce3c966adaac7ea869186) @@ -28,7 +28,7 @@ import java.util.Iterator; import java.util.List; -import org.lamsfoundation.lams.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.learningdesign.Activity; import org.lamsfoundation.lams.learningdesign.ChosenGrouping; import org.lamsfoundation.lams.learningdesign.Grouping; @@ -37,11 +37,13 @@ import org.lamsfoundation.lams.learningdesign.RandomGrouping; import org.lamsfoundation.lams.learningdesign.dao.IGroupingDAO; import org.springframework.dao.DataRetrievalFailureException; +import org.springframework.stereotype.Repository; /** * @author Manpreet Minhas */ -public class GroupingDAO extends BaseDAO implements IGroupingDAO { +@Repository +public class GroupingDAO extends LAMSBaseDAO implements IGroupingDAO { private final static String GROUPINGS_FOR_LEARNING_DESIGN_VIA_CREATE = "select grouping from " + Grouping.class.getName() + " grouping, " + GroupingActivity.class.getName() + " grouping_activity " @@ -64,9 +66,8 @@ * related to branches and which are not attached to a GroupingActivity. */ public List getGroupingsByLearningDesign(Long learningDesignId) { - List groupingsA = this.getHibernateTemplate() - .find(GroupingDAO.GROUPINGS_FOR_LEARNING_DESIGN_VIA_CREATE, learningDesignId); - List groupingsB = this.getHibernateTemplate().find(GroupingDAO.GROUPINGS_FOR_LEARNING_DESIGN_VIA_GROUPING, + List groupingsA = this.doFind(GroupingDAO.GROUPINGS_FOR_LEARNING_DESIGN_VIA_CREATE, learningDesignId); + List groupingsB = this.doFind(GroupingDAO.GROUPINGS_FOR_LEARNING_DESIGN_VIA_GROUPING, learningDesignId); HashMap realGroupings = new HashMap(); Iterator iter = groupingsA.iterator(); Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningDesignDAO.java =================================================================== diff -u -r19150ba35226fd786e2cd009c05bd9d940118e95 -ra8bfd24410deb4e2837ce3c966adaac7ea869186 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningDesignDAO.java (.../LearningDesignDAO.java) (revision 19150ba35226fd786e2cd009c05bd9d940118e95) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningDesignDAO.java (.../LearningDesignDAO.java) (revision a8bfd24410deb4e2837ce3c966adaac7ea869186) @@ -27,15 +27,17 @@ import org.hibernate.HibernateException; import org.hibernate.Query; -import org.lamsfoundation.lams.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.learningdesign.LearningDesign; import org.lamsfoundation.lams.learningdesign.LearningDesignAccess; import org.lamsfoundation.lams.learningdesign.dao.ILearningDesignDAO; +import org.springframework.stereotype.Repository; /** * @author Manpreet Minhas */ -public class LearningDesignDAO extends BaseDAO implements ILearningDesignDAO { +@Repository +public class LearningDesignDAO extends LAMSBaseDAO implements ILearningDesignDAO { private static final String TABLENAME ="lams_learning_design"; private static final String FIND_BY_USERID = "from " + TABLENAME +" in class " + LearningDesign.class.getName()+ " where user_id =?"; @@ -91,22 +93,22 @@ * @see org.lamsfoundation.lams.learningdesign.dao.ILearningDesignDAO#getAllValidLearningDesignsInFolder(java.lang.Integer) */ public List getAllValidLearningDesignsInFolder(Integer workspaceFolderID) { - return this.getHibernateTemplate().find(VALID_IN_FOLDER,workspaceFolderID); + return this.doFind(VALID_IN_FOLDER,workspaceFolderID); } /** * (non-Javadoc) * @see org.lamsfoundation.lams.learningdesign.dao.ILearningDesignDAO#getAllLearningDesignsInFolder(java.lang.Integer) */ public List getAllLearningDesignsInFolder(Integer workspaceFolderID) { - return this.getHibernateTemplate().find(ALL_IN_FOLDER,workspaceFolderID); + return this.doFind(ALL_IN_FOLDER,workspaceFolderID); } /** * (non-Javadoc) * @see getLearningDesignsByOriginalDesign#getLearningDesignsByParent(java.lang.Long) */ public List getLearningDesignsByOriginalDesign(Long originalDesignID){ - List list = this.getHibernateTemplate().find(FIND_BY_ORIGINAL,originalDesignID); + List list = this.doFind(FIND_BY_ORIGINAL,originalDesignID); return list; } @@ -115,13 +117,13 @@ * @see org.lamsfoundation.lams.learningdesign.dao.ILearningDesignDAO#getLearningDesignTitlesByWorkspaceFolder(java.lang.Integer) */ public List getLearningDesignTitlesByWorkspaceFolder(Integer workspaceFolderID, String prefix){ - return this.getHibernateTemplate().find(FIND_LD_NAMES_IN_FOLDER, + return this.doFind(FIND_LD_NAMES_IN_FOLDER, new Object[] { workspaceFolderID, prefix + "%" }); } @SuppressWarnings("unchecked") @Override public List getAccessByUser(Integer userId) { - return (List) this.getHibernateTemplate().find(ACCESS_BY_USER, userId); + return (List) this.doFind(ACCESS_BY_USER, userId); } } \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningLibraryDAO.java =================================================================== diff -u -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 -ra8bfd24410deb4e2837ce3c966adaac7ea869186 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningLibraryDAO.java (.../LearningLibraryDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningLibraryDAO.java (.../LearningLibraryDAO.java) (revision a8bfd24410deb4e2837ce3c966adaac7ea869186) @@ -25,15 +25,17 @@ import java.util.List; -import org.lamsfoundation.lams.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.learningdesign.LearningLibrary; import org.lamsfoundation.lams.learningdesign.LearningLibraryGroup; import org.lamsfoundation.lams.learningdesign.dao.ILearningLibraryDAO; +import org.springframework.stereotype.Repository; /** * @author Manpreet Minhas */ -public class LearningLibraryDAO extends BaseDAO implements ILearningLibraryDAO { +@Repository +public class LearningLibraryDAO extends LAMSBaseDAO implements ILearningLibraryDAO { private static final String FIND_VALID_LIB = "from " + LearningLibrary.class.getName() + " l where l.validLibrary=true"; @@ -47,7 +49,7 @@ @Override @SuppressWarnings("unchecked") public List getAllLearningLibraries() { - return getSessionFactory().getCurrentSession().createQuery(LearningLibraryDAO.FIND_VALID_LIB).list(); + return getSession().createQuery(LearningLibraryDAO.FIND_VALID_LIB).list(); } @Override @@ -56,13 +58,13 @@ if (valid) { return getAllLearningLibraries(); } else { - return (List) getHibernateTemplate().find(LearningLibraryDAO.FIND_ALL_LIB); + return (List) doFind(LearningLibraryDAO.FIND_ALL_LIB); } } @Override @SuppressWarnings("unchecked") public List getLearningLibraryGroups() { - return getHibernateTemplate().loadAll(LearningLibraryGroup.class); + return loadAll(LearningLibraryGroup.class); } } \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LicenseDAO.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -ra8bfd24410deb4e2837ce3c966adaac7ea869186 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LicenseDAO.java (.../LicenseDAO.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LicenseDAO.java (.../LicenseDAO.java) (revision a8bfd24410deb4e2837ce3c966adaac7ea869186) @@ -23,14 +23,16 @@ /* $$Id$$ */ package org.lamsfoundation.lams.learningdesign.dao.hibernate; -import org.lamsfoundation.lams.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.learningdesign.License; import org.lamsfoundation.lams.learningdesign.dao.ILicenseDAO; +import org.springframework.stereotype.Repository; /** * @author Manpreet Minhas */ -public class LicenseDAO extends BaseDAO implements ILicenseDAO{ +@Repository +public class LicenseDAO extends LAMSBaseDAO implements ILicenseDAO{ public License getLicenseByID(Long licenseID){ return(License)super.find(License.class,licenseID); Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/TransitionDAO.java =================================================================== diff -u -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 -ra8bfd24410deb4e2837ce3c966adaac7ea869186 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/TransitionDAO.java (.../TransitionDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/TransitionDAO.java (.../TransitionDAO.java) (revision a8bfd24410deb4e2837ce3c966adaac7ea869186) @@ -26,16 +26,18 @@ import java.util.List; import org.hibernate.Query; -import org.lamsfoundation.lams.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.learningdesign.Activity; +import org.lamsfoundation.lams.learningdesign.LearningDesign; import org.lamsfoundation.lams.learningdesign.Transition; import org.lamsfoundation.lams.learningdesign.dao.ITransitionDAO; -import org.lamsfoundation.lams.learningdesign.LearningDesign; +import org.springframework.stereotype.Repository; /** * @author Manpreet Minhas */ -public class TransitionDAO extends BaseDAO implements ITransitionDAO { +@Repository +public class TransitionDAO extends LAMSBaseDAO implements ITransitionDAO { private static final String TABLENAME ="lams_learning_transition"; private static final String FIND_BY_TO_ACTIVITY = "from " + TABLENAME +" in class " + Transition.class.getName()+ " where to_activity_id =?"; @@ -51,7 +53,7 @@ * @see org.lamsfoundation.lams.learningdesign.dao.ITransitionDAO#getTransitionByTransitionID(java.lang.Long) */ public Transition getTransitionByTransitionID(Long transitionID) { - return (Transition)this.getHibernateTemplate().get(Transition.class,transitionID); + return (Transition)this.getSession().get(Transition.class,transitionID); } /** Index: lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonClassDAO.java =================================================================== diff -u -r315fad9f727a91c28b274654eab02cac89d76b9c -ra8bfd24410deb4e2837ce3c966adaac7ea869186 --- lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonClassDAO.java (.../LessonClassDAO.java) (revision 315fad9f727a91c28b274654eab02cac89d76b9c) +++ lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonClassDAO.java (.../LessonClassDAO.java) (revision a8bfd24410deb4e2837ce3c966adaac7ea869186) @@ -24,20 +24,22 @@ package org.lamsfoundation.lams.lesson.dao.hibernate; -import org.lamsfoundation.lams.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.lesson.LessonClass; import org.lamsfoundation.lams.lesson.dao.ILessonClassDAO; +import org.springframework.stereotype.Repository; /** * Hibernate implementation of ILessonDAO * @author chris */ -public class LessonClassDAO extends BaseDAO implements ILessonClassDAO +@Repository +public class LessonClassDAO extends LAMSBaseDAO implements ILessonClassDAO { public LessonClass getLessonClass(Long lessonClassId) { - return (LessonClass)getHibernateTemplate().get(LessonClass.class, lessonClassId); + return (LessonClass)getSession().get(LessonClass.class, lessonClassId); } /** @@ -46,7 +48,7 @@ */ public void saveLessonClass(LessonClass lessonClass) { - getHibernateTemplate().save(lessonClass); + getSession().save(lessonClass); } /** @@ -55,15 +57,15 @@ */ public void deleteLessonClass(LessonClass lessonClass) { - getHibernateTemplate().delete(lessonClass); + getSession().delete(lessonClass); } /** * @see org.lamsfoundation.lams.lesson.dao.ILessonClassDAO#updateLessonClass(org.lamsfoundation.lams.lesson.LessonClass) */ public void updateLessonClass(LessonClass lessonClass) { - getHibernateTemplate().update(lessonClass); + getSession().update(lessonClass); } Index: lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java =================================================================== diff -u -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 -ra8bfd24410deb4e2837ce3c966adaac7ea869186 --- lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java (.../LessonDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) +++ lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java (.../LessonDAO.java) (revision a8bfd24410deb4e2837ce3c966adaac7ea869186) @@ -31,7 +31,7 @@ import org.hibernate.Query; import org.hibernate.Session; import org.hibernate.criterion.Restrictions; -import org.lamsfoundation.lams.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.learningdesign.Activity; import org.lamsfoundation.lams.learningdesign.LearningDesign; import org.lamsfoundation.lams.lesson.LearnerProgress; @@ -41,13 +41,15 @@ import org.lamsfoundation.lams.usermanagement.User; import org.springframework.orm.hibernate4.HibernateCallback; import org.springframework.orm.hibernate4.HibernateTemplate; +import org.springframework.stereotype.Repository; /** * Hibernate implementation of ILessonDAO * * @author chris */ -public class LessonDAO extends BaseDAO implements ILessonDAO { +@Repository +public class LessonDAO extends LAMSBaseDAO implements ILessonDAO { private final static String FIND_LESSON_BY_CREATOR = "from " + Lesson.class.getName() + " lesson where lesson.user.userId=? and lesson.lessonStateId <= 6 and " + " lesson.learningDesign.copyTypeID=" + LearningDesign.COPY_TYPE_LESSON; @@ -76,7 +78,7 @@ * @return the lesson */ public Lesson getLesson(Long lessonId) { - Lesson lesson = (Lesson) getHibernateTemplate().get(Lesson.class, lessonId); + Lesson lesson = (Lesson) getSession().get(Lesson.class, lessonId); return lesson; } @@ -93,7 +95,7 @@ /** Get all the lessons in the database. This includes the disabled lessons. */ public List getAllLessons() { - return getHibernateTemplate().loadAll(Lesson.class); + return loadAll(Lesson.class); } /** @@ -202,7 +204,7 @@ * @param lesson */ public void saveLesson(Lesson lesson) { - getHibernateTemplate().save(lesson); + getSession().save(lesson); } /** @@ -211,7 +213,7 @@ * @param lesson */ public void deleteLesson(Lesson lesson) { - getHibernateTemplate().delete(lesson); + getSession().delete(lesson); } /** @@ -220,7 +222,7 @@ * @see org.lamsfoundation.lams.lesson.dao.ILessonDAO#updateLesson(org.lamsfoundation.lams.lesson.Lesson) */ public void updateLesson(Lesson lesson) { - getHibernateTemplate().update(lesson); + getSession().update(lesson); } /** @@ -232,7 +234,7 @@ * @return List The list of Lessons for the given user */ public List getLessonsCreatedByUser(Integer userID) { - List lessons = this.getHibernateTemplate().find(LessonDAO.FIND_LESSON_BY_CREATOR, userID); + List lessons = this.doFind(LessonDAO.FIND_LESSON_BY_CREATOR, userID); return lessons; } @@ -268,7 +270,7 @@ * @return the list of Lessons */ public List getPreviewLessonsBeforeDate(final Date startDate) { - List lessons = this.getHibernateTemplate().find(LessonDAO.FIND_PREVIEW_BEFORE_START_DATE, startDate); + List lessons = this.doFind(LessonDAO.FIND_PREVIEW_BEFORE_START_DATE, startDate); return lessons; } @@ -337,15 +339,15 @@ } public List getLessonsByGroup(final Integer orgId) { - return this.getHibernateTemplate().find(LessonDAO.LESSONS_BY_GROUP, orgId); + return this.doFind(LessonDAO.LESSONS_BY_GROUP, orgId); } /** * @see org.lamsfoundation.lams.lesson.dao.ILessonDAO#getLessonsByOriginalLearningDesign(Integer) */ public List getLessonsByOriginalLearningDesign(final Long ldId, final Integer orgId) { Object[] args = { ldId.longValue(), orgId.intValue() }; - List lessons = this.getHibernateTemplate().find(LessonDAO.LESSONS_WITH_ORIGINAL_LEARNING_DESIGN, args); + List lessons = this.doFind(LessonDAO.LESSONS_WITH_ORIGINAL_LEARNING_DESIGN, args); return lessons; } @@ -354,7 +356,7 @@ */ @SuppressWarnings("unchecked") public List getMonitorsByToolSessionId(Long sessionId) { - return (List) this.getHibernateTemplate().findByNamedQueryAndNamedParam("monitorsByToolSessionId", "sessionId", + return (List) this.doFindByNamedQueryAndNamedParam("monitorsByToolSessionId", "sessionId", sessionId); }