Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml =================================================================== diff -u -r809352b41790344e447df862668ab048d4dd56e3 -rceb74e3b4097cf6461280448f904fa21a176aaa4 --- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml (.../commonContext.xml) (revision 809352b41790344e447df862668ab048d4dd56e3) +++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml (.../commonContext.xml) (revision ceb74e3b4097cf6461280448f904fa21a176aaa4) @@ -354,7 +354,7 @@ PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED - PROPAGATION_REQUIRED + PROPAGATION_REQUIRED PROPAGATION_REQUIRED Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentQuestionResultDAOHibernate.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rceb74e3b4097cf6461280448f904fa21a176aaa4 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentQuestionResultDAOHibernate.java (.../AssessmentQuestionResultDAOHibernate.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentQuestionResultDAOHibernate.java (.../AssessmentQuestionResultDAOHibernate.java) (revision ceb74e3b4097cf6461280448f904fa21a176aaa4) @@ -25,7 +25,7 @@ import java.util.List; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.assessment.dao.AssessmentQuestionResultDAO; import org.lamsfoundation.lams.tool.assessment.model.AssessmentQuestionResult; Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rceb74e3b4097cf6461280448f904fa21a176aaa4 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java (.../AssessmentResultDAOHibernate.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java (.../AssessmentResultDAOHibernate.java) (revision ceb74e3b4097cf6461280448f904fa21a176aaa4) @@ -25,8 +25,8 @@ import java.util.ArrayList; import java.util.List; -import org.hibernate.Query; -import org.hibernate.SQLQuery; +import org.hibernate.query.NativeQuery; +import org.hibernate.query.Query; import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.assessment.dao.AssessmentResultDAO; import org.lamsfoundation.lams.tool.assessment.dto.AssessmentUserDTO; @@ -40,16 +40,16 @@ public class AssessmentResultDAOHibernate extends LAMSBaseDAO implements AssessmentResultDAO { private static final String FIND_LAST_BY_ASSESSMENT_AND_USER = "FROM " + AssessmentResult.class.getName() - + " AS r WHERE r.user.userId = ? AND r.assessment.uid=? AND r.latest=1"; + + " AS r WHERE r.user.userId = :userId AND r.assessment.uid=:uid AND r.latest=1"; private static final String FIND_WHETHER_LAST_RESULT_FINISHED = "SELECT (r.finishDate IS NOT NULL) FROM " + AssessmentResult.class.getName() - + " AS r WHERE r.user.userId = ? AND r.assessment.uid=? AND r.latest=1"; + + " AS r WHERE r.user.userId = :userId AND r.assessment.uid=:uid AND r.latest=1"; private static final String FIND_BY_ASSESSMENT_AND_USER_AND_FINISHED = "FROM " + AssessmentResult.class.getName() + " AS r WHERE r.user.userId = ? AND r.assessment.uid=? AND (r.finishDate != null) ORDER BY r.startDate ASC"; private static final String FIND_LAST_FINISHED_BY_ASSESSMENT_AND_USER = "FROM " + AssessmentResult.class.getName() - + " AS r WHERE r.user.userId = ? AND r.assessment.uid=? AND (r.finishDate != null) AND r.latest=1"; + + " AS r WHERE r.user.userId = :userId AND r.assessment.uid=:uid AND (r.finishDate != null) AND r.latest=1"; private static final String FIND_BY_SESSION_AND_USER = "FROM " + AssessmentResult.class.getName() + " AS r WHERE r.user.userId = ? AND r.sessionId=?"; @@ -58,7 +58,7 @@ + " AS r WHERE r.user.userId = ? AND r.sessionId=? AND (r.finishDate != null) ORDER BY r.startDate ASC"; private static final String FIND_LAST_FINISHED_BY_SESSION_AND_USER = "FROM " + AssessmentResult.class.getName() - + " AS r WHERE r.user.userId = ? AND r.sessionId=? AND (r.finishDate != null) AND r.latest=1"; + + " AS r WHERE r.user.userId = :userId AND r.sessionId=:sessionId AND (r.finishDate != null) AND r.latest=1"; private static final String FIND_LAST_FINISHED_RESULTS_BY_CONTENT_ID = "FROM " + AssessmentResult.class.getName() + " AS r WHERE r.assessment.contentId=? AND (r.finishDate != null) AND r.latest=1"; @@ -68,27 +68,27 @@ + " AS r WHERE r.user.userId=? AND r.assessment.uid=? AND (r.finishDate != null)"; private static final String LAST_ASSESSMENT_RESULT_GRADE = "select r.grade FROM " + AssessmentResult.class.getName() - + " AS r WHERE r.user.userId=? AND r.assessment.uid=? AND (r.finishDate != null) AND r.latest=1"; + + " AS r WHERE r.user.userId=:userId AND r.assessment.uid=:uid AND (r.finishDate != null) AND r.latest=1"; private static final String LAST_ASSESSMENT_RESULT_GRADES_BY_CONTENT_ID = "select r.user.userId, r.grade FROM " + AssessmentResult.class.getName() + " AS r WHERE r.assessment.contentId=? AND (r.finishDate != null) AND r.latest=1"; private static final String BEST_SCORE_BY_SESSION_AND_USER = "SELECT MAX(r.grade) FROM " + AssessmentResult.class.getName() - + " AS r WHERE r.user.userId = ? AND r.sessionId=? AND (r.finishDate != null)"; + + " AS r WHERE r.user.userId = :userId AND r.sessionId=:sessionId AND (r.finishDate != null)"; private static final String BEST_SCORES_BY_CONTENT_ID = "SELECT r.user.userId, MAX(r.grade) FROM " + AssessmentResult.class.getName() + " AS r WHERE r.assessment.contentId=? AND (r.finishDate != null) GROUP BY r.user.userId"; private static final String FIRST_SCORE_BY_SESSION_AND_USER = "SELECT r.grade FROM " + AssessmentResult.class.getName() - + " AS r WHERE r.user.userId = ? AND r.sessionId=? AND (r.finishDate != null) ORDER BY r.startDate ASC"; + + " AS r WHERE r.user.userId = :userId AND r.sessionId=:sessionId AND (r.finishDate != null) ORDER BY r.startDate ASC"; private static final String AVERAGE_SCORE_BY_SESSION_AND_USER = "SELECT AVG(r.grade) FROM " + AssessmentResult.class.getName() - + " AS r WHERE r.user.userId = ? AND r.sessionId=? AND (r.finishDate != null)"; + + " AS r WHERE r.user.userId = :userId AND r.sessionId=:sessionId AND (r.finishDate != null)"; private static final String AVERAGE_SCORES_BY_CONTENT_ID = "SELECT r.user.userId, AVG(r.grade) FROM " + AssessmentResult.class.getName() @@ -121,8 +121,8 @@ @Override public AssessmentResult getLastAssessmentResult(Long assessmentUid, Long userId) { Query q = getSession().createQuery(FIND_LAST_BY_ASSESSMENT_AND_USER); - q.setParameter(0, userId); - q.setParameter(1, assessmentUid); + q.setParameter("userId", userId); + q.setParameter("uid", assessmentUid); return (AssessmentResult) q.uniqueResult(); } @@ -131,26 +131,26 @@ Assessment assessment = user.getAssessment() == null ? user.getSession().getAssessment() : user.getAssessment(); Query q = getSession().createQuery(FIND_WHETHER_LAST_RESULT_FINISHED); - q.setParameter(0, user.getUserId()); - q.setParameter(1, assessment.getUid()); + q.setParameter("userId", user.getUserId()); + q.setParameter("uid", assessment.getUid()); return (Boolean) q.uniqueResult(); } @Override public AssessmentResult getLastFinishedAssessmentResult(Long assessmentUid, Long userId) { Query q = getSession().createQuery(FIND_LAST_FINISHED_BY_ASSESSMENT_AND_USER); - q.setParameter(0, userId); - q.setParameter(1, assessmentUid); + q.setParameter("userId", userId); + q.setParameter("uid", assessmentUid); return (AssessmentResult) q.uniqueResult(); } @Override public Float getLastTotalScoreByUser(Long assessmentUid, Long userId) { Query q = getSession().createQuery(LAST_ASSESSMENT_RESULT_GRADE); - q.setParameter(0, userId); - q.setParameter(1, assessmentUid); + q.setParameter("userId", userId); + q.setParameter("uid", assessmentUid); Object lastTotalScore = q.uniqueResult(); return (lastTotalScore == null) ? 0 : (Float)lastTotalScore; @@ -166,8 +166,8 @@ @Override public Float getBestTotalScoreByUser(Long sessionId, Long userId) { Query q = getSession().createQuery(BEST_SCORE_BY_SESSION_AND_USER); - q.setParameter(0, userId); - q.setParameter(1, sessionId); + q.setParameter("userId", userId); + q.setParameter("sessionId", sessionId); return ((Float) q.uniqueResult()); } @@ -180,8 +180,8 @@ @Override public Float getFirstTotalScoreByUser(Long sessionId, Long userId) { Query q = getSession().createQuery(FIRST_SCORE_BY_SESSION_AND_USER); - q.setParameter(0, userId); - q.setParameter(1, sessionId); + q.setParameter("userId", userId); + q.setParameter("sessionId", sessionId); q.setMaxResults(1); return ((Float) q.uniqueResult()); } @@ -195,17 +195,17 @@ + "INNER JOIN (SELECT user_uid, MIN(start_date) AS startDate FROM tl_laasse10_assessment_result WHERE finish_date IS NOT NULL GROUP BY user_uid) firstRes " + "ON (res.user_uid = firstRes.user_uid AND res.start_date = firstRes.startDate) GROUP BY res.user_uid"; - SQLQuery query = getSession().createSQLQuery(FIRST_SCORES_BY_CONTENT_ID); - query.setLong("contentId", toolContentId); + NativeQuery query = getSession().createNativeQuery(FIRST_SCORES_BY_CONTENT_ID); + query.setParameter("contentId", toolContentId); List list = query.list(); return convertResultsToAssessmentUserDTOList(list); } @Override public Float getAvergeTotalScoreByUser(Long sessionId, Long userId) { Query q = getSession().createQuery(AVERAGE_SCORE_BY_SESSION_AND_USER); - q.setParameter(0, userId); - q.setParameter(1, sessionId); + q.setParameter("userId", userId); + q.setParameter("sessionId", sessionId); Object result = q.uniqueResult(); return result == null ? null : ((Double) result).floatValue(); } @@ -230,8 +230,8 @@ @Override public AssessmentResult getLastFinishedAssessmentResultByUser(Long sessionId, Long userId) { Query q = getSession().createQuery(FIND_LAST_FINISHED_BY_SESSION_AND_USER); - q.setParameter(0, userId); - q.setParameter(1, sessionId); + q.setParameter("userId", userId); + q.setParameter("sessionId", sessionId); return (AssessmentResult) q.uniqueResult(); } @@ -283,8 +283,8 @@ + "JOIN tl_laasse10_option_answer AS optionAnswer ON questionResult.uid = optionAnswer.question_result_uid AND optionAnswer.answer_boolean=1 AND optionAnswer.question_option_uid = :optionUid " + "WHERE (result.finish_date IS NOT NULL) AND result.latest=1"; - SQLQuery query = getSession().createSQLQuery(COUNT_ATTEMPTS_BY_OPTION_UID); - query.setLong("optionUid", optionUid); + NativeQuery query = getSession().createNativeQuery(COUNT_ATTEMPTS_BY_OPTION_UID); + query.setParameter("optionUid", optionUid); List list = query.list(); if (list == null || list.size() == 0) { return 0; Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rceb74e3b4097cf6461280448f904fa21a176aaa4 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java (.../AssessmentUserDAOHibernate.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java (.../AssessmentUserDAOHibernate.java) (revision ceb74e3b4097cf6461280448f904fa21a176aaa4) @@ -26,8 +26,8 @@ import java.util.ArrayList; import java.util.List; -import org.hibernate.Query; -import org.hibernate.SQLQuery; +import org.hibernate.query.NativeQuery; +import org.hibernate.query.Query; import org.hibernate.type.FloatType; import org.hibernate.type.IntegerType; import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; @@ -129,11 +129,11 @@ bldr.append(LOAD_USERS_ORDERED_ORDER_BY_NAME); bldr.append(sortOrder); - SQLQuery query = getSession().createSQLQuery(bldr.toString()); - query.setLong("sessionId", sessionId); + NativeQuery query = getSession().createNativeQuery(bldr.toString()); + query.setParameter("sessionId", sessionId); // support for custom search from a toolbar searchString = searchString == null ? "" : searchString; - query.setString("searchString", searchString); + query.setParameter("searchString", searchString); query.setFirstResult(page * size); query.setMaxResults(size); List list = query.list(); @@ -173,10 +173,10 @@ + " AND (CONCAT(user.lastName, ' ', user.firstName) LIKE CONCAT('%', :searchString, '%')) "; Query query = getSession().createQuery(LOAD_USERS_ORDERED_BY_NAME); - query.setLong("sessionId", sessionId); + query.setParameter("sessionId", sessionId); // support for custom search from a toolbar searchString = searchString == null ? "" : searchString; - query.setString("searchString", searchString); + query.setParameter("searchString", searchString); List list = query.list(); if ((list == null) || (list.size() == 0)) { @@ -193,7 +193,7 @@ + " WHERE user.session.assessment.contentId = :contentId "; Query query = getSession().createQuery(LOAD_USERS_ORDERED_BY_NAME); - query.setLong("contentId", contentId); + query.setParameter("contentId", contentId); List list = query.list(); if ((list == null) || (list.size() == 0)) { @@ -207,11 +207,11 @@ @Override public Object[] getStatsMarksBySession(Long sessionId) { - Query query = getSession().createSQLQuery(FIND_MARK_STATS_FOR_SESSION) + Query query = getSession().createNativeQuery(FIND_MARK_STATS_FOR_SESSION) .addScalar("min_grade", FloatType.INSTANCE) .addScalar("avg_grade", FloatType.INSTANCE) .addScalar("max_grade", FloatType.INSTANCE); - query.setLong("sessionId", sessionId); + query.setParameter("sessionId", sessionId); List list = query.list(); if ((list == null) || (list.size() == 0)) { return null; @@ -224,12 +224,12 @@ @Override public Object[] getStatsMarksForLeaders(Long toolContentId) { - Query query = getSession().createSQLQuery(FIND_MARK_STATS_FOR_LEADERS) + Query query = getSession().createNativeQuery(FIND_MARK_STATS_FOR_LEADERS) .addScalar("min_grade", FloatType.INSTANCE) .addScalar("avg_grade", FloatType.INSTANCE) .addScalar("max_grade", FloatType.INSTANCE) .addScalar("num_complete", IntegerType.INSTANCE); - query.setLong("toolContentId", toolContentId); + query.setParameter("toolContentId", toolContentId); List list = query.list(); if ((list == null) || (list.size() == 0)) { return null; @@ -272,12 +272,12 @@ bldr.append(LOAD_USERS_ORDERED_ORDER_BY_NAME); bldr.append(sortOrder); - SQLQuery query = getSession().createSQLQuery(bldr.toString()); - query.setLong("sessionId", sessionId); - query.setLong("questionUid", questionUid); + NativeQuery query = getSession().createNativeQuery(bldr.toString()); + query.setParameter("sessionId", sessionId); + query.setParameter("questionUid", questionUid); // support for custom search from a toolbar searchString = searchString == null ? "" : searchString; - query.setString("searchString", searchString); + query.setParameter("searchString", searchString); query.setFirstResult(page * size); query.setMaxResults(size); List list = query.list(); @@ -313,8 +313,8 @@ @Override public List getRawUserMarksBySession(Long sessionId) { - SQLQuery query = getSession().createSQLQuery(LOAD_MARKS_FOR_SESSION); - query.setLong("sessionId", sessionId); + NativeQuery query = getSession().createNativeQuery(LOAD_MARKS_FOR_SESSION); + query.setParameter("sessionId", sessionId); List list = query.list(); return list; } @@ -323,8 +323,8 @@ @Override public List getRawLeaderMarksByToolContentId(Long toolContentId) { - SQLQuery query = getSession().createSQLQuery(LOAD_MARKS_FOR_LEADERS); - query.setLong("toolContentId", toolContentId); + NativeQuery query = getSession().createNativeQuery(LOAD_MARKS_FOR_LEADERS); + query.setParameter("toolContentId", toolContentId); List list = query.list(); return list; } Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapNodeDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rceb74e3b4097cf6461280448f904fa21a176aaa4 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapNodeDAO.java (.../MindmapNodeDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapNodeDAO.java (.../MindmapNodeDAO.java) (revision ceb74e3b4097cf6461280448f904fa21a176aaa4) @@ -26,8 +26,8 @@ import java.util.List; -import org.hibernate.Query; import org.hibernate.Session; +import org.hibernate.query.Query; import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.mindmap.dao.IMindmapNodeDAO; import org.lamsfoundation.lams.tool.mindmap.model.MindmapNode; Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapRequestDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rceb74e3b4097cf6461280448f904fa21a176aaa4 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapRequestDAO.java (.../MindmapRequestDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapRequestDAO.java (.../MindmapRequestDAO.java) (revision ceb74e3b4097cf6461280448f904fa21a176aaa4) @@ -26,7 +26,7 @@ import java.util.List; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.mindmap.dao.IMindmapRequestDAO; import org.lamsfoundation.lams.tool.mindmap.model.MindmapRequest; @@ -47,8 +47,8 @@ + " mr where mr.uniqueId = ? and mr.user.uid = ? and " + " mr.mindmap.uid = ? and mr.globalId > ? "; private static final String SQL_QUERY_FIND_LAST_GLOBAL_ID_BY_MINDMAP = " select mr.globalId from " - + MindmapRequest.class.getName() + " mr where mr.mindmap.uid = ? and " - + " mr.user.mindmapSession.sessionId = ? order by mr.globalId desc"; + + MindmapRequest.class.getName() + " mr where mr.mindmap.uid = :uid and " + + " mr.user.mindmapSession.sessionId = :sessionId order by mr.globalId desc"; private static final String SQL_QUERY_FIND_REQUESTS_BY_USER_ID = " from " + MindmapRequest.class.getName() + " mr where mr.user.userId = ? "; @@ -79,8 +79,8 @@ @Override public Long getLastGlobalIdByMindmapId(Long mindmapId, Long sessionId) { Query q = getSession().createQuery(SQL_QUERY_FIND_LAST_GLOBAL_ID_BY_MINDMAP); - q.setParameter(0, mindmapId); - q.setParameter(1, sessionId); + q.setParameter("uid", mindmapId); + q.setParameter("sessionId", sessionId); q.setMaxResults(1); Object result = q.uniqueResult(); // must return a valid number or calling code will throw a null ptr exception. Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapSessionDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rceb74e3b4097cf6461280448f904fa21a176aaa4 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapSessionDAO.java (.../MindmapSessionDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapSessionDAO.java (.../MindmapSessionDAO.java) (revision ceb74e3b4097cf6461280448f904fa21a176aaa4) @@ -40,9 +40,6 @@ public static final String SQL_QUERY_FIND_BY_SESSION_ID = "from " + MindmapSession.class.getName() + " where session_id = ?"; - public static final String SQL_QUERY_FIND_BY_MINDMAP_ID = "from " + MindmapSession.class.getName() - + " ms where ms.mindmap.uid = ?"; - @Override public void saveOrUpdate(MindmapSession session) { getSession().saveOrUpdate(session); Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rceb74e3b4097cf6461280448f904fa21a176aaa4 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml (.../mindmapApplicationContext.xml) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml (.../mindmapApplicationContext.xml) (revision ceb74e3b4097cf6461280448f904fa21a176aaa4) @@ -56,6 +56,7 @@ PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED + PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/hibernate/NotebookUserDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rceb74e3b4097cf6461280448f904fa21a176aaa4 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/hibernate/NotebookUserDAO.java (.../NotebookUserDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/hibernate/NotebookUserDAO.java (.../NotebookUserDAO.java) (revision ceb74e3b4097cf6461280448f904fa21a176aaa4) @@ -28,7 +28,7 @@ import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringUtils; -import org.hibernate.SQLQuery; +import org.hibernate.query.NativeQuery; import org.hibernate.transform.Transformers; import org.hibernate.type.IntegerType; import org.hibernate.type.LongType; @@ -151,10 +151,10 @@ // Now specify the sort based on the switch statement above. queryText.append(" ORDER BY " + sortingOrder); - SQLQuery query = getSession().createSQLQuery(queryText.toString()); + NativeQuery query = getSession().createNativeQuery(queryText.toString()); query.addEntity("user", NotebookUser.class).addScalar("notebookEntry", StringType.INSTANCE) .addScalar("notebookModifiedDate", TimestampType.INSTANCE).addScalar("portraitId", IntegerType.INSTANCE) - .setLong("sessionId", sessionId.longValue()) + .setParameter("sessionId", sessionId.longValue()) .setFirstResult(page * size).setMaxResults(size); return query.list(); } @@ -180,8 +180,7 @@ " JOIN tl_lantbk11_session session ON user.notebook_session_uid = session.uid and session.session_id = :sessionId"); buildNameSearch(searchString, queryText); - List list = getSession().createSQLQuery(queryText.toString()).setLong("sessionId", sessionId.longValue()) - .list(); + List list = getSession().createSQLQuery(queryText.toString()).setParameter("sessionId", sessionId.longValue()).list(); if (list == null || list.size() == 0) { return 0; } @@ -196,8 +195,7 @@ " JOIN tl_lantbk11_session session ON user.notebook_session_uid = session.uid and session.session_id = :sessionId"); buildNameSearch(searchString, queryText); - List list = getSession().createSQLQuery(queryText.toString()).setLong("sessionId", sessionId.longValue()) - .list(); + List list = getSession().createSQLQuery(queryText.toString()).setParameter("sessionId", sessionId.longValue()).list(); if (list == null || list.size() == 0) { return 0; } @@ -213,10 +211,10 @@ @Override @SuppressWarnings("unchecked") public List getStatisticsBySession(final Long contentId) { - SQLQuery query = getSession().createSQLQuery(GET_STATISTICS); + NativeQuery query = getSession().createNativeQuery(GET_STATISTICS); query.addScalar("sessionId", LongType.INSTANCE).addScalar("sessionName", StringType.INSTANCE) .addScalar("numLearners", IntegerType.INSTANCE).addScalar("numLearnersFinished", IntegerType.INSTANCE) - .setLong("contentId", contentId).setResultTransformer(Transformers.aliasToBean(StatisticDTO.class)); + .setParameter("contentId", contentId).setResultTransformer(Transformers.aliasToBean(StatisticDTO.class)); return query.list(); } Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/MonitoringController.java =================================================================== diff -u -rf2ad75cef0c507a64877942631fee13efbc6ed50 -rceb74e3b4097cf6461280448f904fa21a176aaa4 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/MonitoringController.java (.../MonitoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/MonitoringController.java (.../MonitoringController.java) (revision ceb74e3b4097cf6461280448f904fa21a176aaa4) @@ -169,7 +169,7 @@ responseRow.put(NotebookConstants.ATTR_USER_ID, user.getUserId()); if (userAndReflection.length > 3 && userAndReflection[3] != null) { - responseRow.put(NotebookConstants.ATTR_PORTRAIT_ID, (String) userAndReflection[3]); + responseRow.put(NotebookConstants.ATTR_PORTRAIT_ID, (Integer) userAndReflection[3]); } rows.add(responseRow); } Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dao/hibernate/PixlrConfigItemDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rceb74e3b4097cf6461280448f904fa21a176aaa4 --- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dao/hibernate/PixlrConfigItemDAO.java (.../PixlrConfigItemDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dao/hibernate/PixlrConfigItemDAO.java (.../PixlrConfigItemDAO.java) (revision ceb74e3b4097cf6461280448f904fa21a176aaa4) @@ -12,7 +12,7 @@ @Override public PixlrConfigItem getConfigItemByKey(final String configKey) { - return (PixlrConfigItem) getSession().createQuery(LOAD_CONFIG_ITEM_BY_KEY).setString("key", configKey) + return (PixlrConfigItem) getSession().createQuery(LOAD_CONFIG_ITEM_BY_KEY).setParameter("key", configKey) .uniqueResult(); } Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewDAOHibernate.java =================================================================== diff -u -r1042117ad93a6a9f93d8b1c8be7e718b7efd383f -rceb74e3b4097cf6461280448f904fa21a176aaa4 --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewDAOHibernate.java (.../PeerreviewDAOHibernate.java) (revision 1042117ad93a6a9f93d8b1c8be7e718b7efd383f) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewDAOHibernate.java (.../PeerreviewDAOHibernate.java) (revision ceb74e3b4097cf6461280448f904fa21a176aaa4) @@ -70,7 +70,7 @@ @Override public List getStatistics(Long toolContentId) { return getSession().createSQLQuery(GET_STATS) - .setLong("toolContentId", toolContentId) + .setParameter("toolContentId", toolContentId) .setResultTransformer( Transformers.aliasToBean( PeerreviewStatisticsDTO.class ) ) .list(); Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewUserDAOHibernate.java =================================================================== diff -u -r4a6c446731f09a496394db2f52e60431d8160d53 -rceb74e3b4097cf6461280448f904fa21a176aaa4 --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewUserDAOHibernate.java (.../PeerreviewUserDAOHibernate.java) (revision 4a6c446731f09a496394db2f52e60431d8160d53) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewUserDAOHibernate.java (.../PeerreviewUserDAOHibernate.java) (revision ceb74e3b4097cf6461280448f904fa21a176aaa4) @@ -27,8 +27,8 @@ import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringUtils; -import org.hibernate.Query; -import org.hibernate.SQLQuery; +import org.hibernate.query.NativeQuery; +import org.hibernate.query.Query; import org.hibernate.type.LongType; import org.hibernate.type.StringType; import org.hibernate.type.TimestampType; @@ -124,8 +124,8 @@ @Override public int createUsersForSession(final PeerreviewSession session) { - SQLQuery query = getSession().createSQLQuery(CREATE_USERS); - query.setLong("session_uid", session.getUid()).setLong("tool_session_id", session.getSessionId()); + NativeQuery query = getSession().createNativeQuery(CREATE_USERS); + query.setParameter("session_uid", session.getUid()).setParameter("tool_session_id", session.getSessionId()); return query.executeUpdate(); } @@ -202,12 +202,12 @@ bldr.append(sortingOrder); String queryString = bldr.toString(); - Query query = getSession().createSQLQuery(queryString) - .setLong("toolContentId", toolContentId) - .setLong("toolSessionId", toolSessionId) - .setLong("ratingCriteriaId", criteria.getRatingCriteriaId()); + NativeQuery query = getSession().createNativeQuery(queryString) + .setParameter("toolContentId", toolContentId) + .setParameter("toolSessionId", toolSessionId) + .setParameter("ratingCriteriaId", criteria.getRatingCriteriaId()); if ( queryString.contains(":userId") ) { - query.setLong("userId", userId); + query.setParameter("userId", userId); } if ( page != null && size != null ) { query.setFirstResult(page * size).setMaxResults(size); @@ -231,11 +231,11 @@ @SuppressWarnings("unchecked") @Override public List getDetailedRatingsComments(Long toolContentId, Long toolSessionId, Long criteriaId, Long itemId ) { - Query query = getSession().createSQLQuery(SELECT_ALL_RATINGS_COMMENTS_LEFT_FOR_ITEM) - .setLong("toolContentId", toolContentId) - .setLong("toolSessionId", toolSessionId) - .setLong("ratingCriteriaId", criteriaId) - .setLong("itemId", itemId); + NativeQuery query = getSession().createNativeQuery(SELECT_ALL_RATINGS_COMMENTS_LEFT_FOR_ITEM) + .setParameter("toolContentId", toolContentId) + .setParameter("toolSessionId", toolSessionId) + .setParameter("ratingCriteriaId", criteriaId) + .setParameter("itemId", itemId); return (List) query.list(); } @@ -282,10 +282,10 @@ bldr.append(sortingOrder); String queryString = bldr.toString(); - Query query = getSession().createSQLQuery(queryString) - .setLong("toolContentId", toolContentId) - .setLong("toolSessionId", toolSessionId) - .setLong("ratingCriteriaId", criteria.getRatingCriteriaId()); + NativeQuery query = getSession().createNativeQuery(queryString) + .setParameter("toolContentId", toolContentId) + .setParameter("toolSessionId", toolSessionId) + .setParameter("ratingCriteriaId", criteria.getRatingCriteriaId()); if ( page != null && size != null ) { query.setFirstResult(page * size).setMaxResults(size); } @@ -341,14 +341,14 @@ // Now specify the sort based on the switch statement above. queryText.append(sortingOrder); - SQLQuery query = getSession().createSQLQuery(queryText.toString()); + NativeQuery query = getSession().createNativeQuery(queryText.toString()); query.addScalar("user_id", LongType.INSTANCE) .addScalar("first_name", StringType.INSTANCE) .addScalar("last_name", StringType.INSTANCE) .addScalar("portraitId", LongType.INSTANCE) .addScalar("notebookEntry", StringType.INSTANCE) .addScalar("notebookModifiedDate", TimestampType.INSTANCE) - .setLong("toolSessionId", toolSessionId.longValue()) + .setParameter("toolSessionId", toolSessionId.longValue()) .setFirstResult(page * size).setMaxResults(size); return query.list(); @@ -389,7 +389,7 @@ String queryString = bldr.toString(); Query query = getSession().createQuery(queryString) - .setLong("toolSessionId", toolSessionId); + .setParameter("toolSessionId", toolSessionId); if ( page != null && size != null ) { query.setFirstResult(page * size).setMaxResults(size); } Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmissionDetailsDAO.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rceb74e3b4097cf6461280448f904fa21a176aaa4 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmissionDetailsDAO.java (.../SubmissionDetailsDAO.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmissionDetailsDAO.java (.../SubmissionDetailsDAO.java) (revision ceb74e3b4097cf6461280448f904fa21a176aaa4) @@ -40,7 +40,7 @@ public class SubmissionDetailsDAO extends LAMSBaseDAO implements ISubmissionDetailsDAO { private static final String FIND_BY_SESSION = "from " + SubmissionDetails.class.getName() - + " as d where d.submitFileSession.sessionID=?"; + + " as d where d.submitFileSession.sessionID=:sessionID"; private static final String FIND_BY_SESSION_LEARNER = "from " + SubmissionDetails.class.getName() + " as d where d.submitFileSession.sessionID=? and d.learner.userID=?"; @@ -64,7 +64,7 @@ public List getSubmissionDetailsBySession(Long sessionID) { if (sessionID != null) { return getSessionFactory().getCurrentSession().createQuery(FIND_BY_SESSION) - .setLong(0, sessionID.longValue()).list(); + .setParameter("sessionID", sessionID.longValue()).list(); } return null; } Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesSessionDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rceb74e3b4097cf6461280448f904fa21a176aaa4 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesSessionDAO.java (.../SubmitFilesSessionDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesSessionDAO.java (.../SubmitFilesSessionDAO.java) (revision ceb74e3b4097cf6461280448f904fa21a176aaa4) @@ -67,7 +67,7 @@ public List getSubmitFilesSessionByContentID(Long contentID) { if (contentID != null) { return getSessionFactory().getCurrentSession().createQuery(FIND_LEARNER_BY_CONTENT_ID) - .setLong("contentID", contentID.longValue()).list(); + .setParameter("contentID", contentID.longValue()).list(); } return null; } Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitUserDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rceb74e3b4097cf6461280448f904fa21a176aaa4 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitUserDAO.java (.../SubmitUserDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitUserDAO.java (.../SubmitUserDAO.java) (revision ceb74e3b4097cf6461280448f904fa21a176aaa4) @@ -29,7 +29,7 @@ import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringUtils; -import org.hibernate.SQLQuery; +import org.hibernate.query.NativeQuery; import org.hibernate.transform.Transformers; import org.hibernate.type.IntegerType; import org.hibernate.type.LongType; @@ -160,12 +160,12 @@ // Now specify the sort based on the switch statement above. queryText.append(" ORDER BY " + sortingOrder); - SQLQuery query = getSession().createSQLQuery(queryText.toString()); + NativeQuery query = getSession().createNativeQuery(queryText.toString()); query.addEntity("user", SubmitUser.class) .addScalar("portraitId", IntegerType.INSTANCE) .addScalar("numFiles", IntegerType.INSTANCE).addScalar("numFilesRemoved", IntegerType.INSTANCE) .addScalar("numFilesMarked", IntegerType.INSTANCE).addScalar("notebookEntry", StringType.INSTANCE) - .setLong("sessionId", sessionId.longValue()).setFirstResult(page * size).setMaxResults(size); + .setParameter("sessionId", sessionId.longValue()).setFirstResult(page * size).setMaxResults(size); return query.list(); } @@ -189,7 +189,7 @@ "SELECT count(*) FROM tl_lasbmt11_user user WHERE user.session_id = :sessionId "); buildNameSearch(searchString, queryText); - List list = getSession().createSQLQuery(queryText.toString()).setLong("sessionId", sessionId).list(); + List list = getSession().createSQLQuery(queryText.toString()).setParameter("sessionId", sessionId).list(); if (list == null || list.size() == 0) { return 0; } @@ -206,10 +206,10 @@ @SuppressWarnings("unchecked") public List getStatisticsBySession(final Long contentId) { - SQLQuery query = getSession().createSQLQuery(GET_STATISTICS); + NativeQuery query = getSession().createNativeQuery(GET_STATISTICS); query.addScalar("sessionId", LongType.INSTANCE).addScalar("sessionName", StringType.INSTANCE) .addScalar("totalUploadedFiles", IntegerType.INSTANCE).addScalar("markedCount", IntegerType.INSTANCE) - .setLong("contentId", contentId).setResultTransformer(Transformers.aliasToBean(StatisticDTO.class)); + .setParameter("contentId", contentId).setResultTransformer(Transformers.aliasToBean(StatisticDTO.class)); List list = query.list(); for (StatisticDTO dto : list) { @@ -229,10 +229,10 @@ @SuppressWarnings("unchecked") public List getLeaderStatisticsBySession(final Long contentId) { - SQLQuery query = getSession().createSQLQuery(GET_LEADER_STATISTICS); + NativeQuery query = getSession().createNativeQuery(GET_LEADER_STATISTICS); query.addScalar("sessionId", LongType.INSTANCE).addScalar("sessionName", StringType.INSTANCE) .addScalar("totalUploadedFiles", IntegerType.INSTANCE).addScalar("markedCount", IntegerType.INSTANCE) - .setLong("contentId", contentId).setResultTransformer(Transformers.aliasToBean(StatisticDTO.class)); + .setParameter("contentId", contentId).setResultTransformer(Transformers.aliasToBean(StatisticDTO.class)); List list = query.list(); for (StatisticDTO dto : list) { @@ -253,10 +253,10 @@ @SuppressWarnings("unchecked") public List getReportsForGroup(final Long sessionId, final Long reportId) { - SQLQuery query = getSession().createSQLQuery(GET_GROUP_REPORTS); + NativeQuery query = getSession().createNativeQuery(GET_GROUP_REPORTS); query.addScalar("reportId", LongType.INSTANCE) - .setLong("sessionId", sessionId) - .setLong("reportId", reportId); + .setParameter("sessionId", sessionId) + .setParameter("reportId", reportId); return query.list(); Index: lams_tool_sbmt/web/includes/javascript/marks.js =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rceb74e3b4097cf6461280448f904fa21a176aaa4 --- lams_tool_sbmt/web/includes/javascript/marks.js (.../marks.js) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_sbmt/web/includes/javascript/marks.js (.../marks.js) (revision ceb74e3b4097cf6461280448f904fa21a176aaa4) @@ -2,7 +2,7 @@ var msg = LABEL_DELETE.replace('{0}', filename) var answer = confirm(msg); if (answer) { - location.href = MONITOR_URL + "/removeLearnerFiledo?userID="+userId+"&toolSessionID="+sessionId+"&detailID="+detailId; + location.href = MONITOR_URL + "/removeLearnerFile.do?userID="+userId+"&toolSessionID="+sessionId+"&detailID="+detailId; } } Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rceb74e3b4097cf6461280448f904fa21a176aaa4 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java (.../ScratchieAnswerVisitDAOHibernate.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java (.../ScratchieAnswerVisitDAOHibernate.java) (revision ceb74e3b4097cf6461280448f904fa21a176aaa4) @@ -25,10 +25,8 @@ import java.util.List; -import org.hibernate.Query; import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.scratchie.dao.ScratchieAnswerVisitDAO; -import org.lamsfoundation.lams.tool.scratchie.model.ScratchieAnswer; import org.lamsfoundation.lams.tool.scratchie.model.ScratchieAnswerVisitLog; import org.springframework.stereotype.Repository; Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieBurningQuestionDAOHibernate.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rceb74e3b4097cf6461280448f904fa21a176aaa4 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieBurningQuestionDAOHibernate.java (.../ScratchieBurningQuestionDAOHibernate.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieBurningQuestionDAOHibernate.java (.../ScratchieBurningQuestionDAOHibernate.java) (revision ceb74e3b4097cf6461280448f904fa21a176aaa4) @@ -26,7 +26,7 @@ import java.util.ArrayList; import java.util.List; -import org.hibernate.SQLQuery; +import org.hibernate.query.NativeQuery; import org.hibernate.type.IntegerType; import org.hibernate.type.StringType; import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; @@ -64,11 +64,11 @@ + " LEFT JOIN tl_lascrt11_burning_que_like like1 ON bq.uid = like1.burning_question_uid " + " WHERE bq.question IS NOT NULL AND bq.question != ''" + " GROUP BY bq.uid"; - SQLQuery query = getSession().createSQLQuery(GET_BURNING_QUESTIONS_WITH_LIKES); + NativeQuery query = getSession().createNativeQuery(GET_BURNING_QUESTIONS_WITH_LIKES); query.addEntity("bq", ScratchieBurningQuestion.class).addScalar("sessionName", StringType.INSTANCE) - .addScalar("total_likes", IntegerType.INSTANCE).setLong("scratchieUid", scratchieUid); + .addScalar("total_likes", IntegerType.INSTANCE).setParameter("scratchieUid", scratchieUid); if (sessionId != null) { - query.addScalar("user_liked", IntegerType.INSTANCE).setLong("sessionId", sessionId); + query.addScalar("user_liked", IntegerType.INSTANCE).setParameter("sessionId", sessionId); } List rawObjects = query.list(); @@ -99,7 +99,7 @@ @Override public ScratchieBurningQuestion getBurningQuestionBySessionAndItem(Long sessionId, Long itemUid) { - List list = this.doFind(FIND_BY_SESSION_AND_ITEM, new Object[] { sessionId, itemUid }); + List list = this.doFind(FIND_BY_SESSION_AND_ITEM, new Object[] { sessionId, itemUid }); if (list == null || list.size() == 0) { return null; } @@ -108,13 +108,14 @@ @Override public ScratchieBurningQuestion getGeneralBurningQuestionBySession(Long sessionId) { - List list = this.find(FIND_GENERAL_QUESTION_BY_SESSION, new Object[] { sessionId }); + List list = this.find(FIND_GENERAL_QUESTION_BY_SESSION, new Object[] { sessionId }); if (list == null || list.size() == 0) { return null; } return (ScratchieBurningQuestion) list.get(0); } + @SuppressWarnings("unchecked") @Override public List getBurningQuestionsBySession(Long sessionId) { return (List) this.doFind(FIND_BY_SESSION, new Object[] { sessionId }); Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieConfigItemDAOHibernate.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rceb74e3b4097cf6461280448f904fa21a176aaa4 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieConfigItemDAOHibernate.java (.../ScratchieConfigItemDAOHibernate.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieConfigItemDAOHibernate.java (.../ScratchieConfigItemDAOHibernate.java) (revision ceb74e3b4097cf6461280448f904fa21a176aaa4) @@ -35,7 +35,7 @@ @Override public ScratchieConfigItem getConfigItemByKey(final String configKey) { - return (ScratchieConfigItem) getSession().createQuery(LOAD_CONFIG_ITEM_BY_KEY).setString("key", configKey) + return (ScratchieConfigItem) getSession().createQuery(LOAD_CONFIG_ITEM_BY_KEY).setParameter("key", configKey) .uniqueResult(); } Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieSessionDAOHibernate.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rceb74e3b4097cf6461280448f904fa21a176aaa4 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieSessionDAOHibernate.java (.../ScratchieSessionDAOHibernate.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieSessionDAOHibernate.java (.../ScratchieSessionDAOHibernate.java) (revision ceb74e3b4097cf6461280448f904fa21a176aaa4) @@ -28,8 +28,7 @@ import java.util.Set; import java.util.TreeSet; -import org.hibernate.Query; -import org.hibernate.SQLQuery; +import org.hibernate.query.NativeQuery; import org.hibernate.type.FloatType; import org.hibernate.type.IntegerType; import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; @@ -88,20 +87,20 @@ @SuppressWarnings("unchecked") @Override public List getRawLeaderMarksByToolContentId(Long toolContentId) { - SQLQuery query = getSession().createSQLQuery(LOAD_MARKS); - query.setLong("toolContentId", toolContentId); + NativeQuery query = getSession().createNativeQuery(LOAD_MARKS); + query.setParameter("toolContentId", toolContentId); List list = query.list(); return list; } @Override public Object[] getStatsMarksForLeaders(Long toolContentId) { - Query query = getSession().createSQLQuery(FIND_MARK_STATS) + NativeQuery query = getSession().createNativeQuery(FIND_MARK_STATS) .addScalar("min_grade", FloatType.INSTANCE) .addScalar("avg_grade", FloatType.INSTANCE) .addScalar("max_grade", FloatType.INSTANCE) .addScalar("num_complete", IntegerType.INSTANCE); - query.setLong("toolContentId", toolContentId); + query.setParameter("toolContentId", toolContentId); @SuppressWarnings("rawtypes") List list = query.list(); if ((list == null) || (list.size() == 0)) { Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieUserDAOHibernate.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rceb74e3b4097cf6461280448f904fa21a176aaa4 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieUserDAOHibernate.java (.../ScratchieUserDAOHibernate.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieUserDAOHibernate.java (.../ScratchieUserDAOHibernate.java) (revision ceb74e3b4097cf6461280448f904fa21a176aaa4) @@ -69,7 +69,7 @@ final String COUNT_USERS_BY_CONTENT_ID = "SELECT COUNT(*) FROM " + ScratchieUser.class.getName() + " as user WHERE user.session.scratchie.contentId = :contentId "; - List list = getSession().createQuery(COUNT_USERS_BY_CONTENT_ID).setLong("contentId", contentId).list(); + List list = getSession().createQuery(COUNT_USERS_BY_CONTENT_ID).setParameter("contentId", contentId).list(); if (list == null || list.size() == 0) { return 0; } else { Index: lams_tool_spreadsheet/.classpath =================================================================== diff -u -rbe86c0bc220914398d3ce8ec9ae9cab91b47353a -rceb74e3b4097cf6461280448f904fa21a176aaa4 --- lams_tool_spreadsheet/.classpath (.../.classpath) (revision be86c0bc220914398d3ce8ec9ae9cab91b47353a) +++ lams_tool_spreadsheet/.classpath (.../.classpath) (revision ceb74e3b4097cf6461280448f904fa21a176aaa4) @@ -1,24 +1,28 @@ - + + + + + + - - + Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/hibernate/SpreadsheetUserDAOHibernate.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rceb74e3b4097cf6461280448f904fa21a176aaa4 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/hibernate/SpreadsheetUserDAOHibernate.java (.../SpreadsheetUserDAOHibernate.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/hibernate/SpreadsheetUserDAOHibernate.java (.../SpreadsheetUserDAOHibernate.java) (revision ceb74e3b4097cf6461280448f904fa21a176aaa4) @@ -27,7 +27,7 @@ import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringUtils; -import org.hibernate.SQLQuery; +import org.hibernate.query.NativeQuery; import org.hibernate.type.IntegerType; import org.hibernate.type.StringType; import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; @@ -50,7 +50,7 @@ @Override public SpreadsheetUser getUserByUserIDAndSessionID(Long userID, Long sessionId) { - List list = this.doFind(FIND_BY_USER_ID_SESSION_ID, new Object[] { userID, sessionId }); + List list = this.doFind(FIND_BY_USER_ID_SESSION_ID, new Object[] { userID, sessionId }); if (list == null || list.size() == 0) { return null; } @@ -59,7 +59,7 @@ @Override public SpreadsheetUser getUserByUserIDAndContentID(Long userId, Long contentId) { - List list = this.doFind(FIND_BY_USER_ID_CONTENT_ID, new Object[] { userId, contentId }); + List list = this.doFind(FIND_BY_USER_ID_CONTENT_ID, new Object[] { userId, contentId }); if (list == null || list.size() == 0) { return null; } @@ -136,10 +136,10 @@ // Now specify the sort based on the switch statement above. queryText.append(" ORDER BY " + sortingOrder); - SQLQuery query = getSession().createSQLQuery(queryText.toString()); + NativeQuery query = getSession().createNativeQuery(queryText.toString()); query.addEntity("user", SpreadsheetUser.class).addScalar("notebookEntry", StringType.INSTANCE) .addScalar("portraitId", IntegerType.INSTANCE) - .setLong("sessionId", sessionId.longValue()).setFirstResult(page * size).setMaxResults(size); + .setParameter("sessionId", sessionId).setFirstResult(page * size).setMaxResults(size); return query.list(); } @@ -164,8 +164,7 @@ " JOIN tl_lasprd10_session session ON user.session_uid = session.uid and session.session_id = :sessionId"); buildNameSearch(searchString, queryText); - List list = getSession().createSQLQuery(queryText.toString()).setLong("sessionId", sessionId.longValue()) - .list(); + List list = getSession().createNativeQuery(queryText.toString()).setParameter("sessionId", sessionId).list(); if (list == null || list.size() == 0) { return 0; } Index: lams_tool_survey/.classpath =================================================================== diff -u -rbe86c0bc220914398d3ce8ec9ae9cab91b47353a -rceb74e3b4097cf6461280448f904fa21a176aaa4 --- lams_tool_survey/.classpath (.../.classpath) (revision be86c0bc220914398d3ce8ec9ae9cab91b47353a) +++ lams_tool_survey/.classpath (.../.classpath) (revision ceb74e3b4097cf6461280448f904fa21a176aaa4) @@ -1,24 +1,28 @@ - + + + + + + - - + Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyAnswerDAOHibernate.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rceb74e3b4097cf6461280448f904fa21a176aaa4 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyAnswerDAOHibernate.java (.../SurveyAnswerDAOHibernate.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyAnswerDAOHibernate.java (.../SurveyAnswerDAOHibernate.java) (revision ceb74e3b4097cf6461280448f904fa21a176aaa4) @@ -90,8 +90,9 @@ } String sqlQuery = LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION_LIMIT + sortingOrder; - return getSession().createQuery(sqlQuery).setLong("sessionId", sessionId.longValue()) - .setLong("questionUid", questionUid.longValue()).setFirstResult(page * size).setMaxResults(size).list(); + return getSession().createQuery(sqlQuery).setParameter("sessionId", sessionId.longValue()) + .setParameter("questionUid", questionUid.longValue()).setFirstResult(page * size).setMaxResults(size) + .list(); } @Override Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyUserDAOHibernate.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rceb74e3b4097cf6461280448f904fa21a176aaa4 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyUserDAOHibernate.java (.../SurveyUserDAOHibernate.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyUserDAOHibernate.java (.../SurveyUserDAOHibernate.java) (revision ceb74e3b4097cf6461280448f904fa21a176aaa4) @@ -27,7 +27,7 @@ import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringUtils; -import org.hibernate.SQLQuery; +import org.hibernate.query.NativeQuery; import org.hibernate.type.IntegerType; import org.hibernate.type.StringType; import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; @@ -54,7 +54,7 @@ @Override public SurveyUser getUserByUserIDAndSessionID(Long userID, Long sessionId) { - List list = this.doFind(FIND_BY_USER_ID_SESSION_ID, new Object[] { userID, sessionId }); + List list = this.doFind(FIND_BY_USER_ID_SESSION_ID, new Object[] { userID, sessionId }); if (list == null || list.size() == 0) { return null; } @@ -63,7 +63,7 @@ @Override public SurveyUser getUserByUserIDAndContentID(Long userId, Long contentId) { - List list = this.doFind(FIND_BY_USER_ID_CONTENT_ID, new Object[] { userId, contentId }); + List list = this.doFind(FIND_BY_USER_ID_CONTENT_ID, new Object[] { userId, contentId }); if (list == null || list.size() == 0) { return null; } @@ -78,7 +78,7 @@ @Override public int getCountFinishedUsers(Long sessionId) { - List list = doFind(GET_COUNT_FINISHED_USERS_FOR_SESSION, new Object[] { sessionId }); + List list = doFind(GET_COUNT_FINISHED_USERS_FOR_SESSION, new Object[] { sessionId }); if (list == null || list.size() == 0) { return 0; } @@ -125,11 +125,11 @@ // Now specify the sort based on the switch statement above. queryText.append(" ORDER BY " + sortingOrder); - SQLQuery query = getSession().createSQLQuery(queryText.toString()); + NativeQuery query = getSession().createNativeQuery(queryText.toString()); query.addEntity("user", SurveyUser.class).addScalar("answerChoices", StringType.INSTANCE) .addScalar("answerText", StringType.INSTANCE).addScalar("portraitId", IntegerType.INSTANCE) - .setLong("sessionId", sessionId.longValue()) - .setLong("questionId", questionId.longValue()).setFirstResult(page * size).setMaxResults(size); + .setParameter("sessionId", sessionId.longValue()) + .setParameter("questionId", questionId.longValue()).setFirstResult(page * size).setMaxResults(size); return query.list(); } @@ -154,7 +154,7 @@ " JOIN tl_lasurv11_session session ON user.session_uid = session.uid and session.session_id = :sessionId"); buildNameSearch(searchString, queryText); - List list = getSession().createSQLQuery(queryText.toString()).setLong("sessionId", sessionId.longValue()) + List list = getSession().createNativeQuery(queryText.toString()).setParameter("sessionId", sessionId.longValue()) .list(); if (list == null || list.size() == 0) { return 0; @@ -207,10 +207,10 @@ // Now specify the sort based on the switch statement above. queryText.append(" ORDER BY " + sortingOrder); - SQLQuery query = getSession().createSQLQuery(queryText.toString()); + NativeQuery query = getSession().createNativeQuery(queryText.toString()); query.addEntity("user", SurveyUser.class).addScalar("notebookEntry", StringType.INSTANCE) .addScalar("portraitId", IntegerType.INSTANCE) - .setLong("sessionId", sessionId.longValue()).setFirstResult(page * size).setMaxResults(size); + .setParameter("sessionId", sessionId.longValue()).setFirstResult(page * size).setMaxResults(size); return query.list(); } @@ -224,8 +224,8 @@ /** Returns < [surveySession, numUsers] ... [surveySession, numUsers]> */ public List getStatisticsBySession(final Long contentId) { - SQLQuery query = getSession().createSQLQuery(GET_STATISTICS); - query.addEntity(SurveySession.class).addScalar("numUsers", IntegerType.INSTANCE).setLong("contentId", + NativeQuery query = getSession().createNativeQuery(GET_STATISTICS); + query.addEntity(SurveySession.class).addScalar("numUsers", IntegerType.INSTANCE).setParameter("contentId", contentId); return query.list(); } Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListItemVisitDAOHibernate.java =================================================================== diff -u -r0b3631fb6cd93265967ec5d314313e15999d9061 -rceb74e3b4097cf6461280448f904fa21a176aaa4 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListItemVisitDAOHibernate.java (.../TaskListItemVisitDAOHibernate.java) (revision 0b3631fb6cd93265967ec5d314313e15999d9061) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListItemVisitDAOHibernate.java (.../TaskListItemVisitDAOHibernate.java) (revision ceb74e3b4097cf6461280448f904fa21a176aaa4) @@ -25,7 +25,7 @@ import java.util.List; -import org.hibernate.SQLQuery; +import org.hibernate.query.NativeQuery; import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.taskList.dao.TaskListItemVisitDAO; import org.lamsfoundation.lams.tool.taskList.model.TaskListItemVisitLog; @@ -92,8 +92,8 @@ @Override public Object[] getDateRangeOfTasks(Long userUid, Long sessionId) { - SQLQuery query = (SQLQuery) getSession().createSQLQuery(SQL_QUERY_DATES_BY_USER_SESSION.toString()) - .setLong("userUid", userUid).setLong("sessionId", sessionId); + NativeQuery query = (NativeQuery) getSession().createNativeQuery(SQL_QUERY_DATES_BY_USER_SESSION.toString()) + .setParameter("userUid", userUid).setParameter("sessionId", sessionId); Object[] values = (Object[]) query.list().get(0); return values; } Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListUserDAOHibernate.java =================================================================== diff -u -r0b3631fb6cd93265967ec5d314313e15999d9061 -rceb74e3b4097cf6461280448f904fa21a176aaa4 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListUserDAOHibernate.java (.../TaskListUserDAOHibernate.java) (revision 0b3631fb6cd93265967ec5d314313e15999d9061) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListUserDAOHibernate.java (.../TaskListUserDAOHibernate.java) (revision ceb74e3b4097cf6461280448f904fa21a176aaa4) @@ -31,8 +31,8 @@ import java.util.LinkedList; import java.util.List; -import org.hibernate.Query; -import org.hibernate.SQLQuery; +import org.hibernate.query.NativeQuery; +import org.hibernate.query.Query; import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.taskList.dao.TaskListUserDAO; import org.lamsfoundation.lams.tool.taskList.dto.TaskListUserDTO; @@ -106,11 +106,11 @@ .append(LOAD_USERS_JOINS) .append(sortOrder); - SQLQuery query = getSession().createSQLQuery(bldr.toString()); - query.setLong("sessionId", sessionId); + NativeQuery query = getSession().createNativeQuery(bldr.toString()); + query.setParameter("sessionId", sessionId); // support for custom search from a toolbar searchString = searchString == null ? "" : searchString; - query.setString("searchString", searchString); + query.setParameter("searchString", searchString); query.setFirstResult(page * size); query.setMaxResults(size); List list = query.list(); @@ -160,13 +160,13 @@ + " WHEN :sortBy='completed' THEN visitLog.complete " + " WHEN :sortBy='accessDate' THEN visitLog.access_date " + " END " + sortOrder; - SQLQuery query = getSession().createSQLQuery(LOAD_USERS); - query.setLong("sessionId", sessionId); - query.setLong("taskListItemUid", taskListItemUid); + NativeQuery query = getSession().createNativeQuery(LOAD_USERS); + query.setParameter("sessionId", sessionId); + query.setParameter("taskListItemUid", taskListItemUid); // support for custom search from a toolbar searchString = searchString == null ? "" : searchString; - query.setString("searchString", searchString); - query.setString("sortBy", sortBy); + query.setParameter("searchString", searchString); + query.setParameter("sortBy", sortBy); query.setFirstResult(page * size); query.setMaxResults(size); List list = query.list(); Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dao/hibernate/WikiPageDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rceb74e3b4097cf6461280448f904fa21a176aaa4 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dao/hibernate/WikiPageDAO.java (.../WikiPageDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dao/hibernate/WikiPageDAO.java (.../WikiPageDAO.java) (revision ceb74e3b4097cf6461280448f904fa21a176aaa4) @@ -1,7 +1,7 @@ package org.lamsfoundation.lams.tool.wiki.dao.hibernate; -import org.hibernate.Query; -import org.hibernate.SQLQuery; +import org.hibernate.query.NativeQuery; +import org.hibernate.query.Query; import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.wiki.dao.IWikiPageDAO; import org.lamsfoundation.lams.tool.wiki.dto.WikiPageDTO; @@ -17,11 +17,11 @@ + " where wiki_uid=? AND title=? AND wiki_session_uid=null"; public static final String GET_BY_SESSION_AND_TITLE = "from tl_lawiki10_wiki_page in class " - + WikiPage.class.getName() + " where wiki_session_uid=? AND title=?"; + + WikiPage.class.getName() + " where wiki_session_uid=:wikiId AND title=:title"; public static final String REMOVE_WIKI_REFERENCES = "UPDATE tl_lawiki10_wiki_page_content AS content " + "JOIN tl_lawiki10_wiki_page AS page ON content.wiki_page_uid=page.uid " - + "SET content.body=REPLACE(content.body,?,?) WHERE content.editor IS NULL AND page.wiki_uid=?"; + + "SET content.body=REPLACE(content.body,:codeToReplace,:replacementCode) WHERE content.editor IS NULL AND page.wiki_uid=:parentWikiUid"; public static final String CHANGE_WIKI_JAVASCRIPT_METHOD = "javascript:changeWikiPage('?')"; @@ -35,8 +35,8 @@ if (wiki != null && title != null && title.length() > 0) { Long wikiId = wiki.getUid(); Query query = getSessionFactory().getCurrentSession().createQuery(GET_BY_WIKI_AND_TITLE); - query.setLong(0, wikiId); - query.setString(1, title); + query.setParameter(0, wikiId); + query.setParameter(1, title); return (WikiPage) query.uniqueResult(); } return null; @@ -47,8 +47,8 @@ if (wikiSession != null && title != null && title.length() > 0) { Long wikiId = wikiSession.getUid(); Query query = getSessionFactory().getCurrentSession().createQuery(GET_BY_SESSION_AND_TITLE); - query.setLong(0, wikiId); - query.setString(1, title); + query.setParameter("wikiId", wikiId); + query.setParameter("title", title); return (WikiPage) query.uniqueResult(); } return null; @@ -63,10 +63,10 @@ String codeToReplace = WikiPageDAO.CHANGE_WIKI_JAVASCRIPT_METHOD.replace("?", escapedTitle); String replacementCode = "#"; - SQLQuery query = getSessionFactory().getCurrentSession().createSQLQuery(REMOVE_WIKI_REFERENCES); - query.setString(0, codeToReplace); - query.setString(1, replacementCode); - query.setLong(2, removedWikiPage.getParentWiki().getUid()); + NativeQuery query = getSessionFactory().getCurrentSession().createNativeQuery(REMOVE_WIKI_REFERENCES); + query.setParameter("codeToReplace", codeToReplace); + query.setParameter("replacementCode", replacementCode); + query.setParameter("parentWikiUid", removedWikiPage.getParentWiki().getUid()); super.delete(object); query.executeUpdate();