Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/CredentialDAO.java =================================================================== diff -u -r809352b41790344e447df862668ab048d4dd56e3 -r8846e87b362ce07b580e3750128c5826e667f7e5 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/CredentialDAO.java (.../CredentialDAO.java) (revision 809352b41790344e447df862668ab048d4dd56e3) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/CredentialDAO.java (.../CredentialDAO.java) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) @@ -27,8 +27,8 @@ import java.util.List; import org.apache.log4j.Logger; -import org.hibernate.Query; import org.hibernate.Session; +import org.hibernate.query.Query; import org.lamsfoundation.lams.contentrepository.CrCredential; import org.lamsfoundation.lams.contentrepository.ICredentials; import org.lamsfoundation.lams.contentrepository.IWorkspace; @@ -68,10 +68,10 @@ } Session hibernateSession = getSessionFactory().getCurrentSession(); - Query query = hibernateSession.createQuery(CredentialDAO.CHECK_CREDENTIAL_WITH_WORKSPACE); - query.setString("name", credential.getName()); - query.setString("password", String.valueOf(credential.getPassword())); - query.setLong("workspaceId", workspace.getWorkspaceId()); + Query query = hibernateSession.createQuery(CredentialDAO.CHECK_CREDENTIAL_WITH_WORKSPACE); + query.setParameter("name", credential.getName()); + query.setParameter("password", String.valueOf(credential.getPassword())); + query.setParameter("workspaceId", workspace.getWorkspaceId()); Long count = (Long) query.uniqueResult(); if (count > 2) { @@ -96,9 +96,9 @@ } Session hibernateSession = getSessionFactory().getCurrentSession(); - Query query = hibernateSession.createQuery(CredentialDAO.CHECK_CREDENTIAL); - query.setString("name", credential.getName()); - query.setString("password", String.valueOf(credential.getPassword())); + Query query = hibernateSession.createQuery(CredentialDAO.CHECK_CREDENTIAL); + query.setParameter("name", credential.getName()); + query.setParameter("password", String.valueOf(credential.getPassword())); Long count = (Long) query.uniqueResult(); if (count > 2) { Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoAnswerDAOHibernate.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8846e87b362ce07b580e3750128c5826e667f7e5 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoAnswerDAOHibernate.java (.../DacoAnswerDAOHibernate.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoAnswerDAOHibernate.java (.../DacoAnswerDAOHibernate.java) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) @@ -48,6 +48,7 @@ + DacoAnswer.class.getName() + " AS a WHERE a.user.session.sessionId=:sessionId"; @Override + @SuppressWarnings("unchecked") public List getQuestionSummaries(Long userUid, List summaries) { List result = (List) doFindByNamedParam(DacoAnswerDAOHibernate.FIND_USER_NUMBER_SUMMARY, Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoDAOHibernate.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8846e87b362ce07b580e3750128c5826e667f7e5 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoDAOHibernate.java (.../DacoDAOHibernate.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoDAOHibernate.java (.../DacoDAOHibernate.java) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) @@ -42,7 +42,7 @@ @Override public Daco getByContentId(Long contentId) { - List list = doFind(DacoDAOHibernate.FIND_BY_CONTENT_ID, contentId); + List list = doFind(DacoDAOHibernate.FIND_BY_CONTENT_ID, contentId); if (list.size() > 0) { return (Daco) list.get(0); } else { Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoSessionDAOHibernate.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8846e87b362ce07b580e3750128c5826e667f7e5 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoSessionDAOHibernate.java (.../DacoSessionDAOHibernate.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoSessionDAOHibernate.java (.../DacoSessionDAOHibernate.java) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) @@ -25,7 +25,7 @@ import java.util.List; -import org.hibernate.SQLQuery; +import org.hibernate.query.NativeQuery; import org.hibernate.transform.Transformers; import org.hibernate.type.IntegerType; import org.hibernate.type.LongType; @@ -54,7 +54,7 @@ @Override public DacoSession getSessionBySessionId(Long sessionId) { - List list = doFind(DacoSessionDAOHibernate.FIND_BY_SESSION_ID, sessionId); + List list = doFind(DacoSessionDAOHibernate.FIND_BY_SESSION_ID, sessionId); if (list == null || list.size() == 0) { return null; } @@ -73,11 +73,12 @@ } @Override + @SuppressWarnings("unchecked") public List statistics(Long toolContentUid) { - SQLQuery query = getSession().createSQLQuery(DacoSessionDAOHibernate.CALC_SESSION_STATS); + NativeQuery query = getSession().createNativeQuery(DacoSessionDAOHibernate.CALC_SESSION_STATS); query.addScalar("sessionId", LongType.INSTANCE).addScalar("sessionName", StringType.INSTANCE) .addScalar("numberLearners", IntegerType.INSTANCE).addScalar("totalRecordCount", IntegerType.INSTANCE) - .setLong("contentUid", toolContentUid) + .setParameter("contentUid", toolContentUid) .setResultTransformer(Transformers.aliasToBean(MonitoringSessionStatsDTO.class)); return query.list(); Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoUserDAOHibernate.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8846e87b362ce07b580e3750128c5826e667f7e5 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoUserDAOHibernate.java (.../DacoUserDAOHibernate.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoUserDAOHibernate.java (.../DacoUserDAOHibernate.java) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) @@ -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; @@ -47,12 +47,10 @@ + " as u where u.userId =? and u.session.sessionId=?"; private static final String FIND_BY_SESSION_ID = "from " + DacoUser.class.getName() + " as u where u.session.sessionId=?"; - private static final String FIND_BY_CONTENT_ID = "from " + DacoUser.class.getName() - + " as u where u.daco.contentId=?"; @Override public DacoUser getUserByUserIdAndSessionId(Long userID, Long sessionId) { - List list = doFind(DacoUserDAOHibernate.FIND_BY_USER_ID_AND_SESSION_ID, new Object[] { userID, sessionId }); + List list = doFind(DacoUserDAOHibernate.FIND_BY_USER_ID_AND_SESSION_ID, new Object[] { userID, sessionId }); if (list == null || list.size() == 0) { return null; } @@ -61,7 +59,7 @@ @Override public DacoUser getUserByUserIdAndContentId(Long userId, Long contentId) { - List list = doFind(DacoUserDAOHibernate.FIND_BY_USER_ID_AND_CONTENT_ID, new Object[] { userId, contentId }); + List list = doFind(DacoUserDAOHibernate.FIND_BY_USER_ID_AND_CONTENT_ID, new Object[] { userId, contentId }); if (list == null || list.size() == 0) { return null; } @@ -158,11 +156,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", DacoUser.class).addScalar("record_count", IntegerType.INSTANCE) .addScalar("notebookEntry", StringType.INSTANCE) .addScalar("portraitId", IntegerType.INSTANCE) - .setLong("sessionId", sessionId.longValue()) + .setParameter("sessionId", sessionId.longValue()) .setFirstResult(page * size).setMaxResults(size); return query.list(); Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/MonitoringController.java =================================================================== diff -u -rf2ad75cef0c507a64877942631fee13efbc6ed50 -r8846e87b362ce07b580e3750128c5826e667f7e5 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/MonitoringController.java (.../MonitoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) @@ -234,7 +234,7 @@ responseRow.put(DacoConstants.NOTEBOOK_ENTRY, HtmlUtils.htmlEscape((String) userAndReflection[2])); } if (userAndReflection.length > 3 && userAndReflection[3] != null) { - responseRow.put(DacoConstants.PORTRAIT_ID, (String) userAndReflection[3]); + responseRow.put(DacoConstants.PORTRAIT_ID, (Integer) userAndReflection[3]); } rows.add(responseRow); } Index: lams_tool_daco/web/pages/learning/questionSummaries.jsp =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8846e87b362ce07b580e3750128c5826e667f7e5 --- lams_tool_daco/web/pages/learning/questionSummaries.jsp (.../questionSummaries.jsp) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_daco/web/pages/learning/questionSummaries.jsp (.../questionSummaries.jsp) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) @@ -18,7 +18,7 @@ - + Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranConfigItemDAOHibernate.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8846e87b362ce07b580e3750128c5826e667f7e5 --- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranConfigItemDAOHibernate.java (.../DokumaranConfigItemDAOHibernate.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranConfigItemDAOHibernate.java (.../DokumaranConfigItemDAOHibernate.java) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) @@ -12,7 +12,7 @@ @Override public DokumaranConfigItem getConfigItemByKey(final String configKey) { - return (DokumaranConfigItem) getSession().createQuery(LOAD_CONFIG_ITEM_BY_KEY).setString("key", configKey) + return (DokumaranConfigItem) getSession().createQuery(LOAD_CONFIG_ITEM_BY_KEY).setParameter("key", configKey) .uniqueResult(); } Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dao/hibernate/ForumUserDao.java =================================================================== diff -u -rb71c9cb2f96eb891545d32aaca8904051d1e00d5 -r8846e87b362ce07b580e3750128c5826e667f7e5 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dao/hibernate/ForumUserDao.java (.../ForumUserDao.java) (revision b71c9cb2f96eb891545d32aaca8904051d1e00d5) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dao/hibernate/ForumUserDao.java (.../ForumUserDao.java) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) @@ -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.type.IntegerType; import org.hibernate.type.StringType; import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; @@ -181,10 +181,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", ForumUser.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(); } @@ -210,7 +210,7 @@ " JOIN tl_lafrum11_tool_session session ON user.session_id = session.uid and session.session_id = :sessionId"); buildNameSearch(queryText, searchString); - 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; Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dao/hibernate/MessageDao.java =================================================================== diff -u -rb71c9cb2f96eb891545d32aaca8904051d1e00d5 -r8846e87b362ce07b580e3750128c5826e667f7e5 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dao/hibernate/MessageDao.java (.../MessageDao.java) (revision b71c9cb2f96eb891545d32aaca8904051d1e00d5) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dao/hibernate/MessageDao.java (.../MessageDao.java) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) @@ -28,11 +28,9 @@ import java.util.List; import org.hibernate.LockOptions; -import org.hibernate.SQLQuery; -import org.hibernate.type.StringType; +import org.hibernate.query.NativeQuery; import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.forum.dao.IMessageDAO; -import org.lamsfoundation.lams.tool.forum.model.ForumUser; import org.lamsfoundation.lams.tool.forum.model.Message; import org.springframework.stereotype.Repository; @@ -127,8 +125,8 @@ @Override public Object[] getDateRangeOfMessages(Long userUid) { - SQLQuery query = (SQLQuery) getSession().createSQLQuery(SQL_QUERY_DATES_BY_USER_SESSION.toString()) - .setLong("userUid", userUid); + NativeQuery query = getSession().createNativeQuery(SQL_QUERY_DATES_BY_USER_SESSION.toString()) + .setParameter("userUid", userUid); Object[] values = (Object[]) query.list().get(0); return values; } Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dao/hibernate/MessageSeqDao.java =================================================================== diff -u -rb71c9cb2f96eb891545d32aaca8904051d1e00d5 -r8846e87b362ce07b580e3750128c5826e667f7e5 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dao/hibernate/MessageSeqDao.java (.../MessageSeqDao.java) (revision b71c9cb2f96eb891545d32aaca8904051d1e00d5) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dao/hibernate/MessageSeqDao.java (.../MessageSeqDao.java) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) @@ -29,8 +29,8 @@ import java.util.List; import org.apache.log4j.Logger; -import org.hibernate.Query; import org.hibernate.criterion.Restrictions; +import org.hibernate.query.Query; import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.forum.dao.IMessageSeqDAO; import org.lamsfoundation.lams.tool.forum.model.MessageSeq; Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryConfigItemDAOHibernate.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8846e87b362ce07b580e3750128c5826e667f7e5 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryConfigItemDAOHibernate.java (.../ImageGalleryConfigItemDAOHibernate.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryConfigItemDAOHibernate.java (.../ImageGalleryConfigItemDAOHibernate.java) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) @@ -35,7 +35,7 @@ @Override public ImageGalleryConfigItem getConfigItemByKey(final String configKey) { - return (ImageGalleryConfigItem) getSession().createQuery(LOAD_CONFIG_ITEM_BY_KEY).setString("key", configKey) + return (ImageGalleryConfigItem) getSession().createQuery(LOAD_CONFIG_ITEM_BY_KEY).setParameter("key", configKey) .uniqueResult(); } Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/CommonCartridgeConfigItemDAOHibernate.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8846e87b362ce07b580e3750128c5826e667f7e5 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/CommonCartridgeConfigItemDAOHibernate.java (.../CommonCartridgeConfigItemDAOHibernate.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/CommonCartridgeConfigItemDAOHibernate.java (.../CommonCartridgeConfigItemDAOHibernate.java) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) @@ -35,7 +35,7 @@ @Override public CommonCartridgeConfigItem getConfigItemByKey(final String configKey) { - return (CommonCartridgeConfigItem) getSession().createQuery(LOAD_CONFIG_ITEM_BY_KEY).setString("key", configKey) + return (CommonCartridgeConfigItem) getSession().createQuery(LOAD_CONFIG_ITEM_BY_KEY).setParameter("key", configKey) .uniqueResult(); } Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/CommonCartridgeItemVisitDAOHibernate.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8846e87b362ce07b580e3750128c5826e667f7e5 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/CommonCartridgeItemVisitDAOHibernate.java (.../CommonCartridgeItemVisitDAOHibernate.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/CommonCartridgeItemVisitDAOHibernate.java (.../CommonCartridgeItemVisitDAOHibernate.java) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) @@ -27,7 +27,7 @@ import java.util.List; import java.util.Map; -import org.hibernate.SQLQuery; +import org.hibernate.query.NativeQuery; import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.commonCartridge.dao.CommonCartridgeItemVisitDAO; import org.lamsfoundation.lams.tool.commonCartridge.model.CommonCartridge; @@ -99,8 +99,8 @@ @Override public Object[] getDateRangeOfAccesses(Long userUid) { - SQLQuery query = (SQLQuery) getSession().createSQLQuery(SQL_QUERY_DATES_BY_USER_SESSION.toString()) - .setLong("userUid", userUid); + NativeQuery query =getSession().createNativeQuery(SQL_QUERY_DATES_BY_USER_SESSION.toString()) + .setParameter("userUid", userUid); Object[] values = (Object[]) query.list().get(0); return values; } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcQueContentDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8846e87b362ce07b580e3750128c5826e667f7e5 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcQueContentDAO.java (.../IMcQueContentDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcQueContentDAO.java (.../IMcQueContentDAO.java) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) @@ -43,7 +43,7 @@ * @param mcContentUid * @return McQueContent */ - McQueContent getQuestionContentByDisplayOrder(final Long displayOrder, final Long mcContentUid); + McQueContent getQuestionContentByDisplayOrder(final Integer displayOrder, final Long mcContentUid); /** *

Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McContentDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8846e87b362ce07b580e3750128c5826e667f7e5 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McContentDAO.java (.../McContentDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McContentDAO.java (.../McContentDAO.java) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) @@ -39,19 +39,18 @@ @Repository public class McContentDAO extends LAMSBaseDAO implements IMcContentDAO { - private static final String FIND_MC_CONTENT = "from " + McContent.class.getName() + " as mc where content_id=?"; + private static final String FIND_MC_CONTENT = "from " + McContent.class.getName() + " as mc where content_id=:mcContentId"; @Override public McContent getMcContentByUID(Long uid) { return (McContent) this.getSession().get(McContent.class, uid); } + @SuppressWarnings("rawtypes") @Override public McContent findMcContentById(Long mcContentId) { - String query = "from McContent as mc where mc.mcContentId = ?"; - List list = getSessionFactory().getCurrentSession().createQuery(FIND_MC_CONTENT) - .setLong(0, mcContentId.longValue()).list(); + .setParameter("mcContentId", mcContentId.longValue()).list(); if (list != null && list.size() > 0) { McContent mc = (McContent) list.get(0); @@ -75,11 +74,12 @@ this.getSession().saveOrUpdate(mc); } + @SuppressWarnings("rawtypes") @Override public void removeMcById(Long mcContentId) { if (mcContentId != null) { List list = getSessionFactory().getCurrentSession().createQuery(FIND_MC_CONTENT) - .setLong(0, mcContentId.longValue()).list(); + .setParameter(0, mcContentId.longValue()).list(); if (list != null && list.size() > 0) { McContent mc = (McContent) list.get(0); @@ -94,6 +94,7 @@ deleteAll(mcContent.getMcSessions()); } + @SuppressWarnings("unchecked") @Override public void addMcSession(Long mcContentId, McSession mcSession) { McContent content = findMcContentById(mcContentId); @@ -103,6 +104,7 @@ this.getSession().saveOrUpdate(content); } + @SuppressWarnings("rawtypes") @Override public List findAll(Class objClass) { String query = "from obj in class " + objClass.getName(); Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McOptionsContentDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8846e87b362ce07b580e3750128c5826e667f7e5 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McOptionsContentDAO.java (.../McOptionsContentDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McOptionsContentDAO.java (.../McOptionsContentDAO.java) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) @@ -43,23 +43,25 @@ private static final String FIND_OPTIONS_BY_QUESTION_UID = "from mcOptsContent in class McOptsContent where mcOptsContent.mcQueContentId=:mcQueContentUid order by mcOptsContent.displayOrder"; + @SuppressWarnings("unchecked") @Override public List findMcOptionsContentByQueId(Long questionUid) { if (questionUid != null) { List list = getSessionFactory().getCurrentSession().createQuery(FIND_OPTIONS_BY_QUESTION_UID) - .setLong("mcQueContentUid", questionUid.longValue()).list(); + .setParameter("mcQueContentUid", questionUid.longValue()).list(); return list; } return null; } + @SuppressWarnings("unchecked") @Override public List getOptionDtos(Long questionUid) { - List optionDtos = new LinkedList(); + List optionDtos = new LinkedList(); if (questionUid != null) { List options = getSessionFactory().getCurrentSession() - .createQuery(FIND_OPTIONS_BY_QUESTION_UID).setLong("mcQueContentUid", questionUid.longValue()) + .createQuery(FIND_OPTIONS_BY_QUESTION_UID).setParameter("mcQueContentUid", questionUid.longValue()) .list(); if (options != null && options.size() > 0) { Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8846e87b362ce07b580e3750128c5826e667f7e5 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java (.../McQueContentDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java (.../McQueContentDAO.java) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) @@ -50,8 +50,8 @@ @Override public McQueContent findMcQuestionContentByUid(Long uid) { if (uid != null) { - List list = getSessionFactory().getCurrentSession().createQuery(FIND_QUESTION_CONTENT_BY_UID) - .setLong("uid", uid.longValue()).list(); + List list = getSessionFactory().getCurrentSession().createQuery(FIND_QUESTION_CONTENT_BY_UID) + .setParameter("uid", uid.longValue()).list(); if (list != null && list.size() > 0) { McQueContent mcq = (McQueContent) list.get(0); @@ -62,25 +62,26 @@ } @Override - public List getQuestionsByContentUid(final long contentUid) { - List list = getSessionFactory().getCurrentSession().createQuery(LOAD_QUESTION_CONTENT_BY_CONTENT_ID) - .setLong("mcContentId", contentUid).list(); + @SuppressWarnings("unchecked") + public List getQuestionsByContentUid(final long contentUid) { + List list = getSessionFactory().getCurrentSession().createQuery(LOAD_QUESTION_CONTENT_BY_CONTENT_ID) + .setParameter("mcContentId", contentUid).list(); return list; } @Override - public List refreshQuestionContent(final Long mcContentId) { - List list = getSessionFactory().getCurrentSession().createQuery(REFRESH_QUESTION_CONTENT) - .setLong("mcContentId", mcContentId.longValue()).list(); + public List refreshQuestionContent(final Long mcContentId) { + List list = getSessionFactory().getCurrentSession().createQuery(REFRESH_QUESTION_CONTENT) + .setParameter("mcContentId", mcContentId.longValue()).list(); return list; } @Override - public McQueContent getQuestionContentByDisplayOrder(final Long displayOrder, final Long mcContentUid) { - List list = getSessionFactory().getCurrentSession().createQuery(LOAD_QUESTION_CONTENT_BY_DISPLAY_ORDER) - .setLong("displayOrder", displayOrder.longValue()).setLong("mcContentUid", mcContentUid.longValue()) + public McQueContent getQuestionContentByDisplayOrder(final Integer displayOrder, final Long mcContentUid) { + List list = getSessionFactory().getCurrentSession().createQuery(LOAD_QUESTION_CONTENT_BY_DISPLAY_ORDER) + .setParameter("displayOrder", displayOrder).setParameter("mcContentUid", mcContentUid) .list(); if (list != null && list.size() > 0) { @@ -96,9 +97,9 @@ } @Override - public List getAllQuestionEntriesSorted(final long mcContentId) { - List list = getSessionFactory().getCurrentSession().createQuery(SORT_QUESTION_CONTENT_BY_DISPLAY_ORDER) - .setLong("mcContentId", mcContentId).list(); + public List getAllQuestionEntriesSorted(final long mcContentId) { + List list = getSessionFactory().getCurrentSession().createQuery(SORT_QUESTION_CONTENT_BY_DISPLAY_ORDER) + .setParameter("mcContentId", mcContentId).list(); return list; } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McSessionDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8846e87b362ce07b580e3750128c5826e667f7e5 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McSessionDAO.java (.../McSessionDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McSessionDAO.java (.../McSessionDAO.java) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) @@ -41,13 +41,13 @@ private static final String LOAD_MCSESSION_BY_USER = "select ms from McSession ms left join fetch " + "ms.mcQueUsers user where user.queUsrId=:userId"; - private static final String LOAD_MCSESSION_BY_MCSESSIONID = "from McSession mcs where mcs.mcSessionId=?"; + private static final String LOAD_MCSESSION_BY_MCSESSIONID = "from McSession mcs where mcs.mcSessionId=:mcSessionId"; @Override public McSession getMcSessionById(Long mcSessionId) { - List list = getSessionFactory().getCurrentSession().createQuery(LOAD_MCSESSION_BY_MCSESSIONID) - .setLong(0, mcSessionId.longValue()).list(); + List list = getSessionFactory().getCurrentSession().createQuery(LOAD_MCSESSION_BY_MCSESSIONID) + .setParameter("mcSessionId", mcSessionId.longValue()).list(); if (list != null && list.size() > 0) { McSession mcs = (McSession) list.get(0); @@ -73,7 +73,7 @@ @Override public McSession getMcSessionByUser(final Long userId) { - return (McSession) getSession().createQuery(LOAD_MCSESSION_BY_USER).setLong("userId", userId.longValue()) + return (McSession) getSession().createQuery(LOAD_MCSESSION_BY_USER).setParameter("userId", userId.longValue()) .uniqueResult(); } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8846e87b362ce07b580e3750128c5826e667f7e5 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java (.../McUserDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java (.../McUserDAO.java) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) @@ -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.hibernate.type.FloatType; import org.hibernate.type.IntegerType; import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; @@ -79,14 +79,14 @@ + " user where user.queUsrId=:userId and user.mcSession.mcContent.mcContentId=:contentId"; return (McQueUsr) getSessionFactory().getCurrentSession().createQuery(GET_USER_BY_USER_ID_AND_CONTENT_ID) - .setLong("userId", userId).setLong("contentId", contentId).uniqueResult(); + .setParameter("userId", userId).setParameter("contentId", contentId).uniqueResult(); } @SuppressWarnings("rawtypes") @Override public McQueUsr getMcUserBySession(final Long queUsrId, final Long mcSessionUid) { - List list = getSessionFactory().getCurrentSession().createQuery(GET_USER_BY_USER_ID_SESSION) + List list = getSessionFactory().getCurrentSession().createQuery(GET_USER_BY_USER_ID_SESSION) .setLong("queUsrId", queUsrId.longValue()).setLong("mcSessionUid", mcSessionUid.longValue()).list(); if (list != null && list.size() > 0) { @@ -104,8 +104,8 @@ " INNER JOIN lams_user luser ON luser.user_id = user.que_usr_id" + " WHERE session.mc_session_id = :sessionId"; - SQLQuery query = getSession().createSQLQuery(LOAD_USERS_WITH_PORTRAITS_BY_SESSION_ID); - query.setLong("sessionId", sessionId); + NativeQuery query = getSession().createNativeQuery(LOAD_USERS_WITH_PORTRAITS_BY_SESSION_ID); + query.setParameter("sessionId", sessionId); List list = query.list(); ArrayList userDtos = new ArrayList(); @@ -163,12 +163,12 @@ .append(LOAD_USERS_JOINWHERE) .append(sortOrder); - SQLQuery query = getSession().createSQLQuery(bldr.toString()); - query.setLong("sessionId", sessionId); + NativeQuery query = getSession().createSQLQuery(bldr.toString()); + query.setParameter("sessionId", sessionId); // 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(); @@ -205,12 +205,12 @@ + " WHERE user.mcSession.mcSessionId = :sessionId " + " AND (user.fullname LIKE CONCAT('%', :searchString, '%')) "; - Query query = getSession().createQuery(LOAD_USERS_ORDERED_BY_NAME); - query.setLong("sessionId", sessionId); + Query query = getSession().createQuery(LOAD_USERS_ORDERED_BY_NAME); + query.setParameter("sessionId", sessionId); // support for custom search from a toolbar searchString = searchString == null ? "" : searchString; - query.setString("searchString", searchString); - List list = query.list(); + query.setParameter("searchString", searchString); + List list = query.list(); if ((list == null) || (list.size() == 0)) { return 0; @@ -223,12 +223,12 @@ @Override public Object[] getStatsMarksBySession(Long sessionId) { - Query query = getSession().createSQLQuery(FIND_MARK_STATS_FOR_SESSION) + Query query = getSession().createSQLQuery(FIND_MARK_STATS_FOR_SESSION) .addScalar("min_grade", FloatType.INSTANCE) .addScalar("avg_grade", FloatType.INSTANCE) .addScalar("max_grade", FloatType.INSTANCE); - query.setLong("sessionId", sessionId); - List list = query.list(); + query.setParameter("sessionId", sessionId); + List list = query.list(); if ((list == null) || (list.size() == 0)) { return null; } else { @@ -240,13 +240,13 @@ @Override public Object[] getStatsMarksForLeaders(Long toolContentId) { - Query query = getSession().createSQLQuery(FIND_MARK_STATS_FOR_LEADERS) + Query query = getSession().createSQLQuery(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); - List list = query.list(); + query.setParameter("toolContentId", toolContentId); + List list = query.list(); if ((list == null) || (list.size() == 0)) { return null; } else { @@ -258,8 +258,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; } @@ -268,8 +268,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_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8846e87b362ce07b580e3750128c5826e667f7e5 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java (.../McUsrAttemptDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java (.../McUsrAttemptDAO.java) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) @@ -79,7 +79,7 @@ @Override public List getFinalizedUserAttempts(final Long userUid) { return getSessionFactory().getCurrentSession().createQuery(LOAD_ALL_QUESTION_ATTEMPTS) - .setLong("queUsrUid", userUid.longValue()).list(); + .setParameter("queUsrUid", userUid.longValue()).list(); } @Override @@ -89,7 +89,7 @@ + " AND attempt.mcQueUsr.responseFinalised = true AND u.userId=attempt.mcQueUsr.queUsrId"; return getSessionFactory().getCurrentSession().createQuery(LOAD_QUESTION_ATTEMPTS_BY_SESSION_ID) - .setLong("sessionId", sessionId).list(); + .setParameter("sessionId", sessionId).list(); } @Override @@ -100,7 +100,7 @@ + " AND attempt.mcQueUsr.responseFinalised = true AND u.userId=attempt.mcQueUsr.queUsrId"; return getSessionFactory().getCurrentSession().createQuery(LOAD_QUESTION_ATTEMPTS_BY_SESSION_ID) - .setLong("contentId", contentId).list(); + .setParameter("contentId", contentId).list(); } @Override @@ -119,8 +119,8 @@ @SuppressWarnings("unchecked") public McUsrAttempt getUserAttemptByQuestion(final Long queUsrUid, final Long mcQueContentId) { List userAttemptList = getSessionFactory().getCurrentSession() - .createQuery(LOAD_PARTICULAR_QUESTION_ATTEMPT).setLong("queUsrUid", queUsrUid.longValue()) - .setLong("mcQueContentId", mcQueContentId.longValue()).list(); + .createQuery(LOAD_PARTICULAR_QUESTION_ATTEMPT).setParameter("queUsrUid", queUsrUid.longValue()) + .setParameter("mcQueContentId", mcQueContentId.longValue()).list(); if (userAttemptList.size() > 1) { throw new RuntimeException("There are more than 1 latest question attempt"); } @@ -133,8 +133,8 @@ @SuppressWarnings("unchecked") public List getUserAttemptsByQuestionSession(final Long sessionUid, final Long mcQueContentId) { List userAttemptList = getSessionFactory().getCurrentSession() - .createQuery(LOAD_FINAL_USER_QUESTION_ATTEMPTS_FOR_QUESTION_SESSION).setLong("sessionUid", sessionUid.longValue()) - .setLong("mcQueContentId", mcQueContentId.longValue()).list(); + .createQuery(LOAD_FINAL_USER_QUESTION_ATTEMPTS_FOR_QUESTION_SESSION).setParameter("sessionUid", sessionUid.longValue()) + .setParameter("mcQueContentId", mcQueContentId.longValue()).list(); return userAttemptList; } @@ -146,7 +146,7 @@ @Override public void removeAllUserAttempts(Long queUserUid) { List userAttempts = getSessionFactory().getCurrentSession() - .createQuery(LOAD_ALL_QUESTION_ATTEMPTS).setLong("queUsrUid", queUserUid.longValue()).list(); + .createQuery(LOAD_ALL_QUESTION_ATTEMPTS).setParameter("queUsrUid", queUserUid.longValue()).list(); for (McUsrAttempt userAttempt : userAttempts) { this.getSession().delete(userAttempt); Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8846e87b362ce07b580e3750128c5826e667f7e5 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java (.../IMcService.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java (.../IMcService.java) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) @@ -24,7 +24,6 @@ import java.io.IOException; import java.util.List; -import java.util.Locale; import java.util.Set; import org.lamsfoundation.lams.notebook.model.NotebookEntry; @@ -47,7 +46,6 @@ import org.lamsfoundation.lams.tool.mc.pojos.McQueUsr; import org.lamsfoundation.lams.tool.mc.pojos.McSession; import org.lamsfoundation.lams.tool.mc.pojos.McUsrAttempt; -import org.lamsfoundation.lams.util.NumberUtil; /** * Interface that defines the contract that all MCQ service provider must follow. @@ -78,7 +76,7 @@ void setDefineLater(String strToolContentID, boolean value); - McQueContent getQuestionByDisplayOrder(final Long displayOrder, final Long mcContentUid); + McQueContent getQuestionByDisplayOrder(final Integer displayOrder, final Long mcContentUid); McQueUsr createMcUser(Long toolSessionId) throws McApplicationException; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r8846e87b362ce07b580e3750128c5826e667f7e5 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java (.../McService.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java (.../McService.java) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) @@ -233,7 +233,7 @@ } @Override - public McQueContent getQuestionByDisplayOrder(final Long displayOrder, final Long mcContentUid) { + public McQueContent getQuestionByDisplayOrder(final Integer displayOrder, final Long mcContentUid) { return mcQueContentDAO.getQuestionContentByDisplayOrder(displayOrder, mcContentUid); } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java =================================================================== diff -u -rf2ad75cef0c507a64877942631fee13efbc6ed50 -r8846e87b362ce07b580e3750128c5826e667f7e5 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java (.../McLearningController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java (.../McLearningController.java) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) @@ -594,7 +594,7 @@ //create attemptMap for displaying on jsp Map attemptMap = new TreeMap(new McComparator()); for (int i = 1; i <= mcContent.getMcQueContents().size(); i++) { - McQueContent question = mcService.getQuestionByDisplayOrder(new Long(i), toolContentUID); + McQueContent question = mcService.getQuestionByDisplayOrder(i, toolContentUID); McUsrAttempt userAttempt = mcService.getUserAttemptByQuestion(user.getUid(), question.getUid()); Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McPedagogicalPlannerController.java =================================================================== diff -u -rf2ad75cef0c507a64877942631fee13efbc6ed50 -r8846e87b362ce07b580e3750128c5826e667f7e5 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McPedagogicalPlannerController.java (.../McPedagogicalPlannerController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McPedagogicalPlannerController.java (.../McPedagogicalPlannerController.java) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) @@ -105,7 +105,7 @@ plannerForm.removeQuestion(questionIndex - 1); } else { if (questionIndex <= mcContent.getMcQueContents().size()) { - McQueContent mcQueContent = mcService.getQuestionByDisplayOrder((long) questionIndex, + McQueContent mcQueContent = mcService.getQuestionByDisplayOrder(questionIndex, mcContent.getUid()); mcQueContent.setQuestion(question); int candidateAnswerDTOIndex = 0; @@ -148,7 +148,7 @@ } } while (questionIndex <= plannerForm.getQuestionCount()); for (; questionIndex <= mcContent.getMcQueContents().size(); questionIndex++) { - McQueContent mcQueContent = mcService.getQuestionByDisplayOrder((long) questionIndex, + McQueContent mcQueContent = mcService.getQuestionByDisplayOrder(questionIndex, mcContent.getUid()); mcContent.getMcQueContents().remove(mcQueContent); mcService.removeMcQueContent(mcQueContent); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaQuestionDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8846e87b362ce07b580e3750128c5826e667f7e5 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaQuestionDAO.java (.../IQaQuestionDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaQuestionDAO.java (.../IQaQuestionDAO.java) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) @@ -42,7 +42,7 @@ List getAllQuestionEntries(final long qaContentId); - QaQueContent getQuestionByDisplayOrder(Long displayOrder, Long qaContentId); + QaQueContent getQuestionByDisplayOrder(Integer displayOrder, Long qaContentId); QaQueContent getQuestionByUid(Long questionUid); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaContentDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8846e87b362ce07b580e3750128c5826e667f7e5 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaContentDAO.java (.../QaContentDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaContentDAO.java (.../QaContentDAO.java) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) @@ -41,8 +41,8 @@ @Override public QaContent getQaByContentId(long qaId) { - String query = "from QaContent as qa where qa.qaContentId = ?"; - List list = getSessionFactory().getCurrentSession().createQuery(query).setLong(0, qaId).list(); + String query = "from QaContent as qa where qa.qaContentId = :qaContentId"; + List list = getSessionFactory().getCurrentSession().createQuery(query).setParameter("qaContentId", qaId).list(); if (list != null && list.size() > 0) { QaContent qa = (QaContent) list.get(0); @@ -78,8 +78,8 @@ @Override public void removeQa(Long qaContentId) { if (qaContentId != null) { - String query = "from qa in class org.lamsfoundation.lams.tool.qa.QaContent" + " where qa.qaContentId = ?"; - Object obj = getSessionFactory().getCurrentSession().createQuery(query).setLong(0, qaContentId.longValue()) + String query = "from qa in class org.lamsfoundation.lams.tool.qa.QaContent" + " where qa.qaContentId = :qaContentId"; + Object obj = getSessionFactory().getCurrentSession().createQuery(query).setParameter("qaContentId", qaContentId.longValue()) .uniqueResult(); getSession().delete(obj); } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueUsrDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8846e87b362ce07b580e3750128c5826e667f7e5 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueUsrDAO.java (.../QaQueUsrDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueUsrDAO.java (.../QaQueUsrDAO.java) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) @@ -28,8 +28,7 @@ import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; -import org.hibernate.SQLQuery; +import org.hibernate.query.NativeQuery; import org.hibernate.type.StringType; import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; @@ -44,7 +43,6 @@ */ @Repository public class QaQueUsrDAO extends LAMSBaseDAO implements IQaQueUsrDAO { - private static Logger logger = Logger.getLogger(QaQueUsrDAO.class.getName()); private static final String COUNT_SESSION_USER = "select qaQueUsr.queUsrId from QaQueUsr qaQueUsr where qaQueUsr.qaSession.qaSessionId= :qaSession"; private static final String LOAD_USER_FOR_SESSION = "from qaQueUsr in class QaQueUsr where qaQueUsr.qaSession.qaSessionId= :qaSessionId"; @@ -58,8 +56,8 @@ public QaQueUsr getQaUserBySession(final Long queUsrId, final Long qaSessionId) { String strGetUser = "from qaQueUsr in class QaQueUsr where qaQueUsr.queUsrId=:queUsrId and qaQueUsr.qaSession.qaSessionId=:qaSessionId"; - List list = getSession().createQuery(strGetUser).setLong("queUsrId", queUsrId.longValue()) - .setLong("qaSessionId", qaSessionId.longValue()).list(); + List list = getSession().createQuery(strGetUser).setParameter("queUsrId", queUsrId.longValue()) + .setParameter("qaSessionId", qaSessionId.longValue()).list(); if (list != null && list.size() > 0) { QaQueUsr usr = (QaQueUsr) list.get(0); @@ -69,9 +67,9 @@ } @Override - public List getUserBySessionOnly(final QaSession qaSession) { - List list = getSession().createQuery(LOAD_USER_FOR_SESSION) - .setLong("qaSessionId", qaSession.getQaSessionId().longValue()).list(); + public List getUserBySessionOnly(final QaSession qaSession) { + List list = getSession().createQuery(LOAD_USER_FOR_SESSION) + .setParameter("qaSessionId", qaSession.getQaSessionId().longValue()).list(); return list; } @@ -91,7 +89,6 @@ } private void buildNameSearch(StringBuilder queryText, String searchString) { - String filteredSearchString = null; if (!StringUtils.isBlank(searchString)) { String[] tokens = searchString.trim().split("\\s+"); for (String token : tokens) { @@ -143,9 +140,9 @@ // 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.addScalar("username", StringType.INSTANCE).addScalar("fullname", StringType.INSTANCE) - .addScalar("notebookEntry", StringType.INSTANCE).setLong("toolSessionId", toolSessionId.longValue()) + .addScalar("notebookEntry", StringType.INSTANCE).setParameter("toolSessionId", toolSessionId.longValue()) .setFirstResult(page * size).setMaxResults(size); return query.list(); @@ -154,14 +151,15 @@ private static final String GET_COUNT_USERS_FOR_SESSION_AND_QUESTION_WITH_NAME_SEARCH = "SELECT COUNT(*) FROM tl_laqa11_que_usr user " + " JOIN tl_laqa11_session session ON user.qa_session_id = session.uid AND session.qa_session_id = :toolSessionId "; + @SuppressWarnings("unchecked") @Override public int getCountUsersBySessionWithSearch(final Long toolSessionId, String searchString) { StringBuilder queryText = new StringBuilder(GET_COUNT_USERS_FOR_SESSION_AND_QUESTION_WITH_NAME_SEARCH); buildNameSearch(queryText, searchString); - SQLQuery query = getSession().createSQLQuery(queryText.toString()); - query.setLong("toolSessionId", toolSessionId); + NativeQuery query = getSession().createNativeQuery(queryText.toString()); + query.setParameter("toolSessionId", toolSessionId); List list = query.list(); if (list == null || list.size() == 0) { Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQuestionDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8846e87b362ce07b580e3750128c5826e667f7e5 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQuestionDAO.java (.../QaQuestionDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQuestionDAO.java (.../QaQuestionDAO.java) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) @@ -42,11 +42,12 @@ private static final String LOAD_QUESTION_BY_QUESTION_UID = "from qaQuestion in class QaQueContent where qaQuestion.uid=:uid"; private static final String SORT_QUESTION_BY_DISPLAY_ORDER = "from qaQuestion in class QaQueContent where qaQuestion.qaContent.uid=:uid order by qaQuestion.displayOrder"; + @SuppressWarnings("unchecked") @Override - public QaQueContent getQuestionByDisplayOrder(Long displayOrder, Long contentUid) { + public QaQueContent getQuestionByDisplayOrder(Integer displayOrder, Long contentUid) { List list = getSessionFactory().getCurrentSession() .createQuery(QaQuestionDAO.LOAD_QUESTION_BY_DISPLAY_ORDER) - .setLong("displayOrder", displayOrder.longValue()).setLong("uid", contentUid.longValue()).list(); + .setParameter("displayOrder", displayOrder).setParameter("uid", contentUid).list(); if (list != null && list.size() > 0) { QaQueContent qa = list.get(0); @@ -55,10 +56,11 @@ return null; } + @SuppressWarnings("unchecked") @Override public QaQueContent getQuestionByUid(Long questionUid) { List list = getSessionFactory().getCurrentSession() - .createQuery(QaQuestionDAO.LOAD_QUESTION_BY_QUESTION_UID).setLong("uid", questionUid.longValue()) + .createQuery(QaQuestionDAO.LOAD_QUESTION_BY_QUESTION_UID).setParameter("uid", questionUid.longValue()) .list(); if (list != null && list.size() > 0) { @@ -68,18 +70,20 @@ return null; } + @SuppressWarnings("unchecked") @Override public List getAllQuestionEntriesSorted(final long contentUid) { List list = getSessionFactory().getCurrentSession() - .createQuery(QaQuestionDAO.SORT_QUESTION_BY_DISPLAY_ORDER).setLong("uid", contentUid).list(); + .createQuery(QaQuestionDAO.SORT_QUESTION_BY_DISPLAY_ORDER).setParameter("uid", contentUid).list(); return list; } + @SuppressWarnings("unchecked") @Override public List getAllQuestionEntries(final long contentUid) { - List list = getSessionFactory().getCurrentSession().createQuery(QaQuestionDAO.LOAD_QUESTION_BY_CONTENT_UID) - .setLong("uid", contentUid).list(); + List list = getSessionFactory().getCurrentSession().createQuery(QaQuestionDAO.LOAD_QUESTION_BY_CONTENT_UID) + .setParameter("uid", contentUid).list(); return list; } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaSessionDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8846e87b362ce07b580e3750128c5826e667f7e5 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaSessionDAO.java (.../QaSessionDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaSessionDAO.java (.../QaSessionDAO.java) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) @@ -42,8 +42,8 @@ */ @Override public QaSession getQaSessionById(long qaSessionId) { - String query = "from QaSession as qus where qus.qaSessionId = ?"; - List list = getSessionFactory().getCurrentSession().createQuery(query).setLong(0, qaSessionId).list(); + String query = "from QaSession as qus where qus.qaSessionId = :qaSessionId"; + List list = getSessionFactory().getCurrentSession().createQuery(query).setParameter("qaSessionId", qaSessionId).list(); if (list != null && list.size() > 0) { QaSession qus = (QaSession) list.get(0); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8846e87b362ce07b580e3750128c5826e667f7e5 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java (.../QaUsrRespDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java (.../QaUsrRespDAO.java) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) @@ -28,7 +28,7 @@ import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringUtils; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.type.IntegerType; import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.qa.QaAppConstants; @@ -77,21 +77,23 @@ getSession().delete(resp); } + @SuppressWarnings("unchecked") @Override public QaUsrResp getResponseByUserAndQuestion(final Long queUsrId, final Long questionId) { List list = getSessionFactory().getCurrentSession().createQuery(LOAD_ATTEMPT_FOR_USER_AND_QUESTION) - .setLong("queUsrId", queUsrId.longValue()).setLong("questionId", questionId.longValue()).list(); + .setParameter("queUsrId", queUsrId.longValue()).setParameter("questionId", questionId.longValue()).list(); if (list == null || list.size() == 0) { return null; } else { return list.get(list.size() - 1); } } + @SuppressWarnings("unchecked") @Override public List getResponseBySessionAndQuestion(final Long qaSessionId, final Long questionId) { return getSessionFactory().getCurrentSession().createQuery(LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION) - .setLong("qaSessionId", qaSessionId.longValue()).setLong("questionId", questionId.longValue()).list(); + .setParameter("qaSessionId", qaSessionId.longValue()).setParameter("questionId", questionId.longValue()).list(); } private String buildNameSearch(String searchString, String userRef) { @@ -224,17 +226,17 @@ } - Query query = getSessionFactory().getCurrentSession() + Query query = getSessionFactory().getCurrentSession() .createSQLQuery(queryText.toString()) .addEntity(QaUsrResp.class) .addScalar("portraitId", IntegerType.INSTANCE); if ( needsToolContentId ) { - query.setLong("toolContentId", toolContentId.longValue()); + query.setParameter("toolContentId", toolContentId.longValue()); } - query.setLong("questionId", questionId.longValue()) - .setLong("qaSessionId", qaSessionId.longValue()) - .setLong("excludeUserId", excludeUserId.longValue()); + query.setParameter("questionId", questionId.longValue()) + .setParameter("qaSessionId", qaSessionId.longValue()) + .setParameter("excludeUserId", excludeUserId.longValue()); if ( size > 0 ) { query.setFirstResult(page * size); @@ -252,17 +254,18 @@ return respList; } + @SuppressWarnings("unchecked") @Override public List getResponsesByUserUid(final Long userUid) { List list = getSessionFactory().getCurrentSession().createQuery(LOAD_ATTEMPT_FOR_USER) - .setLong("userUid", userUid.longValue()).list(); + .setParameter("userUid", userUid.longValue()).list(); return list; } @Override public int getCountResponsesByQaContent(final Long qaContentId) { - List list = doFind(GET_COUNT_RESPONSES_BY_QACONTENT, new Object[] { qaContentId }); + List list = doFind(GET_COUNT_RESPONSES_BY_QACONTENT, new Object[] { qaContentId }); if (list == null || list.size() == 0) { return 0; } @@ -284,7 +287,7 @@ queryText += filteredSearchString; } - List list = doFind(queryText, new Object[] { qaSessionId, questionId, excludeUserId }); + List list = doFind(queryText, new Object[] { qaSessionId, questionId, excludeUserId }); if (list == null || list.size() == 0) { return 0; } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java =================================================================== diff -u -r8384e056e833d8aadcd6cb12a219094f89c67042 -r8846e87b362ce07b580e3750128c5826e667f7e5 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java (.../IQaService.java) (revision 8384e056e833d8aadcd6cb12a219094f89c67042) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java (.../IQaService.java) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) @@ -118,7 +118,7 @@ * @param isAutosave * whether it's requested by autosave feature */ - void updateResponseWithNewAnswer(String newAnswer, String toolSessionID, Long questionDisplayOrder, + void updateResponseWithNewAnswer(String newAnswer, String toolSessionID, Integer questionDisplayOrder, boolean isAutosave); void createQuestion(QaQueContent qaQuestion); @@ -131,7 +131,7 @@ QaUsrResp getResponseById(Long responseId); - QaQueContent getQuestionByContentAndDisplayOrder(Long displayOrder, Long contentUid); + QaQueContent getQuestionByContentAndDisplayOrder(Integer displayOrder, Long contentUid); QaQueContent getQuestionByUid(Long questionUid); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java =================================================================== diff -u -r8384e056e833d8aadcd6cb12a219094f89c67042 -r8846e87b362ce07b580e3750128c5826e667f7e5 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java (.../QaService.java) (revision 8384e056e833d8aadcd6cb12a219094f89c67042) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java (.../QaService.java) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) @@ -221,7 +221,7 @@ } @Override - public QaQueContent getQuestionByContentAndDisplayOrder(Long displayOrder, Long contentUid) { + public QaQueContent getQuestionByContentAndDisplayOrder(Integer displayOrder, Long contentUid) { return qaQuestionDAO.getQuestionByDisplayOrder(displayOrder, contentUid); } @@ -303,7 +303,7 @@ } @Override - public void updateResponseWithNewAnswer(String newAnswer, String toolSessionID, Long questionDisplayOrder, + public void updateResponseWithNewAnswer(String newAnswer, String toolSessionID, Integer questionDisplayOrder, boolean isAutosave) { HttpSession ss = SessionManager.getSession(); UserDTO toolUser = (UserDTO) ss.getAttribute(AttributeNames.USER); @@ -313,7 +313,7 @@ QaSession session = getSessionById(new Long(toolSessionID)); QaContent qaContent = session.getQaContent(); - QaQueContent question = getQuestionByContentAndDisplayOrder(new Long(questionDisplayOrder), qaContent.getUid()); + QaQueContent question = getQuestionByContentAndDisplayOrder(questionDisplayOrder, qaContent.getUid()); QaUsrResp response = getResponseByUserAndQuestion(user.getQueUsrId(), question.getUid()); // if response doesn't exist Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java =================================================================== diff -u -ra5a8d194eca9657b72f8be73bd98386a0283816e -r8846e87b362ce07b580e3750128c5826e667f7e5 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java (.../QaLearningController.java) (revision a5a8d194eca9657b72f8be73bd98386a0283816e) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java (.../QaLearningController.java) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) @@ -517,7 +517,7 @@ // store if (errorMap.isEmpty()) { - qaService.updateResponseWithNewAnswer(answer, toolSessionID, new Long(questionIndex), false); + qaService.updateResponseWithNewAnswer(answer, toolSessionID, questionIndex, false); } } @@ -618,18 +618,18 @@ for (int questionIndex = QaAppConstants.INITIAL_QUESTION_COUNT .intValue(); questionIndex <= intTotalQuestionCount; questionIndex++) { String newAnswer = request.getParameter("answer" + questionIndex); - qaService.updateResponseWithNewAnswer(newAnswer, toolSessionID, new Long(questionIndex), true); + qaService.updateResponseWithNewAnswer(newAnswer, toolSessionID, questionIndex, true); } } else { String currentQuestionIndex = qaLearningForm.getCurrentQuestionIndex(); String newAnswer = qaLearningForm.getAnswer(); - QaQueContent currentQuestion = qaService.getQuestionByContentAndDisplayOrder(new Long(currentQuestionIndex), + QaQueContent currentQuestion = qaService.getQuestionByContentAndDisplayOrder(new Integer(currentQuestionIndex), qaContent.getUid()); boolean isRequiredQuestionMissed = currentQuestion.isRequired() && isEmpty(newAnswer); if (!isRequiredQuestionMissed) { - qaService.updateResponseWithNewAnswer(newAnswer, toolSessionID, new Long(currentQuestionIndex), true); + qaService.updateResponseWithNewAnswer(newAnswer, toolSessionID, new Integer(currentQuestionIndex), true); } } } @@ -925,7 +925,7 @@ // store if (errorMap.isEmpty()) { qaService.updateResponseWithNewAnswer(newAnswer, qaLearningForm.getToolSessionID(), - new Long(currentQuestionIndex), false); + new Integer(currentQuestionIndex), false); } else { request.setAttribute("errorMap", errorMap); nextQuestionOffset = 0; Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaPedagogicalPlannerController.java =================================================================== diff -u -r46e01bf046d755f571ba59957ac869c086bad58c -r8846e87b362ce07b580e3750128c5826e667f7e5 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaPedagogicalPlannerController.java (.../QaPedagogicalPlannerController.java) (revision 46e01bf046d755f571ba59957ac869c086bad58c) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaPedagogicalPlannerController.java (.../QaPedagogicalPlannerController.java) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) @@ -84,7 +84,7 @@ } else { if (questionIndex < qaContent.getQaQueContents().size()) { QaQueContent qaQuestion = qaService - .getQuestionByContentAndDisplayOrder((long) questionIndex + 1, qaContent.getUid()); + .getQuestionByContentAndDisplayOrder(questionIndex + 1, qaContent.getUid()); qaQuestion.setQuestion(question); qaService.saveOrUpdateQuestion(qaQuestion); @@ -103,7 +103,7 @@ qaService.removeQuestionsFromCache(qaContent); qaService.removeQaContentFromCache(qaContent); for (; questionIndex < qaContent.getQaQueContents().size(); questionIndex++) { - QaQueContent qaQuestion = qaService.getQuestionByContentAndDisplayOrder((long) questionIndex + 1, + QaQueContent qaQuestion = qaService.getQuestionByContentAndDisplayOrder(questionIndex + 1, qaContent.getUid()); qaService.removeQuestion(qaQuestion); } Index: lams_tool_larsrc/.classpath =================================================================== diff -u -rbe86c0bc220914398d3ce8ec9ae9cab91b47353a -r8846e87b362ce07b580e3750128c5826e667f7e5 --- lams_tool_larsrc/.classpath (.../.classpath) (revision be86c0bc220914398d3ce8ec9ae9cab91b47353a) +++ lams_tool_larsrc/.classpath (.../.classpath) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) @@ -1,24 +1,28 @@ - + + + + + + - - + Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemVisitDAOHibernate.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8846e87b362ce07b580e3750128c5826e667f7e5 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemVisitDAOHibernate.java (.../ResourceItemVisitDAOHibernate.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemVisitDAOHibernate.java (.../ResourceItemVisitDAOHibernate.java) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) @@ -30,8 +30,8 @@ import java.util.List; import java.util.Map; -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.rsrc.dao.ResourceItemVisitDAO; import org.lamsfoundation.lams.tool.rsrc.dto.VisitLogDTO; @@ -63,7 +63,7 @@ @Override public ResourceItemVisitLog getResourceItemLog(Long itemUid, Long userId) { - List list = doFind(FIND_BY_ITEM_AND_USER, new Object[] { userId, itemUid }); + List list = doFind(FIND_BY_ITEM_AND_USER, new Object[] { userId, itemUid }); if (list == null || list.size() == 0) { return null; } @@ -72,7 +72,7 @@ @Override public int getUserViewLogCount(Long toolSessionId, Long userUid) { - List list = doFind(FIND_VIEW_COUNT_BY_USER, new Object[] { toolSessionId, userUid }); + List list = doFind(FIND_VIEW_COUNT_BY_USER, new Object[] { toolSessionId, userUid }); if (list == null || list.size() == 0) { return 0; } @@ -85,8 +85,8 @@ // Note: Hibernate 3.1 query.uniqueResult() returns Integer, Hibernate 3.2 query.uniqueResult() returns Long List result = getSession().createQuery(FIND_SUMMARY) - .setLong("sessionId", sessionId) - .setLong("contentId", contentId) + .setParameter("sessionId", sessionId) + .setParameter("contentId", contentId) .list(); Map summaryList = new HashMap(result.size()); @@ -116,6 +116,7 @@ + " WHEN :sortBy='completeTime' THEN visit.complete_date " + " WHEN :sortBy='timeTaken' THEN TIMEDIFF(visit.complete_date,visit.access_date) END "; + @SuppressWarnings("unchecked") @Override public List getPagedVisitLogsBySessionAndItem(Long sessionId, Long itemUid, int page, int size, String sortBy, String sortOrder, String searchString, IUserManagementService userManagementService) { @@ -129,14 +130,14 @@ .append(LOAD_USERS_ORDERED_BY_NAME_WHERE) .append(sortOrder); - Query query = getSession().createSQLQuery(bldr.toString()) - .setLong("sessionId", sessionId) - .setLong("itemUid", itemUid); + Query query = getSession().createSQLQuery(bldr.toString()) + .setParameter("sessionId", sessionId) + .setParameter("itemUid", itemUid); // support for custom search from a toolbar searchString = searchString == null ? "" : searchString; - query.setString("searchString", searchString) - .setString("sortBy", sortBy) + query.setParameter("searchString", searchString) + .setParameter("sortBy", sortBy) .setFirstResult(page * size) .setMaxResults(size); List list = query.list(); @@ -174,11 +175,11 @@ + " AND (CONCAT(visit.user.lastName, ' ', visit.user.firstName) LIKE CONCAT('%', :searchString, '%')) "; Query query = getSession().createQuery(COUNT_USERS_BY_SESSION_AND_ITEM); - query.setLong("sessionId", sessionId); - query.setLong("itemUid", itemUid); + query.setParameter("sessionId", sessionId); + query.setParameter("itemUid", itemUid); // 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)) { @@ -190,8 +191,8 @@ @Override public Object[] getDateRangeOfAccesses(Long userUid, Long toolSessionId) { - SQLQuery query = (SQLQuery) getSession().createSQLQuery(SQL_QUERY_DATES_BY_USER_SESSION.toString()) - .setLong("userUid", userUid).setLong("sessionId", toolSessionId); + NativeQuery query = getSession().createNativeQuery(SQL_QUERY_DATES_BY_USER_SESSION.toString()) + .setParameter("userUid", userUid).setParameter("sessionId", toolSessionId); Object[] values = (Object[]) query.list().get(0); return values; } Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardContentDAO.java =================================================================== diff -u -r711e4127d79bb67af04a3b7a01155cc395171da5 -r8846e87b362ce07b580e3750128c5826e667f7e5 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardContentDAO.java (.../NoticeboardContentDAO.java) (revision 711e4127d79bb67af04a3b7a01155cc395171da5) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardContentDAO.java (.../NoticeboardContentDAO.java) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) @@ -71,7 +71,7 @@ @Override public NoticeboardContent getNbContentBySession(final Long nbSessionId) { return (NoticeboardContent) getSession().createQuery(LOAD_NB_BY_SESSION) - .setLong("sessionId", nbSessionId.longValue()).uniqueResult(); + .setParameter("sessionId", nbSessionId.longValue()).uniqueResult(); } /** @see org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardContentDAO#saveNbContent(org.lamsfoundation.lams.tool.noticeboard.model.NoticeboardContent) */ @@ -91,7 +91,7 @@ public void removeNoticeboard(Long nbContentId) { if (nbContentId != null) { List list = getSessionFactory().getCurrentSession().createQuery(FIND_NB_CONTENT) - .setLong("nbContentId", nbContentId.longValue()).list(); + .setParameter("nbContentId", nbContentId.longValue()).list(); if (list != null && list.size() > 0) { NoticeboardContent nb = (NoticeboardContent) list.get(0); Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardSessionDAO.java =================================================================== diff -u -r711e4127d79bb67af04a3b7a01155cc395171da5 -r8846e87b362ce07b580e3750128c5826e667f7e5 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardSessionDAO.java (.../NoticeboardSessionDAO.java) (revision 711e4127d79bb67af04a3b7a01155cc395171da5) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardSessionDAO.java (.../NoticeboardSessionDAO.java) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) @@ -80,7 +80,7 @@ if (nbSessionId != null) { List list = getSessionFactory().getCurrentSession().createQuery(FIND_NB_SESSION) - .setLong("nbSessionId", nbSessionId.longValue()).list(); + .setParameter("nbSessionId", nbSessionId.longValue()).list(); if ((list != null) && (list.size() > 0)) { NoticeboardSession nb = list.get(0); @@ -101,7 +101,7 @@ @Override public NoticeboardSession getNbSessionByUser(final Long userId) { return (NoticeboardSession) getSession().createQuery(NoticeboardSessionDAO.LOAD_NBSESSION_BY_USER) - .setLong("userId", userId.longValue()).uniqueResult(); + .setParameter("userId", userId.longValue()).uniqueResult(); } /** @see org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardSessionDAO#removeNbUsers(org.lamsfoundation.lams.tool.noticeboard.model.NoticeboardSession) */ Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardUserDAO.java =================================================================== diff -u -r711e4127d79bb67af04a3b7a01155cc395171da5 -r8846e87b362ce07b580e3750128c5826e667f7e5 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardUserDAO.java (.../NoticeboardUserDAO.java) (revision 711e4127d79bb67af04a3b7a01155cc395171da5) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardUserDAO.java (.../NoticeboardUserDAO.java) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) @@ -69,8 +69,8 @@ @Override public NoticeboardUser getNbUserBySession(Long userId, Long sessionId) { List usersReturned = getSessionFactory().getCurrentSession().createQuery(FIND_NB_USER_BY_SESSION) - .setLong("userId", userId.longValue()) - .setLong("sessionId", sessionId.longValue()).list(); + .setParameter("userId", userId.longValue()) + .setParameter("sessionId", sessionId.longValue()).list(); if (usersReturned != null && usersReturned.size() > 0) { NoticeboardUser nb = (NoticeboardUser) usersReturned.get(0);