Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java =================================================================== diff -u -r2188972474f8d186d6811e3dea2e4136be669335 -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java (.../Activity.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java (.../Activity.java) (revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29) @@ -33,7 +33,6 @@ import java.util.TreeSet; import java.util.Vector; -import javax.persistence.Cacheable; import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.DiscriminatorColumn; @@ -57,6 +56,8 @@ import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; +import org.hibernate.annotations.Cache; +import org.hibernate.annotations.CacheConcurrencyStrategy; import org.lamsfoundation.lams.learningdesign.dto.AuthoringActivityDTO; import org.lamsfoundation.lams.learningdesign.dto.BranchActivityEntryDTO; import org.lamsfoundation.lams.learningdesign.dto.LibraryActivityDTO; @@ -259,13 +260,15 @@ @ManyToMany @JoinTable(name = "lams_input_activity", joinColumns = @JoinColumn(name = "activity_id"), inverseJoinColumns = @JoinColumn(name = "input_activity_id")) @OrderBy("activity_id") + @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) private Set inputActivities = new HashSet<>(); /** * The BranchActivityEntries that map conditions to this Activity; bi-directional association required (e.g. * LDEV-1910) */ @OneToMany(mappedBy = "branchingActivity", cascade = CascadeType.ALL, orphanRemoval = true) + @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) private Set branchActivityEntries = new HashSet<>(); // --------------------------------------------------------------------- @@ -937,7 +940,7 @@ } public boolean isActivityReadOnly() { - return readOnly.equals(Boolean.TRUE); + return readOnly; } // --------------------------------------------------------------------- Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java =================================================================== diff -u -r1ee503e3d0e0228ea8a45025fddf15d9623c0377 -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java (.../ComplexActivity.java) (revision 1ee503e3d0e0228ea8a45025fddf15d9623c0377) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java (.../ComplexActivity.java) (revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29) @@ -39,6 +39,8 @@ import javax.persistence.Transient; import org.apache.commons.lang.builder.ToStringBuilder; +import org.hibernate.annotations.Cache; +import org.hibernate.annotations.CacheConcurrencyStrategy; import org.hibernate.annotations.Cascade; import org.hibernate.annotations.CascadeType; import org.hibernate.annotations.SortComparator; @@ -57,7 +59,8 @@ @OneToMany(mappedBy = "parentActivity", fetch = FetchType.EAGER) @Cascade(CascadeType.SAVE_UPDATE) @SortComparator(ActivityOrderComparator.class) - private Set activities = new TreeSet(new ActivityOrderComparator()); + @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) + private Set activities = new TreeSet<>(new ActivityOrderComparator()); @OneToOne(fetch = FetchType.LAZY) @JoinColumn(name = "default_activity_id") @@ -180,7 +183,7 @@ @Override public Set getAuthoringActivityDTOSet(ArrayList branchMappings, String languageCode) { - Set dtoSet = new TreeSet(new ActivityDTOOrderComparator()); + Set dtoSet = new TreeSet<>(new ActivityDTOOrderComparator()); dtoSet.add(new AuthoringActivityDTO(this, branchMappings, languageCode)); // add parent activity // add the DTO for all child activities Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java =================================================================== diff -u -r2188972474f8d186d6811e3dea2e4136be669335 -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java (.../LearningDesign.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java (.../LearningDesign.java) (revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29) @@ -32,7 +32,6 @@ import java.util.SortedSet; import java.util.TreeSet; -import javax.persistence.Cacheable; import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; @@ -147,9 +146,11 @@ private LearningDesign originalLearningDesign; @OneToMany(mappedBy = "learningDesign") + @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) private Set lessons = new HashSet<>(); @OneToMany(mappedBy = "learningDesign", cascade = CascadeType.ALL, orphanRemoval = true) + @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) private Set transitions = new HashSet<>(); @OneToMany(mappedBy = "learningDesign", cascade = CascadeType.ALL, orphanRemoval = true) @@ -158,9 +159,11 @@ private Set activities = new TreeSet<>(new ActivityOrderComparator()); @OneToMany(mappedBy = "learningDesign", cascade = CascadeType.ALL, orphanRemoval = true) + @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) private Set competences = new HashSet<>(); @OneToMany(mappedBy = "learningDesignId", cascade = CascadeType.ALL, orphanRemoval = true) + @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) private Set annotations = new HashSet<>(); @ManyToOne(fetch = FetchType.LAZY) Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningLibrary.java =================================================================== diff -u -raaa9a8f28fa1b2a222690dbb3a2d7647efb30cd5 -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningLibrary.java (.../LearningLibrary.java) (revision aaa9a8f28fa1b2a222690dbb3a2d7647efb30cd5) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningLibrary.java (.../LearningLibrary.java) (revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29) @@ -39,6 +39,8 @@ import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; +import org.hibernate.annotations.Cache; +import org.hibernate.annotations.CacheConcurrencyStrategy; /** * @author Manpreet Minhas @@ -63,6 +65,7 @@ private Date createDateTime; @OneToMany(mappedBy = "learningLibrary") + @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) private Set activities = new HashSet(); @Column(name = "valid_flag") Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java =================================================================== diff -u -r47043f84205046a23497bf8c57060e2dcadf0c9a -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java (.../SequenceActivity.java) (revision 47043f84205046a23497bf8c57060e2dcadf0c9a) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java (.../SequenceActivity.java) (revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29) @@ -41,6 +41,8 @@ import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.log4j.Logger; +import org.hibernate.annotations.Cache; +import org.hibernate.annotations.CacheConcurrencyStrategy; import org.lamsfoundation.lams.learningdesign.dto.ValidationErrorDTO; import org.lamsfoundation.lams.learningdesign.strategy.SequenceActivityStrategy; import org.lamsfoundation.lams.tool.SystemTool; @@ -59,7 +61,8 @@ private static Logger log = Logger.getLogger(SequenceActivity.class); @OneToMany(mappedBy = "branchSequenceActivity", cascade = CascadeType.ALL, orphanRemoval = true) - private Set branchEntries = new HashSet(); + @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) + private Set branchEntries = new HashSet<>(); @ManyToOne(fetch = FetchType.EAGER) @JoinColumn(name = "system_tool_id") @@ -137,7 +140,7 @@ public SortedSet getGroupsForBranch() { Set mappingEntries = getBranchEntries(); - TreeSet sortedGroups = new TreeSet(); + TreeSet sortedGroups = new TreeSet<>(); if (mappingEntries != null) { Iterator mappingIter = mappingEntries.iterator(); @@ -182,7 +185,7 @@ */ @Override public Vector validateActivity(MessageService messageService) { - Vector listOfValidationErrors = new Vector(); + Vector listOfValidationErrors = new Vector<>(); if (getActivities() != null && getActivities().size() > 0 && getDefaultActivity() == null) { listOfValidationErrors.add( new ValidationErrorDTO(ValidationErrorDTO.SEQUENCE_ACTIVITY_MUST_HAVE_FIRST_ACTIVITY_ERROR_CODE, Index: lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java =================================================================== diff -u -r2188972474f8d186d6811e3dea2e4136be669335 -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 --- lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java (.../Lesson.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) +++ lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java (.../Lesson.java) (revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29) @@ -27,7 +27,6 @@ import java.util.HashSet; import java.util.Set; -import javax.persistence.Cacheable; import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.ColumnResult; @@ -51,6 +50,8 @@ import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; +import org.hibernate.annotations.Cache; +import org.hibernate.annotations.CacheConcurrencyStrategy; import org.lamsfoundation.lams.gradebook.GradebookUserLesson; import org.lamsfoundation.lams.learningdesign.LearningDesign; import org.lamsfoundation.lams.lesson.dto.LessonDetailsDTO; @@ -267,10 +268,12 @@ */ @ManyToMany @JoinTable(name = "lams_lesson_dependency", joinColumns = @JoinColumn(name = "lesson_id"), inverseJoinColumns = @JoinColumn(name = "preceding_lesson_id")) + @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) private Set precedingLessons = new HashSet<>(); @ManyToMany @JoinTable(name = "lams_lesson_dependency", joinColumns = @JoinColumn(name = "preceding_lesson_id"), inverseJoinColumns = @JoinColumn(name = "lesson_id")) + @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) private Set succeedingLessons = new HashSet<>(); // --------------------------------------------------------------------- Index: lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java =================================================================== diff -u -rf95c86fefb27fbad60e46af80e1a487bae53561a -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 --- lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java (.../Tool.java) (revision f95c86fefb27fbad60e46af80e1a487bae53561a) +++ lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java (.../Tool.java) (revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29) @@ -41,6 +41,8 @@ import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; +import org.hibernate.annotations.Cache; +import org.hibernate.annotations.CacheConcurrencyStrategy; import org.lamsfoundation.lams.integration.ExtServerToolAdapterMap; import org.lamsfoundation.lams.learningdesign.ToolActivity; @@ -104,6 +106,7 @@ @OneToMany(fetch = FetchType.EAGER) @JoinColumn(name = "tool_id") + @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) private Set mappedServers = new HashSet(); @Column(name = "grouping_support_type_id") Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java =================================================================== diff -u -r1ee503e3d0e0228ea8a45025fddf15d9623c0377 -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java (.../Organisation.java) (revision 1ee503e3d0e0228ea8a45025fddf15d9623c0377) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java (.../Organisation.java) (revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29) @@ -43,6 +43,8 @@ import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; +import org.hibernate.annotations.Cache; +import org.hibernate.annotations.CacheConcurrencyStrategy; import org.hibernate.annotations.LazyCollection; import org.hibernate.annotations.LazyCollectionOption; import org.lamsfoundation.lams.lesson.Lesson; @@ -79,21 +81,25 @@ private User createdBy; @OneToMany(mappedBy = "organisationID", cascade = CascadeType.ALL, orphanRemoval = true) - private Set workspaceFolders = new HashSet(); + @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) + private Set workspaceFolders = new HashSet<>(); @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "organisation_type_id") private OrganisationType organisationType; @OneToMany(mappedBy = "organisation", cascade = CascadeType.ALL, orphanRemoval = true) - private Set userOrganisations = new HashSet(); + @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) + private Set userOrganisations = new HashSet<>(); @OneToMany(mappedBy = "parentOrganisation", cascade = CascadeType.ALL, orphanRemoval = true) - private Set childOrganisations = new HashSet(); + @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) + private Set childOrganisations = new HashSet<>(); @OneToMany(mappedBy = "organisation", cascade = CascadeType.ALL, orphanRemoval = true) @LazyCollection(LazyCollectionOption.EXTRA) - private Set lessons = new HashSet(); + @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) + private Set lessons = new HashSet<>(); @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "organisation_state_id") Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java =================================================================== diff -u -r2188972474f8d186d6811e3dea2e4136be669335 -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java (.../Assessment.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java (.../Assessment.java) (revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29) @@ -32,7 +32,6 @@ import java.util.Set; import java.util.TreeSet; -import javax.persistence.Cacheable; import javax.persistence.CascadeType; import javax.persistence.CollectionTable; import javax.persistence.Column; @@ -193,11 +192,13 @@ @OneToMany(cascade = CascadeType.ALL) @JoinColumn(name = "assessment_uid") @OrderBy("sequence_id ASC") + @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) private Set questionReferences = new TreeSet<>(new SequencableComparator()); @OneToMany(cascade = CascadeType.ALL) @JoinColumn(name = "assessment_uid") @OrderBy("sequence_id ASC") + @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) private Set overallFeedbacks = new TreeSet<>(new SequencableComparator()); // ********************************************************** Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java =================================================================== diff -u -r2188972474f8d186d6811e3dea2e4136be669335 -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java (.../AssessmentQuestionResult.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java (.../AssessmentQuestionResult.java) (revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29) @@ -27,7 +27,6 @@ import java.util.LinkedHashSet; import java.util.Set; -import javax.persistence.Cacheable; import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; @@ -40,8 +39,6 @@ import javax.persistence.Transient; import org.apache.commons.lang.StringEscapeUtils; -import org.hibernate.annotations.Cache; -import org.hibernate.annotations.CacheConcurrencyStrategy; import org.lamsfoundation.lams.qb.model.QbQuestion; import org.lamsfoundation.lams.qb.model.QbToolAnswer; import org.lamsfoundation.lams.tool.assessment.dto.QuestionDTO; @@ -87,7 +84,6 @@ @OneToMany(cascade = CascadeType.ALL) @JoinColumn(name = "question_result_uid") - @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) private Set optionAnswers = new LinkedHashSet<>(); // *************** NON Persist Fields ******************** Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentResult.java =================================================================== diff -u -r2188972474f8d186d6811e3dea2e4136be669335 -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentResult.java (.../AssessmentResult.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentResult.java (.../AssessmentResult.java) (revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29) @@ -27,7 +27,6 @@ import java.util.Set; import java.util.TreeSet; -import javax.persistence.Cacheable; import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; @@ -41,8 +40,6 @@ import javax.persistence.Table; import javax.persistence.Transient; -import org.hibernate.annotations.Cache; -import org.hibernate.annotations.CacheConcurrencyStrategy; import org.hibernate.annotations.SortComparator; import org.lamsfoundation.lams.qb.model.QbToolAnswer; @@ -94,7 +91,6 @@ @OneToMany(cascade = CascadeType.ALL) @JoinColumn(name = "result_uid") @SortComparator(QbToolAnswer.QbToolAnswerComparator.class) - @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) private Set questionResults = new TreeSet<>(); // *************** NON Persist Fields ******************** Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/Chat.java =================================================================== diff -u -rd5d38057e102e214efbc365d07fed0837c936ada -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/Chat.java (.../Chat.java) (revision d5d38057e102e214efbc365d07fed0837c936ada) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/Chat.java (.../Chat.java) (revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29) @@ -39,6 +39,8 @@ import javax.persistence.Table; import org.apache.log4j.Logger; +import org.hibernate.annotations.Cache; +import org.hibernate.annotations.CacheConcurrencyStrategy; import org.lamsfoundation.lams.learningdesign.TextSearchConditionComparator; import org.lamsfoundation.lams.tool.chat.service.ChatService; @@ -98,11 +100,13 @@ private Date submissionDeadline; @OneToMany(mappedBy = "chat", cascade = CascadeType.ALL) - private Set chatSessions = new HashSet(); + @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) + private Set chatSessions = new HashSet<>(); @OneToMany(cascade = CascadeType.ALL) @JoinColumn(name = "content_uid") - private Set conditions = new TreeSet(new TextSearchConditionComparator()); + @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) + private Set conditions = new TreeSet<>(new TextSearchConditionComparator()); public Chat() { } @@ -270,12 +274,9 @@ if (this == other) { return true; } - if (other == null) { + if ((other == null) || !(other instanceof Chat)) { return false; } - if (!(other instanceof Chat)) { - return false; - } Chat castOther = (Chat) other; return this.getUid() == castOther.getUid() @@ -306,10 +307,10 @@ chat.setUid(null); // create an empty set for the chatSession - chat.chatSessions = new HashSet(); + chat.chatSessions = new HashSet<>(); if (conditions != null) { - Set set = new TreeSet(new TextSearchConditionComparator()); + Set set = new TreeSet<>(new TextSearchConditionComparator()); for (ChatCondition condition : conditions) { set.add((ChatCondition) condition.clone()); } Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/Daco.java =================================================================== diff -u -r1ee503e3d0e0228ea8a45025fddf15d9623c0377 -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/Daco.java (.../Daco.java) (revision 1ee503e3d0e0228ea8a45025fddf15d9623c0377) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/Daco.java (.../Daco.java) (revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29) @@ -43,6 +43,8 @@ import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.log4j.Logger; +import org.hibernate.annotations.Cache; +import org.hibernate.annotations.CacheConcurrencyStrategy; /** * Daco @@ -99,7 +101,8 @@ @OneToMany(fetch = FetchType.EAGER, mappedBy = "daco", cascade = CascadeType.ALL) @OrderBy("uid ASC") - private Set dacoQuestions = new LinkedHashSet(); + @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) + private Set dacoQuestions = new LinkedHashSet<>(); @Column(name = "reflect_on_activity") private boolean reflectOnActivity; Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/model/Forum.java =================================================================== diff -u -r1ee503e3d0e0228ea8a45025fddf15d9623c0377 -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/model/Forum.java (.../Forum.java) (revision 1ee503e3d0e0228ea8a45025fddf15d9623c0377) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/model/Forum.java (.../Forum.java) (revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29) @@ -45,6 +45,8 @@ import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.log4j.Logger; +import org.hibernate.annotations.Cache; +import org.hibernate.annotations.CacheConcurrencyStrategy; import org.lamsfoundation.lams.learningdesign.TextSearchConditionComparator; /** @@ -122,9 +124,9 @@ * TODO: I don't think this is going to work as the create_by column is in this table and hibernate will expect it * in the user table. * Probably need to revert to a hacked many - to - one - * + * * @ManyToOne(fetch = FetchType.LAZY) - * + * * @JoinColumn(name = "create_by") */ @OneToOne(fetch = FetchType.EAGER) @@ -168,6 +170,7 @@ @OneToMany(cascade = CascadeType.ALL) @JoinColumn(name = "content_uid") + @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) private Set conditions; /** @@ -176,7 +179,7 @@ */ public Forum() { messages = new HashSet(); - conditions = new TreeSet(new TextSearchConditionComparator()); + conditions = new TreeSet<>(new TextSearchConditionComparator()); } // ********************************************************** @@ -199,7 +202,7 @@ forum.messages = set; } if (getConditions() != null) { - Set conditionsCopy = new TreeSet(new TextSearchConditionComparator()); + Set conditionsCopy = new TreeSet<>(new TextSearchConditionComparator()); for (ForumCondition condition : getConditions()) { conditionsCopy.add(condition.clone(forum)); } Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.java =================================================================== diff -u -r1ee503e3d0e0228ea8a45025fddf15d9623c0377 -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.java (.../ImageGallery.java) (revision 1ee503e3d0e0228ea8a45025fddf15d9623c0377) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.java (.../ImageGallery.java) (revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29) @@ -44,6 +44,8 @@ import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.log4j.Logger; +import org.hibernate.annotations.Cache; +import org.hibernate.annotations.CacheConcurrencyStrategy; import org.hibernate.annotations.Cascade; import org.lamsfoundation.lams.rating.model.LearnerItemRatingCriteria; @@ -101,6 +103,7 @@ @OneToMany(cascade = CascadeType.ALL) @OrderBy("order_id ASC") @JoinColumn(name = "tool_content_id", referencedColumnName = "content_id") + @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) private Set ratingCriterias = new HashSet<>(); @Column(name = "reflect_on_activity") Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridge.java =================================================================== diff -u -r1b54b6d33e0b878ab132c09a1f56ecde9fef5756 -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridge.java (.../CommonCartridge.java) (revision 1b54b6d33e0b878ab132c09a1f56ecde9fef5756) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridge.java (.../CommonCartridge.java) (revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29) @@ -45,6 +45,8 @@ import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.log4j.Logger; +import org.hibernate.annotations.Cache; +import org.hibernate.annotations.CacheConcurrencyStrategy; import org.hibernate.annotations.Cascade; /** @@ -101,6 +103,7 @@ @OneToMany(cascade = CascadeType.ALL) @JoinColumn(name = "commonCartridge_uid") @OrderBy("create_date DESC") + @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) private Set commonCartridgeItems = new HashSet<>();; @Column(name = "reflect_on_activity") Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McContent.java =================================================================== diff -u -r6553f690f1017ee47046a67f4de84d646435bf29 -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McContent.java (.../McContent.java) (revision 6553f690f1017ee47046a67f4de84d646435bf29) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McContent.java (.../McContent.java) (revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29) @@ -38,6 +38,8 @@ import javax.persistence.Table; import org.apache.commons.lang.builder.ToStringBuilder; +import org.hibernate.annotations.Cache; +import org.hibernate.annotations.CacheConcurrencyStrategy; import org.hibernate.annotations.SortComparator; import org.lamsfoundation.lams.qb.model.QbToolQuestion; @@ -124,9 +126,11 @@ @OneToMany(mappedBy = "mcContent", cascade = CascadeType.ALL) @SortComparator(QbToolQuestion.QbToolQuestionComparator.class) + @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) private Set mcQueContents; @OneToMany(mappedBy = "mcContent", cascade = CascadeType.ALL, orphanRemoval = true) + @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) private Set mcSessions; /** full constructor */ Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/model/QaContent.java =================================================================== diff -u -r86c25c80d92701a94c3161575c76c363891402ad -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/model/QaContent.java (.../QaContent.java) (revision 86c25c80d92701a94c3161575c76c363891402ad) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/model/QaContent.java (.../QaContent.java) (revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29) @@ -21,12 +21,10 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.qa.model; import java.io.Serializable; import java.util.Date; -import java.util.HashSet; import java.util.Iterator; import java.util.Set; import java.util.TreeSet; @@ -45,6 +43,8 @@ import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; +import org.hibernate.annotations.Cache; +import org.hibernate.annotations.CacheConcurrencyStrategy; import org.lamsfoundation.lams.learningdesign.TextSearchConditionComparator; import org.lamsfoundation.lams.rating.model.LearnerItemRatingCriteria; @@ -133,21 +133,25 @@ @OneToMany(cascade = CascadeType.ALL) @JoinColumn(name = "tool_content_id", referencedColumnName = "qa_content_id") @OrderBy("orderId asc") + @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) private Set ratingCriterias; @OneToMany(mappedBy = "qaContent", cascade = CascadeType.ALL) @OrderBy("displayOrder") + @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) private Set qaQueContents; @OneToMany(mappedBy = "qaContent", cascade = CascadeType.ALL) + @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) private Set qaSessions; @OneToMany(cascade = CascadeType.ALL) @JoinColumn(name = "content_uid") + @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) private Set conditions; public QaContent() { - conditions = new TreeSet(new TextSearchConditionComparator()); + conditions = new TreeSet<>(new TextSearchConditionComparator()); }; /** full constructor */ @@ -176,7 +180,7 @@ this.qaQueContents = qaQueContents; this.qaSessions = qaSessions; this.conditions = conditions != null ? conditions - : new TreeSet(new TextSearchConditionComparator()); + : new TreeSet<>(new TextSearchConditionComparator()); this.allowRichEditor = allowRichEditor; this.useSelectLeaderToolOuput = useSelectLeaderToolOuput; this.maximumRates = maximumRates; @@ -185,7 +189,8 @@ } /** - * Copy Constructor to create a new qa content instance. Note that we don't copy the qa session data here because the + * Copy Constructor to create a new qa content instance. Note that we don't copy the qa session data here because + * the * qa session will be created after we copied tool content. * * @param qa @@ -214,7 +219,7 @@ public Set deepCopyRatingCriterias(QaContent newQaContent) { - Set newCriterias = new TreeSet(); + Set newCriterias = new TreeSet<>(); for (Iterator i = ratingCriterias.iterator(); i.hasNext();) { LearnerItemRatingCriteria criteria = i.next(); LearnerItemRatingCriteria newCriteria = (LearnerItemRatingCriteria) criteria.clone(); @@ -225,7 +230,7 @@ } public Set deepCopyQaQueContent(QaContent newQaContent) { - Set newQaQueContent = new TreeSet(); + Set newQaQueContent = new TreeSet<>(); for (Iterator i = this.getQaQueContents().iterator(); i.hasNext();) { QaQueContent queContent = i.next(); newQaQueContent.add(QaQueContent.newInstance(queContent, newQaContent)); @@ -235,7 +240,7 @@ public Set deepCopyConditions(QaContent newQaContent) { - Set newConditions = new TreeSet(new TextSearchConditionComparator()); + Set newConditions = new TreeSet<>(new TextSearchConditionComparator()); if (getConditions() != null) { for (QaCondition condition : getConditions()) { newConditions.add(condition.clone(newQaContent)); @@ -246,7 +251,7 @@ } public Set deepCopyQaSession(QaContent newQaSession) { - return new TreeSet(); + return new TreeSet<>(); } public Set getQaQueContents() { Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java =================================================================== diff -u -r77491c8baf27f5b5d8705ea6b306e8db142389e7 -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java (.../Resource.java) (revision 77491c8baf27f5b5d8705ea6b306e8db142389e7) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java (.../Resource.java) (revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29) @@ -46,6 +46,8 @@ import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.log4j.Logger; +import org.hibernate.annotations.Cache; +import org.hibernate.annotations.CacheConcurrencyStrategy; import org.hibernate.annotations.Cascade; import org.lamsfoundation.lams.rating.model.LearnerItemRatingCriteria; @@ -128,6 +130,7 @@ @OneToMany(cascade = CascadeType.ALL) @OrderBy("order_id ASC") @JoinColumn(name = "tool_content_id", referencedColumnName = "content_id") + @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) private Set ratingCriterias = new HashSet<>(); // *************** NON Persist Fields ******************** Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/model/Leaderselection.java =================================================================== diff -u -r439dc8c74e7d6a7dd5ba26b021f0806ee19d8291 -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 --- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/model/Leaderselection.java (.../Leaderselection.java) (revision 439dc8c74e7d6a7dd5ba26b021f0806ee19d8291) +++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/model/Leaderselection.java (.../Leaderselection.java) (revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29) @@ -36,6 +36,8 @@ import javax.persistence.Table; import org.apache.log4j.Logger; +import org.hibernate.annotations.Cache; +import org.hibernate.annotations.CacheConcurrencyStrategy; import org.lamsfoundation.lams.tool.leaderselection.service.LeaderselectionService; @Entity @@ -74,6 +76,7 @@ private Long toolContentId; @OneToMany(mappedBy = "leaderselection") + @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) private Set leaderselectionSessions = new HashSet<>(); public Long getUid() { @@ -174,12 +177,9 @@ if (this == other) { return true; } - if (other == null) { + if ((other == null) || !(other instanceof Leaderselection)) { return false; } - if (!(other instanceof Leaderselection)) { - return false; - } Leaderselection castOther = (Leaderselection) other; return this.getUid() == castOther.getUid() @@ -210,7 +210,7 @@ leaderselection.setUid(null); // create an empty set for the leaderselectionSession - leaderselection.leaderselectionSessions = new HashSet(); + leaderselection.leaderselectionSessions = new HashSet<>(); } catch (CloneNotSupportedException cnse) { Leaderselection.log.error("Error cloning " + Leaderselection.class); Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/Mindmap.java =================================================================== diff -u -r604a8b98bc089c78d262394c77d68a0e52473f4c -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/Mindmap.java (.../Mindmap.java) (revision 604a8b98bc089c78d262394c77d68a0e52473f4c) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/Mindmap.java (.../Mindmap.java) (revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29) @@ -36,6 +36,8 @@ import javax.persistence.Table; import org.apache.log4j.Logger; +import org.hibernate.annotations.Cache; +import org.hibernate.annotations.CacheConcurrencyStrategy; import org.lamsfoundation.lams.tool.mindmap.service.MindmapService; //import org.lamsfoundation.lams.learningdesign.TextSearchConditionComparator; @@ -115,6 +117,7 @@ private String galleryWalkInstructions; @OneToMany(mappedBy = "mindmap") + @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) private Set mindmapSessions; // Constructors @@ -397,12 +400,9 @@ if (this == other) { return true; } - if (other == null) { + if ((other == null) || !(other instanceof Mindmap)) { return false; } - if (!(other instanceof Mindmap)) { - return false; - } Mindmap castOther = (Mindmap) other; return this.getUid() == castOther.getUid() Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/model/NoticeboardContent.java =================================================================== diff -u -rb71c9cb2f96eb891545d32aaca8904051d1e00d5 -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/model/NoticeboardContent.java (.../NoticeboardContent.java) (revision b71c9cb2f96eb891545d32aaca8904051d1e00d5) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/model/NoticeboardContent.java (.../NoticeboardContent.java) (revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29) @@ -37,6 +37,8 @@ import javax.persistence.OneToMany; import javax.persistence.Table; +import org.hibernate.annotations.Cache; +import org.hibernate.annotations.CacheConcurrencyStrategy; import org.lamsfoundation.lams.contentrepository.exception.ItemNotFoundException; import org.lamsfoundation.lams.contentrepository.exception.RepositoryCheckedException; @@ -98,14 +100,13 @@ @Column(name = "allow_anonymous") private boolean allowAnonymous; - @OneToMany(mappedBy = "nbContent", - cascade = CascadeType.ALL, - orphanRemoval = true) + @OneToMany(mappedBy = "nbContent", cascade = CascadeType.ALL, orphanRemoval = true) + @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) private Set nbSessions; - + /** default constructor */ public NoticeboardContent() { - this.nbSessions = new HashSet(); + this.nbSessions = new HashSet<>(); } /** full constructor */ @@ -126,7 +127,7 @@ this.allowComments = allowComments; this.commentsLikeAndDislike = commentsLikeAndDislike; this.allowAnonymous = allowAnonymous; - this.nbSessions = new HashSet(); + this.nbSessions = new HashSet<>(); } /** @@ -222,7 +223,7 @@ this.allowComments = allowComments; } - public boolean isCommentsLikeAndDislike() { + public boolean isCommentsLikeAndDislike() { return commentsLikeAndDislike; } Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/Notebook.java =================================================================== diff -u -rbc098bac007b1eac4ebdf897b0dd8b26365d4762 -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/Notebook.java (.../Notebook.java) (revision bc098bac007b1eac4ebdf897b0dd8b26365d4762) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/Notebook.java (.../Notebook.java) (revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29) @@ -39,6 +39,8 @@ import javax.persistence.Table; import org.apache.log4j.Logger; +import org.hibernate.annotations.Cache; +import org.hibernate.annotations.CacheConcurrencyStrategy; import org.lamsfoundation.lams.learningdesign.TextSearchConditionComparator; import org.lamsfoundation.lams.tool.notebook.service.NotebookService; @@ -92,11 +94,13 @@ private Long toolContentId; @OneToMany(mappedBy = "notebook") - private Set notebookSessions = new HashSet(); + @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) + private Set notebookSessions = new HashSet<>(); @OneToMany(cascade = CascadeType.ALL) @JoinColumn(name = "content_uid") - private Set conditions = new TreeSet(new TextSearchConditionComparator()); + @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) + private Set conditions = new TreeSet<>(new TextSearchConditionComparator()); public Long getUid() { return uid; @@ -236,12 +240,9 @@ if (this == other) { return true; } - if (other == null) { + if ((other == null) || !(other instanceof Notebook)) { return false; } - if (!(other instanceof Notebook)) { - return false; - } Notebook castOther = (Notebook) other; return this.getUid() == castOther.getUid() @@ -272,10 +273,10 @@ notebook.setUid(null); // create an empty set for the notebookSession - notebook.notebookSessions = new HashSet(); + notebook.notebookSessions = new HashSet<>(); if (conditions != null) { - Set set = new TreeSet(new TextSearchConditionComparator()); + Set set = new TreeSet<>(new TextSearchConditionComparator()); for (NotebookCondition condition : conditions) { set.add((NotebookCondition) condition.clone()); } Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.java =================================================================== diff -u -rf1d0722ace2f721a8a423f094d2101c433c15a0a -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.java (.../Peerreview.java) (revision f1d0722ace2f721a8a423f094d2101c433c15a0a) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.java (.../Peerreview.java) (revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29) @@ -43,6 +43,8 @@ import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.log4j.Logger; +import org.hibernate.annotations.Cache; +import org.hibernate.annotations.CacheConcurrencyStrategy; import org.hibernate.annotations.Cascade; import org.hibernate.annotations.CascadeType; import org.lamsfoundation.lams.rating.model.LearnerItemRatingCriteria; @@ -84,6 +86,7 @@ @Cascade(CascadeType.ALL) @JoinColumn(name = "tool_content_id", referencedColumnName = "content_id") @OrderBy("orderId asc") + @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) private Set ratingCriterias; @Column(name = "lock_on_finished") Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java =================================================================== diff -u -r7276ea4054a0e0a542c4845123b24ec0b5a1e195 -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java (.../Scratchie.java) (revision 7276ea4054a0e0a542c4845123b24ec0b5a1e195) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java (.../Scratchie.java) (revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29) @@ -42,6 +42,8 @@ import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.log4j.Logger; +import org.hibernate.annotations.Cache; +import org.hibernate.annotations.CacheConcurrencyStrategy; import org.hibernate.annotations.SortComparator; import org.lamsfoundation.lams.qb.model.QbToolQuestion; @@ -88,6 +90,7 @@ @OneToMany @JoinColumn(name = "scratchie_uid") @SortComparator(QbToolQuestion.QbToolQuestionComparator.class) + @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) private Set scratchieItems = new TreeSet<>(); @Column(name = "burning_questions_enabled") Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/model/Scribe.java =================================================================== diff -u -r3a932581b82347c4b65a2255dce5bf19d8e63c0a -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/model/Scribe.java (.../Scribe.java) (revision 3a932581b82347c4b65a2255dce5bf19d8e63c0a) +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/model/Scribe.java (.../Scribe.java) (revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29) @@ -21,7 +21,6 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.scribe.model; import java.util.Date; @@ -40,13 +39,15 @@ import javax.persistence.Table; import org.apache.log4j.Logger; +import org.hibernate.annotations.Cache; +import org.hibernate.annotations.CacheConcurrencyStrategy; import org.lamsfoundation.lams.tool.scribe.service.ScribeService; @Entity @Table(name = "tl_lascrb11_scribe") public class Scribe implements java.io.Serializable, Cloneable { - private static final long serialVersionUID = 579733009969321015L; + private static final long serialVersionUID = 579733009969321015L; static Logger log = Logger.getLogger(ScribeService.class.getName()); @@ -92,6 +93,7 @@ private Long toolContentId; @OneToMany(mappedBy = "scribe") + @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) private Set scribeSessions; @OneToMany(mappedBy = "scribe", cascade = CascadeType.ALL, orphanRemoval = true) @@ -247,12 +249,9 @@ if ((this == other)) { return true; } - if ((other == null)) { + if ((other == null) || !(other instanceof Scribe)) { return false; } - if (!(other instanceof Scribe)) { - return false; - } Scribe castOther = (Scribe) other; return ((this.getUid() == castOther.getUid()) @@ -285,7 +284,7 @@ if (scribeHeadings != null) { // create copy of headings Iterator iter = scribeHeadings.iterator(); - Set set = new HashSet(); + Set set = new HashSet<>(); while (iter.hasNext()) { ScribeHeading originalHeading = (ScribeHeading) iter.next(); ScribeHeading newHeading = (ScribeHeading) originalHeading.clone(); Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/Survey.java =================================================================== diff -u -r1ee503e3d0e0228ea8a45025fddf15d9623c0377 -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/Survey.java (.../Survey.java) (revision 1ee503e3d0e0228ea8a45025fddf15d9623c0377) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/Survey.java (.../Survey.java) (revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29) @@ -45,6 +45,8 @@ import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.log4j.Logger; +import org.hibernate.annotations.Cache; +import org.hibernate.annotations.CacheConcurrencyStrategy; import org.hibernate.annotations.Cascade; import org.hibernate.annotations.SortComparator; import org.lamsfoundation.lams.learningdesign.TextSearchConditionComparator; @@ -114,12 +116,14 @@ @OneToMany(cascade = CascadeType.ALL) @JoinColumn(name = "survey_uid") @OrderBy("sequence_id") - private Set questions = new HashSet(); + @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) + private Set questions = new HashSet<>(); @OneToMany(cascade = CascadeType.ALL) @JoinColumn(name = "content_uid") @SortComparator(TextSearchConditionComparator.class) - private Set conditions = new TreeSet(new TextSearchConditionComparator()); + @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) + private Set conditions = new TreeSet<>(new TextSearchConditionComparator()); public static Survey newInstance(Survey defaultContent, Long contentId) { Survey toContent = new Survey(); @@ -146,7 +150,7 @@ survey.setUid(null); if (questions != null) { Iterator iter = questions.iterator(); - Set set = new HashSet(); + Set set = new HashSet<>(); while (iter.hasNext()) { SurveyQuestion item = iter.next(); SurveyQuestion newItem = (SurveyQuestion) item.clone(); @@ -155,7 +159,7 @@ survey.questions = set; } if (getConditions() != null) { - Set set = new TreeSet(new TextSearchConditionComparator()); + Set set = new TreeSet<>(new TextSearchConditionComparator()); for (SurveyCondition condition : getConditions()) { set.add(condition.clone(survey)); } Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.java =================================================================== diff -u -r1ee503e3d0e0228ea8a45025fddf15d9623c0377 -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.java (.../SurveyQuestion.java) (revision 1ee503e3d0e0228ea8a45025fddf15d9623c0377) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.java (.../SurveyQuestion.java) (revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29) @@ -44,6 +44,8 @@ import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; +import org.hibernate.annotations.Cache; +import org.hibernate.annotations.CacheConcurrencyStrategy; import org.lamsfoundation.lams.tool.survey.util.SurveyWebUtils; /** @@ -82,6 +84,7 @@ @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true) @JoinColumn(name = "question_uid") @OrderBy("sequence_id") + @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) private Set options = new HashSet(); @Column(name = "create_date") Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskList.java =================================================================== diff -u -r1ee503e3d0e0228ea8a45025fddf15d9623c0377 -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskList.java (.../TaskList.java) (revision 1ee503e3d0e0228ea8a45025fddf15d9623c0377) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskList.java (.../TaskList.java) (revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29) @@ -46,6 +46,8 @@ import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.log4j.Logger; +import org.hibernate.annotations.Cache; +import org.hibernate.annotations.CacheConcurrencyStrategy; import org.hibernate.annotations.Cascade; /** @@ -100,6 +102,7 @@ @OneToMany(cascade = CascadeType.ALL) @OrderBy("sequence_id ASC") @JoinColumn(name = "taskList_uid") + @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) private Set conditions = new HashSet(); @Column(name = "create_date") Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/model/VoteContent.java =================================================================== diff -u -r374f1e3729c3892074184bbd480ae87bce110cfd -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/model/VoteContent.java (.../VoteContent.java) (revision 374f1e3729c3892074184bbd480ae87bce110cfd) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/model/VoteContent.java (.../VoteContent.java) (revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29) @@ -39,6 +39,8 @@ import javax.persistence.Table; import org.apache.commons.lang.builder.ToStringBuilder; +import org.hibernate.annotations.Cache; +import org.hibernate.annotations.CacheConcurrencyStrategy; /** *

@@ -106,9 +108,11 @@ @OneToMany(mappedBy = "voteContent", cascade = CascadeType.ALL, orphanRemoval = true) @OrderBy("displayOrder") + @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) private Set voteQueContents; @OneToMany(mappedBy = "voteContent", cascade = CascadeType.ALL, orphanRemoval = true) + @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) private Set voteSessions; @Column(name = "submission_deadline") Index: lams_tool_zoom/.classpath =================================================================== diff -u -ra5b247dd91cb3ffabf9de46cba029e5537fad087 -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 --- lams_tool_zoom/.classpath (.../.classpath) (revision a5b247dd91cb3ffabf9de46cba029e5537fad087) +++ lams_tool_zoom/.classpath (.../.classpath) (revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29) @@ -26,6 +26,7 @@ + Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/model/Zoom.java =================================================================== diff -u -r39c44821fbe9ecde816b4795e55e2da17ed24d25 -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 --- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/model/Zoom.java (.../Zoom.java) (revision 39c44821fbe9ecde816b4795e55e2da17ed24d25) +++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/model/Zoom.java (.../Zoom.java) (revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29) @@ -39,6 +39,8 @@ import javax.persistence.Table; import org.apache.log4j.Logger; +import org.hibernate.annotations.Cache; +import org.hibernate.annotations.CacheConcurrencyStrategy; @Entity @Table(name = "tl_lazoom10_zoom") @@ -102,6 +104,7 @@ private String meetingPassword; @OneToMany(mappedBy = "zoom") + @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) private Set zoomSessions; public Long getUid() { @@ -283,12 +286,9 @@ if ((this == other)) { return true; } - if ((other == null)) { + if ((other == null) || !(other instanceof Zoom)) { return false; } - if (!(other instanceof Zoom)) { - return false; - } Zoom castOther = (Zoom) other; return ((this.getUid() == castOther.getUid())