Index: lams_common/src/java/org/lamsfoundation/lams/config/dao/hibernate/ConfigurationDAO.java =================================================================== diff -u -raaf2f15ad427fc713849cf696579ab4542ac75c2 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_common/src/java/org/lamsfoundation/lams/config/dao/hibernate/ConfigurationDAO.java (.../ConfigurationDAO.java) (revision aaf2f15ad427fc713849cf696579ab4542ac75c2) +++ lams_common/src/java/org/lamsfoundation/lams/config/dao/hibernate/ConfigurationDAO.java (.../ConfigurationDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -58,6 +58,6 @@ @Override public ConfigurationItem getConfigItemByKey(final String configKey) { return (ConfigurationItem) getSession().createQuery(ConfigurationDAO.LOAD_CONFIG_ITEM_BY_KEY) - .setString("key", configKey).uniqueResult(); + .setString("key", configKey).setCacheable(true).uniqueResult(); } } \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/dao/IBaseDAO.java =================================================================== diff -u -rf4051aee3b6cf552e0e4e3d4afa5ab4961c344af -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_common/src/java/org/lamsfoundation/lams/dao/IBaseDAO.java (.../IBaseDAO.java) (revision f4051aee3b6cf552e0e4e3d4afa5ab4961c344af) +++ lams_common/src/java/org/lamsfoundation/lams/dao/IBaseDAO.java (.../IBaseDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -223,13 +223,17 @@ public List findByPropertyValues(Class clazz, String name, Collection values); + public List findByProperty(Class clazz, String name, Object value, boolean cache); + /** * @param properties * a map of property names and values * @return a list of objects which have the same property values */ public List findByProperties(Class clazz, Map properties); + List findByProperties(Class clazz, Map properties, boolean cache); + public List find(String queryString); public List find(String queryString, Object value); Index: lams_common/src/java/org/lamsfoundation/lams/dao/hibernate/LAMSBaseDAO.java =================================================================== diff -u -rf4051aee3b6cf552e0e4e3d4afa5ab4961c344af -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_common/src/java/org/lamsfoundation/lams/dao/hibernate/LAMSBaseDAO.java (.../LAMSBaseDAO.java) (revision f4051aee3b6cf552e0e4e3d4afa5ab4961c344af) +++ lams_common/src/java/org/lamsfoundation/lams/dao/hibernate/LAMSBaseDAO.java (.../LAMSBaseDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -254,16 +254,15 @@ return loadAll(clazz); } - /* - * (non-Javadoc) - * - * @see org.lamsfoundation.lams.dao.IBaseDAO#findByProperty(java.lang.Class, - * java.lang.String, java.lang.Object) - */ @Override public List findByProperty(Class clazz, String name, Object value) { + return findByProperty(clazz, name, value, false); + } + + @Override + public List findByProperty(Class clazz, String name, Object value, boolean cache) { String queryString = buildQueryString(clazz, name, SELECT); - return doFind(queryString, value); + return doFindCacheable(queryString, cache, new Object[] { value }); } @Override @@ -275,18 +274,17 @@ return getSession().createQuery(queryString, clazz).setParameterList("param", values).getResultList(); } - /* - * (non-Javadoc) - * - * @see - * org.lamsfoundation.lams.dao.IBaseDAO#findByProperties(java.lang.Class, - * java.util.Map) - */ @SuppressWarnings("unchecked") @Override public List findByProperties(Class clazz, Map properties) { + return findByProperties(clazz, properties, false); + } + + @SuppressWarnings("unchecked") + @Override + public List findByProperties(Class clazz, Map properties, boolean cache) { Qv qv = buildQueryString(clazz, properties, SELECT, EQUAL_TO_WHAT); - return doFind(qv.queryString, qv.values); + return doFind(qv.queryString, cache, qv.values); } private String buildQueryString(Class clazz, String operation) { @@ -471,8 +469,16 @@ } public List doFind(final String queryString, final Object... values) { + return doFind(queryString, false, values); + } + + public List doFindCacheable(final String queryString, final Object... values) { + return doFind(queryString, true, values); + } + + private List doFind(final String queryString, boolean cache, final Object... values) { Query queryObject = convertLegacyStyleParameters(queryString, values); - return queryObject.list(); + return queryObject.setCacheable(cache).list(); } private Query convertLegacyStyleParameters(final String queryString, final Object... values) { @@ -520,7 +526,7 @@ CriteriaQuery query = builder.createQuery(entityClass); Root variableRoot = query.from(entityClass); query.select(variableRoot); - return getSession().createQuery(query).getResultList(); + return getSession().createQuery(query).setCacheable(true).getResultList(); } Index: lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java =================================================================== diff -u -r9225b20d682774352e82ae8b658ef2f64dc2bebf -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java (.../IntegrationService.java) (revision 9225b20d682774352e82ae8b658ef2f64dc2bebf) +++ lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java (.../IntegrationService.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -118,9 +118,7 @@ */ @Override public ExtServer getExtServer(String serverId) { - Map properties = new HashMap<>(); - properties.put("serverid", serverId); - List list = service.findByProperties(ExtServer.class, properties); + List list = service.findByProperty(ExtServer.class, "serverid", serverId, true); if (list == null || list.size() == 0) { return null; } else { @@ -133,7 +131,7 @@ Map properties = new HashMap<>(); properties.put("courseid", extCourseId); properties.put("extServer.sid", sid); - List list = service.findByProperties(ExtCourseClassMap.class, properties); + List list = service.findByProperties(ExtCourseClassMap.class, properties, true); if ((list == null) || (list.size() == 0)) { return null; @@ -293,7 +291,7 @@ Map properties = new HashMap<>(); properties.put("extServer.sid", extServer.getSid()); properties.put("extUsername", extUsername); - List list = service.findByProperties(ExtUserUseridMap.class, properties); + List list = service.findByProperties(ExtUserUseridMap.class, properties, true); if ((list == null) || (list.size() == 0)) { return null; @@ -577,7 +575,7 @@ Map properties = new HashMap<>(); properties.put("tool.toolSignature", toolSig); - return service.findByProperties(ExtServerToolAdapterMap.class, properties); + return service.findByProperties(ExtServerToolAdapterMap.class, properties, true); } @Override @@ -586,7 +584,7 @@ Map properties = new HashMap<>(); properties.put("tool.toolSignature", toolSig); properties.put("extServer.serverid", serverId); - List ret = service.findByProperties(ExtServerToolAdapterMap.class, properties); + List ret = service.findByProperties(ExtServerToolAdapterMap.class, properties, true); if ((ret != null) && (ret.size() > 0)) { return (ExtServerToolAdapterMap) ret.get(0); } else { @@ -871,7 +869,7 @@ Map properties = new HashMap<>(); properties.put("extServer.sid", sid); properties.put("organisation.organisationId", lesson.getOrganisation().getOrganisationId()); - List list = service.findByProperties(ExtCourseClassMap.class, properties); + List list = service.findByProperties(ExtCourseClassMap.class, properties, true); return list == null || list.isEmpty() ? null : list.get(0); } @@ -944,7 +942,7 @@ @Override public ExtServerLessonMap getExtServerLessonMap(Long lessonId) { - List list = service.findByProperty(ExtServerLessonMap.class, "lessonId", lessonId); + List list = service.findByProperty(ExtServerLessonMap.class, "lessonId", lessonId, true); if ((list == null) || (list.size() == 0)) { return null; } else { @@ -965,7 +963,8 @@ } private ExtCourseClassMap getExtCourseClassMap(Integer organisationId) { - List list = service.findByProperty(ExtCourseClassMap.class, "organisation.organisationId", organisationId); + List list = service.findByProperty(ExtCourseClassMap.class, "organisation.organisationId", organisationId, + true); if (list == null || list.size() == 0) { return null; } else { Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java =================================================================== diff -u -rfd9592fa74d56ccd0719c7245b3424b3523f2197 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java (.../Activity.java) (revision fd9592fa74d56ccd0719c7245b3424b3523f2197) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java (.../Activity.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -71,7 +71,6 @@ * add a ACTIVITY_TYPE constant. */ @Entity -@Cacheable @Table(name = "lams_learning_activity") @Inheritance(strategy = InheritanceType.SINGLE_TABLE) @DiscriminatorColumn(name = "learning_activity_type_id", discriminatorType = DiscriminatorType.INTEGER) Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java =================================================================== diff -u -rfd9592fa74d56ccd0719c7245b3424b3523f2197 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java (.../LearningDesign.java) (revision fd9592fa74d56ccd0719c7245b3424b3523f2197) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java (.../LearningDesign.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -60,7 +60,6 @@ * @author Manpreet Minhas */ @Entity -@Cacheable @Table(name = "lams_learning_design") public class LearningDesign implements Serializable { Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IActivityDAO.java =================================================================== diff -u -r122ff0d8419be3fac72ddb842cbbce1cea01e542 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IActivityDAO.java (.../IActivityDAO.java) (revision 122ff0d8419be3fac72ddb842cbbce1cea01e542) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IActivityDAO.java (.../IActivityDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -90,11 +90,6 @@ public List getActivitiesByParentActivityId(Long parentActivityId); /** - * @return List of all the activities - */ - public List getAllActivities(); - - /** * @param learningDesignId * The id of the learningDesign * @return List of all the activities Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java =================================================================== diff -u -ra61b6ad192148c0ae514f37a9b488c3a15535ee9 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java (.../ActivityDAO.java) (revision a61b6ad192148c0ae514f37a9b488c3a15535ee9) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java (.../ActivityDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -74,7 +74,7 @@ */ @Override public Activity getActivityByActivityId(Long activityId) { - Activity act = (Activity) super.find(Activity.class, activityId); + Activity act = super.find(Activity.class, activityId); return getNonCGLibActivity(act); } @@ -156,22 +156,14 @@ */ @Override public List getActivitiesByParentActivityId(Long parentActivityId) { - List list = this.doFind(ActivityDAO.FIND_BY_PARENT, parentActivityId); + List list = this.doFindCacheable(ActivityDAO.FIND_BY_PARENT, parentActivityId); return list; } - /* - * @see org.lamsfoundation.lams.learningdesign.dao.interfaces.IActivityDAO#getAllActivities() - */ - @Override - public List getAllActivities() { - return super.findAll(Activity.class); - } - @SuppressWarnings("unchecked") @Override public List getActivitiesByLearningDesignId(Long learningDesignId) { - return this.doFind(ActivityDAO.FIND_BY_LEARNING_DESIGN_ID, learningDesignId); + return this.doFindCacheable(ActivityDAO.FIND_BY_LEARNING_DESIGN_ID, learningDesignId); } /** @@ -183,7 +175,7 @@ */ @Override public List getGroupingActivitiesByLearningDesignId(Long learningDesignId) { - return this.doFind(ActivityDAO.FIND_GROUPINGACTIVITY_TYPE_BY_LEARNING_DESIGN_ID, learningDesignId); + return this.doFindCacheable(ActivityDAO.FIND_GROUPINGACTIVITY_TYPE_BY_LEARNING_DESIGN_ID, learningDesignId); } /* @@ -225,6 +217,7 @@ Query query = this.getSessionFactory().getCurrentSession().createQuery(ActivityDAO.FIND_BY_UI_ID); query.setInteger("uiid", id.intValue()); query.setLong("ldId", designID.longValue()); + query.setCacheable(true); return getNonCGLibActivity((Activity) query.uniqueResult()); } return null; @@ -235,14 +228,14 @@ */ @Override public List getActivitiesByLibraryID(Long libraryID) { - List list = this.doFind(ActivityDAO.FIND_BY_LIBRARY_ID, libraryID); + List list = this.doFindCacheable(ActivityDAO.FIND_BY_LIBRARY_ID, libraryID); return list; } /* @see org.lamsfoundation.lams.learningdesign.dao.IActivityDAO#getTemplateActivityByLibraryID(java.lang.Long) */ @Override public Activity getTemplateActivityByLibraryID(Long libraryID) { - List list = this.doFind(ActivityDAO.FIND_BY_LIBRARY_ID, libraryID); + List list = this.doFindCacheable(ActivityDAO.FIND_BY_LIBRARY_ID, libraryID); return list != null && list.size() != 0 ? (Activity) list.get(0) : null; } } Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/BranchActivityEntryDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/BranchActivityEntryDAO.java (.../BranchActivityEntryDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/BranchActivityEntryDAO.java (.../BranchActivityEntryDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -21,7 +21,6 @@ * **************************************************************** */ - package org.lamsfoundation.lams.learningdesign.dao.hibernate; import java.util.List; @@ -53,15 +52,13 @@ @Override @SuppressWarnings("unchecked") public List getEntriesByLearningDesign(Long learningDesignId) { - return (List) this.doFind(BranchActivityEntryDAO.ENTRIES_FOR_LEARNING_DESIGN, - learningDesignId); + return this.doFindCacheable(BranchActivityEntryDAO.ENTRIES_FOR_LEARNING_DESIGN, learningDesignId); } @Override @SuppressWarnings("unchecked") public BranchCondition getConditionByID(Long conditionID) { - List result = (List) this.doFind(BranchActivityEntryDAO.CONDITION_BY_ID, - conditionID); + List result = this.doFindCacheable(BranchActivityEntryDAO.CONDITION_BY_ID, conditionID); if (result == null || result.isEmpty()) { return null; } Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningDesignDAO.java =================================================================== diff -u -rf5852bd3f19beebb0e143f3e23e604289d0963e4 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningDesignDAO.java (.../LearningDesignDAO.java) (revision f5852bd3f19beebb0e143f3e23e604289d0963e4) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningDesignDAO.java (.../LearningDesignDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -64,7 +64,7 @@ */ @Override public LearningDesign getLearningDesignById(Long learningDesignId) { - LearningDesign design = (LearningDesign) super.find(LearningDesign.class, learningDesignId); + LearningDesign design = super.find(LearningDesign.class, learningDesignId); return design != null && !design.getRemoved() ? design : null; } @@ -75,7 +75,8 @@ */ @Override public List getAllValidLearningDesignsInFolder(Integer workspaceFolderID) { - return getSession().createQuery(VALID_IN_FOLDER).setParameter("workspace_folder_id", workspaceFolderID).list(); + return getSession().createQuery(VALID_IN_FOLDER).setParameter("workspace_folder_id", workspaceFolderID) + .setCacheable(true).list(); } /** @@ -85,7 +86,8 @@ */ @Override public List getAllLearningDesignsInFolder(Integer workspaceFolderID) { - return getSession().createQuery(ALL_IN_FOLDER).setParameter("workspace_folder_id", workspaceFolderID).list(); + return getSession().createQuery(ALL_IN_FOLDER).setParameter("workspace_folder_id", workspaceFolderID) + .setCacheable(true).list(); } /** @@ -95,7 +97,7 @@ */ @Override public List getLearningDesignsByOriginalDesign(Long originalDesignID) { - List list = this.doFind(FIND_BY_ORIGINAL, originalDesignID); + List list = this.doFindCacheable(FIND_BY_ORIGINAL, originalDesignID); return list; } @@ -106,20 +108,19 @@ */ @Override public List getLearningDesignTitlesByWorkspaceFolder(Integer workspaceFolderID, String prefix) { - return this.doFind(FIND_LD_NAMES_IN_FOLDER, new Object[] { workspaceFolderID, prefix + "%" }); + return this.doFindCacheable(FIND_LD_NAMES_IN_FOLDER, workspaceFolderID, prefix + "%"); } @SuppressWarnings("unchecked") @Override public List getLearningDesignAccess(Integer userId) { - return (List) this.doFind(ACCESS_BY_USER, userId); + return this.doFind(ACCESS_BY_USER, userId); } @SuppressWarnings("unchecked") @Override public LearningDesignAccess getLearningDesignAccess(Long learningDesignId, Integer userId) { - List list = (List) this.doFind(ACCESS_BY_LD_AND_USER, - learningDesignId, userId); + List list = this.doFind(ACCESS_BY_LD_AND_USER, learningDesignId, userId); return list.isEmpty() ? null : list.get(0); } @@ -128,8 +129,8 @@ public List getAllPagedLearningDesigns(Integer workspaceFolderID, Integer page, Integer size, String sortName, String sortDate) { String sortingOrder = setupSortString(sortName, sortDate); - Query query = getSession().createQuery(ALL_IN_FOLDER + sortingOrder).setParameter("workspace_folder_id", - workspaceFolderID); + Query query = getSession().createQuery(ALL_IN_FOLDER + sortingOrder) + .setParameter("workspace_folder_id", workspaceFolderID).setCacheable(true); if (page != null && size != null) { query.setFirstResult(page * size).setMaxResults(size); } @@ -142,8 +143,8 @@ public List getValidPagedLearningDesigns(Integer workspaceFolderID, Integer page, Integer size, String sortName, String sortDate) { String sortingOrder = setupSortString(sortName, sortDate); - Query query = getSession().createQuery(VALID_IN_FOLDER + sortingOrder).setParameter("workspace_folder_id", - workspaceFolderID); + Query query = getSession().createQuery(VALID_IN_FOLDER + sortingOrder) + .setParameter("workspace_folder_id", workspaceFolderID).setCacheable(true); if (page != null && size != null) { query.setFirstResult(page * size).setMaxResults(size); } @@ -164,7 +165,7 @@ @Override public long countAllLearningDesigns(Integer workspaceFolderID, boolean validDesignsOnly) { - Map properties = new HashMap(); + Map properties = new HashMap<>(); properties.put("workspaceFolder.workspaceFolderId", workspaceFolderID); properties.put("removed", Boolean.FALSE); if (validDesignsOnly) { Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningLibraryDAO.java =================================================================== diff -u -r72d525026e011d4ac75686e07377a4242c3eb09f -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningLibraryDAO.java (.../LearningLibraryDAO.java) (revision 72d525026e011d4ac75686e07377a4242c3eb09f) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningLibraryDAO.java (.../LearningLibraryDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -48,7 +48,7 @@ @Override @SuppressWarnings("unchecked") public List getAllLearningLibraries() { - return getSession().createQuery(LearningLibraryDAO.FIND_VALID_LIB).list(); + return getSession().createQuery(LearningLibraryDAO.FIND_VALID_LIB).setCacheable(true).list(); } @Override @@ -57,7 +57,7 @@ if (valid) { return getAllLearningLibraries(); } else { - return doFind(LearningLibraryDAO.FIND_ALL_LIB); + return doFindCacheable(LearningLibraryDAO.FIND_ALL_LIB); } } } \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LicenseDAO.java =================================================================== diff -u -re3bdd10ab88fbb1a570a9a79de64df6dbfef2922 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LicenseDAO.java (.../LicenseDAO.java) (revision e3bdd10ab88fbb1a570a9a79de64df6dbfef2922) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LicenseDAO.java (.../LicenseDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -40,12 +40,12 @@ @Override public License getLicenseByID(Long licenseID) { - return (License) super.find(License.class, licenseID); + return super.find(License.class, licenseID); } @Override @SuppressWarnings("unchecked") public List getLicensesByOrderId() { - return (List) getSession().createQuery(LICENSES_BY_ORDER_ID).list(); + return getSession().createQuery(LICENSES_BY_ORDER_ID).setCacheable(true).list(); } } Index: lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java =================================================================== diff -u -rfd9592fa74d56ccd0719c7245b3424b3523f2197 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java (.../Lesson.java) (revision fd9592fa74d56ccd0719c7245b3424b3523f2197) +++ lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java (.../Lesson.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -126,7 +126,6 @@ @ColumnResult(name = "dependent", type = Boolean.class), @ColumnResult(name = "scheduledFinish", type = Boolean.class) })) @Entity -@Cacheable @Table(name = "lams_lesson") public class Lesson implements Serializable { Index: lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java =================================================================== diff -u -r3381ada7328ee41ac3ae3e81e8f00a26660965ff -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java (.../LearnerProgressDAO.java) (revision 3381ada7328ee41ac3ae3e81e8f00a26660965ff) +++ lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java (.../LearnerProgressDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -126,7 +126,7 @@ @Override public LearnerProgress getLearnerProgress(Long learnerProgressId) { - return (LearnerProgress) getSession().get(LearnerProgress.class, learnerProgressId); + return getSession().get(LearnerProgress.class, learnerProgressId); } @Override @@ -338,7 +338,7 @@ public Map getNumUsersCurrentActivities(Long[] activityIds) { List resultQuery = getSession().createQuery(LearnerProgressDAO.COUNT_CURRENT_ACTIVITY) .setParameterList("activityIds", activityIds).list(); - Map result = new TreeMap(); + Map result = new TreeMap<>(); // put all requested activity IDs into the result for (Long activityId : activityIds) { result.put(activityId, 0); @@ -363,14 +363,14 @@ @Override public Integer getLearnerProgressArchiveMaxAttemptID(Integer userId, Long lessonId) { Object value = getSession().createQuery(LearnerProgressDAO.FIND_PROGRESS_ARCHIVE_MAX_ATTEMPT) - .setInteger("learnerId", userId).setLong("lessonId", lessonId).uniqueResult(); + .setInteger("learnerId", userId).setLong("lessonId", lessonId).setCacheable(true).uniqueResult(); return value == null ? null : ((Number) value).intValue(); } @Override public LearnerProgressArchive getLearnerProgressArchive(Long lessonId, Integer userId, Date archiveDate) { return (LearnerProgressArchive) getSession().createQuery(LearnerProgressDAO.FIND_PROGRESS_ARCHIVE_BY_DATE) .setInteger("learnerId", userId).setLong("lessonId", lessonId).setTimestamp("archiveDate", archiveDate) - .uniqueResult(); + .setCacheable(true).uniqueResult(); } } \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java =================================================================== diff -u -r0b789ab29e5a14f005e0978cdcad6add8606c83f -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java (.../LessonDAO.java) (revision 0b789ab29e5a14f005e0978cdcad6add8606c83f) +++ lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java (.../LessonDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -241,7 +241,7 @@ */ @Override public List getLessonsCreatedByUser(Integer userID) { - List lessons = this.doFind(LessonDAO.FIND_LESSON_BY_CREATOR, userID); + List lessons = this.doFindCacheable(LessonDAO.FIND_LESSON_BY_CREATOR, userID); return lessons; } @@ -254,7 +254,7 @@ */ @Override public List getPreviewLessonsBeforeDate(Date startDate) { - List lessons = this.doFind(LessonDAO.FIND_PREVIEW_BEFORE_START_DATE, startDate); + List lessons = this.doFindCacheable(LessonDAO.FIND_PREVIEW_BEFORE_START_DATE, startDate); return lessons; } @@ -265,6 +265,7 @@ public Lesson getLessonForActivity(long activityId) { Query query = getSession().createQuery(LessonDAO.FIND_LESSON_FOR_ACTIVITY); query.setLong("activityId", activityId); + query.setCacheable(true); return (Lesson) query.uniqueResult(); } @@ -276,6 +277,7 @@ public Long[] getLessonActivityIdsForToolContentId(long toolContentId) { Query query = getSession().createQuery(LessonDAO.FIND_LESSON_ACTIVITY_IDS_BY_TOOL_CONTENT_ID); query.setLong("toolContentId", toolContentId); + query.setCacheable(true); List list = query.list(); Long[] longArray = { null, null }; @@ -325,7 +327,7 @@ @Override public List getLessonsByGroup(Integer orgId) { - return this.doFind(LessonDAO.LESSONS_BY_GROUP, orgId); + return this.doFindCacheable(LessonDAO.LESSONS_BY_GROUP, orgId); } /** @@ -334,7 +336,7 @@ @Override public List getLessonsByOriginalLearningDesign(Long ldId, Integer orgId) { Object[] args = { ldId.longValue(), orgId.intValue() }; - List lessons = this.doFind(LessonDAO.LESSONS_WITH_ORIGINAL_LEARNING_DESIGN, args); + List lessons = this.doFindCacheable(LessonDAO.LESSONS_WITH_ORIGINAL_LEARNING_DESIGN, args); return lessons; } @@ -405,9 +407,9 @@ @Override public long[] getPreviewLessonCount() { - Query query = getSession().createQuery(LessonDAO.COUNT_LESSONS); + Query query = getSession().createQuery(LessonDAO.COUNT_LESSONS).setCacheable(true); long allLessons = ((Number) query.uniqueResult()).longValue(); - query = getSession().createQuery(LessonDAO.COUNT_PREVIEW_LESSONS); + query = getSession().createQuery(LessonDAO.COUNT_PREVIEW_LESSONS).setCacheable(true); long previewLessons = ((Number) query.uniqueResult()).longValue(); return new long[] { previewLessons, allLessons }; @@ -416,7 +418,7 @@ @Override @SuppressWarnings("unchecked") public List getPreviewLessons(Integer limit) { - Query query = getSession().createQuery(FIND_PREVIEW_LESSON_IDS); + Query query = getSession().createQuery(FIND_PREVIEW_LESSON_IDS).setCacheable(true); if (limit != null) { query.setMaxResults(limit); } @@ -426,8 +428,8 @@ @Override @SuppressWarnings("unchecked") public List getOrganisationLessons(Integer organisationId) { - Query query = getSession().createQuery(FIND_LESSON_IDS_BY_ORG_ID).setParameter("organisationId", - organisationId); + Query query = getSession().createQuery(FIND_LESSON_IDS_BY_ORG_ID) + .setParameter("organisationId", organisationId).setCacheable(true); return query.list(); } Index: lams_common/src/java/org/lamsfoundation/lams/logevent/dao/hibernate/LogEventDAO.java =================================================================== diff -u -r3443abdf0cbd3a7e1b5caed8f1eacd987d89b5ac -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_common/src/java/org/lamsfoundation/lams/logevent/dao/hibernate/LogEventDAO.java (.../LogEventDAO.java) (revision 3443abdf0cbd3a7e1b5caed8f1eacd987d89b5ac) +++ lams_common/src/java/org/lamsfoundation/lams/logevent/dao/hibernate/LogEventDAO.java (.../LogEventDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -76,20 +76,20 @@ @Override @SuppressWarnings("unchecked") public List getByUser(Integer userId) { - return (List) doFind(GET_LOG_EVENT_BY_USER, userId); + return doFind(GET_LOG_EVENT_BY_USER, userId); } @Override @SuppressWarnings("unchecked") public List getEventsOccurredBetween(Date startDate, Date finishDate) { - return (List) doFind(GET_LOG_EVENTS_OCCURED_BETWEEN_DATES, startDate, finishDate); + return doFind(GET_LOG_EVENTS_OCCURED_BETWEEN_DATES, startDate, finishDate); } /** Get the generic event types */ @Override @SuppressWarnings("unchecked") public List getEventTypes() { - return (List) doFind(GET_LOG_EVENT_TYPES); + return doFindCacheable(GET_LOG_EVENT_TYPES); } /** Get the date of the oldest log event (and not the time) */ Index: lams_common/src/java/org/lamsfoundation/lams/outcome/dao/hibernate/OutcomeDAO.java =================================================================== diff -u -r67db3e1b2ada0d59ff98c807a54282783797c5e6 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_common/src/java/org/lamsfoundation/lams/outcome/dao/hibernate/OutcomeDAO.java (.../OutcomeDAO.java) (revision 67db3e1b2ada0d59ff98c807a54282783797c5e6) +++ lams_common/src/java/org/lamsfoundation/lams/outcome/dao/hibernate/OutcomeDAO.java (.../OutcomeDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -61,7 +61,7 @@ @SuppressWarnings("unchecked") public List getOutcomesSortedByName() { String queryString = FIND_OUTCOMES_SORTED_BY_NAME.replace("?", ""); - return find(queryString); + return doFindCacheable(queryString); } @Override @@ -73,7 +73,7 @@ } queryString = queryString.replace("?", ""); - Query query = getSession().createQuery(queryString); + Query query = getSession().createQuery(queryString).setCacheable(true); if (StringUtils.isNotBlank(search)) { query.setParameter("search", "%" + search + "%"); } @@ -103,7 +103,7 @@ } // find mappings bound to the given lesson/activity/item if (!properties.isEmpty()) { - result.addAll(findByProperties(OutcomeMapping.class, properties)); + result.addAll(findByProperties(OutcomeMapping.class, properties, true)); } // find mappings bound to an activity via its QB questions @@ -113,7 +113,7 @@ if (!qbQuestionIds.isEmpty()) { Query query = getSession() .createQuery(FIND_OUTCOME_MAPPINGS_BY_QUESTION_ID, OutcomeMapping.class) - .setParameter("qbQuestionIds", qbQuestionIds); + .setParameter("qbQuestionIds", qbQuestionIds).setCacheable(true); result.addAll(query.getResultList()); } return result; @@ -125,7 +125,7 @@ @Override @SuppressWarnings("unchecked") public List getScalesSortedByName() { - return find(FIND_SCALES_SORTED_BY_NAME); + return doFindCacheable(FIND_SCALES_SORTED_BY_NAME); } @Override Index: lams_common/src/java/org/lamsfoundation/lams/policies/dao/hibernate/PolicyDAO.java =================================================================== diff -u -r02dd6f814078937b4d1418bbb3b7a31bb531b287 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_common/src/java/org/lamsfoundation/lams/policies/dao/hibernate/PolicyDAO.java (.../PolicyDAO.java) (revision 02dd6f814078937b4d1418bbb3b7a31bb531b287) +++ lams_common/src/java/org/lamsfoundation/lams/policies/dao/hibernate/PolicyDAO.java (.../PolicyDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -22,7 +22,7 @@ @Override public Policy getPolicyByUid(Long uid) { - return (Policy) super.find(Policy.class, uid); + return super.find(Policy.class, uid); } @Override @@ -35,10 +35,11 @@ SQLQuery query = getSession().createSQLQuery(LOAD_POLICIES_WITH_CONSENTS_COUNT); query.addEntity(Policy.class); query.addScalar("userConsentsCount"); + query.setCacheable(true); List resultQuery = query.list(); // this map keeps the insertion order - LinkedList policies = new LinkedList(); + LinkedList policies = new LinkedList<>(); // make the result easier to process for (Object[] entry : resultQuery) { Policy policy = (Policy) entry[0]; @@ -53,7 +54,7 @@ @Override public List getPreviousVersionsPolicies(Long policyId) { String query = "from Policy p where p.policyId=? ORDER BY p.lastModified ASC"; - return (List) doFind(query, policyId); + return doFindCacheable(query, policyId); } @Override @@ -64,6 +65,7 @@ Query query = getSession().createSQLQuery(SQL); query.setInteger("userId", userId); + query.setCacheable(true); Object value = query.uniqueResult(); int result = ((Number) value).intValue(); @@ -82,10 +84,11 @@ query.addScalar("isConsentedByUser"); query.addScalar("dateAgreedOn"); query.setInteger("userId", userId); + query.setCacheable(true); List resultQuery = query.list(); // this map keeps the insertion order - LinkedList policyDtos = new LinkedList(); + LinkedList policyDtos = new LinkedList<>(); // make the result easier to process for (Object[] entry : resultQuery) { Policy policy = (Policy) entry[0]; @@ -106,7 +109,7 @@ @Override public List getConsentsByUserId(Integer userId) { String query = "from PolicyConsent consent where consent.user.userId=? ORDER BY consent.dateAgreedOn ASC"; - return (List) doFind(query, userId); + return doFind(query, userId); } @Override @@ -159,7 +162,7 @@ List list = query.list(); //group by userId as long as it returns all completed visitLogs for each user - List policyConsentDtos = new ArrayList(); + List policyConsentDtos = new ArrayList<>(); for (Object[] element : list) { Integer userId = ((Number) element[0]).intValue(); String login = (String) element[1]; Index: lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java =================================================================== diff -u -r13c335f3d4be6b001b11adf935a122fc3cac0bde -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java (.../QbDAO.java) (revision 13c335f3d4be6b001b11adf935a122fc3cac0bde) +++ lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java (.../QbDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -12,6 +12,7 @@ import javax.persistence.Query; import org.apache.commons.lang.StringUtils; +import org.hibernate.jpa.QueryHints; import org.hibernate.query.NativeQuery; import org.hibernate.type.IntegerType; import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; @@ -141,13 +142,14 @@ Query q = getSession().createQuery(FIND_QUESTIONS_BY_QUESTION_ID, QbQuestion.class); q.setParameter("questionId", questionId); + q.setHint(QueryHints.HINT_CACHEABLE, true); return q.getResultList(); } @Override public List getQuestionsByToolContentId(long toolContentId) { return getSession().createQuery(FIND_QUESTIONS_BY_TOOL_CONTENT_ID, QbQuestion.class) - .setParameter("toolContentId", toolContentId).getResultList(); + .setParameter("toolContentId", toolContentId).setCacheable(true).getResultList(); } @Override @@ -212,7 +214,7 @@ @SuppressWarnings("unchecked") public List getQuestionVersions(long qbQuestionUid) { return this.getSession().createQuery(FIND_QUESTION_VERSIONS).setParameter("qbQuestionUid", qbQuestionUid) - .list(); + .setCacheable(true).list(); } @Override Index: lams_common/src/java/org/lamsfoundation/lams/qb/model/QbOption.java =================================================================== diff -u -rfd9592fa74d56ccd0719c7245b3424b3523f2197 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_common/src/java/org/lamsfoundation/lams/qb/model/QbOption.java (.../QbOption.java) (revision fd9592fa74d56ccd0719c7245b3424b3523f2197) +++ lams_common/src/java/org/lamsfoundation/lams/qb/model/QbOption.java (.../QbOption.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -21,7 +21,6 @@ * @author Marcin Cieslak */ @Entity -@Cacheable @Table(name = "lams_qb_option") public class QbOption implements Serializable, Cloneable, Comparable { private static final long serialVersionUID = -2354311780882736829L; Index: lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java =================================================================== diff -u -rfd9592fa74d56ccd0719c7245b3424b3523f2197 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java (.../QbQuestion.java) (revision fd9592fa74d56ccd0719c7245b3424b3523f2197) +++ lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java (.../QbQuestion.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -34,7 +34,6 @@ * @author Marcin Cieslak */ @Entity -@Cacheable @Table(name = "lams_qb_question") public class QbQuestion implements Serializable, Cloneable { private static final long serialVersionUID = -6287273838239262151L; Index: lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestionUnit.java =================================================================== diff -u -rfd9592fa74d56ccd0719c7245b3424b3523f2197 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestionUnit.java (.../QbQuestionUnit.java) (revision fd9592fa74d56ccd0719c7245b3424b3523f2197) +++ lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestionUnit.java (.../QbQuestionUnit.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -21,7 +21,6 @@ * @author Andrey Balan */ @Entity -@Cacheable @Table(name = "lams_qb_question_unit") public class QbQuestionUnit implements Serializable, Cloneable, Comparable { private static final long serialVersionUID = -6772525485898794744L; Index: lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingCriteriaDAO.java =================================================================== diff -u -rfd9592fa74d56ccd0719c7245b3424b3523f2197 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingCriteriaDAO.java (.../RatingCriteriaDAO.java) (revision fd9592fa74d56ccd0719c7245b3424b3523f2197) +++ lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingCriteriaDAO.java (.../RatingCriteriaDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -123,7 +123,7 @@ @Override public List getRubricsColumnHeaders(int groupId) { return getSession().createQuery(GET_RUBRICS_COLUMN_HEADERS, String.class).setParameter("groupId", groupId) - .getResultList(); + .setCacheable(true).getResultList(); } @Override Index: lams_common/src/java/org/lamsfoundation/lams/rating/model/RatingCriteria.java =================================================================== diff -u -rfd9592fa74d56ccd0719c7245b3424b3523f2197 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_common/src/java/org/lamsfoundation/lams/rating/model/RatingCriteria.java (.../RatingCriteria.java) (revision fd9592fa74d56ccd0719c7245b3424b3523f2197) +++ lams_common/src/java/org/lamsfoundation/lams/rating/model/RatingCriteria.java (.../RatingCriteria.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -84,7 +84,6 @@ */ @Entity -@Cacheable @Table(name = "lams_rating_criteria") @Inheritance(strategy = InheritanceType.SINGLE_TABLE) @DiscriminatorColumn(name = "rating_criteria_type_id", discriminatorType = DiscriminatorType.INTEGER) Index: lams_common/src/java/org/lamsfoundation/lams/signup/dao/hibernate/SignupDAO.java =================================================================== diff -u -re952488de6475350bc2fab3272b5350b3a7a6d51 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_common/src/java/org/lamsfoundation/lams/signup/dao/hibernate/SignupDAO.java (.../SignupDAO.java) (revision e952488de6475350bc2fab3272b5350b3a7a6d51) +++ lams_common/src/java/org/lamsfoundation/lams/signup/dao/hibernate/SignupDAO.java (.../SignupDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -16,7 +16,8 @@ @Override public SignupOrganisation getSignupOrganisation(String context) { - List list = doFind("from SignupOrganisation s where s.disabled=" + Boolean.FALSE + " and s.context=?", context); + List list = doFindCacheable("from SignupOrganisation s where s.disabled=" + Boolean.FALSE + " and s.context=?", + context); if (list != null && list.size() > 0) { return (SignupOrganisation) list.get(0); } @@ -32,7 +33,7 @@ public List getOrganisationCandidates() { String query = "from Organisation o where o.organisationState.organisationStateId=" + OrganisationState.ACTIVE; query += " and o.organisationType.organisationTypeId!=" + OrganisationType.ROOT_TYPE; - return (List) doFind(query); + return doFindCacheable(query); } @Override Index: lams_common/src/java/org/lamsfoundation/lams/themes/dao/hibernate/ThemeDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_common/src/java/org/lamsfoundation/lams/themes/dao/hibernate/ThemeDAO.java (.../ThemeDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_common/src/java/org/lamsfoundation/lams/themes/dao/hibernate/ThemeDAO.java (.../ThemeDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -43,7 +43,7 @@ */ @Override public List getAllThemes() { - return doFind("from Theme c"); + return doFindCacheable("from Theme c"); } /** @@ -53,7 +53,7 @@ @Override public Theme getThemeById(Long themeId) { String queryString = "from Theme c where c.themeId=?"; - List list = (List) doFind(queryString, themeId); + List list = doFind(queryString, themeId); if ((list != null) && (list.size() > 0)) { return list.get(0); } else { @@ -68,7 +68,7 @@ @Override public List getThemeByName(String name) { String queryString = "from Theme c where c.name=?"; - return (List) doFind(queryString, name); + return doFindCacheable(queryString, name); } /** Index: lams_common/src/java/org/lamsfoundation/lams/timezone/dao/hibernate/TimezoneDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_common/src/java/org/lamsfoundation/lams/timezone/dao/hibernate/TimezoneDAO.java (.../TimezoneDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_common/src/java/org/lamsfoundation/lams/timezone/dao/hibernate/TimezoneDAO.java (.../TimezoneDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -20,7 +20,6 @@ * **************************************************************** */ - package org.lamsfoundation.lams.timezone.dao.hibernate; import java.util.List; @@ -47,7 +46,7 @@ @Override public List getDefaultTimezones() { - List timezones = this.doFind(FIND_DEFAULT_TIMEZONES); + List timezones = this.doFindCacheable(FIND_DEFAULT_TIMEZONES); return timezones; } @@ -63,7 +62,7 @@ @Override public Timezone getServerTimezone() { - List list = doFind(FIND_SERVER_TIMEZONE); + List list = doFindCacheable(FIND_SERVER_TIMEZONE); if (list.size() > 0) { return (Timezone) list.get(0); } else { @@ -75,5 +74,4 @@ public void setServerTimezone(Timezone serverTimezone) { super.update(serverTimezone); } - -} +} \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/SystemToolDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/SystemToolDAO.java (.../SystemToolDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/SystemToolDAO.java (.../SystemToolDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -21,7 +21,6 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.dao.hibernate; import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; @@ -36,13 +35,13 @@ @Override public SystemTool getSystemToolByID(final Long systemToolID) { - return (SystemTool) getSession().get(SystemTool.class, systemToolID); + return getSession().get(SystemTool.class, systemToolID); } @Override public SystemTool getSystemToolByActivityTypeId(final Integer activityTypeId) { - return (SystemTool) getSession().createQuery(LOAD_TOOL_BY_ACT_TYPE).setInteger("activityTypeId", activityTypeId) - .uniqueResult(); + return (SystemTool) getSession().createQuery(LOAD_TOOL_BY_ACT_TYPE).setCacheable(true) + .setInteger("activityTypeId", activityTypeId).uniqueResult(); } } Index: lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/ToolDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/ToolDAO.java (.../ToolDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/ToolDAO.java (.../ToolDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -38,32 +38,30 @@ */ @Repository public class ToolDAO extends LAMSBaseDAO implements IToolDAO { - private static final String FIND_ALL = "from obj in class " + Tool.class.getName(); private static final String LOAD_TOOL_BY_SIG = "from tool in class Tool where tool.toolSignature=:toolSignature"; /** * @see org.lamsfoundation.lams.tool.dao.IToolDAO#getToolByID(java.lang.Long) */ @Override public Tool getToolByID(Long toolID) { - return (Tool) getSession().get(Tool.class, toolID); + return getSession().get(Tool.class, toolID); } @Override public List getAllTools() { - return this.doFind(FIND_ALL); + return findAll(Tool.class); } @Override public Tool getToolBySignature(final String toolSignature) { return (Tool) getSession().createQuery(LOAD_TOOL_BY_SIG).setString("toolSignature", toolSignature) - .uniqueResult(); + .setCacheable(true).uniqueResult(); } @Override public long getToolDefaultContentIdBySignature(final String toolSignature) { - Tool tool = (Tool) getSession().createQuery(LOAD_TOOL_BY_SIG).setString("toolSignature", toolSignature) - .uniqueResult(); + Tool tool = getToolBySignature(toolSignature); if (tool != null) { return tool.getDefaultToolContentId(); @@ -76,5 +74,4 @@ public void saveOrUpdateTool(Tool tool) { this.getSession().saveOrUpdate(tool); } - -} +} \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java =================================================================== diff -u -rfd9592fa74d56ccd0719c7245b3424b3523f2197 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java (.../User.java) (revision fd9592fa74d56ccd0719c7245b3424b3523f2197) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java (.../User.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -70,7 +70,6 @@ import org.lamsfoundation.lams.util.LanguageUtil; @Entity -@Cacheable @Table(name = "lams_user") public class User implements Serializable, Comparable { private static final long serialVersionUID = 8711215689846731994L; Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAO.java =================================================================== diff -u -rc1af58895d976d53fba617a4a1eaafc071b8f169 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAO.java (.../OrganisationDAO.java) (revision c1af58895d976d53fba617a4a1eaafc071b8f169) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAO.java (.../OrganisationDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -168,6 +168,7 @@ query.setString("searchString", searchString); query.setFirstResult(page * size); query.setMaxResults(size); + query.setCacheable(true); return query.list(); } @@ -188,6 +189,6 @@ @Override public List getOrganisationsByCodes(Collection codes) { return getSession().createQuery(GET_COURSES_BY_CODES, Organisation.class).setParameter("codes", codes) - .getResultList(); + .setCacheable(true).getResultList(); } } \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java =================================================================== diff -u -r4c272c96c3885f945357ffff697c662ff04d2e75 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java (.../IUserManagementService.java) (revision 4c272c96c3885f945357ffff697c662ff04d2e75) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java (.../IUserManagementService.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -111,6 +111,8 @@ */ List findByProperty(Class clazz, String name, Object value); + List findByProperty(Class clazz, String name, Object value, boolean cache); + List findByPropertyValues(Class clazz, String name, Collection values); /** @@ -120,6 +122,8 @@ */ List findByProperties(Class clazz, Map properties); + List findByProperties(Class clazz, Map properties, boolean cache); + /** * Retrieves users from the specified organisation * Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java =================================================================== diff -u -rdacf1a057fe0f54a632f0d4e3707519b4b0983f6 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java (.../UserManagementService.java) (revision dacf1a057fe0f54a632f0d4e3707519b4b0983f6) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java (.../UserManagementService.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -228,16 +228,26 @@ } @Override + public List findByProperty(Class clazz, String name, Object value, boolean cache) { + return baseDAO.findByProperty(clazz, name, value, cache); + } + + @Override public List findByPropertyValues(Class clazz, String name, Collection values) { return baseDAO.findByPropertyValues(clazz, name, values); } @Override public List findByProperties(Class clazz, Map properties) { - return baseDAO.findByProperties(clazz, properties); + return findByProperties(clazz, properties, false); } @Override + public List findByProperties(Class clazz, Map properties, boolean cache) { + return baseDAO.findByProperties(clazz, properties, cache); + } + + @Override public List getUsersFromOrganisation(Integer orgId) { String query = "select uo.user from UserOrganisation uo" + " where uo.organisation.organisationId=" + orgId + " order by uo.user.login"; @@ -300,9 +310,8 @@ @Override public Organisation getRootOrganisation() { - return baseDAO - .findByProperty(Organisation.class, "organisationType.organisationTypeId", OrganisationType.ROOT_TYPE) - .get(0); + return baseDAO.findByProperty(Organisation.class, "organisationType.organisationTypeId", + OrganisationType.ROOT_TYPE, true).get(0); } @Override @@ -327,7 +336,7 @@ Map properties = new HashMap<>(); properties.put("organisationType.organisationTypeId", typeId); properties.put("organisationState.organisationStateId", stateId); - return baseDAO.findByProperties(Organisation.class, properties); + return baseDAO.findByProperties(Organisation.class, properties, true); } @Override @@ -344,7 +353,6 @@ } @Override - @SuppressWarnings("unchecked") public List getUserOrganisationRoles(Integer orgId, String login) { Map properties = new HashMap<>(); properties.put("userOrganisation.organisation.organisationId", orgId); @@ -941,7 +949,7 @@ @Override public Theme getDefaultTheme() { String htmlName = Configuration.get(ConfigurationKeys.DEFAULT_THEME); - List list = findByProperty(Theme.class, "name", htmlName); + List list = findByProperty(Theme.class, "name", htmlName, true); return list != null ? list.get(0) : null; } Index: lams_common/src/java/org/lamsfoundation/lams/util/LanguageUtil.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_common/src/java/org/lamsfoundation/lams/util/LanguageUtil.java (.../LanguageUtil.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_common/src/java/org/lamsfoundation/lams/util/LanguageUtil.java (.../LanguageUtil.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -117,11 +117,11 @@ String serverCountry = Configuration.get(ConfigurationKeys.SERVER_COUNTRY); return StringUtils.isBlank(serverCountry) ? LanguageUtil.DEFAULT_COUNTRY : serverCountry; } - + /** * Checks whether specified country belongs to the list of allowed country codes. If positive return it, and if not * - default country. - * + * * @param input * @return */ @@ -161,18 +161,18 @@ * default locale. */ public static SupportedLocale getSupportedLocale(String input) { - List list = LanguageUtil.getService().findByProperty(SupportedLocale.class, "languageIsoCode", input); + List list = LanguageUtil.getService().findByProperty(SupportedLocale.class, "languageIsoCode", input, true); if ((list != null) && (list.size() > 0)) { return (SupportedLocale) list.get(0); } else { - list = LanguageUtil.getService().findByProperty(SupportedLocale.class, "countryIsoCode", input); + list = LanguageUtil.getService().findByProperty(SupportedLocale.class, "countryIsoCode", input, true); if ((list != null) && (list.size() > 0)) { return (SupportedLocale) list.get(0); } } return LanguageUtil.getDefaultLocale(); } - + /** * Wrapper method for getSupportedLocaleByNameOrLanguageCode(String input). */ @@ -181,7 +181,7 @@ SupportedLocale supportedLocale = LanguageUtil.getSupportedLocaleByNameOrLanguageCode(localeId); return new Locale(supportedLocale.getLanguageIsoCode(), supportedLocale.getCountryIsoCode()); } - + /** * Searches for a supported locale based on the provided input, first assuming it has "xx_XX" format, then that the * first two letters is a language ISO code. Otherwise returns server default locale. @@ -202,7 +202,7 @@ String localeLanguage = input.substring(0, 2).toLowerCase(); List list = LanguageUtil.getService().findByProperty(SupportedLocale.class, - "languageIsoCode", localeLanguage); + "languageIsoCode", localeLanguage, true); if ((list != null) && (list.size() > 0)) { locale = list.get(0); } @@ -234,7 +234,7 @@ private static SupportedLocale getSupportedLocaleOrNull(String langIsoCode, String countryIsoCode) { SupportedLocale locale = null; - Map properties = new HashMap(); + Map properties = new HashMap<>(); if (StringUtils.isNotBlank(countryIsoCode)) { properties.put("countryIsoCode", countryIsoCode.trim()); @@ -247,7 +247,7 @@ return null; } - List list = LanguageUtil.getService().findByProperties(SupportedLocale.class, properties); + List list = LanguageUtil.getService().findByProperties(SupportedLocale.class, properties, true); if ((list != null) && (list.size() > 0)) { Collections.sort(list); locale = (SupportedLocale) list.get(0); @@ -267,7 +267,7 @@ LanguageUtil.getMessageService(); SupportedLocale lamsDefaultLocale = enforceUsingDefaultLocale ? LanguageUtil.getDefaultLocale() : null; - Map countryCodesMap = new HashMap(); + Map countryCodesMap = new HashMap<>(); for (String countryCode : CommonConstants.COUNTRY_CODES) { String countryName = enforceUsingDefaultLocale ? messageService.getMessage("country." + countryCode, lamsDefaultLocale) Index: lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/dao/hibernate/KumaliveDAO.java =================================================================== diff -u -r7dfa802584b72c21927df5f28425ee7939fcc9c5 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/dao/hibernate/KumaliveDAO.java (.../KumaliveDAO.java) (revision 7dfa802584b72c21927df5f28425ee7939fcc9c5) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/dao/hibernate/KumaliveDAO.java (.../KumaliveDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -54,14 +54,14 @@ @Override @SuppressWarnings("unchecked") public Kumalive findKumalive(Integer organisationId) { - List result = (List) doFind(FIND_CURRENT_KUMALIVE_BY_ORGANISATION, organisationId); + List result = doFindCacheable(FIND_CURRENT_KUMALIVE_BY_ORGANISATION, organisationId); return result.isEmpty() ? null : result.get(0); } @SuppressWarnings("unchecked") @Override public List findRubrics(Integer organisationId) { - return (List) doFind(FIND_RUBRICS_BY_ORGANISATION, organisationId); + return doFindCacheable(FIND_RUBRICS_BY_ORGANISATION, organisationId); } @SuppressWarnings("unchecked") @@ -80,13 +80,13 @@ query.append(" DESC"); } - return (List) doFind(query.toString(), organisationId); + return doFindCacheable(query.toString(), organisationId); } @Override public List findKumalives(List kumaliveIds) { Query query = getSession().createQuery(FIND_KUMALIVES_BY_IDS, Kumalive.class); - query.setParameterList("ids", kumaliveIds); + query.setParameterList("ids", kumaliveIds).setCacheable(true); return query.list(); } @@ -98,19 +98,19 @@ query.append(" DESC"); } - return (List) doFind(query.toString(), kumaliveId); + return doFind(query.toString(), kumaliveId); } @SuppressWarnings("unchecked") @Override public List findKumaliveScore(Long kumaliveId, Integer userId) { - return (List) doFind(FIND_SCORE_BY_KUMALIVE_AND_USER, kumaliveId, userId); + return doFind(FIND_SCORE_BY_KUMALIVE_AND_USER, kumaliveId, userId); } @Override @SuppressWarnings("unchecked") public KumalivePoll findPollByKumaliveId(Long kumaliveId) { - List result = (List) doFind(FIND_CURRENT_POLL_BY_KUMALIVE, kumaliveId); + List result = doFind(FIND_CURRENT_POLL_BY_KUMALIVE, kumaliveId); return result.isEmpty() ? null : result.get(0); } } \ No newline at end of file Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java =================================================================== diff -u -ra39116377d13ac23757521c9a86dc9bf95a140ab -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java (.../MonitoringService.java) (revision a39116377d13ac23757521c9a86dc9bf95a140ab) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java (.../MonitoringService.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -1925,13 +1925,13 @@ @SuppressWarnings("unchecked") @Override public List getArchivedEmailNotifications(Integer organisationId) { - return baseDAO.findByProperty(EmailNotificationArchive.class, "organisationId", organisationId); + return baseDAO.findByProperty(EmailNotificationArchive.class, "organisationId", organisationId, true); } @SuppressWarnings("unchecked") @Override public List getArchivedEmailNotifications(Long lessonId) { - return baseDAO.findByProperty(EmailNotificationArchive.class, "lessonId", lessonId); + return baseDAO.findByProperty(EmailNotificationArchive.class, "lessonId", lessonId, true); } @Override Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentDAOHibernate.java =================================================================== diff -u -rdcdc1487609bd4f00afaa93c09272d84ab0cd325 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentDAOHibernate.java (.../AssessmentDAOHibernate.java) (revision dcdc1487609bd4f00afaa93c09272d84ab0cd325) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentDAOHibernate.java (.../AssessmentDAOHibernate.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -41,7 +41,7 @@ @Override public Assessment getByContentId(Long contentId) { - List list = doFind(GET_RESOURCE_BY_CONTENTID, contentId); + List list = doFindCacheable(GET_RESOURCE_BY_CONTENTID, contentId); if (list.size() > 0) { return (Assessment) list.get(0); } else { Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentQuestionResultDAOHibernate.java =================================================================== diff -u -rfd9592fa74d56ccd0719c7245b3424b3523f2197 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentQuestionResultDAOHibernate.java (.../AssessmentQuestionResultDAOHibernate.java) (revision fd9592fa74d56ccd0719c7245b3424b3523f2197) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentQuestionResultDAOHibernate.java (.../AssessmentQuestionResultDAOHibernate.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -68,7 +68,7 @@ public List getAssessmentQuestionResultList(Long assessmentUid, Long userId, Long questionUid) { Query query = getSession().createQuery(FIND_BY_ASSESSMENT_QUESTION_AND_USER) .setParameter("assessmentUid", assessmentUid).setParameter("userId", userId) - .setParameter("qbToolQuestionUid", questionUid).setCacheable(true); + .setParameter("qbToolQuestionUid", questionUid); return query.getResultList(); } Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java =================================================================== diff -u -r80abc9d8fb675b692eeed5e3bae46c759c8c317a -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java (.../AssessmentResultDAOHibernate.java) (revision 80abc9d8fb675b692eeed5e3bae46c759c8c317a) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java (.../AssessmentResultDAOHibernate.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -190,8 +190,7 @@ @Override public AssessmentResult getLastAssessmentResult(Long assessmentUid, Long userId) { - Query q = getSession().createQuery(FIND_LAST_BY_ASSESSMENT_AND_USER, AssessmentResult.class) - .setCacheable(true); + Query q = getSession().createQuery(FIND_LAST_BY_ASSESSMENT_AND_USER, AssessmentResult.class); q.setParameter("userId", userId); q.setParameter("assessmentUid", assessmentUid); return q.uniqueResult(); @@ -209,7 +208,7 @@ @Override public AssessmentResult getLastFinishedAssessmentResult(Long assessmentUid, Long userId) { Query q = getSession().createQuery(FIND_LAST_FINISHED_BY_ASSESSMENT_AND_USER, - AssessmentResult.class).setCacheable(true); + AssessmentResult.class); q.setParameter("userId", userId); q.setParameter("assessmentUid", assessmentUid); return q.uniqueResult(); Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentSessionDAOHibernate.java =================================================================== diff -u -rfd9592fa74d56ccd0719c7245b3424b3523f2197 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentSessionDAOHibernate.java (.../AssessmentSessionDAOHibernate.java) (revision fd9592fa74d56ccd0719c7245b3424b3523f2197) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentSessionDAOHibernate.java (.../AssessmentSessionDAOHibernate.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -39,8 +39,8 @@ @SuppressWarnings("unchecked") @Override public AssessmentSession getSessionBySessionId(Long sessionId) { - List list = getSession().createQuery(FIND_BY_SESSION_ID) - .setParameter("sessionId", sessionId).setCacheable(true).getResultList(); + List list = getSession().createQuery(FIND_BY_SESSION_ID).setParameter("sessionId", sessionId) + .getResultList(); if (list == null || list.size() == 0) { return null; } @@ -53,7 +53,7 @@ + " as p where p.assessment.contentId=:contectId order by p.sessionName asc"; List result = getSession().createQuery(FIND_BY_CONTENT_ID, AssessmentSession.class) - .setParameter("contectId", toolContentId).list(); + .setParameter("contectId", toolContentId).setCacheable(true).list(); return result; } Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java =================================================================== diff -u -rfd9592fa74d56ccd0719c7245b3424b3523f2197 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java (.../Assessment.java) (revision fd9592fa74d56ccd0719c7245b3424b3523f2197) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java (.../Assessment.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -65,7 +65,6 @@ * @author Andrey Balan */ @Entity -@Cacheable @Table(name = "tl_laasse10_assessment") public class Assessment implements Cloneable { private static final Logger log = Logger.getLogger(Assessment.class); Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentOptionAnswer.java =================================================================== diff -u -rfd9592fa74d56ccd0719c7245b3424b3523f2197 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentOptionAnswer.java (.../AssessmentOptionAnswer.java) (revision fd9592fa74d56ccd0719c7245b3424b3523f2197) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentOptionAnswer.java (.../AssessmentOptionAnswer.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -37,7 +37,6 @@ * @author Andrey Balan */ @Entity -@Cacheable @Table(name = "tl_laasse10_option_answer") public class AssessmentOptionAnswer implements Cloneable { Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java =================================================================== diff -u -rfd9592fa74d56ccd0719c7245b3424b3523f2197 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java (.../AssessmentQuestion.java) (revision fd9592fa74d56ccd0719c7245b3424b3523f2197) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java (.../AssessmentQuestion.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -44,7 +44,6 @@ * @author Andrey Balan */ @Entity -@Cacheable @Table(name = "tl_laasse10_assessment_question") //in this entity's table primary key is "uid", but it references "tool_question_uid" in lams_qb_tool_question @PrimaryKeyJoinColumn(name = "uid") Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java =================================================================== diff -u -rfd9592fa74d56ccd0719c7245b3424b3523f2197 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java (.../AssessmentQuestionResult.java) (revision fd9592fa74d56ccd0719c7245b3424b3523f2197) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java (.../AssessmentQuestionResult.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -52,7 +52,6 @@ * @author Andrey Balan */ @Entity -@Cacheable @Table(name = "tl_laasse10_question_result") //in this entity's table primary key is "uid", but it references "answer_uid" in lams_qb_tool_answer @PrimaryKeyJoinColumn(name = "uid") Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentResult.java =================================================================== diff -u -rfd9592fa74d56ccd0719c7245b3424b3523f2197 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentResult.java (.../AssessmentResult.java) (revision fd9592fa74d56ccd0719c7245b3424b3523f2197) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentResult.java (.../AssessmentResult.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -52,7 +52,6 @@ * @author Andrey Balan */ @Entity -@Cacheable @Table(name = "tl_laasse10_assessment_result") public class AssessmentResult { Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentSession.java =================================================================== diff -u -rfd9592fa74d56ccd0719c7245b3424b3523f2197 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentSession.java (.../AssessmentSession.java) (revision fd9592fa74d56ccd0719c7245b3424b3523f2197) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentSession.java (.../AssessmentSession.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -47,7 +47,6 @@ * @author Andrey Balan */ @Entity -@Cacheable @Table(name = "tl_laasse10_session") public class AssessmentSession { Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dao/hibernate/ChatDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dao/hibernate/ChatDAO.java (.../ChatDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dao/hibernate/ChatDAO.java (.../ChatDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -21,7 +21,6 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.chat.dao.hibernate; import java.util.List; @@ -41,7 +40,7 @@ @Override public Chat getByContentId(Long toolContentId) { - List list = doFind(ChatDAO.FIND_FORUM_BY_CONTENTID, toolContentId); + List list = doFindCacheable(ChatDAO.FIND_FORUM_BY_CONTENTID, toolContentId); if (list != null && list.size() > 0) { return (Chat) list.get(0); } else { Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dao/hibernate/ChatSessionDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dao/hibernate/ChatSessionDAO.java (.../ChatSessionDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dao/hibernate/ChatSessionDAO.java (.../ChatSessionDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -21,7 +21,6 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.chat.dao.hibernate; import java.util.List; @@ -48,7 +47,7 @@ @Override public ChatSession getBySessionId(Long toolSessionId) { - List list = doFind(SQL_QUERY_FIND_BY_SESSION_ID, toolSessionId); + List list = doFindCacheable(SQL_QUERY_FIND_BY_SESSION_ID, toolSessionId); if (list == null || list.isEmpty()) { return null; } Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoDAOHibernate.java =================================================================== diff -u -r8846e87b362ce07b580e3750128c5826e667f7e5 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoDAOHibernate.java (.../DacoDAOHibernate.java) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoDAOHibernate.java (.../DacoDAOHibernate.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -42,7 +42,7 @@ @Override public Daco getByContentId(Long contentId) { - List list = doFind(DacoDAOHibernate.FIND_BY_CONTENT_ID, contentId); + List list = doFindCacheable(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 -r8846e87b362ce07b580e3750128c5826e667f7e5 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoSessionDAOHibernate.java (.../DacoSessionDAOHibernate.java) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoSessionDAOHibernate.java (.../DacoSessionDAOHibernate.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -54,7 +54,7 @@ @Override public DacoSession getSessionBySessionId(Long sessionId) { - List list = doFind(DacoSessionDAOHibernate.FIND_BY_SESSION_ID, sessionId); + List list = doFindCacheable(DacoSessionDAOHibernate.FIND_BY_SESSION_ID, sessionId); if (list == null || list.size() == 0) { return null; } @@ -64,7 +64,7 @@ @Override @SuppressWarnings("unchecked") public List getByContentId(Long toolContentId) { - return (List) doFind(DacoSessionDAOHibernate.FIND_BY_CONTENT_ID, toolContentId); + return doFindCacheable(DacoSessionDAOHibernate.FIND_BY_CONTENT_ID, toolContentId); } @Override @@ -75,7 +75,8 @@ @Override @SuppressWarnings("unchecked") public List statistics(Long toolContentUid) { - NativeQuery query = getSession().createNativeQuery(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) .setParameter("contentUid", toolContentUid) Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dao/hibernate/ForumDao.java =================================================================== diff -u -rb71c9cb2f96eb891545d32aaca8904051d1e00d5 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dao/hibernate/ForumDao.java (.../ForumDao.java) (revision b71c9cb2f96eb891545d32aaca8904051d1e00d5) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dao/hibernate/ForumDao.java (.../ForumDao.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -21,7 +21,6 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.forum.dao.hibernate; import java.util.List; @@ -51,7 +50,7 @@ @Override public Forum getById(Long forumId) { - return (Forum) getSession().get(Forum.class, forumId); + return getSession().get(Forum.class, forumId); } @Override @@ -61,7 +60,7 @@ @Override public Forum getByContentId(Long contentID) { - List list = doFind(ForumDao.FIND_FORUM_BY_CONTENTID, contentID); + List list = doFindCacheable(ForumDao.FIND_FORUM_BY_CONTENTID, contentID); if (list != null && list.size() > 0) { return (Forum) list.get(0); } else { Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dao/hibernate/ForumToolSessionDao.java =================================================================== diff -u -rb71c9cb2f96eb891545d32aaca8904051d1e00d5 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dao/hibernate/ForumToolSessionDao.java (.../ForumToolSessionDao.java) (revision b71c9cb2f96eb891545d32aaca8904051d1e00d5) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dao/hibernate/ForumToolSessionDao.java (.../ForumToolSessionDao.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -21,8 +21,6 @@ * **************************************************************** */ - - package org.lamsfoundation.lams.tool.forum.dao.hibernate; import java.util.List; @@ -57,7 +55,7 @@ @Override public List getByContentId(Long contentID) { - List list = this.doFind(SQL_QUERY_FIND_BY_CONTENT_ID, contentID); + List list = this.doFindCacheable(SQL_QUERY_FIND_BY_CONTENT_ID, contentID); return list; } Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java =================================================================== diff -u -r6132d98ee813109713fda3579007d4359596fc1e -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java (.../ForumService.java) (revision 6132d98ee813109713fda3579007d4359596fc1e) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java (.../ForumService.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -1461,11 +1461,9 @@ } } - @SuppressWarnings("unchecked") @Override public ForumConfigItem getConfigItem(String key) { - List result = forumDao.findByProperty(ForumConfigItem.class, "configKey", - ForumConfigItem.KEY_KEEP_LEARNER_CONTENT); + List result = forumDao.findByProperty(ForumConfigItem.class, "configKey", key, true); return result.isEmpty() ? null : result.get(0); } Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryConfigItemDAOHibernate.java =================================================================== diff -u -r230b4867ed4f106ca02b646ea23b36469452de3c -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryConfigItemDAOHibernate.java (.../ImageGalleryConfigItemDAOHibernate.java) (revision 230b4867ed4f106ca02b646ea23b36469452de3c) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryConfigItemDAOHibernate.java (.../ImageGalleryConfigItemDAOHibernate.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -20,7 +20,6 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.imageGallery.dao.hibernate; import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; @@ -36,7 +35,7 @@ @Override public ImageGalleryConfigItem getConfigItemByKey(final String configKey) { return getSession().createQuery(LOAD_CONFIG_ITEM_BY_KEY, ImageGalleryConfigItem.class) - .setParameter("key", configKey).uniqueResult(); + .setParameter("key", configKey).setCacheable(true).uniqueResult(); } @Override Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryDAOHibernate.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryDAOHibernate.java (.../ImageGalleryDAOHibernate.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryDAOHibernate.java (.../ImageGalleryDAOHibernate.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -43,7 +43,7 @@ @Override public ImageGallery getByContentId(Long contentId) { - List list = doFind(GET_RESOURCE_BY_CONTENTID, contentId); + List list = doFindCacheable(GET_RESOURCE_BY_CONTENTID, contentId); if (list.size() > 0) { return (ImageGallery) list.get(0); } else { Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGallerySessionDAOHibernate.java =================================================================== diff -u -r230b4867ed4f106ca02b646ea23b36469452de3c -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGallerySessionDAOHibernate.java (.../ImageGallerySessionDAOHibernate.java) (revision 230b4867ed4f106ca02b646ea23b36469452de3c) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGallerySessionDAOHibernate.java (.../ImageGallerySessionDAOHibernate.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -40,7 +40,7 @@ @Override public ImageGallerySession getSessionBySessionId(Long sessionId) { - List list = doFind(FIND_BY_SESSION_ID, sessionId); + List list = doFindCacheable(FIND_BY_SESSION_ID, sessionId); if (list == null || list.size() == 0) { return null; } @@ -50,7 +50,7 @@ @Override @SuppressWarnings("unchecked") public List getByContentId(Long toolContentId) { - return (List) doFind(FIND_BY_CONTENT_ID, toolContentId); + return doFindCacheable(FIND_BY_CONTENT_ID, toolContentId); } @Override Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/CommonCartridgeConfigItemDAOHibernate.java =================================================================== diff -u -r8846e87b362ce07b580e3750128c5826e667f7e5 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/CommonCartridgeConfigItemDAOHibernate.java (.../CommonCartridgeConfigItemDAOHibernate.java) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/CommonCartridgeConfigItemDAOHibernate.java (.../CommonCartridgeConfigItemDAOHibernate.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -20,7 +20,6 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.commonCartridge.dao.hibernate; import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; @@ -35,8 +34,8 @@ @Override public CommonCartridgeConfigItem getConfigItemByKey(final String configKey) { - return (CommonCartridgeConfigItem) getSession().createQuery(LOAD_CONFIG_ITEM_BY_KEY).setParameter("key", configKey) - .uniqueResult(); + return (CommonCartridgeConfigItem) getSession().createQuery(LOAD_CONFIG_ITEM_BY_KEY) + .setParameter("key", configKey).setCacheable(true).uniqueResult(); } @Override Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/CommonCartridgeDAOHibernate.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/CommonCartridgeDAOHibernate.java (.../CommonCartridgeDAOHibernate.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/CommonCartridgeDAOHibernate.java (.../CommonCartridgeDAOHibernate.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -41,7 +41,7 @@ @Override public CommonCartridge getByContentId(Long contentId) { - List list = doFind(GET_RESOURCE_BY_CONTENTID, contentId); + List list = doFindCacheable(GET_RESOURCE_BY_CONTENTID, contentId); if (list.size() > 0) { return (CommonCartridge) list.get(0); } else { Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/CommonCartridgeItemDAOHibernate.java =================================================================== diff -u -r2b7e3fbbf396542bef8783e204f2f56e8dc7b803 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/CommonCartridgeItemDAOHibernate.java (.../CommonCartridgeItemDAOHibernate.java) (revision 2b7e3fbbf396542bef8783e204f2f56e8dc7b803) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/CommonCartridgeItemDAOHibernate.java (.../CommonCartridgeItemDAOHibernate.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -39,7 +39,7 @@ @SuppressWarnings("unchecked") @Override public List getAuthoringItems(Long commonCartridgeUid) { - return (List) this.doFind(FIND_AUTHORING_ITEMS, commonCartridgeUid); + return this.doFindCacheable(FIND_AUTHORING_ITEMS, commonCartridgeUid); } @Override Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/CommonCartridgeSessionDAOHibernate.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/CommonCartridgeSessionDAOHibernate.java (.../CommonCartridgeSessionDAOHibernate.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/CommonCartridgeSessionDAOHibernate.java (.../CommonCartridgeSessionDAOHibernate.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -40,7 +40,7 @@ @Override public CommonCartridgeSession getSessionBySessionId(Long sessionId) { - List list = doFind(FIND_BY_SESSION_ID, sessionId); + List list = doFindCacheable(FIND_BY_SESSION_ID, sessionId); if (list == null || list.size() == 0) { return null; } @@ -50,7 +50,7 @@ @Override @SuppressWarnings("unchecked") public List getByContentId(Long toolContentId) { - return (List) doFind(FIND_BY_CONTENT_ID, toolContentId); + return doFindCacheable(FIND_BY_CONTENT_ID, toolContentId); } @Override @@ -62,5 +62,4 @@ public void deleteBySessionId(Long toolSessionId) { this.removeObject(CommonCartridgeSession.class, toolSessionId); } - -} +} \ No newline at end of file Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McContentDAO.java =================================================================== diff -u -rd03a1456d2d0ee7a482273fe35412c67054f133d -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McContentDAO.java (.../McContentDAO.java) (revision d03a1456d2d0ee7a482273fe35412c67054f133d) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McContentDAO.java (.../McContentDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -39,18 +39,19 @@ @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) { - return (McContent) this.getSession().get(McContent.class, uid); + return this.getSession().get(McContent.class, uid); } @SuppressWarnings("rawtypes") @Override public McContent findMcContentById(Long mcContentId) { List list = getSessionFactory().getCurrentSession().createQuery(FIND_MC_CONTENT) - .setParameter("mcContentId", mcContentId.longValue()).list(); + .setParameter("mcContentId", mcContentId.longValue()).setCacheable(true).list(); if (list != null && list.size() > 0) { McContent mc = (McContent) list.get(0); Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java =================================================================== diff -u -r9ca39edffd0c57ba7deeb38316f5a0f7b0d8fe44 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java (.../McQueContentDAO.java) (revision 9ca39edffd0c57ba7deeb38316f5a0f7b0d8fe44) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java (.../McQueContentDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -63,15 +63,17 @@ @SuppressWarnings("unchecked") public List getQuestionsByContentUid(final long contentUid) { List list = getSessionFactory().getCurrentSession() - .createQuery(LOAD_QUESTION_CONTENT_BY_CONTENT_ID).setParameter("contentUid", contentUid).list(); + .createQuery(LOAD_QUESTION_CONTENT_BY_CONTENT_ID).setParameter("contentUid", contentUid) + .setCacheable(true).list(); return list; } @Override 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(); + .setParameter("displayOrder", displayOrder).setParameter("mcContentUid", mcContentUid) + .setCacheable(true).list(); if (list != null && list.size() > 0) { McQueContent mcq = (McQueContent) list.get(0); Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McSessionDAO.java =================================================================== diff -u -rd03a1456d2d0ee7a482273fe35412c67054f133d -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McSessionDAO.java (.../McSessionDAO.java) (revision d03a1456d2d0ee7a482273fe35412c67054f133d) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McSessionDAO.java (.../McSessionDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -47,7 +47,7 @@ public McSession getMcSessionById(Long mcSessionId) { List list = getSessionFactory().getCurrentSession().createQuery(LOAD_MCSESSION_BY_MCSESSIONID) - .setParameter("mcSessionId", mcSessionId).list(); + .setParameter("mcSessionId", mcSessionId).setCacheable(true).list(); if (list != null && list.size() > 0) { McSession mcs = (McSession) list.get(0); @@ -74,7 +74,7 @@ @Override public McSession getMcSessionByUser(final Long userId) { return (McSession) getSession().createQuery(LOAD_MCSESSION_BY_USER).setParameter("userId", userId) - .uniqueResult(); + .setCacheable(true).uniqueResult(); } } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaContentDAO.java =================================================================== diff -u -r86c25c80d92701a94c3161575c76c363891402ad -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaContentDAO.java (.../QaContentDAO.java) (revision 86c25c80d92701a94c3161575c76c363891402ad) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaContentDAO.java (.../QaContentDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -43,7 +43,7 @@ public QaContent getQaByContentId(long qaId) { String query = "from QaContent as qa where qa.qaContentId = :qaContentId"; List list = getSessionFactory().getCurrentSession().createQuery(query).setParameter("qaContentId", qaId) - .list(); + .setCacheable(true).list(); if (list != null && list.size() > 0) { QaContent qa = (QaContent) list.get(0); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQuestionDAO.java =================================================================== diff -u -rf49dd9f6b076828f464fc954bb9c3dc0c87e8b37 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQuestionDAO.java (.../QaQuestionDAO.java) (revision f49dd9f6b076828f464fc954bb9c3dc0c87e8b37) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQuestionDAO.java (.../QaQuestionDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -46,7 +46,7 @@ public QaQueContent getQuestionByDisplayOrder(Integer displayOrder, Long contentUid) { List list = getSessionFactory().getCurrentSession() .createQuery(QaQuestionDAO.LOAD_QUESTION_BY_DISPLAY_ORDER).setParameter("displayOrder", displayOrder) - .setParameter("uid", contentUid).list(); + .setParameter("uid", contentUid).setCacheable(true).list(); if (list != null && list.size() > 0) { QaQueContent qa = list.get(0); @@ -73,7 +73,8 @@ @Override public List getAllQuestionEntriesSorted(final long contentUid) { List list = getSessionFactory().getCurrentSession() - .createQuery(QaQuestionDAO.SORT_QUESTION_BY_DISPLAY_ORDER).setParameter("uid", contentUid).list(); + .createQuery(QaQuestionDAO.SORT_QUESTION_BY_DISPLAY_ORDER).setParameter("uid", contentUid) + .setCacheable(true).list(); return list; } @@ -82,7 +83,8 @@ @Override public List getAllQuestionEntries(final long contentUid) { List list = getSessionFactory().getCurrentSession() - .createQuery(QaQuestionDAO.LOAD_QUESTION_BY_CONTENT_UID).setParameter("uid", contentUid).list(); + .createQuery(QaQuestionDAO.LOAD_QUESTION_BY_CONTENT_UID).setParameter("uid", contentUid) + .setCacheable(true).list(); return list; } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaSessionDAO.java =================================================================== diff -u -r69092337b728f903f824a74377bd0ebf9391120c -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaSessionDAO.java (.../QaSessionDAO.java) (revision 69092337b728f903f824a74377bd0ebf9391120c) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaSessionDAO.java (.../QaSessionDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -20,7 +20,6 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.qa.dao.hibernate; import java.util.List; @@ -43,7 +42,8 @@ @Override public QaSession getQaSessionById(long qaSessionId) { String query = "from QaSession as qus where qus.qaSessionId = :qaSessionId"; - List list = getSessionFactory().getCurrentSession().createQuery(query).setParameter("qaSessionId", qaSessionId).list(); + List list = getSessionFactory().getCurrentSession().createQuery(query) + .setParameter("qaSessionId", qaSessionId).setCacheable(true).list(); if (list != null && list.size() > 0) { QaSession qus = (QaSession) list.get(0); Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceDAOHibernate.java =================================================================== diff -u -r0a46648d9547d3fca73e1931d4e628be7e1acd7b -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceDAOHibernate.java (.../ResourceDAOHibernate.java) (revision 0a46648d9547d3fca73e1931d4e628be7e1acd7b) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceDAOHibernate.java (.../ResourceDAOHibernate.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -41,9 +41,9 @@ @Override public Resource getByContentId(Long contentId) { - List list = (List) doFind(GET_RESOURCE_BY_CONTENTID, contentId); + List list = doFindCacheable(GET_RESOURCE_BY_CONTENTID, contentId); if (list.size() > 0) { - return (Resource) list.get(0); + return list.get(0); } else { return null; } Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceSessionDAOHibernate.java =================================================================== diff -u -r0a46648d9547d3fca73e1931d4e628be7e1acd7b -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceSessionDAOHibernate.java (.../ResourceSessionDAOHibernate.java) (revision 0a46648d9547d3fca73e1931d4e628be7e1acd7b) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceSessionDAOHibernate.java (.../ResourceSessionDAOHibernate.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -40,17 +40,17 @@ @Override public ResourceSession getSessionBySessionId(Long sessionId) { - List list = (List) doFind(FIND_BY_SESSION_ID, sessionId); + List list = doFindCacheable(FIND_BY_SESSION_ID, sessionId); if (list == null || list.size() == 0) { return null; } - return (ResourceSession) list.get(0); + return list.get(0); } @Override @SuppressWarnings("unchecked") public List getByContentId(Long toolContentId) { - return (List) doFind(FIND_BY_CONTENT_ID, toolContentId); + return doFindCacheable(FIND_BY_CONTENT_ID, toolContentId); } @Override Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/dao/hibernate/LeaderselectionDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/dao/hibernate/LeaderselectionDAO.java (.../LeaderselectionDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/dao/hibernate/LeaderselectionDAO.java (.../LeaderselectionDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -21,7 +21,6 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.leaderselection.dao.hibernate; import java.util.List; @@ -41,7 +40,7 @@ @Override public Leaderselection getByContentId(Long toolContentId) { - List list = doFind(LeaderselectionDAO.FIND_FORUM_BY_CONTENTID, toolContentId); + List list = doFindCacheable(LeaderselectionDAO.FIND_FORUM_BY_CONTENTID, toolContentId); if (list != null && list.size() > 0) { return (Leaderselection) list.get(0); } else { Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/dao/hibernate/LeaderselectionSessionDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/dao/hibernate/LeaderselectionSessionDAO.java (.../LeaderselectionSessionDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/dao/hibernate/LeaderselectionSessionDAO.java (.../LeaderselectionSessionDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -21,7 +21,6 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.leaderselection.dao.hibernate; import java.util.List; @@ -48,7 +47,7 @@ @Override public LeaderselectionSession getBySessionId(Long toolSessionId) { - List list = doFind(SQL_QUERY_FIND_BY_SESSION_ID, toolSessionId); + List list = doFindCacheable(SQL_QUERY_FIND_BY_SESSION_ID, toolSessionId); if (list == null || list.isEmpty()) { return null; } Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapDAO.java =================================================================== diff -u -r0ac951a5cbd9d468de8081247c169a6f92123126 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapDAO.java (.../MindmapDAO.java) (revision 0ac951a5cbd9d468de8081247c169a6f92123126) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapDAO.java (.../MindmapDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -21,7 +21,6 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.mindmap.dao.hibernate; import java.util.List; @@ -43,7 +42,7 @@ @Override public Mindmap getByContentId(Long toolContentId) { - List list = doFind(MindmapDAO.FIND_MINDMAP_BY_CONTENTID, toolContentId); + List list = doFindCacheable(MindmapDAO.FIND_MINDMAP_BY_CONTENTID, toolContentId); if (list != null && list.size() > 0) { return (Mindmap) list.get(0); } else { Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapSessionDAO.java =================================================================== diff -u -rceb74e3b4097cf6461280448f904fa21a176aaa4 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapSessionDAO.java (.../MindmapSessionDAO.java) (revision ceb74e3b4097cf6461280448f904fa21a176aaa4) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapSessionDAO.java (.../MindmapSessionDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -21,7 +21,6 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.mindmap.dao.hibernate; import java.util.List; @@ -48,7 +47,7 @@ @Override public MindmapSession getBySessionId(Long toolSessionId) { - List list = doFind(SQL_QUERY_FIND_BY_SESSION_ID, toolSessionId); + List list = doFindCacheable(SQL_QUERY_FIND_BY_SESSION_ID, toolSessionId); if (list == null || list.isEmpty()) { return null; } Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardContentDAO.java =================================================================== diff -u -r8846e87b362ce07b580e3750128c5826e667f7e5 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardContentDAO.java (.../NoticeboardContentDAO.java) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardContentDAO.java (.../NoticeboardContentDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -21,7 +21,6 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.noticeboard.dao.hibernate; import java.util.List; @@ -50,14 +49,14 @@ /** @see org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardContentDAO#getNbContentByUID(java.lang.Long) */ @Override public NoticeboardContent getNbContentByUID(Long uid) { - return (NoticeboardContent) this.getSession().get(NoticeboardContent.class, uid); + return this.getSession().get(NoticeboardContent.class, uid); } /** @see org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardContentDAO#findNbContentById(java.lang.Long) */ @Override public NoticeboardContent findNbContentById(Long nbContentId) { String query = "from NoticeboardContent as nb where nb.nbContentId = ?"; - List content = doFind(query, nbContentId); + List content = doFindCacheable(query, nbContentId); if (content != null && content.size() == 0) { return null; @@ -67,20 +66,26 @@ } - /** @see org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardContentDAO#getNbContentBySession(java.lang.Long) */ + /** + * @see org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardContentDAO#getNbContentBySession(java.lang.Long) + */ @Override public NoticeboardContent getNbContentBySession(final Long nbSessionId) { return (NoticeboardContent) getSession().createQuery(LOAD_NB_BY_SESSION) - .setParameter("sessionId", nbSessionId.longValue()).uniqueResult(); + .setParameter("sessionId", nbSessionId.longValue()).setCacheable(true).uniqueResult(); } - /** @see org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardContentDAO#saveNbContent(org.lamsfoundation.lams.tool.noticeboard.model.NoticeboardContent) */ + /** + * @see org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardContentDAO#saveNbContent(org.lamsfoundation.lams.tool.noticeboard.model.NoticeboardContent) + */ @Override public void saveNbContent(NoticeboardContent nbContent) { this.getSession().save(nbContent); } - /** @see org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardContentDAO#updateNbContent(org.lamsfoundation.lams.tool.noticeboard.model.NoticeboardContent) */ + /** + * @see org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardContentDAO#updateNbContent(org.lamsfoundation.lams.tool.noticeboard.model.NoticeboardContent) + */ @Override public void updateNbContent(NoticeboardContent nbContent) { this.getSession().update(nbContent); @@ -101,13 +106,17 @@ } } - /** @see org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardContentDAO#removeNoticeboard(org.lamsfoundation.lams.tool.noticeboard.model.NoticeboardContent) */ + /** + * @see org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardContentDAO#removeNoticeboard(org.lamsfoundation.lams.tool.noticeboard.model.NoticeboardContent) + */ @Override public void removeNoticeboard(NoticeboardContent nbContent) { removeNoticeboard(nbContent.getNbContentId()); } - /** @see org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardContentDAO#removeNbSessions(org.lamsfoundation.lams.tool.noticeboard.model.NoticeboardContent) */ + /** + * @see org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardContentDAO#removeNbSessions(org.lamsfoundation.lams.tool.noticeboard.model.NoticeboardContent) + */ @Override public void removeNbSessions(NoticeboardContent nbContent) { this.deleteAll(nbContent.getNbSessions()); Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardSessionDAO.java =================================================================== diff -u -r8846e87b362ce07b580e3750128c5826e667f7e5 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardSessionDAO.java (.../NoticeboardSessionDAO.java) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardSessionDAO.java (.../NoticeboardSessionDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -21,7 +21,6 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.noticeboard.dao.hibernate; import java.util.List; @@ -52,7 +51,7 @@ @Override public NoticeboardSession findNbSessionById(Long nbSessionId) { String query = "from NoticeboardSession nbS where nbS.nbSessionId=?"; - List session = (List) doFind(query, nbSessionId); + List session = doFindCacheable(query, nbSessionId); if ((session != null) && (session.size() == 0)) { return null; @@ -61,13 +60,17 @@ } } - /** @see org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardSessionDAO#saveNbSession(org.lamsfoundation.lams.tool.noticeboard.model.NoticeboardSession) */ + /** + * @see org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardSessionDAO#saveNbSession(org.lamsfoundation.lams.tool.noticeboard.model.NoticeboardSession) + */ @Override public void saveNbSession(NoticeboardSession nbSession) { this.getSession().save(nbSession); } - /** @see org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardSessionDAO#updateNbSession(org.lamsfoundation.lams.tool.noticeboard.model.NoticeboardSession) */ + /** + * @see org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardSessionDAO#updateNbSession(org.lamsfoundation.lams.tool.noticeboard.model.NoticeboardSession) + */ @Override public void updateNbSession(NoticeboardSession nbSession) { this.getSession().update(nbSession); @@ -91,7 +94,9 @@ } - /** @see org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardSessionDAO#removeNbSession(org.lamsfoundation.lams.tool.noticeboard.model.NoticeboardSession) */ + /** + * @see org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardSessionDAO#removeNbSession(org.lamsfoundation.lams.tool.noticeboard.model.NoticeboardSession) + */ @Override public void removeNbSession(NoticeboardSession nbSession) { removeNbSession(nbSession.getNbSessionId()); @@ -104,7 +109,9 @@ .setParameter("userId", userId.longValue()).uniqueResult(); } - /** @see org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardSessionDAO#removeNbUsers(org.lamsfoundation.lams.tool.noticeboard.model.NoticeboardSession) */ + /** + * @see org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardSessionDAO#removeNbUsers(org.lamsfoundation.lams.tool.noticeboard.model.NoticeboardSession) + */ @Override public void removeNbUsers(NoticeboardSession nbSession) { deleteAll(nbSession.getNbUsers()); Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/hibernate/NotebookDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/hibernate/NotebookDAO.java (.../NotebookDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/hibernate/NotebookDAO.java (.../NotebookDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -21,7 +21,6 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.notebook.dao.hibernate; import java.util.List; @@ -41,7 +40,7 @@ @Override public Notebook getByContentId(Long toolContentId) { - List list = doFind(NotebookDAO.FIND_FORUM_BY_CONTENTID, toolContentId); + List list = doFindCacheable(NotebookDAO.FIND_FORUM_BY_CONTENTID, toolContentId); if (list != null && list.size() > 0) { return (Notebook) list.get(0); } else { Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/hibernate/NotebookSessionDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/hibernate/NotebookSessionDAO.java (.../NotebookSessionDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/hibernate/NotebookSessionDAO.java (.../NotebookSessionDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -21,7 +21,6 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.notebook.dao.hibernate; import java.util.List; @@ -47,7 +46,7 @@ @Override public NotebookSession getBySessionId(Long toolSessionId) { - List list = doFind(FIND_BY_SESSION_ID, toolSessionId); + List list = doFindCacheable(FIND_BY_SESSION_ID, toolSessionId); if (list == null || list.isEmpty()) { return null; } Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewDAOHibernate.java =================================================================== diff -u -rceb74e3b4097cf6461280448f904fa21a176aaa4 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewDAOHibernate.java (.../PeerreviewDAOHibernate.java) (revision ceb74e3b4097cf6461280448f904fa21a176aaa4) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewDAOHibernate.java (.../PeerreviewDAOHibernate.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -40,20 +40,19 @@ public class PeerreviewDAOHibernate extends LAMSBaseDAO implements PeerreviewDAO { private static final String GET_RESOURCE_BY_CONTENTID = "from " + Peerreview.class.getName() + " as r where r.contentId=?"; - - // ANY_VALUE is needed for Mysql setting ONLY_FULL_GROUP_BY - the sessionName will always be the same + + // ANY_VALUE is needed for Mysql setting ONLY_FULL_GROUP_BY - the sessionName will always be the same // as it is from the same table as sessionId. (LDEV-4222) private static final String GET_STATS = "SELECT s.session_id as \"sessionId\", ANY_VALUE(s.session_name) as \"sessionName\", " + " count(u.uid) as \"numLearnersInSession\", sum(u.session_finished) as \"numLearnersComplete\" " + " FROM tl_laprev11_session s " + " JOIN tl_laprev11_peerreview p ON p.content_id = :toolContentId AND s.peerreview_uid = p.uid " - + " LEFT JOIN tl_laprev11_user u ON u.session_uid = s.uid " - + " GROUP BY session_id"; + + " LEFT JOIN tl_laprev11_user u ON u.session_uid = s.uid " + " GROUP BY session_id"; @SuppressWarnings("rawtypes") @Override public Peerreview getByContentId(Long contentId) { - List list = find(GET_RESOURCE_BY_CONTENTID, contentId); + List list = doFindCacheable(GET_RESOURCE_BY_CONTENTID, contentId); if (list.size() > 0) { return (Peerreview) list.get(0); } else { @@ -69,10 +68,8 @@ @SuppressWarnings("unchecked") @Override public List getStatistics(Long toolContentId) { - return getSession().createSQLQuery(GET_STATS) - .setParameter("toolContentId", toolContentId) - .setResultTransformer( Transformers.aliasToBean( PeerreviewStatisticsDTO.class ) ) - .list(); - + return getSession().createSQLQuery(GET_STATS).setParameter("toolContentId", toolContentId) + .setResultTransformer(Transformers.aliasToBean(PeerreviewStatisticsDTO.class)).list(); + } } Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewSessionDAOHibernate.java =================================================================== diff -u -r1042117ad93a6a9f93d8b1c8be7e718b7efd383f -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewSessionDAOHibernate.java (.../PeerreviewSessionDAOHibernate.java) (revision 1042117ad93a6a9f93d8b1c8be7e718b7efd383f) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewSessionDAOHibernate.java (.../PeerreviewSessionDAOHibernate.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -39,7 +39,7 @@ @Override @SuppressWarnings("rawtypes") public PeerreviewSession getSessionBySessionId(Long sessionId) { - List list = find(FIND_BY_SESSION_ID, sessionId); + List list = doFindCacheable(FIND_BY_SESSION_ID, sessionId); if (list == null || list.size() == 0) { return null; } @@ -49,7 +49,7 @@ @SuppressWarnings("unchecked") @Override public List getByContentId(Long toolContentId) { - return find(FIND_BY_CONTENT_ID, toolContentId); + return doFindCacheable(FIND_BY_CONTENT_ID, toolContentId); } @Override Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesContentDAO.java =================================================================== diff -u -r7694dd245cc58c5b7beb2348aaefb2762c47dc8d -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesContentDAO.java (.../SubmitFilesContentDAO.java) (revision 7694dd245cc58c5b7beb2348aaefb2762c47dc8d) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesContentDAO.java (.../SubmitFilesContentDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -21,8 +21,6 @@ * **************************************************************** */ - - package org.lamsfoundation.lams.tool.sbmt.dao.hibernate; import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; @@ -38,7 +36,7 @@ @Override public SubmitFilesContent getContentByID(Long contentID) { - return (SubmitFilesContent) super.find(SubmitFilesContent.class, contentID); + return super.find(SubmitFilesContent.class, contentID); } @Override Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesSessionDAO.java =================================================================== diff -u -r7694dd245cc58c5b7beb2348aaefb2762c47dc8d -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesSessionDAO.java (.../SubmitFilesSessionDAO.java) (revision 7694dd245cc58c5b7beb2348aaefb2762c47dc8d) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesSessionDAO.java (.../SubmitFilesSessionDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -21,8 +21,6 @@ * **************************************************************** */ - - package org.lamsfoundation.lams.tool.sbmt.dao.hibernate; import java.util.List; @@ -43,7 +41,7 @@ @Override public SubmitFilesSession getSessionByID(Long sessionID) { - return (SubmitFilesSession) super.find(SubmitFilesSession.class, sessionID); + return super.find(SubmitFilesSession.class, sessionID); } @Override @@ -55,7 +53,7 @@ public List getSubmitFilesSessionByContentID(Long contentID) { if (contentID != null) { return getSession().createQuery(FIND_LEARNER_BY_CONTENT_ID, SubmitFilesSession.class) - .setParameter("contentID", contentID).list(); + .setParameter("contentID", contentID).setCacheable(true).list(); } return null; } Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieConfigItemDAOHibernate.java =================================================================== diff -u -r22ca3de0e9fe138e44fc36be1abc6fabbbdc4002 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieConfigItemDAOHibernate.java (.../ScratchieConfigItemDAOHibernate.java) (revision 22ca3de0e9fe138e44fc36be1abc6fabbbdc4002) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieConfigItemDAOHibernate.java (.../ScratchieConfigItemDAOHibernate.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -20,7 +20,6 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.scratchie.dao.hibernate; import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; @@ -35,7 +34,7 @@ @Override public ScratchieConfigItem getConfigItemByKey(final String configKey) { - return getSession().createQuery(LOAD_CONFIG_ITEM_BY_KEY, ScratchieConfigItem.class) + return getSession().createQuery(LOAD_CONFIG_ITEM_BY_KEY, ScratchieConfigItem.class).setCacheable(true) .setParameter("key", configKey).uniqueResult(); } Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieDAOHibernate.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieDAOHibernate.java (.../ScratchieDAOHibernate.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieDAOHibernate.java (.../ScratchieDAOHibernate.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -37,7 +37,7 @@ @Override public Scratchie getByContentId(Long contentId) { - List list = doFind(GET_RESOURCE_BY_CONTENTID, contentId); + List list = doFindCacheable(GET_RESOURCE_BY_CONTENTID, contentId); if (list.size() > 0) { return (Scratchie) list.get(0); } else { Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieItemDAOHibernate.java =================================================================== diff -u -r06d090eefddaafa108bcd8614d47d3d92f946210 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieItemDAOHibernate.java (.../ScratchieItemDAOHibernate.java) (revision 06d090eefddaafa108bcd8614d47d3d92f946210) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieItemDAOHibernate.java (.../ScratchieItemDAOHibernate.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -39,7 +39,7 @@ @SuppressWarnings("unchecked") @Override public List getAuthoringItems(Long scratchieUid) { - return (List) doFind(FIND_AUTHORING_ITEMS, scratchieUid); + return doFindCacheable(FIND_AUTHORING_ITEMS, scratchieUid); } @Override Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieSessionDAOHibernate.java =================================================================== diff -u -r7d3b934bc907a2696392a3b75b3ffc1322d74fe9 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieSessionDAOHibernate.java (.../ScratchieSessionDAOHibernate.java) (revision 7d3b934bc907a2696392a3b75b3ffc1322d74fe9) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieSessionDAOHibernate.java (.../ScratchieSessionDAOHibernate.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -54,7 +54,7 @@ @SuppressWarnings("rawtypes") @Override public ScratchieSession getSessionBySessionId(Long sessionId) { - List list = doFind(FIND_BY_SESSION_ID, sessionId); + List list = doFindCacheable(FIND_BY_SESSION_ID, sessionId); if (list == null || list.size() == 0) { return null; } @@ -64,7 +64,7 @@ @Override @SuppressWarnings("unchecked") public List getByContentId(Long toolContentId) { - List sessions = doFind(FIND_BY_CONTENT_ID, toolContentId); + List sessions = doFindCacheable(FIND_BY_CONTENT_ID, toolContentId); Set sortedSessions = new TreeSet<>(new ScratchieSessionComparator()); sortedSessions.addAll(sessions); Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dao/hibernate/ScribeDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dao/hibernate/ScribeDAO.java (.../ScribeDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dao/hibernate/ScribeDAO.java (.../ScribeDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -21,7 +21,6 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.scribe.dao.hibernate; import java.util.List; @@ -41,7 +40,7 @@ @Override public Scribe getByContentId(Long toolContentId) { - List list = doFind(FIND_FORUM_BY_CONTENTID, toolContentId); + List list = doFindCacheable(FIND_FORUM_BY_CONTENTID, toolContentId); if (list != null && list.size() > 0) { return (Scribe) list.get(0); } else { Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dao/hibernate/ScribeSessionDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dao/hibernate/ScribeSessionDAO.java (.../ScribeSessionDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dao/hibernate/ScribeSessionDAO.java (.../ScribeSessionDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -21,7 +21,6 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.scribe.dao.hibernate; import java.util.List; @@ -48,7 +47,7 @@ @Override public ScribeSession getBySessionId(Long toolSessionId) { - List list = doFind(SQL_QUERY_FIND_BY_SESSION_ID, toolSessionId); + List list = doFindCacheable(SQL_QUERY_FIND_BY_SESSION_ID, toolSessionId); if (list == null || list.isEmpty()) { return null; } Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/hibernate/SpreadsheetDAOHibernate.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/hibernate/SpreadsheetDAOHibernate.java (.../SpreadsheetDAOHibernate.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/hibernate/SpreadsheetDAOHibernate.java (.../SpreadsheetDAOHibernate.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -43,7 +43,7 @@ @Override public Spreadsheet getByContentId(Long contentId) { - List list = doFind(GET_RESOURCE_BY_CONTENTID, contentId); + List list = doFindCacheable(GET_RESOURCE_BY_CONTENTID, contentId); if (list.size() > 0) { return (Spreadsheet) list.get(0); } else { Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/hibernate/SpreadsheetSessionDAOHibernate.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/hibernate/SpreadsheetSessionDAOHibernate.java (.../SpreadsheetSessionDAOHibernate.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/hibernate/SpreadsheetSessionDAOHibernate.java (.../SpreadsheetSessionDAOHibernate.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -40,7 +40,7 @@ @Override public SpreadsheetSession getSessionBySessionId(Long sessionId) { - List list = doFind(FIND_BY_SESSION_ID, sessionId); + List list = doFindCacheable(FIND_BY_SESSION_ID, sessionId); if (list == null || list.size() == 0) { return null; } @@ -50,7 +50,7 @@ @Override @SuppressWarnings("unchecked") public List getByContentId(Long toolContentId) { - return (List) doFind(FIND_BY_CONTENT_ID, toolContentId); + return doFindCacheable(FIND_BY_CONTENT_ID, toolContentId); } @Override Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyDAOHibernate.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyDAOHibernate.java (.../SurveyDAOHibernate.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyDAOHibernate.java (.../SurveyDAOHibernate.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -44,7 +44,7 @@ @Override public Survey getByContentId(Long contentId) { - List list = doFind(SurveyDAOHibernate.GET_RESOURCE_BY_CONTENTID, contentId); + List list = doFindCacheable(SurveyDAOHibernate.GET_RESOURCE_BY_CONTENTID, contentId); if (list.size() > 0) { return (Survey) list.get(0); } else { Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveySessionDAOHibernate.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveySessionDAOHibernate.java (.../SurveySessionDAOHibernate.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveySessionDAOHibernate.java (.../SurveySessionDAOHibernate.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -40,7 +40,7 @@ @Override public SurveySession getSessionBySessionId(Long sessionId) { - List list = doFind(FIND_BY_SESSION_ID, sessionId); + List list = doFindCacheable(FIND_BY_SESSION_ID, sessionId); if (list == null || list.size() == 0) { return null; } @@ -50,7 +50,7 @@ @Override @SuppressWarnings("unchecked") public List getByContentId(Long toolContentId) { - return (List) doFind(FIND_BY_CONTENT_ID, toolContentId); + return doFindCacheable(FIND_BY_CONTENT_ID, toolContentId); } @Override Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListDAOHibernate.java =================================================================== diff -u -r0b3631fb6cd93265967ec5d314313e15999d9061 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListDAOHibernate.java (.../TaskListDAOHibernate.java) (revision 0b3631fb6cd93265967ec5d314313e15999d9061) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListDAOHibernate.java (.../TaskListDAOHibernate.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -43,7 +43,7 @@ @Override public TaskList getByContentId(Long contentId) { - List list = doFind(GET_RESOURCE_BY_CONTENTID, contentId); + List list = doFindCacheable(GET_RESOURCE_BY_CONTENTID, contentId); if (list.size() > 0) { return (TaskList) list.get(0); } else { Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListSessionDAOHibernate.java =================================================================== diff -u -r0b3631fb6cd93265967ec5d314313e15999d9061 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListSessionDAOHibernate.java (.../TaskListSessionDAOHibernate.java) (revision 0b3631fb6cd93265967ec5d314313e15999d9061) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListSessionDAOHibernate.java (.../TaskListSessionDAOHibernate.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -46,7 +46,7 @@ @Override public TaskListSession getSessionBySessionId(Long sessionId) { - List list = doFind(FIND_BY_SESSION_ID, sessionId); + List list = doFindCacheable(FIND_BY_SESSION_ID, sessionId); if (list == null || list.size() == 0) { return null; } @@ -56,7 +56,7 @@ @Override @SuppressWarnings("unchecked") public List getByContentId(Long toolContentId) { - return (List) doFind(FIND_BY_CONTENT_ID, toolContentId); + return doFindCacheable(FIND_BY_CONTENT_ID, toolContentId); } @Override Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteContentDAO.java =================================================================== diff -u -r374f1e3729c3892074184bbd480ae87bce110cfd -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteContentDAO.java (.../VoteContentDAO.java) (revision 374f1e3729c3892074184bbd480ae87bce110cfd) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteContentDAO.java (.../VoteContentDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -62,7 +62,7 @@ public VoteContent getVoteContentByContentId(Long voteContentId) { String query = "from VoteContent as vote where vote.voteContentId = :voteContentId"; List list = getSessionFactory().getCurrentSession().createQuery(query) - .setParameter("voteContentId", voteContentId).list(); + .setParameter("voteContentId", voteContentId).setCacheable(true).list(); if (list != null && list.size() > 0) { VoteContent vote = list.get(0); @@ -74,7 +74,7 @@ @Override public VoteContent getVoteContentBySession(final Long voteSessionId) { return (VoteContent) getSession().createQuery(VoteContentDAO.LOAD_VOTE_BY_SESSION) - .setParameter("sessionId", voteSessionId).uniqueResult(); + .setParameter("sessionId", voteSessionId).setCacheable(true).uniqueResult(); } @Override Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteQueContentDAO.java =================================================================== diff -u -r374f1e3729c3892074184bbd480ae87bce110cfd -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteQueContentDAO.java (.../VoteQueContentDAO.java) (revision 374f1e3729c3892074184bbd480ae87bce110cfd) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteQueContentDAO.java (.../VoteQueContentDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -53,7 +53,8 @@ public VoteQueContent getDefaultVoteContentFirstQuestion() { final long voteContentId = 1; List list = getSessionFactory().getCurrentSession() - .createQuery(LOAD_QUESTION_CONTENT_BY_CONTENT_ID).setParameter("voteContentId", voteContentId).list(); + .createQuery(LOAD_QUESTION_CONTENT_BY_CONTENT_ID).setParameter("voteContentId", voteContentId) + .setCacheable(true).list(); if (list != null && list.size() > 0) { VoteQueContent voteq = list.get(0); @@ -66,8 +67,9 @@ @Override public VoteQueContent getQuestionByDisplayOrder(final Long displayOrder, final Long voteContentUid) { List list = getSessionFactory().getCurrentSession() - .createQuery(LOAD_QUESTION_CONTENT_BY_DISPLAY_ORDER).setParameter("displayOrder", displayOrder.intValue()) - .setParameter("voteContentUid", voteContentUid).list(); + .createQuery(LOAD_QUESTION_CONTENT_BY_DISPLAY_ORDER) + .setParameter("displayOrder", displayOrder.intValue()).setParameter("voteContentUid", voteContentUid) + .setCacheable(true).list(); if (list != null && list.size() > 0) { VoteQueContent voteq = list.get(0); @@ -81,7 +83,7 @@ public List getAllQuestionsSorted(final long voteContentId) { List list = getSessionFactory().getCurrentSession() .createQuery(SORT_QUESTION_CONTENT_BY_DISPLAY_ORDER).setParameter("voteContentId", voteContentId) - .list(); + .setCacheable(true).list(); return list; } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteSessionDAO.java =================================================================== diff -u -r374f1e3729c3892074184bbd480ae87bce110cfd -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteSessionDAO.java (.../VoteSessionDAO.java) (revision 374f1e3729c3892074184bbd480ae87bce110cfd) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteSessionDAO.java (.../VoteSessionDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -61,7 +61,7 @@ String query = "from VoteSession votes where votes.voteSessionId=:voteSessionId"; List list = getSessionFactory().getCurrentSession().createQuery(query) - .setParameter("voteSessionId", voteSessionId).list(); + .setParameter("voteSessionId", voteSessionId).setCacheable(true).list(); if (list != null && list.size() > 0) { VoteSession vote = list.get(0); Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dao/hibernate/WikiDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dao/hibernate/WikiDAO.java (.../WikiDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dao/hibernate/WikiDAO.java (.../WikiDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -21,7 +21,6 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.wiki.dao.hibernate; import java.util.HashSet; @@ -45,7 +44,7 @@ @Override public Wiki getByContentId(Long toolContentId) { - List list = doFind(FIND_FORUM_BY_CONTENTID, toolContentId); + List list = doFindCacheable(FIND_FORUM_BY_CONTENTID, toolContentId); if (list != null && list.size() > 0) { Wiki wiki = (Wiki) list.get(0); removeDuplicatePages(wiki); @@ -72,13 +71,13 @@ public void removeDuplicatePages(Wiki wiki) { Set wikiPages = wiki.getWikiPages(); if (wikiPages != null) { - Set wikiPagesCopy = new HashSet(wikiPages); + Set wikiPagesCopy = new HashSet<>(wikiPages); Iterator it = wikiPages.iterator(); while (it.hasNext()) { WikiPage page = it.next(); if (containsDuplicate(page, wikiPagesCopy)) { it.remove(); - wikiPagesCopy = new HashSet(wikiPages); + wikiPagesCopy = new HashSet<>(wikiPages); } } } Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dao/hibernate/WikiSessionDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2188972474f8d186d6811e3dea2e4136be669335 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dao/hibernate/WikiSessionDAO.java (.../WikiSessionDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dao/hibernate/WikiSessionDAO.java (.../WikiSessionDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) @@ -21,7 +21,6 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.wiki.dao.hibernate; import java.util.List; @@ -48,7 +47,7 @@ @Override public WikiSession getBySessionId(Long toolSessionId) { - List list = this.doFind(SQL_QUERY_FIND_BY_SESSION_ID, toolSessionId); + List list = this.doFindCacheable(SQL_QUERY_FIND_BY_SESSION_ID, toolSessionId); if (list == null || list.isEmpty()) { return null; }