Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml =================================================================== diff -u -r0c0cbdac26679e47d5c48e045c30e5496e1f809b -r4d65537fb74ec9a261ccb55520fe28c1253e9b13 --- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml (.../commonContext.xml) (revision 0c0cbdac26679e47d5c48e045c30e5496e1f809b) +++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml (.../commonContext.xml) (revision 4d65537fb74ec9a261ccb55520fe28c1253e9b13) @@ -373,7 +373,7 @@ - + Fisheye: Tag 4d65537fb74ec9a261ccb55520fe28c1253e9b13 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/dao/hibernate/BaseDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_common/src/java/org/lamsfoundation/lams/events/dao/hibernate/EventDAOHibernate.java =================================================================== diff -u -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 -r4d65537fb74ec9a261ccb55520fe28c1253e9b13 --- lams_common/src/java/org/lamsfoundation/lams/events/dao/hibernate/EventDAOHibernate.java (.../EventDAOHibernate.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) +++ lams_common/src/java/org/lamsfoundation/lams/events/dao/hibernate/EventDAOHibernate.java (.../EventDAOHibernate.java) (revision 4d65537fb74ec9a261ccb55520fe28c1253e9b13) @@ -3,11 +3,13 @@ import java.security.InvalidParameterException; import java.util.List; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.events.Event; import org.lamsfoundation.lams.events.dao.EventDAO; -import org.springframework.orm.hibernate4.support.HibernateDaoSupport; +import org.springframework.stereotype.Repository; -class EventDAOHibernate extends HibernateDaoSupport implements EventDAO { +@Repository +class EventDAOHibernate extends LAMSBaseDAO implements EventDAO { protected static final String GET_EVENT_QUERY = "FROM " + Event.class.getName() + " AS e WHERE e.scope=? AND e.name=? AND e.eventSessionId=? AND e.failTime IS NULL"; @@ -18,7 +20,7 @@ @SuppressWarnings("unchecked") public Event getEvent(String scope, String name, Long sessionId) throws InvalidParameterException { - List events = (List) getHibernateTemplate().find(EventDAOHibernate.GET_EVENT_QUERY, + List events = (List) doFind(EventDAOHibernate.GET_EVENT_QUERY, new Object[] { scope, name, sessionId }); if (events.size() > 1) { throw new InvalidParameterException("Two events with the same parameters exist in the database."); @@ -31,14 +33,14 @@ @SuppressWarnings("unchecked") public List getEventsToResend() { - return (List) getHibernateTemplate().find(EventDAOHibernate.GET_EVENTS_TO_RESEND_QUERY); + return (List) doFind(EventDAOHibernate.GET_EVENTS_TO_RESEND_QUERY); } public void deleteEvent(Event event) { - getHibernateTemplate().delete(event); + getSession().delete(event); } public void saveEvent(Event event) { - getHibernateTemplate().saveOrUpdate(event); + getSession().saveOrUpdate(event); } } \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/GroupDAO.java =================================================================== diff -u -ra8bfd24410deb4e2837ce3c966adaac7ea869186 -r4d65537fb74ec9a261ccb55520fe28c1253e9b13 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/GroupDAO.java (.../GroupDAO.java) (revision a8bfd24410deb4e2837ce3c966adaac7ea869186) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/GroupDAO.java (.../GroupDAO.java) (revision 4d65537fb74ec9a261ccb55520fe28c1253e9b13) @@ -29,8 +29,6 @@ import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.learningdesign.Group; import org.lamsfoundation.lams.learningdesign.dao.IGroupDAO; -import org.springframework.orm.hibernate4.HibernateCallback; -import org.springframework.orm.hibernate4.HibernateTemplate; import org.springframework.stereotype.Repository; /** @@ -65,15 +63,9 @@ * @param userID */ public Integer getCountGroupsForUser(final Integer userID) { - HibernateTemplate hibernateTemplate = new HibernateTemplate(this.getSessionFactory()); - return (Integer) hibernateTemplate.execute(new HibernateCallback() { - public Object doInHibernate(Session session) - throws HibernateException { - Query query = session.createQuery(NUM_GROUPS); - query.setInteger("userID", userID); - Object value = query.uniqueResult(); - return new Integer (((Number)value).intValue()); - } - }); + Query query = getSession().createQuery(NUM_GROUPS); + query.setInteger("userID", userID); + Object value = query.uniqueResult(); + return new Integer(((Number) value).intValue()); } } Index: lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILearnerProgressDAO.java =================================================================== diff -u -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 -r4d65537fb74ec9a261ccb55520fe28c1253e9b13 --- lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILearnerProgressDAO.java (.../ILearnerProgressDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) +++ lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILearnerProgressDAO.java (.../ILearnerProgressDAO.java) (revision 4d65537fb74ec9a261ccb55520fe28c1253e9b13) @@ -25,13 +25,9 @@ import java.util.List; -import org.hibernate.HibernateException; -import org.hibernate.Session; import org.lamsfoundation.lams.learningdesign.Activity; import org.lamsfoundation.lams.lesson.LearnerProgress; import org.lamsfoundation.lams.usermanagement.User; -import org.springframework.orm.hibernate4.HibernateCallback; -import org.springframework.orm.hibernate4.HibernateTemplate; /** * Inteface defines Lesson DAO Methods Index: lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java =================================================================== diff -u -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 -r4d65537fb74ec9a261ccb55520fe28c1253e9b13 --- lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java (.../LearnerProgressDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) +++ lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java (.../LearnerProgressDAO.java) (revision 4d65537fb74ec9a261ccb55520fe28c1253e9b13) @@ -26,22 +26,20 @@ import java.util.List; import org.apache.log4j.Logger; -import org.hibernate.HibernateException; -import org.hibernate.Session; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.learningdesign.Activity; import org.lamsfoundation.lams.lesson.LearnerProgress; import org.lamsfoundation.lams.lesson.dao.ILearnerProgressDAO; import org.lamsfoundation.lams.usermanagement.User; -import org.springframework.orm.hibernate4.HibernateCallback; -import org.springframework.orm.hibernate4.HibernateTemplate; -import org.springframework.orm.hibernate4.support.HibernateDaoSupport; +import org.springframework.stereotype.Repository; /** * Hibernate implementation of ILearnerProgressDAO * * @author chris */ -public class LearnerProgressDAO extends HibernateDaoSupport implements ILearnerProgressDAO { +@Repository +public class LearnerProgressDAO extends LAMSBaseDAO implements ILearnerProgressDAO { protected Logger log = Logger.getLogger(LearnerProgressDAO.class); @@ -68,163 +66,102 @@ @Override public LearnerProgress getLearnerProgress(Long learnerProgressId) { - return (LearnerProgress) getHibernateTemplate().get(LearnerProgress.class, learnerProgressId); + return (LearnerProgress) getSession().get(LearnerProgress.class, learnerProgressId); } @Override public void saveLearnerProgress(LearnerProgress learnerProgress) { - getHibernateTemplate().save(learnerProgress); + getSession().save(learnerProgress); } @Override public void deleteLearnerProgress(LearnerProgress learnerProgress) { - getHibernateTemplate().delete(learnerProgress); + getSession().delete(learnerProgress); } @Override - public LearnerProgress getLearnerProgressByLearner(final Integer learnerId, final Long lessonId) { - HibernateTemplate hibernateTemplate = new HibernateTemplate(this.getSessionFactory()); + public LearnerProgress getLearnerProgressByLearner(final Integer learnerId, final Long lessonId) { - return (LearnerProgress) hibernateTemplate.execute(new HibernateCallback() { - public Object doInHibernate(Session session) throws HibernateException { - return session.createQuery(LOAD_PROGRESS_BY_LEARNER).setInteger("learnerId", learnerId) - .setLong("lessonId", lessonId).uniqueResult(); - } - }); - } + return (LearnerProgress) getSession().createQuery(LOAD_PROGRESS_BY_LEARNER).setInteger("learnerId", learnerId) + .setLong("lessonId", lessonId).uniqueResult(); + } @Override public void updateLearnerProgress(LearnerProgress learnerProgress) { - this.getHibernateTemplate().update(learnerProgress); + this.getSession().update(learnerProgress); } @Override - public List getLearnerProgressReferringToActivity(final Activity activity) { - HibernateTemplate hibernateTemplate = new HibernateTemplate(this.getSessionFactory()); + public List getLearnerProgressReferringToActivity(final Activity activity) { + return (List) getSession().createQuery(LOAD_PROGRESS_BY_ACTIVITY).setEntity("activity", activity).list(); + } - return (List) hibernateTemplate.execute(new HibernateCallback() { - public Object doInHibernate(Session session) throws HibernateException { - return session.createQuery(LOAD_PROGRESS_BY_ACTIVITY).setEntity("activity", activity).list(); - } - }); - } + @Override + public List getCompletedLearnerProgressForLesson(final Long lessonId) { - @Override - public List getCompletedLearnerProgressForLesson(final Long lessonId) { - HibernateTemplate hibernateTemplate = new HibernateTemplate(this.getSessionFactory()); - - return (List) hibernateTemplate.execute(new HibernateCallback() { - public Object doInHibernate(Session session) throws HibernateException { - return session.createQuery(LOAD_COMPLETED_PROGRESS_BY_LESSON).setLong("lessonId", lessonId).list(); - } - }); - } + return (List) getSession().createQuery(LOAD_COMPLETED_PROGRESS_BY_LESSON).setLong("lessonId", lessonId).list(); + } - @Override - public List getLearnerProgressForLesson(final Long lessonId) { - HibernateTemplate hibernateTemplate = new HibernateTemplate(this.getSessionFactory()); + @Override + public List getLearnerProgressForLesson(final Long lessonId) { + return (List) getSession().createQuery(LOAD_PROGRESS_BY_LESSON).setLong("lessonId", lessonId).list(); + } - return (List) hibernateTemplate.execute(new HibernateCallback() { - public Object doInHibernate(Session session) throws HibernateException { - return session.createQuery(LOAD_PROGRESS_BY_LESSON).setLong("lessonId", lessonId).list(); - } - }); - } - @Override @SuppressWarnings("unchecked") - public List getLearnersHaveAttemptedActivity(final Activity activity) { - List learners = null; + public List getLearnersHaveAttemptedActivity(final Activity activity) { + List learners = (List) getSession().getNamedQuery("usersAttemptedActivity") + .setLong("activityId", activity.getActivityId().longValue()).list(); - HibernateTemplate hibernateTemplate = new HibernateTemplate(this.getSessionFactory()); - learners = (List) hibernateTemplate.execute(new HibernateCallback() { - public Object doInHibernate(Session session) throws HibernateException { - return session.getNamedQuery("usersAttemptedActivity") - .setLong("activityId", activity.getActivityId().longValue()).list(); - } - }); + return learners; + } - return learners; - } - @Override public Integer getNumUsersAttemptedActivity(final Activity activity) { - HibernateTemplate hibernateTemplate = new HibernateTemplate(this.getSessionFactory()); - Integer attempted = (Integer) hibernateTemplate.execute(new HibernateCallback() { - public Object doInHibernate(Session session) throws HibernateException { - Object value = session.createQuery(COUNT_ATTEMPTED_ACTIVITY) + Object value = getSession().createQuery(COUNT_ATTEMPTED_ACTIVITY) .setLong("activityId", activity.getActivityId().longValue()).uniqueResult(); - return new Integer(((Number) value).intValue()); - } - }); - return new Integer(attempted.intValue() + getNumUsersCompletedActivity(activity).intValue()); + Integer attempted = new Integer(((Number) value).intValue()); + return new Integer(attempted.intValue() + getNumUsersCompletedActivity(activity).intValue()); } - @Override - @SuppressWarnings("unchecked") - public List getLearnersHaveCompletedActivity(final Activity activity) { - List learners = null; + @Override + @SuppressWarnings("unchecked") + public List getLearnersHaveCompletedActivity(final Activity activity) { + List learners = null; - HibernateTemplate hibernateTemplate = new HibernateTemplate(this.getSessionFactory()); - learners = (List) hibernateTemplate.execute(new HibernateCallback() { - public Object doInHibernate(Session session) throws HibernateException { - return session.getNamedQuery("usersCompletedActivity") - .setLong("activityId", activity.getActivityId().longValue()).list(); - } - }); + learners = (List) getSession().getNamedQuery("usersCompletedActivity") + .setLong("activityId", activity.getActivityId().longValue()).list(); + return learners; + } - return learners; - } - - @Override - public Integer getNumUsersCompletedActivity(final Activity activity) { - HibernateTemplate hibernateTemplate = new HibernateTemplate(this.getSessionFactory()); - return (Integer) hibernateTemplate.execute(new HibernateCallback() { - public Object doInHibernate(Session session) throws HibernateException { - Object value = session.createQuery(COUNT_COMPLETED_ACTIVITY) - .setLong("activityId", activity.getActivityId().longValue()).uniqueResult(); + @Override + public Integer getNumUsersCompletedActivity(final Activity activity) { + Object value = getSession().createQuery(COUNT_COMPLETED_ACTIVITY) + .setLong("activityId", activity.getActivityId().longValue()).uniqueResult(); return new Integer(((Number) value).intValue()); - } - }); - } + } @Override public Integer getNumAllLearnerProgress(final Long lessonId) { - HibernateTemplate hibernateTemplate = new HibernateTemplate(this.getSessionFactory()); - return (Integer) hibernateTemplate.execute(new HibernateCallback() { - public Object doInHibernate(Session session) throws HibernateException { - Object value = session.createQuery(COUNT_PROGRESS_BY_LESSON).setLong("lessonId", lessonId.longValue()) + Object value = getSession().createQuery(COUNT_PROGRESS_BY_LESSON).setLong("lessonId", lessonId.longValue()) .uniqueResult(); return new Integer(((Number) value).intValue()); - } - }); } - @Override - @SuppressWarnings("unchecked") - public List getBatchLearnerProgress(final Long lessonId, final User lastUser, final int batchSize) { - HibernateTemplate hibernateTemplate = new HibernateTemplate(this.getSessionFactory()); - - if (lastUser == null) { - return (List) hibernateTemplate.execute(new HibernateCallback() { - public Object doInHibernate(Session session) throws HibernateException { - return session.createQuery(LOAD_PROGRESS_BY_LESSON) - .setLong("lessonId", lessonId.longValue()) - .setMaxResults(batchSize).list(); + @Override + @SuppressWarnings("unchecked") + public List getBatchLearnerProgress(final Long lessonId, final User lastUser, final int batchSize) { + + if (lastUser == null) { + return (List) getSession().createQuery(LOAD_PROGRESS_BY_LESSON) + .setLong("lessonId", lessonId.longValue()).setMaxResults(batchSize).list(); + + } else { + return (List) getSession().createQuery(LOAD_NEXT_BATCH_PROGRESS_BY_LESSON) + .setLong("lessonId", lessonId.longValue()).setString("lastUserLastName", lastUser.getLastName()) + .setString("lastUserFirstName", lastUser.getFirstName()) + .setInteger("lastUserId", lastUser.getUserId().intValue()).setMaxResults(batchSize).list(); } - }); - - } else { - return (List) hibernateTemplate.execute(new HibernateCallback() { - public Object doInHibernate(Session session) throws HibernateException { - return session.createQuery(LOAD_NEXT_BATCH_PROGRESS_BY_LESSON) - .setLong("lessonId", lessonId.longValue()) - .setString("lastUserLastName", lastUser.getLastName()) - .setString("lastUserFirstName", lastUser.getFirstName()) - .setInteger("lastUserId", lastUser.getUserId().intValue()).setMaxResults(batchSize).list(); - } - }); } - } } Index: lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java =================================================================== diff -u -ra8bfd24410deb4e2837ce3c966adaac7ea869186 -r4d65537fb74ec9a261ccb55520fe28c1253e9b13 --- lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java (.../LessonDAO.java) (revision a8bfd24410deb4e2837ce3c966adaac7ea869186) +++ lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java (.../LessonDAO.java) (revision 4d65537fb74ec9a261ccb55520fe28c1253e9b13) @@ -27,9 +27,7 @@ import java.util.List; import org.hibernate.FetchMode; -import org.hibernate.HibernateException; import org.hibernate.Query; -import org.hibernate.Session; import org.hibernate.criterion.Restrictions; import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.learningdesign.Activity; @@ -39,8 +37,6 @@ import org.lamsfoundation.lams.lesson.dao.ILessonDAO; import org.lamsfoundation.lams.usermanagement.Role; import org.lamsfoundation.lams.usermanagement.User; -import org.springframework.orm.hibernate4.HibernateCallback; -import org.springframework.orm.hibernate4.HibernateTemplate; import org.springframework.stereotype.Repository; /** @@ -82,16 +78,11 @@ return lesson; } - public Lesson getLessonWithJoinFetchedProgress(final Long lessonId) { - HibernateTemplate hibernateTemplate = new HibernateTemplate(this.getSessionFactory()); + public Lesson getLessonWithJoinFetchedProgress(final Long lessonId) { - return (Lesson) hibernateTemplate.execute(new HibernateCallback() { - public Object doInHibernate(Session session) throws HibernateException { - return session.createCriteria(Lesson.class).add(Restrictions.like("lessonId", lessonId)).setFetchMode( - "learnerProgresses", FetchMode.JOIN).uniqueResult(); - } - }); - } + return (Lesson) getSession().createCriteria(Lesson.class).add(Restrictions.like("lessonId", lessonId)) + .setFetchMode("learnerProgresses", FetchMode.JOIN).uniqueResult(); + } /** Get all the lessons in the database. This includes the disabled lessons. */ public List getAllLessons() { @@ -105,20 +96,13 @@ * a User that identifies the learner. * @return a List with all active lessons in it. */ - public List getActiveLessonsForLearner(final User learner) { - List lessons = null; + public List getActiveLessonsForLearner(final User learner) { - HibernateTemplate hibernateTemplate = new HibernateTemplate(this.getSessionFactory()); - lessons = (List) hibernateTemplate.execute(new HibernateCallback() { - public Object doInHibernate(Session session) throws HibernateException { - Query query = session.getNamedQuery("activeLessonsAllOrganisations"); + Query query = getSession().getNamedQuery("activeLessonsAllOrganisations"); query.setInteger("userId", learner.getUserId().intValue()); List result = query.list(); return result; - } - }); - return lessons; - } + } /** * Gets all lessons that are active for a learner, in a given organisation @@ -129,73 +113,46 @@ * the desired organisation. * @return a List with all active lessons in it. */ - public List getActiveLessonsForLearner(final Integer learnerId, final Integer organisationId) { - List lessons = null; + public List getActiveLessonsForLearner(final Integer learnerId, final Integer organisationId) { - HibernateTemplate hibernateTemplate = new HibernateTemplate(this.getSessionFactory()); - lessons = (List) hibernateTemplate.execute(new HibernateCallback() { - public Object doInHibernate(Session session) throws HibernateException { - Query query = session.getNamedQuery("activeLessons"); + Query query = getSession().getNamedQuery("activeLessons"); query.setInteger("userId", learnerId); query.setInteger("organisationId", organisationId); List result = query.list(); return result; - } - }); - return (List)lessons; - } + } /** * @see org.lamsfoundation.lams.lesson.dao.ILessonDAO#getActiveLearnerByLesson(long) */ public List getActiveLearnerByLesson(final long lessonId) { - List learners = null; - HibernateTemplate hibernateTemplate = new HibernateTemplate(this.getSessionFactory()); - learners = (List) hibernateTemplate.execute(new HibernateCallback() { - public Object doInHibernate(Session session) throws HibernateException { - Query query = session.getNamedQuery("activeLearners"); + Query query = getSession().getNamedQuery("activeLearners"); query.setLong("lessonId", lessonId); List result = query.list(); return result; - } - }); - return learners; } /** * @see org.lamsfoundation.lams.lesson.dao.ILessonDAO#getActiveLearnerByLessonAndGroup(long, long) */ public List getActiveLearnerByLessonAndGroup(final long lessonId, final long groupId) { - List learners = null; - - HibernateTemplate hibernateTemplate = new HibernateTemplate(this.getSessionFactory()); - learners = (List) hibernateTemplate.execute(new HibernateCallback() { - public Object doInHibernate(Session session) throws HibernateException { - Query query = session.getNamedQuery("activeLearnersByGroup"); + Query query = getSession().getNamedQuery("activeLearnersByGroup"); query.setLong("lessonId", lessonId); query.setLong("groupId", groupId); List result = query.list(); return result; - } - }); - return learners; } /** * @see org.lamsfoundation.lams.lesson.dao.ILessonDAO#getActiveLearnerByLesson(long) Note: Hibernate 3.1 * query.uniqueResult() returns Integer, Hibernate 3.2 query.uniqueResult() returns Long */ public Integer getCountActiveLearnerByLesson(final long lessonId) { - HibernateTemplate hibernateTemplate = new HibernateTemplate(this.getSessionFactory()); - return (Integer) hibernateTemplate.execute(new HibernateCallback() { - public Object doInHibernate(Session session) throws HibernateException { - Query query = session.createQuery(LessonDAO.COUNT_ACTIVE_LEARNERS); + Query query = getSession().createQuery(LessonDAO.COUNT_ACTIVE_LEARNERS); query.setLong("lessonId", lessonId); Object value = query.uniqueResult(); return new Integer(((Number) value).intValue()); - } - }); } /** @@ -247,19 +204,11 @@ * @return a List with all appropriate lessons in it. */ public List getLessonsForMonitoring(final int userID, final int organisationID) { - List lessons = null; - - HibernateTemplate hibernateTemplate = new HibernateTemplate(this.getSessionFactory()); - lessons = (List) hibernateTemplate.execute(new HibernateCallback() { - public Object doInHibernate(Session session) throws HibernateException { - Query query = session.getNamedQuery("lessonsForMonitoring"); + Query query = getSession().getNamedQuery("lessonsForMonitoring"); query.setInteger("userId", userID); query.setInteger("organisationId", organisationID); List result = query.list(); return result; - } - }); - return lessons; } /** @@ -278,27 +227,17 @@ * Get the lesson that applies to this activity. Not all activities have an attached lesson. */ public Lesson getLessonForActivity(final long activityId) { - HibernateTemplate hibernateTemplate = new HibernateTemplate(this.getSessionFactory()); - return (Lesson) hibernateTemplate.execute(new HibernateCallback() { - public Object doInHibernate(Session session) throws HibernateException { - Query query = session.createQuery(LessonDAO.FIND_LESSON_FOR_ACTIVITY); + Query query = getSession().createQuery(LessonDAO.FIND_LESSON_FOR_ACTIVITY); query.setLong("activityId", activityId); - return query.uniqueResult(); - } - }); + return (Lesson) query.uniqueResult(); } /** * @see org.lamsfoundation.lams.lesson.dao.ILessonDAO#getLessonsByOrgAndUserWithCompletedFlag(Integer, Integer, * boolean) */ public List getLessonsByOrgAndUserWithCompletedFlag(final Integer userId, final Integer orgId, final Integer userRole) { - List dtos = null; - HibernateTemplate hibernateTemplate = new HibernateTemplate(this.getSessionFactory()); - dtos = (List) hibernateTemplate.execute(new HibernateCallback() { - public Object doInHibernate(Session session) throws HibernateException { - String queryName; if (Role.ROLE_MONITOR.equals(userRole)) { queryName = "staffLessonsByOrgAndUserWithCompletedFlag"; @@ -309,33 +248,23 @@ queryName = "allLessonsByOrgAndUserWithCompletedFlag"; } - Query query = session.getNamedQuery(queryName); + Query query = getSession().getNamedQuery(queryName); query.setInteger("userId", userId.intValue()); query.setInteger("orgId", orgId.intValue()); List result = query.list(); return result; - } - }); - return dtos; } /** * @see org.lamsfoundation.lams.lesson.dao.ILessonDAO#getLessonsByOrgAndUserWithCompletedFlag(Integer, Integer, * boolean) */ public List getLessonsByGroupAndUser(final Integer userId, final Integer orgId) { - List dtos = null; - HibernateTemplate hibernateTemplate = new HibernateTemplate(this.getSessionFactory()); - dtos = (List) hibernateTemplate.execute(new HibernateCallback() { - public Object doInHibernate(Session session) throws HibernateException { - Query query = session.getNamedQuery("lessonsByOrgAndUserWithChildOrgs"); + Query query = getSession().getNamedQuery("lessonsByOrgAndUserWithChildOrgs"); query.setInteger("userId", userId.intValue()); query.setInteger("orgId", orgId.intValue()); List result = query.list(); return result; - } - }); - return dtos; } public List getLessonsByGroup(final Integer orgId) { @@ -364,13 +293,8 @@ * @see org.lamsfoundation.lams.lesson.dao.ILessonDAO#getLessonDetailsFromSessionID(java.lang.Long) */ public Lesson getLessonFromSessionID(final Long toolSessionID) { - HibernateTemplate hibernateTemplate = new HibernateTemplate(this.getSessionFactory()); - return (Lesson) hibernateTemplate.execute(new HibernateCallback() { - public Object doInHibernate(Session session) throws HibernateException { - Query query = session.createQuery(LessonDAO.LESSON_BY_SESSION_ID); + Query query = getSession().createQuery(LessonDAO.LESSON_BY_SESSION_ID); query.setLong("toolSessionID", toolSessionID); - return query.uniqueResult(); - } - }); + return (Lesson) query.uniqueResult(); } } Index: lams_common/src/java/org/lamsfoundation/lams/planner/dao/hibernate/PedagogicalPlannerDAOHibernate.java =================================================================== diff -u -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 -r4d65537fb74ec9a261ccb55520fe28c1253e9b13 --- lams_common/src/java/org/lamsfoundation/lams/planner/dao/hibernate/PedagogicalPlannerDAOHibernate.java (.../PedagogicalPlannerDAOHibernate.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) +++ lams_common/src/java/org/lamsfoundation/lams/planner/dao/hibernate/PedagogicalPlannerDAOHibernate.java (.../PedagogicalPlannerDAOHibernate.java) (revision 4d65537fb74ec9a261ccb55520fe28c1253e9b13) @@ -29,20 +29,22 @@ import java.util.List; import java.util.Set; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.planner.PedagogicalPlannerNodeRole; import org.lamsfoundation.lams.planner.PedagogicalPlannerSequenceNode; import org.lamsfoundation.lams.planner.dao.PedagogicalPlannerDAO; import org.lamsfoundation.lams.usermanagement.Role; import org.lamsfoundation.lams.usermanagement.User; -import org.springframework.orm.hibernate4.support.HibernateDaoSupport; +import org.springframework.stereotype.Repository; /** * * @author Marcin Cieslak * * @version $Revision$ */ -public class PedagogicalPlannerDAOHibernate extends HibernateDaoSupport implements PedagogicalPlannerDAO { +@Repository +public class PedagogicalPlannerDAOHibernate extends LAMSBaseDAO implements PedagogicalPlannerDAO { private static final String FIND_ROOT_NODE = "FROM " + PedagogicalPlannerSequenceNode.class.getName() + " AS n WHERE n.parent=NULL"; private static final String FIND_PARENT_TITLE = "SELECT n.parent.uid, n.title FROM " @@ -66,12 +68,12 @@ */ public PedagogicalPlannerSequenceNode getByUid(Long uid) { - return (PedagogicalPlannerSequenceNode) getHibernateTemplate().get(PedagogicalPlannerSequenceNode.class, uid); + return (PedagogicalPlannerSequenceNode) getSession().get(PedagogicalPlannerSequenceNode.class, uid); } @SuppressWarnings("unchecked") public PedagogicalPlannerSequenceNode getRootNode() { - List subnodeList = (List) getHibernateTemplate().find( + List subnodeList = (List) doFind( PedagogicalPlannerDAOHibernate.FIND_ROOT_NODE); PedagogicalPlannerSequenceNode rootNode = new PedagogicalPlannerSequenceNode(); rootNode.setLocked(true); @@ -87,7 +89,7 @@ List result; Object[] row; while (currentUid != null) { - result = (List) getHibernateTemplate().find(PedagogicalPlannerDAOHibernate.FIND_PARENT_TITLE, currentUid); + result = (List) doFind(PedagogicalPlannerDAOHibernate.FIND_PARENT_TITLE, currentUid); if (result.size() > 0) { row = result.get(0); if (!currentUid.equals(nodeUid)) { @@ -104,17 +106,17 @@ } public void removeNode(PedagogicalPlannerSequenceNode node) { - getHibernateTemplate().delete(node); - getHibernateTemplate().flush(); + getSession().delete(node); + getSession().flush(); } public void saveOrUpdateNode(PedagogicalPlannerSequenceNode node) { - getHibernateTemplate().saveOrUpdate(node); - getHibernateTemplate().flush(); + getSession().saveOrUpdate(node); + getSession().flush(); } public Integer getNextOrderId(Long parentUid) { - Integer maxOrderId = (Integer) getHibernateTemplate().find(PedagogicalPlannerDAOHibernate.FIND_MAX_ORDER_ID, + Integer maxOrderId = (Integer) doFind(PedagogicalPlannerDAOHibernate.FIND_MAX_ORDER_ID, parentUid).get(0); if (maxOrderId == null) { maxOrderId = 0; @@ -127,12 +129,12 @@ Long parentUid = node.getParent() == null ? null : node.getParent().getUid(); String query = (orderDelta < 0) ? PedagogicalPlannerDAOHibernate.FIND_NEIGHBOUR_NODE_DESC : PedagogicalPlannerDAOHibernate.FIND_NEIGHBOUR_NODE_ASC; - return (PedagogicalPlannerSequenceNode) getHibernateTemplate().find(query, + return (PedagogicalPlannerSequenceNode) doFind(query, new Object[] { parentUid, parentUid, order }).get(0); } private List getPlannerNodeRoles(Integer userId, Long nodeUid, Integer roleId) { - return getHibernateTemplate().find(PedagogicalPlannerDAOHibernate.GET_PLANNER_NODE_ROLE, + return doFind(PedagogicalPlannerDAOHibernate.GET_PLANNER_NODE_ROLE, new Object[] { userId, nodeUid, roleId }); } @@ -154,7 +156,7 @@ } public List getNodeUsers(Long nodeUid, Integer roleId) { - return getHibernateTemplate().find(PedagogicalPlannerDAOHibernate.GET_PLANNER_NODE_ROLE_USERS, + return doFind(PedagogicalPlannerDAOHibernate.GET_PLANNER_NODE_ROLE_USERS, new Object[] { nodeUid, roleId }); } @@ -173,18 +175,18 @@ public void saveNodeRole(Integer userId, Long nodeUid, Integer roleId) { PedagogicalPlannerSequenceNode node = getByUid(nodeUid); - User user = (User) getHibernateTemplate().get(User.class, userId); - Role role = (Role) getHibernateTemplate().get(Role.class, roleId); + User user = (User) getSession().get(User.class, userId); + Role role = (Role) getSession().get(Role.class, roleId); PedagogicalPlannerNodeRole nodeRole = new PedagogicalPlannerNodeRole(node, user, role); - getHibernateTemplate().saveOrUpdate(nodeRole); - getHibernateTemplate().flush(); + getSession().saveOrUpdate(nodeRole); + getSession().flush(); } public void removeNodeRole(Integer userId, Long nodeUid, Integer roleId) { List l = getPlannerNodeRoles(userId, nodeUid, roleId); for (Object o : l) { - getHibernateTemplate().delete(o); + getSession().delete(o); } - getHibernateTemplate().flush(); + getSession().flush(); } } \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/security/SecurityDAO.java =================================================================== diff -u -r093df66baaeb89432c9e5a0351c8fb91cc4a13ac -r4d65537fb74ec9a261ccb55520fe28c1253e9b13 --- lams_common/src/java/org/lamsfoundation/lams/security/SecurityDAO.java (.../SecurityDAO.java) (revision 093df66baaeb89432c9e5a0351c8fb91cc4a13ac) +++ lams_common/src/java/org/lamsfoundation/lams/security/SecurityDAO.java (.../SecurityDAO.java) (revision 4d65537fb74ec9a261ccb55520fe28c1253e9b13) @@ -27,14 +27,16 @@ import org.hibernate.Query; import org.hibernate.SQLQuery; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.lesson.Lesson; import org.lamsfoundation.lams.usermanagement.Organisation; import org.lamsfoundation.lams.usermanagement.OrganisationType; import org.lamsfoundation.lams.usermanagement.Role; import org.lamsfoundation.lams.usermanagement.UserOrganisation; -import org.springframework.orm.hibernate4.support.HibernateDaoSupport; +import org.springframework.stereotype.Repository; -public class SecurityDAO extends HibernateDaoSupport implements ISecurityDAO { +@Repository +public class SecurityDAO extends LAMSBaseDAO implements ISecurityDAO { /** * Checks if the user is a staff member in the given lesson. @@ -70,12 +72,12 @@ @Override @SuppressWarnings("rawtypes") public Object find(Class clazz, Serializable id) { - return getHibernateTemplate().get(clazz, id); + return getSession().get(clazz, id); } @Override public boolean hasOrgRole(Integer orgId, Integer userId, String... roles) { - Query query = getHibernateTemplate().getSessionFactory().getCurrentSession() + Query query = getSession() .createQuery(SecurityDAO.CHECK_ORG_ROLE); query.setParameter("orgId", orgId); query.setParameter("userId", userId); @@ -97,7 +99,7 @@ @Override public boolean isLessonLearner(Long lessonId, Integer userId) { - SQLQuery query = getHibernateTemplate().getSessionFactory().getCurrentSession() + SQLQuery query = getSession() .createSQLQuery(SecurityDAO.CHECK_LESSON_LEARNER); query.setLong(0, lessonId); query.setInteger(1, userId); @@ -106,7 +108,7 @@ @Override public boolean isLessonMonitor(Long lessonId, Integer userId, boolean ownerAccepted) { - boolean result = !getHibernateTemplate().find(SecurityDAO.CHECK_LESSON_MONITOR, + boolean result = !doFind(SecurityDAO.CHECK_LESSON_MONITOR, new Object[] { lessonId, userId }).isEmpty(); Lesson lesson = null; if (!result && ownerAccepted) { @@ -118,6 +120,6 @@ @Override public boolean isSysadmin(Integer userId) { - return !getHibernateTemplate().find(SecurityDAO.CHECK_SYSADMIN, new Object[] { userId }).isEmpty(); + return !doFind(SecurityDAO.CHECK_SYSADMIN, new Object[] { userId }).isEmpty(); } } \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/themes/dao/ICSSThemeDAO.java =================================================================== diff -u -r7998a31f6d7d4f1eef3e866bafef22caa012eb7a -r4d65537fb74ec9a261ccb55520fe28c1253e9b13 --- lams_common/src/java/org/lamsfoundation/lams/themes/dao/ICSSThemeDAO.java (.../ICSSThemeDAO.java) (revision 7998a31f6d7d4f1eef3e866bafef22caa012eb7a) +++ lams_common/src/java/org/lamsfoundation/lams/themes/dao/ICSSThemeDAO.java (.../ICSSThemeDAO.java) (revision 4d65537fb74ec9a261ccb55520fe28c1253e9b13) @@ -28,8 +28,7 @@ import org.lamsfoundation.lams.themes.Theme; /** - * This class interacts with Spring's HibernateTemplate to save/delete and - * retrieve CSSTheme and other related objects. + * This class retrieve CSSTheme and other related objects. * * @author Fiona Malikoff */ Index: lams_common/src/java/org/lamsfoundation/lams/themes/dao/hibernate/CSSThemeDAO.java =================================================================== diff -u -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 -r4d65537fb74ec9a261ccb55520fe28c1253e9b13 --- lams_common/src/java/org/lamsfoundation/lams/themes/dao/hibernate/CSSThemeDAO.java (.../CSSThemeDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) +++ lams_common/src/java/org/lamsfoundation/lams/themes/dao/hibernate/CSSThemeDAO.java (.../CSSThemeDAO.java) (revision 4d65537fb74ec9a261ccb55520fe28c1253e9b13) @@ -25,31 +25,32 @@ import java.util.List; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.themes.Theme; import org.lamsfoundation.lams.themes.dao.ICSSThemeDAO; -import org.springframework.orm.hibernate4.support.HibernateDaoSupport; +import org.springframework.stereotype.Repository; /** - * This class interacts with Spring's HibernateTemplate to save/delete and - * retrieve Theme and other related objects. + * This class retrieve CSSTheme and other related objects. * * @author Fiona Malikoff */ -public class CSSThemeDAO extends HibernateDaoSupport implements ICSSThemeDAO { +@Repository +public class CSSThemeDAO extends LAMSBaseDAO implements ICSSThemeDAO { /** * @see org.lamsfoundation.lams.themes.dao.ICSSThemeDAO#getAllThemes() */ public List getAllThemes() { - return getHibernateTemplate().find("from Theme c"); + return doFind("from Theme c"); } /** * @see org.lamsfoundation.lams.themes.dao.ICSSThemeDAO#getThemeById(java.lang.Long) */ public Theme getThemeById(Long themeId) { String queryString = "from Theme c where c.themeId=?"; - List list = getHibernateTemplate().find(queryString, themeId); + List list = doFind(queryString, themeId); if (list != null && list.size() > 0) return (Theme) list.get(0); else @@ -61,42 +62,42 @@ */ public List getThemeByName(String name) { String queryString = "from Theme c where c.name=?"; - return getHibernateTemplate().find(queryString, name); + return doFind(queryString, name); } /** * @see org.lamsfoundation.lams.themes.dao.ICSSThemeDAO#saveOrUpdateTheme(org.lamsfoundation.lams.usermanagement.User) */ public void saveOrUpdateTheme(Theme theme) { - getHibernateTemplate().saveOrUpdate(theme); + getSession().saveOrUpdate(theme); } /** * @see org.lamsfoundation.lams.themes.dao.ICSSThemeDAO#deleteTheme(org.lamsfoundation.lams.usermanagement.User) */ public void deleteTheme(Theme theme) { - getHibernateTemplate().delete(theme); + getSession().delete(theme); } /** * @see org.lamsfoundation.lams.themes.dao.ICSSThemeDAO#deleteUserById(java.lang.Integer) */ public void deleteThemeById(Long themeId) { - getHibernateTemplate().delete(getThemeById(themeId)); + getSession().delete(getThemeById(themeId)); } /** * @see org.lamsfoundation.lams.themes.dao.ICSSThemeDAO#getAllCSSThemes() */ public List getAllCSSThemes() { - return getHibernateTemplate().find("from Theme c where c.type=1"); + return doFind("from Theme c where c.type=1"); } /** * @see org.lamsfoundation.lams.themes.dao.ICSSThemeDAO#getAllFlashThemes() */ public List getAllFlashThemes() { - return getHibernateTemplate().find("from Theme c where c.type=2"); + return doFind("from Theme c where c.type=2"); } } Index: lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/ToolDAO.java =================================================================== diff -u -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 -r4d65537fb74ec9a261ccb55520fe28c1253e9b13 --- lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/ToolDAO.java (.../ToolDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) +++ lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/ToolDAO.java (.../ToolDAO.java) (revision 4d65537fb74ec9a261ccb55520fe28c1253e9b13) @@ -27,10 +27,10 @@ import org.hibernate.HibernateException; import org.hibernate.Session; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.Tool; import org.lamsfoundation.lams.tool.dao.IToolDAO; -import org.springframework.orm.hibernate4.HibernateCallback; -import org.springframework.orm.hibernate4.support.HibernateDaoSupport; +import org.springframework.stereotype.Repository; /** @@ -39,7 +39,8 @@ * @author Ozgur Demirtas 24/06/2005 * */ -public class ToolDAO extends HibernateDaoSupport implements IToolDAO +@Repository +public class ToolDAO extends LAMSBaseDAO implements IToolDAO { private static final String FIND_ALL = "from obj in class " + Tool.class.getName(); private static final String LOAD_TOOL_BY_SIG = "from tool in class Tool where tool.toolSignature=:toolSignature"; @@ -50,37 +51,23 @@ */ public Tool getToolByID(Long toolID) { - return (Tool)getHibernateTemplate().get(Tool.class,toolID); + return (Tool)getSession().get(Tool.class,toolID); } public List getAllTools(){ - return this.getHibernateTemplate().find(FIND_ALL); + return this.doFind(FIND_ALL); } - public Tool getToolBySignature(final String toolSignature) - { - return (Tool) getHibernateTemplate().execute(new HibernateCallback() - { - public Object doInHibernate(Session session) throws HibernateException - { - return session.createQuery(LOAD_TOOL_BY_SIG) - .setString("toolSignature",toolSignature) - .uniqueResult(); - } - }); - } + public Tool getToolBySignature(final String toolSignature) { + return (Tool) getSession().createQuery(LOAD_TOOL_BY_SIG).setString("toolSignature", toolSignature) + .uniqueResult(); + } public long getToolDefaultContentIdBySignature(final String toolSignature) { - Tool tool= (Tool) getHibernateTemplate().execute(new HibernateCallback() - { - public Object doInHibernate(Session session) throws HibernateException - { - return session.createQuery(LOAD_TOOL_BY_SIG) + Tool tool= (Tool) getSession().createQuery(LOAD_TOOL_BY_SIG) .setString("toolSignature",toolSignature) .uniqueResult(); - } - }); if (tool != null) return tool.getDefaultToolContentId(); @@ -90,7 +77,7 @@ public void saveOrUpdateTool(Tool tool) { - this.getHibernateTemplate().saveOrUpdate(tool); + this.getSession().saveOrUpdate(tool); } Index: lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/ToolImportSupportDAO.java =================================================================== diff -u -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 -r4d65537fb74ec9a261ccb55520fe28c1253e9b13 --- lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/ToolImportSupportDAO.java (.../ToolImportSupportDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) +++ lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/ToolImportSupportDAO.java (.../ToolImportSupportDAO.java) (revision 4d65537fb74ec9a261ccb55520fe28c1253e9b13) @@ -25,34 +25,25 @@ import java.util.List; -import org.hibernate.HibernateException; -import org.hibernate.Session; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.ToolImportSupport; import org.lamsfoundation.lams.tool.dao.IToolImportSupportDAO; -import org.springframework.orm.hibernate4.HibernateCallback; -import org.springframework.orm.hibernate4.support.HibernateDaoSupport; +import org.springframework.stereotype.Repository; -public class ToolImportSupportDAO extends HibernateDaoSupport implements IToolImportSupportDAO +@Repository +public class ToolImportSupportDAO extends LAMSBaseDAO implements IToolImportSupportDAO { private static final String LOAD_BY_OLD_SIG = "from tis in class ToolImportSupport where tis.supportsToolSignature=:supportsToolSignature"; private static final String FIND_ALL = "from obj in class " + ToolImportSupport.class.getName(); /** Get all the ToolImportSupport objects which record support for the given old tool signature */ - public List getToolSignatureWhichSupports(final String oldToolSignature) { - return (List) getHibernateTemplate().execute(new HibernateCallback() - { - public Object doInHibernate(Session session) throws HibernateException - { - return session.createQuery(LOAD_BY_OLD_SIG) - .setString("supportsToolSignature",oldToolSignature) - .list(); - } - }); + public List getToolSignatureWhichSupports(final String oldToolSignature) { + return (List) getSession().createQuery(LOAD_BY_OLD_SIG).setString("supportsToolSignature", oldToolSignature).list(); - } + } public List getAllToolImportSupport(){ - return this.getHibernateTemplate().find(FIND_ALL); + return doFind(FIND_ALL); } } Index: lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/ToolSessionDAO.java =================================================================== diff -u -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 -r4d65537fb74ec9a261ccb55520fe28c1253e9b13 --- lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/ToolSessionDAO.java (.../ToolSessionDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) +++ lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/ToolSessionDAO.java (.../ToolSessionDAO.java) (revision 4d65537fb74ec9a261ccb55520fe28c1253e9b13) @@ -26,20 +26,22 @@ import java.util.List; import org.hibernate.Query; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.learningdesign.Activity; import org.lamsfoundation.lams.lesson.Lesson; import org.lamsfoundation.lams.tool.GroupedToolSession; import org.lamsfoundation.lams.tool.NonGroupedToolSession; import org.lamsfoundation.lams.tool.ToolSession; import org.lamsfoundation.lams.tool.dao.IToolSessionDAO; import org.lamsfoundation.lams.usermanagement.User; -import org.springframework.orm.hibernate4.support.HibernateDaoSupport; +import org.springframework.stereotype.Repository; /** * Hibernate implementation of ILessonDAO * @author chris, Jacky Fang */ -public class ToolSessionDAO extends HibernateDaoSupport implements IToolSessionDAO +@Repository +public class ToolSessionDAO extends LAMSBaseDAO implements IToolSessionDAO { protected static final String LOAD_NONGROUPED_TOOL_SESSION_BY_LEARNER = @@ -61,7 +63,7 @@ */ public ToolSession getToolSession(Long toolSessionId) { - ToolSession session = (ToolSession) getHibernateTemplate().get(ToolSession.class, toolSessionId); + ToolSession session = (ToolSession) getSession().get(ToolSession.class, toolSessionId); return session; } @@ -107,14 +109,14 @@ public void saveToolSession(ToolSession toolSession) { - getHibernateTemplate().save(toolSession); + getSession().save(toolSession); } /** * @see org.lamsfoundation.lams.tool.dao.IToolSessionDAO#removeToolSession(org.lamsfoundation.lams.tool.ToolSession) */ public void removeToolSession(ToolSession toolSession) { - getHibernateTemplate().delete(toolSession); + getSession().delete(toolSession); } /** @@ -133,7 +135,7 @@ */ public void updateToolSession(ToolSession toolSession) { - getHibernateTemplate().update(toolSession); + getSession().update(toolSession); } Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAO.java =================================================================== diff -u -rb6ed1309cf89ecede6717145c629d7cb3b842582 -r4d65537fb74ec9a261ccb55520fe28c1253e9b13 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAO.java (.../OrganisationDAO.java) (revision b6ed1309cf89ecede6717145c629d7cb3b842582) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAO.java (.../OrganisationDAO.java) (revision 4d65537fb74ec9a261ccb55520fe28c1253e9b13) @@ -25,14 +25,10 @@ import java.util.List; -import org.hibernate.HibernateException; -import org.hibernate.Session; import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.usermanagement.OrganisationState; import org.lamsfoundation.lams.usermanagement.OrganisationType; import org.lamsfoundation.lams.usermanagement.dao.IOrganisationDAO; -import org.springframework.orm.hibernate4.HibernateCallback; -import org.springframework.orm.hibernate4.HibernateTemplate; import org.springframework.stereotype.Repository; /** @@ -82,39 +78,15 @@ + " order by o1.name"; public List getActiveCourseIdsByUser(final Integer userId, final boolean isSysadmin) { - - HibernateTemplate hibernateTemplate = new HibernateTemplate(this.getSessionFactory()); - return (List)hibernateTemplate.execute( - new HibernateCallback() - { - public Object doInHibernate(Session session) throws HibernateException - { - return (isSysadmin - ? session.createQuery(GET_ALL_ACTIVE_COURSE_IDS).list() - : session.createQuery(GET_ACTIVE_COURSE_IDS_BY_USER).setInteger("userId",userId).list() - ); - } - } - ); + return (List) (isSysadmin ? getSession().createQuery(GET_ALL_ACTIVE_COURSE_IDS).list() : getSession() + .createQuery(GET_ACTIVE_COURSE_IDS_BY_USER).setInteger("userId", userId).list()); } public List getArchivedCourseIdsByUser(final Integer userId, final boolean isSysadmin) { - - HibernateTemplate hibernateTemplate = new HibernateTemplate(this.getSessionFactory()); - return (List)hibernateTemplate.execute( - new HibernateCallback() - { - public Object doInHibernate(Session session) throws HibernateException - { - return (isSysadmin - ? session.createQuery(GET_ALL_ARCHIVED_COURSE_IDS).list() - : session.createQuery(GET_ARCHIVED_COURSE_IDS_BY_USER).setInteger("userId",userId).list() - ); - } - } - ); + return (List) (isSysadmin ? getSession().createQuery(GET_ALL_ARCHIVED_COURSE_IDS).list() : getSession() + .createQuery(GET_ARCHIVED_COURSE_IDS_BY_USER).setInteger("userId", userId).list()); } }