Index: lams_common/src/java/org/lamsfoundation/lams/config/dao/hibernate/ConfigurationDAO.java =================================================================== diff -u -rc11264f3271f40971838dd015db6b5107f3bc55e -rf711877b65ec0c82e43fd1fd5b129e0b5b50737d --- lams_common/src/java/org/lamsfoundation/lams/config/dao/hibernate/ConfigurationDAO.java (.../ConfigurationDAO.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) +++ lams_common/src/java/org/lamsfoundation/lams/config/dao/hibernate/ConfigurationDAO.java (.../ConfigurationDAO.java) (revision f711877b65ec0c82e43fd1fd5b129e0b5b50737d) @@ -23,20 +23,20 @@ package org.lamsfoundation.lams.config.dao.hibernate; -import java.util.List; - import org.lamsfoundation.lams.config.ConfigurationItem; import org.lamsfoundation.lams.config.dao.IConfigurationDAO; import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.springframework.stereotype.Repository; +import java.util.List; + /** * @author Mitchell Seaton */ @Repository public class ConfigurationDAO extends LAMSBaseDAO implements IConfigurationDAO { private static final String LOAD_CONFIG_ITEM_BY_KEY = - "from configuration in class " + ConfigurationItem.class.getName() + " where configuration.key=:key"; + "FROM " + ConfigurationItem.class.getName() + " WHERE key = :key"; /** * @see org.lamsfoundation.lams.config.dao.IConfigurationlDAO#getAllItems() @@ -55,7 +55,7 @@ */ @Override public ConfigurationItem getConfigItemByKey(final String configKey) { - return (ConfigurationItem) getSession().createQuery(ConfigurationDAO.LOAD_CONFIG_ITEM_BY_KEY) + return getSession().createQuery(ConfigurationDAO.LOAD_CONFIG_ITEM_BY_KEY, ConfigurationItem.class) .setParameter("key", configKey).setCacheable(true).uniqueResult(); } } \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IActivityDAO.java =================================================================== diff -u -r96033f32ff880d045b4c087f52628d233dc98095 -rf711877b65ec0c82e43fd1fd5b129e0b5b50737d --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IActivityDAO.java (.../IActivityDAO.java) (revision 96033f32ff880d045b4c087f52628d233dc98095) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IActivityDAO.java (.../IActivityDAO.java) (revision f711877b65ec0c82e43fd1fd5b129e0b5b50737d) @@ -23,127 +23,118 @@ package org.lamsfoundation.lams.learningdesign.dao; -import java.util.List; - import org.lamsfoundation.lams.dao.IBaseDAO; import org.lamsfoundation.lams.learningdesign.Activity; import org.lamsfoundation.lams.learningdesign.ActivityEvaluation; +import org.lamsfoundation.lams.learningdesign.GroupingActivity; import org.lamsfoundation.lams.learningdesign.LearningDesign; import org.lamsfoundation.lams.learningdesign.ToolActivity; +import org.springframework.dao.DataRetrievalFailureException; +import java.util.List; + /** * @author Manpreet Minhas - * */ public interface IActivityDAO extends IBaseDAO { /** - * Returns an object that may be assigned to Activity. - * This must return a true Activity object, rather than - * the Hibernate CGLIB proxy, or other code gets too difficult. + * Returns an object that may be assigned to Activity. This must return a true Activity object, rather than the + * Hibernate CGLIB proxy, or other code gets too difficult. *

- * If a new type of activity is added, then this method must be - * updated. - * + * If a new type of activity is added, then this method must be updated. + * * @param activityId - * The activityId of the activity + * The activityId of the activity * @return Activity populated Activity object * @throws DataRetrievalFailureException - * if it can't work out the correct Activity class. + * if it can't work out the correct Activity class. */ public Activity getActivityByActivityId(Long activityId); /** - * Returns an object that may be assigned to the Class clasz. - * Returns a true Activity object, rather than the Hibernate CGLIB proxy. - * + * Returns an object that may be assigned to the Class clasz. Returns a true Activity object, rather than the + * Hibernate CGLIB proxy. + * * @param activityId - * The activityId of the activity + * The activityId of the activity * @param clasz - * The expected class - must be a subclass of Activity + * The expected class - must be a subclass of Activity * @return Activity populated object */ public Activity getActivityByActivityId(Long activityId, Class clasz); /** - * Returns an object that may be assigned to Activity, based - * on the UI id set by Authoring + * Returns an object that may be assigned to Activity, based on the UI id set by Authoring *

- * This must return a true Activity object, rather than - * the Hibernate CGLIB proxy, or other code gets too difficult. + * This must return a true Activity object, rather than the Hibernate CGLIB proxy, or other code gets too + * difficult. *

- * + * * @param uiID - * The internal id (Authoring generated) of the activity - * being looked for + * The internal id (Authoring generated) of the activity being looked for * @param design - * The learning_design_id of the design - * whose first activity we are fetching + * The learning_design_id of the design whose first activity we are fetching * @return Activity The populated activity object matching the specified criteria */ public Activity getActivityByUIID(Integer uiID, LearningDesign design); /** * @param parentActivityId - * The activityId of the parent activity + * The activityId of the parent activity * @return Activity populated Activity object */ - public List getActivitiesByParentActivityId(Long parentActivityId); + public List getActivitiesByParentActivityId(Long parentActivityId); /** * @param learningDesignId - * The id of the learningDesign + * The id of the learningDesign * @return List of all the activities */ public List getActivitiesByLearningDesignId(Long learningDesignId); /** * Get all the grouping activities for this learning design. - * + * * @param learningDesignId - * The id of the learningDesign + * The id of the learningDesign * @return List of all the activities */ - public List getGroupingActivitiesByLearningDesignId(Long learningDesignId); + public List getGroupingActivitiesByLearningDesignId(Long learningDesignId); /** - * Returns a list of activities associated with the LearningLibrary. - * It only returns the template activities and not all activities - * with learning_library_id =libraryID. Template activity is one which - * is not a part of any learning Design but is used as a blue-print/ - * template for creating new activities. Single LearningLibrary - * in a normal case has one template activity. - * + * Returns a list of activities associated with the LearningLibrary. It only returns the template activities and not + * all activities with learning_library_id =libraryID. Template activity is one which is not a part of any learning + * Design but is used as a blue-print/ template for creating new activities. Single LearningLibrary in a normal case + * has one template activity. + * * @param libraryID - * The learning_library_id of the LearningLibrary - * @return List List of activities that belong to - * the given LearningLibrary + * The learning_library_id of the LearningLibrary + * @return List List of activities that belong to the given LearningLibrary */ - public List getActivitiesByLibraryID(Long libraryID); + public List getActivitiesByLibraryID(Long libraryID); /** - * Returns the template activity that belongs to the LearningLibrary. - * A template activity is one where learning_library_id=libraryID AND - * learning_design_id IS NULL. This is what distinguishes between a normal - * activity and a template activity. - * If a template doesnt exist for that particular LearningLibrary then - * and error messaged is logged (an exception is not thrown). - * + * Returns the template activity that belongs to the LearningLibrary. A template activity is one where + * learning_library_id=libraryID AND learning_design_id IS NULL. This is what distinguishes between a normal + * activity and a template activity. If a template doesnt exist for that particular LearningLibrary then and error + * messaged is logged (an exception is not thrown). + * * @param libraryID - * The learning_library_id of the LearningLibrary + * The learning_library_id of the LearningLibrary * @return Activity the template activity for the learning library. */ public Activity getTemplateActivityByLibraryID(Long libraryID); /** * Returns ToolActivity by the specified toolContentId - * + * * @param toolContentId - * @throws NonUniqueResultException - * if there is more than one matching result * @return + * @throws NonUniqueResultException + * if there is more than one matching result */ ToolActivity getToolActivityByToolContentId(Long toolContentId); - + ActivityEvaluation getEvaluationByActivityId(long activityId); } \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/ILearningDesignDAO.java =================================================================== diff -u -rf5852bd3f19beebb0e143f3e23e604289d0963e4 -rf711877b65ec0c82e43fd1fd5b129e0b5b50737d --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/ILearningDesignDAO.java (.../ILearningDesignDAO.java) (revision f5852bd3f19beebb0e143f3e23e604289d0963e4) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/ILearningDesignDAO.java (.../ILearningDesignDAO.java) (revision f711877b65ec0c82e43fd1fd5b129e0b5b50737d) @@ -23,12 +23,12 @@ package org.lamsfoundation.lams.learningdesign.dao; -import java.util.List; - import org.lamsfoundation.lams.dao.IBaseDAO; import org.lamsfoundation.lams.learningdesign.LearningDesign; import org.lamsfoundation.lams.learningdesign.LearningDesignAccess; +import java.util.List; + /** * @author Manpreet Minhas */ @@ -41,23 +41,19 @@ public LearningDesign getLearningDesignById(Long learningDesignId); /** - * This method returns a list of all designs that are valid in - * the given workspaceFolder. + * This method returns a list of all designs that are valid in the given workspaceFolder. * * @param workspaceFolderID - * The workspace_folder_id of the WorkspaceFolder - * from where the designs have to be fetched. + * The workspace_folder_id of the WorkspaceFolder from where the designs have to be fetched. * @return List The List of all available designs */ public List getAllValidLearningDesignsInFolder(Integer workspaceFolderID); /** - * This method returns a list of all available designs in - * the given workspaceFolder. + * This method returns a list of all available designs in the given workspaceFolder. * * @param workspaceFolderID - * The workspace_folder_id of the WorkspaceFolder - * from where the designs have to be fetched. + * The workspace_folder_id of the WorkspaceFolder from where the designs have to be fetched. * @return List The List of all available designs */ public List getAllLearningDesignsInFolder(Integer workspaceFolderID); @@ -67,32 +63,30 @@ * original_learning_design_id * * @param originalDesignID - * The original_learning_design_id - * @return List The List of all corresponding Learning designs with - * given original_learning_design_id + * The original_learning_design_id + * @return List The List of all corresponding Learning designs with given original_learning_design_id */ - public List getLearningDesignsByOriginalDesign(Long originalDesignID); + public List getLearningDesignsByOriginalDesign(Long originalDesignID); /** * Get the titles of all the learning designs with the given prefix in the given folder. */ - public List getLearningDesignTitlesByWorkspaceFolder(Integer workspaceFolderID, String prefix); + public List getLearningDesignTitlesByWorkspaceFolder(Integer workspaceFolderID, String prefix); public List getLearningDesignAccess(Integer userId); public LearningDesignAccess getLearningDesignAccess(Long learningDesignID, Integer userId); /** - * Get a portion of the learning designs in the given folder. If page & size are null, the effect the same data - * is returned as getAllLearningDesignsInFolder but sorted. + * Get a portion of the learning designs in the given folder. If page & size are null, the effect the same data is + * returned as getAllLearningDesignsInFolder but sorted. */ public List getAllPagedLearningDesigns(Integer workspaceFolderID, Integer page, Integer size, String sortName, String sortDate); /** * Get a portion of the valid learning designs in the given folder. If page & size are null, the effect the same - * data - * is returned as getAllValidLearningDesignsInFolder but sorted. + * data is returned as getAllValidLearningDesignsInFolder but sorted. */ public List getValidPagedLearningDesigns(Integer workspaceFolderID, Integer page, Integer size, String sortName, String sortDate); Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java =================================================================== diff -u -r129d0eb39f81fcdb4ef6e3b5ec15c1c94d9324b3 -rf711877b65ec0c82e43fd1fd5b129e0b5b50737d --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java (.../ActivityDAO.java) (revision 129d0eb39f81fcdb4ef6e3b5ec15c1c94d9324b3) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java (.../ActivityDAO.java) (revision f711877b65ec0c82e43fd1fd5b129e0b5b50737d) @@ -23,8 +23,6 @@ package org.lamsfoundation.lams.learningdesign.dao.hibernate; -import java.util.List; - import org.hibernate.query.Query; import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.learningdesign.Activity; @@ -50,26 +48,27 @@ import org.lamsfoundation.lams.tool.exception.DataMissingException; import org.springframework.stereotype.Repository; +import java.util.List; + /** * @author Manpreet Minhas */ @Repository public class ActivityDAO extends LAMSBaseDAO implements IActivityDAO { - private static final String TABLENAME = "lams_learning_activity"; + private static final String FIND_BY_PARENT = + "FROM" + Activity.class.getName() + " WHERE parentActivity.activityId = :activityId"; + private static final String FIND_BY_LEARNING_DESIGN_ID = + "FROM " + Activity.class.getName() + " WHERE learningDesign.learningDesignId = :ldId"; + private static final String FIND_GROUPINGACTIVITY_TYPE_BY_LEARNING_DESIGN_ID = + "FROM " + GroupingActivity.class.getName() + " WHERE learningDesign.learningDesignId = :ldId"; + private static final String FIND_BY_UI_ID = "FROM " + Activity.class.getName() + + " WHERE activityUIID = :uiid AND learningDesign.learningDesignId = :ldId"; + private static final String FIND_BY_LIBRARY_ID = "FROM " + Activity.class.getName() + + " WHERE learningLibrary.learningLibraryId= :libraryId AND learningDesign.learningDesignId IS NULL"; + private static final String FIND_BY_TOOL_CONTENT_ID = + "FROM " + Activity.class.getName() + " WHERE toolContentId = :toolContentId"; - private static final String FIND_BY_PARENT = "from " + ActivityDAO.TABLENAME + " in class " - + Activity.class.getName() + " where parent_activity_id=:P1"; - - private static final String FIND_BY_LEARNING_DESIGN_ID = "from " + ActivityDAO.TABLENAME + " in class " - + Activity.class.getName() + " where learning_design_id=:P1"; - private static final String FIND_GROUPINGACTIVITY_TYPE_BY_LEARNING_DESIGN_ID = "from " + ActivityDAO.TABLENAME - + " in class " + GroupingActivity.class.getName() + " where learning_design_id=:P1"; - private static final String FIND_BY_UI_ID = "from " + ActivityDAO.TABLENAME + " in class " - + Activity.class.getName() + " where activity_ui_id=:uiid" + " AND " + " learning_design_id=:ldId"; - private static final String FIND_BY_LIBRARY_ID = "from " + ActivityDAO.TABLENAME + " in class " - + Activity.class.getName() + " where learning_library_id=:P1" + " AND learning_design_id IS NULL"; - /* * @see org.lamsfoundation.lams.learningdesign.dao.interfaces.IActivityDAO#getActivityById(java.lang.Long) */ @@ -81,18 +80,14 @@ @Override public ToolActivity getToolActivityByToolContentId(Long toolContentId) { - - final String FIND_BY_TOOL_CONTENT_ID = "from " + ActivityDAO.TABLENAME + " in class " + Activity.class.getName() - + " where toolContentId=:toolContentId"; - - Query query = getSessionFactory().getCurrentSession().createQuery(FIND_BY_TOOL_CONTENT_ID); - query.setParameter("toolContentId", toolContentId); + Query query = getSessionFactory().getCurrentSession().createQuery(FIND_BY_TOOL_CONTENT_ID) + .setParameter("toolContentId", toolContentId); return (ToolActivity) getNonCGLibActivity((Activity) query.uniqueResult()); } /** - * we must return the real activity, not a Hibernate proxy. So relook - * it up. This should be quick as it should be in the cache. + * we must return the real activity, not a Hibernate proxy. So relook it up. This should be quick as it should be in + * the cache. */ private Activity getNonCGLibActivity(Activity act) { if (act != null) { @@ -157,26 +152,28 @@ */ @Override public List getActivitiesByParentActivityId(Long parentActivityId) { - List list = this.doFindCacheable(ActivityDAO.FIND_BY_PARENT, parentActivityId); - return list; + return getSession().createQuery(ActivityDAO.FIND_BY_PARENT, Activity.class) + .setParameter("activityId", parentActivityId).setCacheable(true).list(); } @SuppressWarnings("unchecked") @Override public List getActivitiesByLearningDesignId(Long learningDesignId) { - return this.doFindCacheable(ActivityDAO.FIND_BY_LEARNING_DESIGN_ID, learningDesignId); + return getSession().createQuery(ActivityDAO.FIND_BY_LEARNING_DESIGN_ID).setParameter("ldId", learningDesignId) + .setCacheable(true).list(); } /** * Get all the grouping activities for this learning design. * * @param learningDesignId - * The id of the learningDesign + * The id of the learningDesign * @return List of GroupingActivity objects */ @Override public List getGroupingActivitiesByLearningDesignId(Long learningDesignId) { - return this.doFindCacheable(ActivityDAO.FIND_GROUPINGACTIVITY_TYPE_BY_LEARNING_DESIGN_ID, learningDesignId); + return getSession().createQuery(ActivityDAO.FIND_GROUPINGACTIVITY_TYPE_BY_LEARNING_DESIGN_ID, + GroupingActivity.class).setParameter("ldId", learningDesignId).setCacheable(true).list(); } /* @@ -224,19 +221,16 @@ return null; } - /* - * @see org.lamsfoundation.lams.learningdesign.dao.IActivityDAO#getActivitiesByLibraryID(java.lang.Long) - */ @Override - public List getActivitiesByLibraryID(Long libraryID) { - List list = this.doFindCacheable(ActivityDAO.FIND_BY_LIBRARY_ID, libraryID); - return list; + public List getActivitiesByLibraryID(Long libraryID) { + return getSession().createQuery(ActivityDAO.FIND_BY_LIBRARY_ID, Activity.class) + .setParameter("libraryId", libraryID).setCacheable(true).list(); } - /* @see org.lamsfoundation.lams.learningdesign.dao.IActivityDAO#getTemplateActivityByLibraryID(java.lang.Long) */ @Override public Activity getTemplateActivityByLibraryID(Long libraryID) { - List list = this.doFindCacheable(ActivityDAO.FIND_BY_LIBRARY_ID, libraryID); + List list = getSession().createQuery(ActivityDAO.FIND_BY_LIBRARY_ID, Activity.class) + .setParameter("libraryId", libraryID).setCacheable(true).list(); return list != null && list.size() != 0 ? (Activity) list.get(0) : null; } Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/CompetenceDAO.java =================================================================== diff -u -rc11264f3271f40971838dd015db6b5107f3bc55e -rf711877b65ec0c82e43fd1fd5b129e0b5b50737d --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/CompetenceDAO.java (.../CompetenceDAO.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/CompetenceDAO.java (.../CompetenceDAO.java) (revision f711877b65ec0c82e43fd1fd5b129e0b5b50737d) @@ -23,20 +23,19 @@ package org.lamsfoundation.lams.learningdesign.dao.hibernate; -import java.util.Set; - import org.hibernate.query.Query; import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.learningdesign.Competence; import org.lamsfoundation.lams.learningdesign.LearningDesign; import org.lamsfoundation.lams.learningdesign.dao.ICompetenceDAO; import org.springframework.stereotype.Repository; +import java.util.Set; + @Repository public class CompetenceDAO extends LAMSBaseDAO implements ICompetenceDAO { private static final String LOAD_COMPETENCE_BY_LDID_AND_TITLE = - "from lams_competence in class " + Competence.class.getName() - + " where title=:title AND learning_design_id=:ldId"; + "FROM " + Competence.class.getName() + " WHERE title = :title AND learningDesign.learningDesignId = :ldId"; /** * @see org.lamsfoundation.lams.competence.dao.ICompetenceDAO#saveOrUpdate() Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/CompetenceMappingDAO.java =================================================================== diff -u -r129d0eb39f81fcdb4ef6e3b5ec15c1c94d9324b3 -rf711877b65ec0c82e43fd1fd5b129e0b5b50737d --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/CompetenceMappingDAO.java (.../CompetenceMappingDAO.java) (revision 129d0eb39f81fcdb4ef6e3b5ec15c1c94d9324b3) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/CompetenceMappingDAO.java (.../CompetenceMappingDAO.java) (revision f711877b65ec0c82e43fd1fd5b129e0b5b50737d) @@ -1,7 +1,5 @@ package org.lamsfoundation.lams.learningdesign.dao.hibernate; -import java.util.Set; - import org.hibernate.query.Query; import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.learningdesign.Competence; @@ -10,11 +8,14 @@ import org.lamsfoundation.lams.learningdesign.dao.ICompetenceMappingDAO; import org.springframework.stereotype.Repository; +import java.util.Set; + @Repository public class CompetenceMappingDAO extends LAMSBaseDAO implements ICompetenceMappingDAO { - private static final String LOAD_COMPETENCE_MAPPING_BY_ACTIVITY_AND_COMPETENCE = "from lams_competence_mapping in class " - + CompetenceMapping.class.getName() + " where competence_id=:competence_id AND activity_id=:activity_id"; + private static final String LOAD_COMPETENCE_MAPPING_BY_ACTIVITY_AND_COMPETENCE = "FROM " + + CompetenceMapping.class.getName() + + " WHERE competence.competenceId = :competence_id AND toolActivity.activityId = :activity_id"; @Override public void saveOrUpdate(CompetenceMapping competenceMapping) { Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningDesignDAO.java =================================================================== diff -u -r2188972474f8d186d6811e3dea2e4136be669335 -rf711877b65ec0c82e43fd1fd5b129e0b5b50737d --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningDesignDAO.java (.../LearningDesignDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningDesignDAO.java (.../LearningDesignDAO.java) (revision f711877b65ec0c82e43fd1fd5b129e0b5b50737d) @@ -40,24 +40,24 @@ @Repository public class LearningDesignDAO extends LAMSBaseDAO implements ILearningDesignDAO { - private static final String TABLENAME = "lams_learning_design"; - private static final String VALID_IN_FOLDER = "from " + TABLENAME + " in class " + LearningDesign.class.getName() - + " where valid_design_flag=true AND workspace_folder_id=:workspace_folder_id AND removed=0"; + private static final String VALID_IN_FOLDER = "FROM " + LearningDesign.class.getName() + + " WHERE validDesign = true AND workspaceFolder.workspaceFolderId = :workspace_folder_id AND removed = false"; - private static final String ALL_IN_FOLDER = "from " + TABLENAME + " in class " + LearningDesign.class.getName() - + " where workspace_folder_id=:workspace_folder_id AND removed=0"; + private static final String ALL_IN_FOLDER = "FROM " + LearningDesign.class.getName() + + " WHERE workspaceFolder.workspaceFolderId = :workspace_folder_id AND removed = false"; - private static final String FIND_BY_ORIGINAL = "from " + TABLENAME + " in class " + LearningDesign.class.getName() - + " where original_learning_design_id=? AND removed=0"; - private static final String FIND_LD_NAMES_IN_FOLDER = "select title from " + LearningDesign.class.getName() - + " where workspace_folder_id=? AND title like ? AND removed=0"; + private static final String FIND_BY_ORIGINAL = "FROM " + LearningDesign.class.getName() + + " WHERE originalLearningDesign.learningDesignId = :originalLearningDesignId AND removed = false"; - private static final String ACCESS_BY_USER = "from " + LearningDesignAccess.class.getName() - + " as a where a.id.userId = ? order by a.accessDate desc"; + private static final String FIND_LD_NAMES_IN_FOLDER = "SELECT title FROM " + LearningDesign.class.getName() + + " WHERE workspaceFolder.workspaceFolderId = :workspace_folder_id AND title LIKE :title AND removed = false"; - private static final String ACCESS_BY_LD_AND_USER = "from " + LearningDesignAccess.class.getName() - + " as a where a.id.learningDesignId = ? and a.id.userId = ?"; + private static final String ACCESS_BY_USER = "FROM " + LearningDesignAccess.class.getName() + + " AS a WHERE a.id.userId = :userId ORDER BY a.accessDate DESC"; + private static final String ACCESS_BY_LD_AND_USER = "FROM " + LearningDesignAccess.class.getName() + + " AS a WHERE a.id.learningDesignId = :learningDesignId AND a.id.userId = :userId"; + /* * @see * org.lamsfoundation.lams.learningdesign.dao.interfaces.ILearningDesignDAO#getLearningDesignById(java.lang.Long) @@ -96,9 +96,9 @@ * @see getLearningDesignsByOriginalDesign#getLearningDesignsByParent(java.lang.Long) */ @Override - public List getLearningDesignsByOriginalDesign(Long originalDesignID) { - List list = this.doFindCacheable(FIND_BY_ORIGINAL, originalDesignID); - return list; + public List getLearningDesignsByOriginalDesign(Long originalDesignID) { + return getSession().createQuery(FIND_BY_ORIGINAL, LearningDesign.class) + .setParameter("originalLearningDesignId", originalDesignID).setCacheable(true).list(); } /** @@ -107,20 +107,24 @@ * @see org.lamsfoundation.lams.learningdesign.dao.ILearningDesignDAO#getLearningDesignTitlesByWorkspaceFolder(java.lang.Integer) */ @Override - public List getLearningDesignTitlesByWorkspaceFolder(Integer workspaceFolderID, String prefix) { - return this.doFindCacheable(FIND_LD_NAMES_IN_FOLDER, workspaceFolderID, prefix + "%"); + public List getLearningDesignTitlesByWorkspaceFolder(Integer workspaceFolderID, String prefix) { + return getSession().createQuery(FIND_LD_NAMES_IN_FOLDER, String.class) + .setParameter("workspace_folder_id", workspaceFolderID).setParameter("title", prefix + "%") + .setCacheable(true).list(); } @SuppressWarnings("unchecked") @Override public List getLearningDesignAccess(Integer userId) { - return this.doFind(ACCESS_BY_USER, userId); + return getSession().createQuery(ACCESS_BY_USER, LearningDesignAccess.class).setParameter("userId", userId) + .list(); } @SuppressWarnings("unchecked") @Override public LearningDesignAccess getLearningDesignAccess(Long learningDesignId, Integer userId) { - List list = this.doFind(ACCESS_BY_LD_AND_USER, learningDesignId, userId); + List list = getSession().createQuery(ACCESS_BY_LD_AND_USER, LearningDesignAccess.class) + .setParameter("learningDesignId", learningDesignId).setParameter("userId", userId).list(); return list.isEmpty() ? null : list.get(0); } Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/TransitionDAO.java =================================================================== diff -u -r129d0eb39f81fcdb4ef6e3b5ec15c1c94d9324b3 -rf711877b65ec0c82e43fd1fd5b129e0b5b50737d --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/TransitionDAO.java (.../TransitionDAO.java) (revision 129d0eb39f81fcdb4ef6e3b5ec15c1c94d9324b3) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/TransitionDAO.java (.../TransitionDAO.java) (revision f711877b65ec0c82e43fd1fd5b129e0b5b50737d) @@ -23,8 +23,6 @@ package org.lamsfoundation.lams.learningdesign.dao.hibernate; -import java.util.List; - import org.hibernate.query.Query; import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.learningdesign.Activity; @@ -33,25 +31,26 @@ import org.lamsfoundation.lams.learningdesign.dao.ITransitionDAO; import org.springframework.stereotype.Repository; +import java.util.List; + /** * @author Manpreet Minhas */ @Repository public class TransitionDAO extends LAMSBaseDAO implements ITransitionDAO { - private static final String TABLENAME = "lams_learning_transition"; - private static final String FIND_BY_TO_ACTIVITY = "from " + TABLENAME + " in class " + Transition.class.getName() - + " where to_activity_id =:activity_id"; - private static final String FIND_BY_FROM_ACTIVITY = "from " + TABLENAME + " in class " + Transition.class.getName() - + " where from_activity_id =:activity_id"; - private static final String FIND_BY_LEARNING_DESIGN_ID = "from " + TABLENAME + " in class " - + Transition.class.getName() + " where learning_design_id=:ldId"; - private static final String FIND_BY_UI_ID = "from " + TABLENAME + " in class " + Transition.class.getName() - + " where transition_ui_id=:uiid" + " AND " + " learning_design_id=:ldId"; + private static final String FIND_BY_TO_ACTIVITY = + "FROM " + Transition.class.getName() + " WHERE toActivity.activityId = :activity_id"; + private static final String FIND_BY_FROM_ACTIVITY = + "FROM " + Transition.class.getName() + " WHERE fromActivity.activityId =:activity_id"; + private static final String FIND_BY_LEARNING_DESIGN_ID = + "FROM " + Transition.class.getName() + " WHERE learningDesignId = :ldId"; + private static final String FIND_BY_UI_ID = + "FROM " + Transition.class.getName() + " where transitionUIID = :uiid AND learningDesignId = :ldId"; /** * (non-Javadoc) - * + * * @see org.lamsfoundation.lams.learningdesign.dao.ITransitionDAO#getTransitionByTransitionID(java.lang.Long) */ @Override @@ -61,7 +60,7 @@ /** * (non-Javadoc) - * + * * @see org.lamsfoundation.lams.learningdesign.dao.ITransitionDAO#getTransitionByToActivityID(java.lang.Long) */ @Override @@ -76,7 +75,7 @@ /** * (non-Javadoc) - * + * * @see org.lamsfoundation.lams.learningdesign.dao.ITransitionDAO#getTransitionByfromActivityID(java.lang.Long) */ @Override Index: lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/SystemToolDAO.java =================================================================== diff -u -r129d0eb39f81fcdb4ef6e3b5ec15c1c94d9324b3 -rf711877b65ec0c82e43fd1fd5b129e0b5b50737d --- lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/SystemToolDAO.java (.../SystemToolDAO.java) (revision 129d0eb39f81fcdb4ef6e3b5ec15c1c94d9324b3) +++ lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/SystemToolDAO.java (.../SystemToolDAO.java) (revision f711877b65ec0c82e43fd1fd5b129e0b5b50737d) @@ -31,7 +31,7 @@ @Repository public class SystemToolDAO extends LAMSBaseDAO implements ISystemToolDAO { - private static final String LOAD_TOOL_BY_ACT_TYPE = "from tool in class SystemTool where tool.activityTypeId=:activityTypeId"; + private static final String LOAD_TOOL_BY_ACT_TYPE = "FROM SystemTool WHERE activityTypeId = :activityTypeId"; @Override public SystemTool getSystemToolByID(final Long systemToolID) { Index: lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/ToolDAO.java =================================================================== diff -u -rc11264f3271f40971838dd015db6b5107f3bc55e -rf711877b65ec0c82e43fd1fd5b129e0b5b50737d --- lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/ToolDAO.java (.../ToolDAO.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) +++ lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/ToolDAO.java (.../ToolDAO.java) (revision f711877b65ec0c82e43fd1fd5b129e0b5b50737d) @@ -23,20 +23,20 @@ package org.lamsfoundation.lams.tool.dao.hibernate; -import java.util.List; - import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.Tool; import org.lamsfoundation.lams.tool.dao.IToolDAO; import org.springframework.stereotype.Repository; +import java.util.List; + /** * @author Jacky Fang 8/02/2005 * @author Ozgur Demirtas 24/06/2005 */ @Repository public class ToolDAO extends LAMSBaseDAO implements IToolDAO { - private static final String LOAD_TOOL_BY_SIG = "from tool in class Tool where tool.toolSignature=:toolSignature"; + private static final String LOAD_TOOL_BY_SIG = "FROM Tool WHERE toolSignature =: toolSignature"; /** * @see org.lamsfoundation.lams.tool.dao.IToolDAO#getToolByID(java.lang.Long) Index: lams_common/src/java/org/lamsfoundation/lams/workspace/dao/hibernate/WorkspaceFolderContentDAO.java =================================================================== diff -u -r129d0eb39f81fcdb4ef6e3b5ec15c1c94d9324b3 -rf711877b65ec0c82e43fd1fd5b129e0b5b50737d --- lams_common/src/java/org/lamsfoundation/lams/workspace/dao/hibernate/WorkspaceFolderContentDAO.java (.../WorkspaceFolderContentDAO.java) (revision 129d0eb39f81fcdb4ef6e3b5ec15c1c94d9324b3) +++ lams_common/src/java/org/lamsfoundation/lams/workspace/dao/hibernate/WorkspaceFolderContentDAO.java (.../WorkspaceFolderContentDAO.java) (revision f711877b65ec0c82e43fd1fd5b129e0b5b50737d) @@ -23,25 +23,23 @@ package org.lamsfoundation.lams.workspace.dao.hibernate; -import java.util.Iterator; -import java.util.List; - import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.workspace.WorkspaceFolderContent; import org.lamsfoundation.lams.workspace.dao.IWorkspaceFolderContentDAO; import org.springframework.stereotype.Repository; +import java.util.Iterator; +import java.util.List; + /** * @author Manpreet Minhas */ @Repository public class WorkspaceFolderContentDAO extends LAMSBaseDAO implements IWorkspaceFolderContentDAO { - private static final String TABLENAME = "lams_workspace_folder_content"; + private static final String DELETE_BY_VERSION = "FROM " + WorkspaceFolderContent.class.getName() + + " WHERE folderContentID = :folder_content_id AND uuid = :uuid AND versionID = :version_id"; - private static final String DELETE_BY_VERSION = "from " + TABLENAME + " in class " - + WorkspaceFolderContent.class.getName() + " where folder_content_id=:folder_content_id AND uuid=:uuid AND version_id=:version_id"; - /** * (non-Javadoc) * Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McContentDAO.java =================================================================== diff -u -r2188972474f8d186d6811e3dea2e4136be669335 -rf711877b65ec0c82e43fd1fd5b129e0b5b50737d --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McContentDAO.java (.../McContentDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McContentDAO.java (.../McContentDAO.java) (revision f711877b65ec0c82e43fd1fd5b129e0b5b50737d) @@ -22,25 +22,25 @@ package org.lamsfoundation.lams.tool.mc.dao.hibernate; -import java.util.List; - import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.mc.dao.IMcContentDAO; import org.lamsfoundation.lams.tool.mc.model.McContent; import org.lamsfoundation.lams.tool.mc.model.McSession; import org.springframework.stereotype.Repository; +import java.util.List; + /** * @author Ozgur Demirtas - *

- * Hibernate implementation for database access to McContent for the mc tool. - *

+ *

+ * Hibernate implementation for database access to McContent for the mc tool. + *

*/ @Repository public class McContentDAO extends LAMSBaseDAO implements IMcContentDAO { - private static final String FIND_MC_CONTENT = "from " + McContent.class.getName() - + " as mc where content_id=:mcContentId"; + private static final String FIND_MC_CONTENT = + "from " + McContent.class.getName() + " as mc where content_id=:mcContentId"; @Override public McContent getMcContentByUID(Long uid) { @@ -108,7 +108,7 @@ @SuppressWarnings("rawtypes") @Override public List findAll(Class objClass) { - String query = "from obj in class " + objClass.getName(); + String query = "FROM " + objClass.getName(); return doFind(query); } @@ -121,4 +121,4 @@ public void delete(Object object) { getSession().delete(object); } -} +} \ No newline at end of file Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java =================================================================== diff -u -r2188972474f8d186d6811e3dea2e4136be669335 -rf711877b65ec0c82e43fd1fd5b129e0b5b50737d --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java (.../McQueContentDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java (.../McQueContentDAO.java) (revision f711877b65ec0c82e43fd1fd5b129e0b5b50737d) @@ -22,13 +22,13 @@ package org.lamsfoundation.lams.tool.mc.dao.hibernate; -import java.util.List; - import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.mc.dao.IMcQueContentDAO; import org.lamsfoundation.lams.tool.mc.model.McQueContent; import org.springframework.stereotype.Repository; +import java.util.List; + /** * Hibernate implementation for database access to McQueContent for the mc tool. * @@ -37,13 +37,14 @@ @Repository public class McQueContentDAO extends LAMSBaseDAO implements IMcQueContentDAO { - private static final String LOAD_QUESTION_CONTENT_BY_CONTENT_ID = "from mcQueContent in class McQueContent where mcQueContent.mcContent.uid=:contentUid order by mcQueContent.displayOrder"; + private static final String LOAD_QUESTION_CONTENT_BY_CONTENT_ID = "FROM McQueContent WHERE mcContent.uid= :contentUid ORDER BY displayOrder"; - private static final String FIND_QUESTION_CONTENT_BY_UID = "from mcQueContent in class McQueContent where mcQueContent.uid=:uid"; + private static final String FIND_QUESTION_CONTENT_BY_UID = "FROM McQueContent WHERE uid = :uid"; - private static final String LOAD_QUESTION_CONTENT_BY_DISPLAY_ORDER = "from mcQueContent in class McQueContent where mcQueContent.displayOrder=:displayOrder and mcQueContent.mcContent.uid=:mcContentUid"; + private static final String LOAD_QUESTION_CONTENT_BY_DISPLAY_ORDER = "FROM McQueContent WHERE displayOrder = :displayOrder " + + "AND mcContent.uid = :mcContentUid"; - private static final String SORT_QUESTION_CONTENT_BY_DISPLAY_ORDER = "from mcQueContent in class McQueContent where mcQueContent.mcContent.uid=:mcContentId order by mcQueContent.displayOrder"; + private static final String SORT_QUESTION_CONTENT_BY_DISPLAY_ORDER = "FROM McQueContent WHERE mcContent.uid = :mcContentId ORDER BY displayOrder"; @Override public McQueContent findMcQuestionContentByUid(Long uid) { Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java =================================================================== diff -u -rcb01d2d8c064728cb0e2ac524d2f89622a534e39 -rf711877b65ec0c82e43fd1fd5b129e0b5b50737d --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java (.../McUserDAO.java) (revision cb01d2d8c064728cb0e2ac524d2f89622a534e39) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java (.../McUserDAO.java) (revision f711877b65ec0c82e43fd1fd5b129e0b5b50737d) @@ -22,9 +22,6 @@ package org.lamsfoundation.lams.tool.mc.dao.hibernate; -import java.util.ArrayList; -import java.util.List; - import org.hibernate.query.NativeQuery; import org.hibernate.query.Query; import org.hibernate.type.StandardBasicTypes; @@ -35,6 +32,9 @@ import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; import org.springframework.stereotype.Repository; +import java.util.ArrayList; +import java.util.List; + /** * @author Ozgur Demirtas *

@@ -44,7 +44,8 @@ @Repository public class McUserDAO extends LAMSBaseDAO implements IMcUserDAO { - private static final String GET_USER_BY_USER_ID_SESSION = "from mcQueUsr in class McQueUsr where mcQueUsr.queUsrId=:queUsrId and mcQueUsr.mcSession.uid=:mcSessionUid"; + private static final String GET_USER_BY_USER_ID_SESSION = "FROM McQueUsr WHERE queUsrId = :queUsrId " + + "AND mcSession.uid = :mcSessionUid"; private static final String LOAD_MARKS_FOR_SESSION = "SELECT last_attempt_total_mark " + " FROM tl_lamc11_que_usr usr " Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java =================================================================== diff -u -rd0b0ba33d9c8c8d96876b9de3263ac77643ba35a -rf711877b65ec0c82e43fd1fd5b129e0b5b50737d --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java (.../McUsrAttemptDAO.java) (revision d0b0ba33d9c8c8d96876b9de3263ac77643ba35a) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java (.../McUsrAttemptDAO.java) (revision f711877b65ec0c82e43fd1fd5b129e0b5b50737d) @@ -22,9 +22,6 @@ package org.lamsfoundation.lams.tool.mc.dao.hibernate; -import java.util.ArrayList; -import java.util.List; - import org.hibernate.query.Query; import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.mc.dao.IMcUsrAttemptDAO; @@ -34,6 +31,9 @@ import org.lamsfoundation.lams.usermanagement.User; import org.springframework.stereotype.Repository; +import java.util.ArrayList; +import java.util.List; + /** * @author Ozgur Demirtas *

@@ -50,14 +50,14 @@ @Repository public class McUsrAttemptDAO extends LAMSBaseDAO implements IMcUsrAttemptDAO { - private static final String LOAD_PARTICULAR_QUESTION_ATTEMPT = "from attempt in class McUsrAttempt where attempt.mcQueUsr.uid=:queUsrUid" - + " and attempt.qbToolQuestion.uid=:mcQueContentId order by attempt.qbOption.uid"; + private static final String LOAD_PARTICULAR_QUESTION_ATTEMPT = "FROM McUsrAttempt WHERE mcQueUsr.uid = :queUsrUid" + + " AND qbToolQuestion.uid = :mcQueContentId ORDER BY qbOption.uid"; - private static final String LOAD_FINAL_USER_QUESTION_ATTEMPTS_FOR_QUESTION_SESSION = "from attempt in class McUsrAttempt where " - + " attempt.mcQueUsr.mcSessionId=:sessionUid AND attempt.qbToolQuestion.uid=:mcQueContentId " - + " AND attempt.mcQueUsr.responseFinalised = true order by attempt.mcQueUsr.uid"; + private static final String LOAD_FINAL_USER_QUESTION_ATTEMPTS_FOR_QUESTION_SESSION = "FROM McUsrAttempt WHERE " + + " mcQueUsr.mcSessionId = :sessionUid AND qbToolQuestion.uid = :mcQueContentId " + + " AND mcQueUsr.responseFinalised = true ORDER BY mcQueUsr.uid"; - private static final String LOAD_ALL_QUESTION_ATTEMPTS = "from attempt in class McUsrAttempt where attempt.mcQueUsr.uid=:queUsrUid" + private static final String LOAD_ALL_QUESTION_ATTEMPTS = "FROM McUsrAttempt AS attempt where attempt.mcQueUsr.uid=:queUsrUid" + " AND attempt.mcQueUsr.responseFinalised = true order by attempt.qbToolQuestion.uid, attempt.qbOption.uid"; private static final String FIND_ATTEMPTS_COUNT_BY_OPTION = "select count(*) from " + McUsrAttempt.class.getName() Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueUsrDAO.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rf711877b65ec0c82e43fd1fd5b129e0b5b50737d --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueUsrDAO.java (.../QaQueUsrDAO.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueUsrDAO.java (.../QaQueUsrDAO.java) (revision f711877b65ec0c82e43fd1fd5b129e0b5b50737d) @@ -24,9 +24,6 @@ package org.lamsfoundation.lams.tool.qa.dao.hibernate; -import java.util.List; - -import org.apache.commons.lang3.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; import org.hibernate.query.NativeQuery; import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; @@ -35,14 +32,16 @@ import org.lamsfoundation.lams.tool.qa.model.QaSession; import org.springframework.stereotype.Repository; +import java.util.List; + /** * @author Ozgur Demirtas */ @Repository public class QaQueUsrDAO extends LAMSBaseDAO implements IQaQueUsrDAO { 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"; + private static final String LOAD_USER_FOR_SESSION = "FROM QaQueUsr AS qaQueUsr where qaQueUsr.qaSession.qaSessionId= :qaSessionId"; @Override public int countSessionUser(QaSession qaSession) { @@ -52,7 +51,7 @@ @Override 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"; + String strGetUser = "FROM QaQueUsr AS qaQueUsr where qaQueUsr.queUsrId=:queUsrId and qaQueUsr.qaSession.qaSessionId=:qaSessionId"; List list = getSession().createQuery(strGetUser).setParameter("queUsrId", queUsrId) .setParameter("qaSessionId", qaSessionId).list(); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQuestionDAO.java =================================================================== diff -u -r2188972474f8d186d6811e3dea2e4136be669335 -rf711877b65ec0c82e43fd1fd5b129e0b5b50737d --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQuestionDAO.java (.../QaQuestionDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQuestionDAO.java (.../QaQuestionDAO.java) (revision f711877b65ec0c82e43fd1fd5b129e0b5b50737d) @@ -23,23 +23,23 @@ package org.lamsfoundation.lams.tool.qa.dao.hibernate; -import java.util.List; - import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.qa.dao.IQaQuestionDAO; import org.lamsfoundation.lams.tool.qa.model.QaQueContent; import org.springframework.stereotype.Repository; +import java.util.List; + /** * @author Ozgur Demirtas * */ @Repository public class QaQuestionDAO extends LAMSBaseDAO implements IQaQuestionDAO { - private static final String LOAD_QUESTION_BY_CONTENT_UID = "from qaQuestion in class QaQueContent where qaQuestion.qaContent.uid=:uid"; - private static final String LOAD_QUESTION_BY_DISPLAY_ORDER = "from qaQuestion in class QaQueContent where qaQuestion.displayOrder=:displayOrder and qaQuestion.qaContent.uid=:uid"; - 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"; + private static final String LOAD_QUESTION_BY_CONTENT_UID = "FROM QaQueContent AS qaQuestion where qaQuestion.qaContent.uid=:uid"; + private static final String LOAD_QUESTION_BY_DISPLAY_ORDER = "FROM QaQueContent AS qaQuestion where qaQuestion.displayOrder=:displayOrder and qaQuestion.qaContent.uid=:uid"; + private static final String LOAD_QUESTION_BY_QUESTION_UID = "FROM QaQueContent AS qaQuestion where qaQuestion.uid=:uid"; + private static final String SORT_QUESTION_BY_DISPLAY_ORDER = "FROM QaQueContent AS qaQuestion where qaQuestion.qaContent.uid=:uid order by qaQuestion.displayOrder"; @SuppressWarnings("unchecked") @Override Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rf711877b65ec0c82e43fd1fd5b129e0b5b50737d --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java (.../QaUsrRespDAO.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java (.../QaUsrRespDAO.java) (revision f711877b65ec0c82e43fd1fd5b129e0b5b50737d) @@ -23,10 +23,6 @@ package org.lamsfoundation.lams.tool.qa.dao.hibernate; -import java.util.ArrayList; -import java.util.List; - -import org.apache.commons.lang3.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; import org.hibernate.query.Query; import org.hibernate.type.StandardBasicTypes; @@ -37,18 +33,21 @@ import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; import org.springframework.stereotype.Repository; +import java.util.ArrayList; +import java.util.List; + /** * @author Ozgur Demirtas */ @Repository public class QaUsrRespDAO extends LAMSBaseDAO implements IQaUsrRespDAO { - private static final String LOAD_ATTEMPT_FOR_USER_AND_QUESTION = "from qaUsrResp in class QaUsrResp " + private static final String LOAD_ATTEMPT_FOR_USER_AND_QUESTION = "FROM QaUsrResp AS qaUsrResp " + "where qaUsrResp.qaQueUser.queUsrId=:queUsrId and qaUsrResp.qbToolQuestion.uid=:questionId"; - private static final String LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION = "from qaUsrResp in class QaUsrResp " + private static final String LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION = "FROM QaUsrResp AS qaUsrResp " + " where qaUsrResp.qaQueUser.qaSession.qaSessionId=:qaSessionId and qaUsrResp.qbToolQuestion.uid=:questionId"; - private static final String LOAD_ATTEMPT_FOR_USER = "from qaUsrResp in class QaUsrResp " + private static final String LOAD_ATTEMPT_FOR_USER = "FROM QaUsrResp AS qaUsrResp " + "where qaUsrResp.qaQueUser.uid=:userUid order by qaUsrResp.qbToolQuestion.displayOrder asc"; @Override Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteQueContentDAO.java =================================================================== diff -u -r2188972474f8d186d6811e3dea2e4136be669335 -rf711877b65ec0c82e43fd1fd5b129e0b5b50737d --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteQueContentDAO.java (.../VoteQueContentDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteQueContentDAO.java (.../VoteQueContentDAO.java) (revision f711877b65ec0c82e43fd1fd5b129e0b5b50737d) @@ -21,27 +21,26 @@ * ***********************************************************************/ package org.lamsfoundation.lams.tool.vote.dao.hibernate; -import java.util.List; - import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.vote.dao.IVoteQueContentDAO; import org.lamsfoundation.lams.tool.vote.model.VoteQueContent; import org.springframework.stereotype.Repository; +import java.util.List; + /** - * Hibernate implementation for database access to VoteQueContent for the vote - * tool. + * Hibernate implementation for database access to VoteQueContent for the vote tool. * * @author Ozgur Demirtas */ @Repository public class VoteQueContentDAO extends LAMSBaseDAO implements IVoteQueContentDAO { - private static final String LOAD_QUESTION_CONTENT_BY_CONTENT_ID = "from voteQueContent in class VoteQueContent where voteQueContent.voteContent.uid=:voteContentId"; + private static final String LOAD_QUESTION_CONTENT_BY_CONTENT_ID = "FROM VoteQueContent AS voteQueContent where voteQueContent.voteContent.uid=:voteContentId"; - private static final String LOAD_QUESTION_CONTENT_BY_DISPLAY_ORDER = "from voteQueContent in class VoteQueContent where voteQueContent.displayOrder=:displayOrder and voteQueContent.voteContent.uid=:voteContentUid"; + private static final String LOAD_QUESTION_CONTENT_BY_DISPLAY_ORDER = "FROM VoteQueContent AS voteQueContent where voteQueContent.displayOrder=:displayOrder and voteQueContent.voteContent.uid=:voteContentUid"; - private static final String SORT_QUESTION_CONTENT_BY_DISPLAY_ORDER = "from voteQueContent in class VoteQueContent where voteQueContent.voteContent.uid=:voteContentId order by voteQueContent.displayOrder"; + private static final String SORT_QUESTION_CONTENT_BY_DISPLAY_ORDER = "FROM VoteQueContent AS voteQueContent where voteQueContent.voteContent.uid=:voteContentId order by voteQueContent.displayOrder"; @Override public VoteQueContent getQuestionByUid(Long uid) { Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteSessionDAO.java =================================================================== diff -u -r2188972474f8d186d6811e3dea2e4136be669335 -rf711877b65ec0c82e43fd1fd5b129e0b5b50737d --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteSessionDAO.java (.../VoteSessionDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteSessionDAO.java (.../VoteSessionDAO.java) (revision f711877b65ec0c82e43fd1fd5b129e0b5b50737d) @@ -22,15 +22,15 @@ package org.lamsfoundation.lams.tool.vote.dao.hibernate; -import java.util.List; - import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.vote.dao.IVoteSessionDAO; import org.lamsfoundation.lams.tool.vote.model.VoteContent; import org.lamsfoundation.lams.tool.vote.model.VoteQueUsr; import org.lamsfoundation.lams.tool.vote.model.VoteSession; import org.springframework.stereotype.Repository; +import java.util.List; + /** * @author ozgurd *

@@ -48,7 +48,7 @@ private static final String GET_SESSIONS_FROM_CONTENT = "select votes.voteSessionId from VoteSession votes where votes.voteContent=:voteContent"; - private static final String COUNT_SESSION_COMPLETE = "from voteSession in class VoteSession where voteSession.sessionStatus='COMPLETE'"; + private static final String COUNT_SESSION_COMPLETE = "FROM VoteSession AS voteSession where voteSession.sessionStatus='COMPLETE'"; @Override public VoteSession getVoteSessionByUID(Long sessionUid) { @@ -146,4 +146,4 @@ return (List) (doFindByNamedParam(GET_SESSIONS_FROM_CONTENT, new String[] { "voteContent" }, new Object[] { voteContent })); } -} +} \ No newline at end of file Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUserDAO.java =================================================================== diff -u -rb9f40a0836353109d362f2e1218cdf2b21163399 -rf711877b65ec0c82e43fd1fd5b129e0b5b50737d --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUserDAO.java (.../VoteUserDAO.java) (revision b9f40a0836353109d362f2e1218cdf2b21163399) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUserDAO.java (.../VoteUserDAO.java) (revision f711877b65ec0c82e43fd1fd5b129e0b5b50737d) @@ -22,15 +22,15 @@ package org.lamsfoundation.lams.tool.vote.dao.hibernate; -import java.util.Iterator; -import java.util.List; - import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.vote.dao.IVoteUserDAO; import org.lamsfoundation.lams.tool.vote.model.VoteQueUsr; import org.lamsfoundation.lams.tool.vote.model.VoteSession; import org.springframework.stereotype.Repository; +import java.util.Iterator; +import java.util.List; + /** *

* Hibernate implementation for database access to Voting users (learners) for the voting tool. @@ -41,7 +41,7 @@ @Repository public class VoteUserDAO extends LAMSBaseDAO implements IVoteUserDAO { - private static final String LOAD_USER_FOR_SESSION = "from voteQueUsr in class VoteQueUsr where voteQueUsr.voteSession.uid= :voteSessionId"; + private static final String LOAD_USER_FOR_SESSION = "FROM VoteQueUsr AS voteQueUsr where voteQueUsr.voteSession.uid= :voteSessionId"; @SuppressWarnings("unchecked") @Override @@ -82,7 +82,7 @@ @Override public VoteQueUsr getVoteUserBySession(final Long queUsrId, final Long voteSessionId) { - String strGetUser = "from voteQueUsr in class VoteQueUsr where voteQueUsr.queUsrId=:queUsrId and voteQueUsr.voteSession.uid=:voteSessionId"; + String strGetUser = "FROM VoteQueUsr AS voteQueUsr where voteQueUsr.queUsrId=:queUsrId and voteQueUsr.voteSession.uid=:voteSessionId"; List list = getSessionFactory().getCurrentSession().createQuery(strGetUser) .setParameter("queUsrId", queUsrId).setParameter("voteSessionId", voteSessionId) .list(); @@ -134,7 +134,7 @@ @Override public int getTotalNumberOfUsers() { - String query = "from obj in class VoteQueUsr"; + String query = "FROM VoteQueUsr"; return this.doFind(query).size(); } } \ No newline at end of file Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java =================================================================== diff -u -r35d617e013c37361e7d89025c464a7f4a53b9b4e -rf711877b65ec0c82e43fd1fd5b129e0b5b50737d --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java (.../VoteUsrAttemptDAO.java) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java (.../VoteUsrAttemptDAO.java) (revision f711877b65ec0c82e43fd1fd5b129e0b5b50737d) @@ -22,13 +22,6 @@ package org.lamsfoundation.lams.tool.vote.dao.hibernate; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Set; - -import org.apache.commons.lang3.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; import org.hibernate.query.NativeQuery; import org.hibernate.transform.Transformers; @@ -42,6 +35,12 @@ import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; import org.springframework.stereotype.Repository; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; + /** * Hibernate implementation for database access to VoteUsrAttemptDAO for the voting tool. * @@ -50,21 +49,21 @@ @Repository public class VoteUsrAttemptDAO extends LAMSBaseDAO implements IVoteUsrAttemptDAO { - private static final String LOAD_ATTEMPT_FOR_USER = "from voteUsrAttempt in class VoteUsrAttempt where voteUsrAttempt.voteQueUsr.uid=:queUsrId"; + private static final String LOAD_ATTEMPT_FOR_USER = "FROM VoteUsrAttempt AS voteUsrAttempt where voteUsrAttempt.voteQueUsr.uid=:queUsrId"; // The following two queries are the same except one loads the attempts, the other counts them - private static final String LOAD_ATTEMPT_FOR_QUESTION_CONTENT_AND_SESSION = "from voteUsrAttempt in class VoteUsrAttempt where voteUsrAttempt.voteQueContent.uid=:voteQueContentId and voteUsrAttempt.voteQueUsr.voteSession.uid=:sessionUid"; - private static final String COUNT_ATTEMPT_FOR_QUESTION_CONTENT_AND_SESSION = "select count(*) from voteUsrAttempt in class VoteUsrAttempt where voteUsrAttempt.voteQueContent.uid=:voteQueContentId and voteUsrAttempt.voteQueUsr.voteSession.uid=:sessionUid"; + private static final String LOAD_ATTEMPT_FOR_QUESTION_CONTENT_AND_SESSION = "FROM VoteUsrAttempt AS voteUsrAttempt where voteUsrAttempt.voteQueContent.uid=:voteQueContentId and voteUsrAttempt.voteQueUsr.voteSession.uid=:sessionUid"; + private static final String COUNT_ATTEMPT_FOR_QUESTION_CONTENT_AND_SESSION = "select count(*) FROM VoteUsrAttempt AS voteUsrAttempt where voteUsrAttempt.voteQueContent.uid=:voteQueContentId and voteUsrAttempt.voteQueUsr.voteSession.uid=:sessionUid"; - private static final String LOAD_ATTEMPT_FOR_USER_AND_QUESTION_CONTENT = "from voteUsrAttempt in class VoteUsrAttempt where voteUsrAttempt.voteQueUsr.uid=:queUsrId and voteUsrAttempt.voteQueContent.uid=:voteQueContentId"; + private static final String LOAD_ATTEMPT_FOR_USER_AND_QUESTION_CONTENT = "FROM VoteUsrAttempt AS voteUsrAttempt where voteUsrAttempt.voteQueUsr.uid=:queUsrId and voteUsrAttempt.voteQueContent.uid=:voteQueContentId"; - private static final String LOAD_ATTEMPT_FOR_USER_AND_QUESTION_CONTENT_AND_SESSION = "from voteUsrAttempt in class VoteUsrAttempt where voteUsrAttempt.voteQueUsr.uid=:queUsrId and voteUsrAttempt.voteQueContent.uid=:voteQueContentId and voteUsrAttempt.voteQueUsr.voteSession.uid=:sessionUid"; + private static final String LOAD_ATTEMPT_FOR_USER_AND_QUESTION_CONTENT_AND_SESSION = "FROM VoteUsrAttempt AS voteUsrAttempt where voteUsrAttempt.voteQueUsr.uid=:queUsrId and voteUsrAttempt.voteQueContent.uid=:voteQueContentId and voteUsrAttempt.voteQueUsr.voteSession.uid=:sessionUid"; - private static final String LOAD_ATTEMPT_FOR_USER_AND_SESSION = "from voteUsrAttempt in class VoteUsrAttempt where voteUsrAttempt.voteQueUsr.uid=:queUsrId and voteUsrAttempt.voteQueUsr.voteSession.uid=:sessionUid"; + private static final String LOAD_ATTEMPT_FOR_USER_AND_SESSION = "FROM VoteUsrAttempt AS voteUsrAttempt where voteUsrAttempt.voteQueUsr.uid=:queUsrId and voteUsrAttempt.voteQueUsr.voteSession.uid=:sessionUid"; private static final String LOAD_USER_ENTRIES = "select distinct voteUsrAttempt.userEntry from VoteUsrAttempt voteUsrAttempt where voteUsrAttempt.voteQueUsr.voteSession.voteContent.uid=:voteContentUid"; - private static final String LOAD_USER_ENTRY_RECORDS = "from voteUsrAttempt in class VoteUsrAttempt where voteUsrAttempt.userEntry=:userEntry and voteUsrAttempt.voteQueContent.uid=1 and voteUsrAttempt.voteQueUsr.voteSession.voteContent.uid=:voteContentUid"; + private static final String LOAD_USER_ENTRY_RECORDS = "FROM VoteUsrAttempt AS voteUsrAttempt where voteUsrAttempt.userEntry=:userEntry and voteUsrAttempt.voteQueContent.uid=1 and voteUsrAttempt.voteQueUsr.voteSession.voteContent.uid=:voteContentUid"; private static final String LOAD_OPEN_TEXT_ENTRIES_BY_SESSION_UID = "select att from VoteUsrAttempt att, VoteQueUsr user, VoteSession ses where " @@ -140,7 +139,7 @@ @SuppressWarnings("unchecked") @Override public void removeAttemptsForUserandSession(final Long queUsrId, final Long sessionUid) { - String strGetUser = "from voteUsrAttempt in class VoteUsrAttempt where voteUsrAttempt.voteQueUsr.uid=:queUsrId and voteUsrAttempt.voteQueUsr.voteSession.uid=:sessionUid"; + String strGetUser = "FROM VoteUsrAttempt AS voteUsrAttempt where voteUsrAttempt.voteQueUsr.uid=:queUsrId and voteUsrAttempt.voteQueUsr.voteSession.uid=:sessionUid"; List list = getSessionFactory().getCurrentSession().createQuery(strGetUser) .setParameter("queUsrId", queUsrId.longValue()).setParameter("sessionUid", sessionUid).list(); Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dao/hibernate/WikiPageDAO.java =================================================================== diff -u -r70d1adeee6d96136e69aa91bb50d94c4a3b826d2 -rf711877b65ec0c82e43fd1fd5b129e0b5b50737d --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dao/hibernate/WikiPageDAO.java (.../WikiPageDAO.java) (revision 70d1adeee6d96136e69aa91bb50d94c4a3b826d2) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dao/hibernate/WikiPageDAO.java (.../WikiPageDAO.java) (revision f711877b65ec0c82e43fd1fd5b129e0b5b50737d) @@ -13,11 +13,11 @@ @Repository public class WikiPageDAO extends LAMSBaseDAO implements IWikiPageDAO { - public static final String GET_BY_WIKI_AND_TITLE = "from tl_lawiki10_wiki_page in class " + WikiPage.class.getName() - + " where wiki_uid=:wikiId AND title=:title AND wiki_session_uid=null"; + public static final String GET_BY_WIKI_AND_TITLE = "FROM " + WikiPage.class.getName() + + " where parentWiki.uid = :wikiId AND title = :title AND wikiSession IS NULL"; - public static final String GET_BY_SESSION_AND_TITLE = "from tl_lawiki10_wiki_page in class " - + WikiPage.class.getName() + " where wiki_session_uid=:wikiId AND title=:title"; + public static final String GET_BY_SESSION_AND_TITLE = "FROM " + + WikiPage.class.getName() + " where wikiSession.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 "