Index: lams_common/src/java/org/lamsfoundation/lams/comments/Comment.java =================================================================== diff -u -r96068ffc66514c1d25e9adeb96acfa164ab29dd5 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/comments/Comment.java (.../Comment.java) (revision 96068ffc66514c1d25e9adeb96acfa164ab29dd5) +++ lams_common/src/java/org/lamsfoundation/lams/comments/Comment.java (.../Comment.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -21,13 +21,13 @@ * **************************************************************** */ - package org.lamsfoundation.lams.comments; import java.util.Date; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -62,16 +62,16 @@ @Column(name = "create_date") private Date created; - - @ManyToOne - @JoinColumn(name = "create_by") + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "create_by") private User createdBy; @Column(name = "update_date") private Date updated; - @ManyToOne - @JoinColumn(name = "update_by") + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "update_by") private User updatedBy; @Column(name = "last_reply_date") @@ -92,23 +92,23 @@ @Column private boolean anonymous; - @ManyToOne - @JoinColumn(name = "root_comment_uid") + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "root_comment_uid") private Comment rootComment; - - @ManyToOne - @JoinColumn(name = "thread_comment_uid") + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "thread_comment_uid") private Comment threadComment; @Column(name = "comment_level") private short commentLevel; - @ManyToOne - @JoinColumn(name = "parent_uid") + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "parent_uid") private Comment parent; - @ManyToOne - @JoinColumn(name = "session_id") + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "session_id") private CommentSession session; /** Read only fields - calculated when loaded from the database */ Index: lams_common/src/java/org/lamsfoundation/lams/comments/CommentLike.java =================================================================== diff -u -r96068ffc66514c1d25e9adeb96acfa164ab29dd5 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/comments/CommentLike.java (.../CommentLike.java) (revision 96068ffc66514c1d25e9adeb96acfa164ab29dd5) +++ lams_common/src/java/org/lamsfoundation/lams/comments/CommentLike.java (.../CommentLike.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -21,12 +21,11 @@ * **************************************************************** */ - - package org.lamsfoundation.lams.comments; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -49,9 +48,9 @@ @Column @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - - @ManyToOne - @JoinColumn(name = "comment_uid") + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "comment_uid") private Comment comment; @Column(name = "user_id") Index: lams_common/src/java/org/lamsfoundation/lams/events/Subscription.java =================================================================== diff -u -r9e1d6b2a7e9dd1e5f3e43d10c6c2b87365692f4a -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/events/Subscription.java (.../Subscription.java) (revision 9e1d6b2a7e9dd1e5f3e43d10c6c2b87365692f4a) +++ lams_common/src/java/org/lamsfoundation/lams/events/Subscription.java (.../Subscription.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -4,6 +4,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -37,7 +38,7 @@ @Column(name = "user_id") private Integer userId; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "event_uid") private Event event; Index: lams_common/src/java/org/lamsfoundation/lams/gradebook/GradebookUserActivity.java =================================================================== diff -u -rcbe532f585efe39250986f20d58cbef855115cf3 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/gradebook/GradebookUserActivity.java (.../GradebookUserActivity.java) (revision cbe532f585efe39250986f20d58cbef855115cf3) +++ lams_common/src/java/org/lamsfoundation/lams/gradebook/GradebookUserActivity.java (.../GradebookUserActivity.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -26,6 +26,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -49,11 +50,11 @@ @GeneratedValue(strategy = GenerationType.IDENTITY) private long uid; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "activity_id") private ToolActivity activity; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "user_id") private User learner; Index: lams_common/src/java/org/lamsfoundation/lams/gradebook/GradebookUserLesson.java =================================================================== diff -u -rcbe532f585efe39250986f20d58cbef855115cf3 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/gradebook/GradebookUserLesson.java (.../GradebookUserLesson.java) (revision cbe532f585efe39250986f20d58cbef855115cf3) +++ lams_common/src/java/org/lamsfoundation/lams/gradebook/GradebookUserLesson.java (.../GradebookUserLesson.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -24,6 +24,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -47,11 +48,11 @@ @GeneratedValue(strategy = GenerationType.IDENTITY) private long uid; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "lesson_id") private Lesson lesson; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "user_id") private User learner; Index: lams_common/src/java/org/lamsfoundation/lams/integration/ExtCourseClassMap.java =================================================================== diff -u -r5b1fbc89c883857eace8c043a594a79cb0f60bc4 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/integration/ExtCourseClassMap.java (.../ExtCourseClassMap.java) (revision 5b1fbc89c883857eace8c043a594a79cb0f60bc4) +++ lams_common/src/java/org/lamsfoundation/lams/integration/ExtCourseClassMap.java (.../ExtCourseClassMap.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -4,6 +4,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -27,11 +28,11 @@ @Column private String courseid; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "ext_server_org_map_id") private ExtServer extServer; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "classid") private Organisation organisation; Index: lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerLessonMap.java =================================================================== diff -u -r5b1fbc89c883857eace8c043a594a79cb0f60bc4 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerLessonMap.java (.../ExtServerLessonMap.java) (revision 5b1fbc89c883857eace8c043a594a79cb0f60bc4) +++ lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerLessonMap.java (.../ExtServerLessonMap.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -24,6 +24,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -49,7 +50,7 @@ @Column(name = "resource_link_id") private String resourceLinkId; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "ext_server_org_map_id") private ExtServer extServer; Index: lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerToolAdapterMap.java =================================================================== diff -u -r5b1fbc89c883857eace8c043a594a79cb0f60bc4 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerToolAdapterMap.java (.../ExtServerToolAdapterMap.java) (revision 5b1fbc89c883857eace8c043a594a79cb0f60bc4) +++ lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerToolAdapterMap.java (.../ExtServerToolAdapterMap.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -24,6 +24,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -45,11 +46,11 @@ @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "tool_id") private Tool tool; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "ext_server_org_map_id") private ExtServer extServer; Index: lams_common/src/java/org/lamsfoundation/lams/integration/ExtUserUseridMap.java =================================================================== diff -u -r5b1fbc89c883857eace8c043a594a79cb0f60bc4 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/integration/ExtUserUseridMap.java (.../ExtUserUseridMap.java) (revision 5b1fbc89c883857eace8c043a594a79cb0f60bc4) +++ lams_common/src/java/org/lamsfoundation/lams/integration/ExtUserUseridMap.java (.../ExtUserUseridMap.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -4,6 +4,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -28,11 +29,11 @@ @Column(name = "external_username") private String extUsername; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "user_id") private User user; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "ext_server_org_map_id") private ExtServer extServer; Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java =================================================================== diff -u -r47043f84205046a23497bf8c57060e2dcadf0c9a -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java (.../Activity.java) (revision 47043f84205046a23497bf8c57060e2dcadf0c9a) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java (.../Activity.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -38,6 +38,7 @@ import javax.persistence.DiscriminatorColumn; import javax.persistence.DiscriminatorType; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -175,32 +176,32 @@ private String libraryActivityUiImage; /** The LearningLibrary of which this activity is a part */ - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "learning_library_id") private LearningLibrary learningLibrary; /** * The activity that acts as a container/parent for this activity. Normally would be one of the complex activities * which have child activities defined inside them. */ - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "parent_activity_id") private Activity parentActivity; /** * Single Library can have one or more activities defined inside it. This field indicates which activity is this. */ - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "library_activity_id") private Activity libraryActivity; /** The LearningDesign to which this activity belongs */ - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "learning_design_id") private LearningDesign learningDesign; /** The Grouping that applies to this activity */ - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "grouping_id") private Grouping grouping; @@ -216,11 +217,11 @@ @Column(name = "activity_category_id") private Integer activityCategoryID; - @OneToOne + @OneToOne(fetch = FetchType.LAZY) @JoinColumn(name = "transition_to_id") private Transition transitionTo; - @OneToOne + @OneToOne(fetch = FetchType.LAZY) @JoinColumn(name = "transition_from_id") private Transition transitionFrom; Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ActivityEvaluation.java =================================================================== diff -u -raaa9a8f28fa1b2a222690dbb3a2d7647efb30cd5 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ActivityEvaluation.java (.../ActivityEvaluation.java) (revision aaa9a8f28fa1b2a222690dbb3a2d7647efb30cd5) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ActivityEvaluation.java (.../ActivityEvaluation.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -24,6 +24,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.MapsId; @@ -44,7 +45,7 @@ @Column(name = "activity_id") private Long activityId; - @OneToOne + @OneToOne(fetch = FetchType.LAZY) @JoinColumn(name = "activity_id") @MapsId private ToolActivity activity; Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/BranchActivityEntry.java =================================================================== diff -u -r47043f84205046a23497bf8c57060e2dcadf0c9a -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/BranchActivityEntry.java (.../BranchActivityEntry.java) (revision 47043f84205046a23497bf8c57060e2dcadf0c9a) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/BranchActivityEntry.java (.../BranchActivityEntry.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -67,15 +67,15 @@ @Column(name = "entry_ui_id") protected Integer entryUIID; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "sequence_activity_id") protected SequenceActivity branchSequenceActivity; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "branch_activity_id") protected Activity branchingActivity; - - @ManyToOne + + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "group_id") private Group group; Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Competence.java =================================================================== diff -u -raaa9a8f28fa1b2a222690dbb3a2d7647efb30cd5 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Competence.java (.../Competence.java) (revision aaa9a8f28fa1b2a222690dbb3a2d7647efb30cd5) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Competence.java (.../Competence.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -2,6 +2,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -18,7 +19,7 @@ @GeneratedValue(strategy = GenerationType.IDENTITY) private Long competenceId; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "learning_design_id") private LearningDesign learningDesign; Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/CompetenceMapping.java =================================================================== diff -u -raaa9a8f28fa1b2a222690dbb3a2d7647efb30cd5 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/CompetenceMapping.java (.../CompetenceMapping.java) (revision aaa9a8f28fa1b2a222690dbb3a2d7647efb30cd5) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/CompetenceMapping.java (.../CompetenceMapping.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -2,6 +2,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -18,11 +19,11 @@ @GeneratedValue(strategy = GenerationType.IDENTITY) private Long competenceMappingId; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "competence_id") private Competence competence; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "activity_id") private ToolActivity toolActivity; Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java =================================================================== diff -u -r47043f84205046a23497bf8c57060e2dcadf0c9a -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java (.../ComplexActivity.java) (revision 47043f84205046a23497bf8c57060e2dcadf0c9a) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java (.../ComplexActivity.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -59,7 +59,7 @@ @SortComparator(ActivityOrderComparator.class) private Set activities = new TreeSet(new ActivityOrderComparator()); - @OneToOne + @OneToOne(fetch = FetchType.LAZY) @JoinColumn(name = "default_activity_id") protected Activity defaultActivity; Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/DataFlowObject.java =================================================================== diff -u -r47043f84205046a23497bf8c57060e2dcadf0c9a -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/DataFlowObject.java (.../DataFlowObject.java) (revision 47043f84205046a23497bf8c57060e2dcadf0c9a) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/DataFlowObject.java (.../DataFlowObject.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -26,6 +26,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -48,7 +49,7 @@ @GeneratedValue(strategy = GenerationType.IDENTITY) private Long dataFlowObjectId; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "transition_id") private DataTransition dataTransition; Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/GateActivity.java =================================================================== diff -u -r47043f84205046a23497bf8c57060e2dcadf0c9a -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/GateActivity.java (.../GateActivity.java) (revision 47043f84205046a23497bf8c57060e2dcadf0c9a) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/GateActivity.java (.../GateActivity.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -61,7 +61,7 @@ @Column(name = "gate_open_flag") private Boolean gateOpen; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "gate_open_user") private User gateOpenUser; Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Group.java =================================================================== diff -u -r47043f84205046a23497bf8c57060e2dcadf0c9a -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Group.java (.../Group.java) (revision 47043f84205046a23497bf8c57060e2dcadf0c9a) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Group.java (.../Group.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -30,6 +30,7 @@ import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -77,7 +78,7 @@ @Column(name = "group_ui_id") private Integer groupUIID; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "grouping_id", updatable = false) private Grouping grouping; Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupUser.java =================================================================== diff -u -rc7680ea1112522bd5e58439421a26cc402c82138 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupUser.java (.../GroupUser.java) (revision c7680ea1112522bd5e58439421a26cc402c82138) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupUser.java (.../GroupUser.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -29,6 +29,7 @@ import javax.persistence.Embeddable; import javax.persistence.EmbeddedId; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.MapsId; @@ -70,12 +71,12 @@ private GroupUserPrimaryKey id; @MapsId("id") - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "group_id") private Group group; @MapsId("id") - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "user_id") private User user; Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupingActivity.java =================================================================== diff -u -r47043f84205046a23497bf8c57060e2dcadf0c9a -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupingActivity.java (.../GroupingActivity.java) (revision 47043f84205046a23497bf8c57060e2dcadf0c9a) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupingActivity.java (.../GroupingActivity.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -56,7 +56,7 @@ private Integer createGroupingUIID; /** The grouping that this activity creates */ - @OneToOne(optional = false) + @OneToOne(fetch = FetchType.LAZY, optional = false) @JoinColumn(name = "create_grouping_id") public Grouping createGrouping; Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java =================================================================== diff -u -rfb75427cc2eefc24f942e89b3c938bed84a0ff7f -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java (.../LearningDesign.java) (revision fb75427cc2eefc24f942e89b3c938bed84a0ff7f) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java (.../LearningDesign.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -35,6 +35,7 @@ import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -84,11 +85,11 @@ @Column private String title; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "first_activity_id") private Activity firstActivity; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "floating_activity_id") private FloatingActivity floatingActivity; @@ -111,7 +112,7 @@ @Column(name = "edit_override_lock") private Boolean editOverrideLock; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "edit_override_user_id") private User editOverrideUser; @@ -130,15 +131,15 @@ @Column private String version; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "user_id") private User user; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "original_user_id") private User originalUser; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "original_learning_design_id") private LearningDesign originalLearningDesign; @@ -158,7 +159,7 @@ @OneToMany(mappedBy = "learningDesignId", cascade = CascadeType.ALL, orphanRemoval = true) private Set annotations = new HashSet(); - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "workspace_folder_id") private WorkspaceFolder workspaceFolder; @@ -171,7 +172,7 @@ @Column(name = "license_text") private String licenseText; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "license_id") private License license; Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java =================================================================== diff -u -r47043f84205046a23497bf8c57060e2dcadf0c9a -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java (.../ToolActivity.java) (revision 47043f84205046a23497bf8c57060e2dcadf0c9a) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java (.../ToolActivity.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -36,7 +36,6 @@ import javax.persistence.FetchType; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; -import javax.persistence.MapsId; import javax.persistence.OneToMany; import javax.persistence.OneToOne; @@ -81,14 +80,14 @@ @OneToMany(mappedBy = "toolActivity") private Set competenceMappings = new HashSet(); - @OneToOne(mappedBy = "activity") + @OneToOne(fetch = FetchType.LAZY, mappedBy = "activity") @Cascade(org.hibernate.annotations.CascadeType.SAVE_UPDATE) private ActivityEvaluation evaluation; @OneToMany(mappedBy = "activity") private Set gradebookUserActivities = new HashSet(); - @OneToOne(mappedBy = "activity", cascade = CascadeType.ALL) + @OneToOne(fetch = FetchType.LAZY, mappedBy = "activity", cascade = CascadeType.ALL) private PedagogicalPlannerActivityMetadata plannerMetadata; /** default constructor */ Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Transition.java =================================================================== diff -u -r47043f84205046a23497bf8c57060e2dcadf0c9a -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Transition.java (.../Transition.java) (revision 47043f84205046a23497bf8c57060e2dcadf0c9a) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Transition.java (.../Transition.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -31,6 +31,7 @@ import javax.persistence.DiscriminatorType; import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -88,17 +89,17 @@ @Column(name = "create_date_time") private Date createDateTime; - @OneToOne(optional = false) + @OneToOne(fetch = FetchType.LAZY, optional = false) @JoinColumn(name = "to_activity_id") @Cascade(CascadeType.SAVE_UPDATE) Activity toActivity; - @OneToOne(optional = false) + @OneToOne(fetch = FetchType.LAZY, optional = false) @JoinColumn(name = "from_activity_id") @Cascade(CascadeType.SAVE_UPDATE) Activity fromActivity; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "learning_design_id") @Cascade(CascadeType.SAVE_UPDATE) LearningDesign learningDesign; Index: lams_common/src/java/org/lamsfoundation/lams/lesson/LearnerProgress.java =================================================================== diff -u -rcbe532f585efe39250986f20d58cbef855115cf3 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/lesson/LearnerProgress.java (.../LearnerProgress.java) (revision cbe532f585efe39250986f20d58cbef855115cf3) +++ lams_common/src/java/org/lamsfoundation/lams/lesson/LearnerProgress.java (.../LearnerProgress.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -125,12 +125,12 @@ private Long learnerProgressId; /** The User to whom this progress data belongs. */ - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "user_id") private User user; /** The Lesson this progress data is for */ - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "lesson_id") private Lesson lesson; @@ -154,7 +154,7 @@ * The activity that user just completed. The purpose of this activity is to * allow lams to remove unecessary frame for next activity. */ - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "previous_activity_id") private Activity previousActivity; @@ -166,7 +166,7 @@ * not the leaf node. The main purpose of current activity is to restore the * progress states if the user exist without finishing the activity. */ - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "current_activity_id") private Activity currentActivity; @@ -175,7 +175,7 @@ * next activity following the transition or leaf activity within a complex * activity. */ - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "next_activity_id") private Activity nextActivity; Index: lams_common/src/java/org/lamsfoundation/lams/lesson/LearnerProgressArchive.java =================================================================== diff -u -rcbe532f585efe39250986f20d58cbef855115cf3 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/lesson/LearnerProgressArchive.java (.../LearnerProgressArchive.java) (revision cbe532f585efe39250986f20d58cbef855115cf3) +++ lams_common/src/java/org/lamsfoundation/lams/lesson/LearnerProgressArchive.java (.../LearnerProgressArchive.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -57,12 +57,12 @@ private Long learnerProgressId; /** The User to whom this progress data belongs. */ - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "user_id") private User user; /** The Lesson this progress data is for */ - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "lesson_id") private Lesson lesson; @@ -93,7 +93,7 @@ * not the leaf node. The main purpose of current activity is to restore the * progress states if the user exist without finishing the activity. */ - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "current_activity_id") private Activity currentActivity; Index: lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java =================================================================== diff -u -r47043f84205046a23497bf8c57060e2dcadf0c9a -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java (.../Lesson.java) (revision 47043f84205046a23497bf8c57060e2dcadf0c9a) +++ lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java (.../Lesson.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -186,7 +186,7 @@ @Column(name = "scheduled_number_days_to_lesson_finish") private Integer scheduledNumberDaysToLessonFinish; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "user_id") private User user; Index: lams_common/src/java/org/lamsfoundation/lams/lesson/LessonClass.java =================================================================== diff -u -r47043f84205046a23497bf8c57060e2dcadf0c9a -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/lesson/LessonClass.java (.../LessonClass.java) (revision 47043f84205046a23497bf8c57060e2dcadf0c9a) +++ lams_common/src/java/org/lamsfoundation/lams/lesson/LessonClass.java (.../LessonClass.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -31,6 +31,7 @@ import javax.persistence.CascadeType; import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.JoinColumn; import javax.persistence.OneToOne; @@ -55,11 +56,11 @@ private static Logger log = Logger.getLogger(LessonClass.class); - @OneToOne(cascade = CascadeType.ALL) + @OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL) @JoinColumn(name = "staff_group_id") private Group staffGroup; - @OneToOne(mappedBy = "lessonClass") + @OneToOne(fetch = FetchType.LAZY, mappedBy = "lessonClass") private Lesson lesson; /** Creates a new instance of LessonClass */ Index: lams_common/src/java/org/lamsfoundation/lams/logevent/LogEvent.java =================================================================== diff -u -r2959fa5d52dd601e35c5a8a5ca4b37b2aaf8787e -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/logevent/LogEvent.java (.../LogEvent.java) (revision 2959fa5d52dd601e35c5a8a5ca4b37b2aaf8787e) +++ lams_common/src/java/org/lamsfoundation/lams/logevent/LogEvent.java (.../LogEvent.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -20,14 +20,14 @@ * **************************************************************** */ - package org.lamsfoundation.lams.logevent; import java.io.Serializable; import java.util.Date; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -63,12 +63,12 @@ public static final int TYPE_ACTIVITY_EDIT = 9; // Audit Service public static final int TYPE_FORCE_COMPLETE = 10; // Audit Service public static final int TYPE_USER_ORG_ADMIN = 11; - public static final int TYPE_LOGIN_AS = 12; - public static final int TYPE_PASSWORD_CHANGE = 13; + public static final int TYPE_LOGIN_AS = 12; + public static final int TYPE_PASSWORD_CHANGE = 13; public static final int TYPE_ROLE_FAILURE = 14; public static final int TYPE_ACCOUNT_LOCKED = 15; - public static final int TYPE_NOTIFICATION = 16; - public static final int TYPE_MARK_UPDATED = 17; // Audit Service + public static final int TYPE_NOTIFICATION = 16; + public static final int TYPE_MARK_UPDATED = 17; // Audit Service public static final int TYPE_MARK_RELEASED = 18; // Marks released in Gradebook public static final int TYPE_LEARNER_CONTENT_UPDATED = 19; // Audit Service public static final int TYPE_LEARNER_CONTENT_SHOW_HIDE = 20; // Audit Service @@ -87,15 +87,15 @@ private Integer logEventTypeId; //TODO perhaps make this field possible to be null - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "user_id") private User user; /** Date this activity was created */ @Column(name = "occurred_date_time") private Date occurredDateTime; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "target_user_id") private User targetUser; @@ -104,7 +104,7 @@ @Column(name = "activity_id") private Long activityId; - + @Column private String description; Index: lams_common/src/java/org/lamsfoundation/lams/notebook/model/NotebookEntry.java =================================================================== diff -u -r2959fa5d52dd601e35c5a8a5ca4b37b2aaf8787e -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/notebook/model/NotebookEntry.java (.../NotebookEntry.java) (revision 2959fa5d52dd601e35c5a8a5ca4b37b2aaf8787e) +++ lams_common/src/java/org/lamsfoundation/lams/notebook/model/NotebookEntry.java (.../NotebookEntry.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -21,14 +21,13 @@ * **************************************************************** */ - - package org.lamsfoundation.lams.notebook.model; import java.util.Date; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -48,9 +47,9 @@ private static final long serialVersionUID = 653296132134948803L; - @Id - @Column - @GeneratedValue(strategy = GenerationType.IDENTITY) + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; @Column(name = "external_id") @@ -62,14 +61,14 @@ @Column(name = "external_signature") private String externalSignature; - @ManyToOne - @JoinColumn(name = "user_id") + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id") private User user; - @Column + @Column private String title; - @Column + @Column private String entry; @Column(name = "create_date") Index: lams_common/src/java/org/lamsfoundation/lams/outcome/Outcome.java =================================================================== diff -u -r5b1fbc89c883857eace8c043a594a79cb0f60bc4 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/outcome/Outcome.java (.../Outcome.java) (revision 5b1fbc89c883857eace8c043a594a79cb0f60bc4) +++ lams_common/src/java/org/lamsfoundation/lams/outcome/Outcome.java (.../Outcome.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -5,6 +5,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -26,11 +27,11 @@ @GeneratedValue(strategy = GenerationType.IDENTITY) private Long outcomeId; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "organisation_id") private Organisation organisation; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "scale_id") private OutcomeScale scale; @@ -46,7 +47,7 @@ @Column(name = "content_folder_id") private String contentFolderId; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "create_by") private User createBy; Index: lams_common/src/java/org/lamsfoundation/lams/outcome/OutcomeMapping.java =================================================================== diff -u -r5b1fbc89c883857eace8c043a594a79cb0f60bc4 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/outcome/OutcomeMapping.java (.../OutcomeMapping.java) (revision 5b1fbc89c883857eace8c043a594a79cb0f60bc4) +++ lams_common/src/java/org/lamsfoundation/lams/outcome/OutcomeMapping.java (.../OutcomeMapping.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -4,6 +4,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -21,7 +22,7 @@ @GeneratedValue(strategy = GenerationType.IDENTITY) private Long mappingId; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "outcome_id") private Outcome outcome; Index: lams_common/src/java/org/lamsfoundation/lams/outcome/OutcomeResult.java =================================================================== diff -u -r5b1fbc89c883857eace8c043a594a79cb0f60bc4 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/outcome/OutcomeResult.java (.../OutcomeResult.java) (revision 5b1fbc89c883857eace8c043a594a79cb0f60bc4) +++ lams_common/src/java/org/lamsfoundation/lams/outcome/OutcomeResult.java (.../OutcomeResult.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -5,6 +5,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -24,18 +25,18 @@ @GeneratedValue(strategy = GenerationType.IDENTITY) private Long resultId; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "mapping_id") private OutcomeMapping mapping; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "user_id") private User user; @Column private Integer value; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "create_by") private User createBy; Index: lams_common/src/java/org/lamsfoundation/lams/outcome/OutcomeScale.java =================================================================== diff -u -r5b1fbc89c883857eace8c043a594a79cb0f60bc4 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/outcome/OutcomeScale.java (.../OutcomeScale.java) (revision 5b1fbc89c883857eace8c043a594a79cb0f60bc4) +++ lams_common/src/java/org/lamsfoundation/lams/outcome/OutcomeScale.java (.../OutcomeScale.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -34,7 +34,7 @@ @GeneratedValue(strategy = GenerationType.IDENTITY) private Long scaleId; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "organisation_id") private Organisation organisation; @@ -50,7 +50,7 @@ @Column(name = "content_folder_id") private String contentFolderId; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "create_by") private User createBy; Index: lams_common/src/java/org/lamsfoundation/lams/outcome/OutcomeScaleItem.java =================================================================== diff -u -r5b1fbc89c883857eace8c043a594a79cb0f60bc4 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/outcome/OutcomeScaleItem.java (.../OutcomeScaleItem.java) (revision 5b1fbc89c883857eace8c043a594a79cb0f60bc4) +++ lams_common/src/java/org/lamsfoundation/lams/outcome/OutcomeScaleItem.java (.../OutcomeScaleItem.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -4,6 +4,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -21,7 +22,7 @@ @GeneratedValue(strategy = GenerationType.IDENTITY) private Long itemId; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "scale_id") private OutcomeScale scale; Index: lams_common/src/java/org/lamsfoundation/lams/planner/PedagogicalPlannerActivityMetadata.java =================================================================== diff -u -rcbe532f585efe39250986f20d58cbef855115cf3 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/planner/PedagogicalPlannerActivityMetadata.java (.../PedagogicalPlannerActivityMetadata.java) (revision cbe532f585efe39250986f20d58cbef855115cf3) +++ lams_common/src/java/org/lamsfoundation/lams/planner/PedagogicalPlannerActivityMetadata.java (.../PedagogicalPlannerActivityMetadata.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -26,6 +26,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.MapsId; @@ -48,7 +49,7 @@ @Column(name = "activity_id") private Long id; - @OneToOne + @OneToOne(fetch = FetchType.LAZY) @JoinColumn(name = "activity_id") @MapsId private ToolActivity activity; Index: lams_common/src/java/org/lamsfoundation/lams/policies/Policy.java =================================================================== diff -u -r2959fa5d52dd601e35c5a8a5ca4b37b2aaf8787e -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/policies/Policy.java (.../Policy.java) (revision 2959fa5d52dd601e35c5a8a5ca4b37b2aaf8787e) +++ lams_common/src/java/org/lamsfoundation/lams/policies/Policy.java (.../Policy.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -5,6 +5,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -20,12 +21,12 @@ @Entity @Table(name = "lams_policy") public class Policy { - + /** active policy */ public static final Integer STATUS_ACTIVE = new Integer(1); /** inactive policy */ public static final Integer STATUS_INACTIVE = new Integer(2); - + /** site policy */ public static final Integer TYPE_SITE_POLICY = new Integer(1); /** privacy policy */ @@ -34,40 +35,40 @@ public static final Integer TYPE_THIRD_PARTIES_POLICY = new Integer(3); /** other policy */ public static final Integer TYPE_OTHER = new Integer(4); - + @Id @Column @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - + /** - * Shared by all policies created out of one parent one. + * Shared by all policies created out of one parent one. */ @Column(name = "policy_id") private Long policyId; - + @Column(name = "policy_name") private String policyName; - + @Column private String version; - + @Column private String summary; - + @Column(name = "full_policy") private String fullPolicy; - + @Column(name = "policy_state_id") private Integer policyStateId; - + @Column(name = "policy_type_id") private Integer policyTypeId; - - @ManyToOne - @JoinColumn(name = "created_by") + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "created_by") private User createdBy; - + /** Date this policy was modified the last time */ @Column(name = "last_modified") private Date lastModified; @@ -76,20 +77,20 @@ @OneToMany(mappedBy = "policy") @OrderBy("dateAgreedOn ASC") private Set consents; - + // *************** NON Persistent Fields ******************** - + @Transient private boolean hasPreviousVersions; @Transient private int userConsentsCount; - + /** default constructor */ public Policy() { lastModified = new Date(); // default value is set to when the object is created } - + // --------------------------------------------------------------------- // Getters and Setters // --------------------------------------------------------------------- @@ -100,23 +101,23 @@ public void setUid(Long id) { this.uid = id; } - + public Long getPolicyId() { return policyId; } public void setPolicyId(Long policyId) { this.policyId = policyId; } - + public Integer getPolicyStateId() { return this.policyStateId; } public void setPolicyStateId(Integer policyStateId) { this.policyStateId = policyStateId; } - + public Integer getPolicyTypeId() { return this.policyTypeId; } @@ -128,31 +129,35 @@ public String getPolicyName() { return policyName; } + public void setPolicyName(String policyName) { this.policyName = policyName; } - + public String getVersion() { return version; } + public void setVersion(String version) { this.version = version; } public String getSummary() { return summary; } + public void setSummary(String summary) { this.summary = summary; } - + public String getFullPolicy() { return fullPolicy; } + public void setFullPolicy(String fullPolicy) { this.fullPolicy = fullPolicy; } - + public User getCreatedBy() { return this.createdBy; } @@ -169,15 +174,15 @@ public void setLastModified(Date lastModified) { this.lastModified = lastModified != null ? lastModified : new Date(); } - + public Set getConsents() { return this.consents; } public void setConsents(Set consents) { this.consents = consents; - } - + } + public void setPreviousVersions(boolean hasPreviousVersions) { this.hasPreviousVersions = hasPreviousVersions; } Index: lams_common/src/java/org/lamsfoundation/lams/policies/PolicyConsent.java =================================================================== diff -u -r2959fa5d52dd601e35c5a8a5ca4b37b2aaf8787e -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/policies/PolicyConsent.java (.../PolicyConsent.java) (revision 2959fa5d52dd601e35c5a8a5ca4b37b2aaf8787e) +++ lams_common/src/java/org/lamsfoundation/lams/policies/PolicyConsent.java (.../PolicyConsent.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -4,6 +4,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -16,36 +17,36 @@ @Entity @Table(name = "lams_policy_consent") public class PolicyConsent { - + @Id @Column @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - + @Column(name = "date_agreed_on") private Date dateAgreedOn; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "policy_uid") private Policy policy; - - @ManyToOne + + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "user_id") private User user; - + /** default constructor */ public PolicyConsent() { dateAgreedOn = new Date(); // default value is set to when the object is created } - + public Long getUid() { return uid; } public void setUid(Long uid) { this.uid = uid; } - + public Date getDateAgreedOn() { return dateAgreedOn; } @@ -62,7 +63,7 @@ public void setPolicy(Policy policy) { this.policy = policy; } - + public User getUser() { return this.user; } Index: lams_common/src/java/org/lamsfoundation/lams/rating/model/LessonRatingCriteria.java =================================================================== diff -u -r96068ffc66514c1d25e9adeb96acfa164ab29dd5 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/rating/model/LessonRatingCriteria.java (.../LessonRatingCriteria.java) (revision 96068ffc66514c1d25e9adeb96acfa164ab29dd5) +++ lams_common/src/java/org/lamsfoundation/lams/rating/model/LessonRatingCriteria.java (.../LessonRatingCriteria.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -20,13 +20,13 @@ * **************************************************************** */ - package org.lamsfoundation.lams.rating.model; import java.io.Serializable; import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; @@ -39,8 +39,8 @@ public class LessonRatingCriteria extends RatingCriteria implements Cloneable, Serializable { /** Holds value of property lessonId. */ - @ManyToOne - @JoinColumn(name = "lesson_id") + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "lesson_id") private Lesson lesson; @Override Index: lams_common/src/java/org/lamsfoundation/lams/rating/model/Rating.java =================================================================== diff -u -r96068ffc66514c1d25e9adeb96acfa164ab29dd5 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/rating/model/Rating.java (.../Rating.java) (revision 96068ffc66514c1d25e9adeb96acfa164ab29dd5) +++ lams_common/src/java/org/lamsfoundation/lams/rating/model/Rating.java (.../Rating.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -21,12 +21,11 @@ * **************************************************************** */ - - package org.lamsfoundation.lams.rating.model; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -50,20 +49,20 @@ @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - @ManyToOne - @JoinColumn(name = "rating_criteria_id") + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "rating_criteria_id") private RatingCriteria ratingCriteria; @Column(name = "item_id") private Long itemId; - @ManyToOne - @JoinColumn(name = "user_id") + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id") private User learner; @Column private Float rating; - + @Column(name = "tool_session_id") private Long toolSessionId; Index: lams_common/src/java/org/lamsfoundation/lams/rating/model/RatingComment.java =================================================================== diff -u -r96068ffc66514c1d25e9adeb96acfa164ab29dd5 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/rating/model/RatingComment.java (.../RatingComment.java) (revision 96068ffc66514c1d25e9adeb96acfa164ab29dd5) +++ lams_common/src/java/org/lamsfoundation/lams/rating/model/RatingComment.java (.../RatingComment.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -20,13 +20,13 @@ * **************************************************************** */ - package org.lamsfoundation.lams.rating.model; import java.util.Date; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -50,23 +50,23 @@ @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - @ManyToOne - @JoinColumn(name = "rating_criteria_id") + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "rating_criteria_id") private RatingCriteria ratingCriteria; @Column(name = "item_id") private Long itemId; - @ManyToOne - @JoinColumn(name = "user_id") - private User learner; + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id") + private User learner; @Column private String comment; @Column(name = "posted_date") private Date postedDate; - + @Column(name = "tool_session_id") private Long toolSessionId; @@ -146,7 +146,7 @@ public void setPostedDate(Date postedDate) { this.postedDate = postedDate; } - + public Long getToolSessionId() { return toolSessionId; } Index: lams_common/src/java/org/lamsfoundation/lams/signup/model/SignupOrganisation.java =================================================================== diff -u -r2959fa5d52dd601e35c5a8a5ca4b37b2aaf8787e -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/signup/model/SignupOrganisation.java (.../SignupOrganisation.java) (revision 2959fa5d52dd601e35c5a8a5ca4b37b2aaf8787e) +++ lams_common/src/java/org/lamsfoundation/lams/signup/model/SignupOrganisation.java (.../SignupOrganisation.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -4,6 +4,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -29,9 +30,9 @@ @Column(name = "signup_organisation_id") @GeneratedValue(strategy = GenerationType.IDENTITY) private Integer signupOrganisationId; - - @ManyToOne - @JoinColumn(name = "organisation_id") + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "organisation_id") private Organisation organisation; @Column(name = "add_to_lessons") Index: lams_common/src/java/org/lamsfoundation/lams/tool/GroupedToolSession.java =================================================================== diff -u -r47043f84205046a23497bf8c57060e2dcadf0c9a -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/tool/GroupedToolSession.java (.../GroupedToolSession.java) (revision 47043f84205046a23497bf8c57060e2dcadf0c9a) +++ lams_common/src/java/org/lamsfoundation/lams/tool/GroupedToolSession.java (.../GroupedToolSession.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -28,6 +28,7 @@ import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; @@ -48,7 +49,7 @@ public class GroupedToolSession extends ToolSession { private static final long serialVersionUID = 8638128083435243375L; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "group_id") private Group sessionGroup; Index: lams_common/src/java/org/lamsfoundation/lams/tool/NonGroupedToolSession.java =================================================================== diff -u -r47043f84205046a23497bf8c57060e2dcadf0c9a -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/tool/NonGroupedToolSession.java (.../NonGroupedToolSession.java) (revision 47043f84205046a23497bf8c57060e2dcadf0c9a) +++ lams_common/src/java/org/lamsfoundation/lams/tool/NonGroupedToolSession.java (.../NonGroupedToolSession.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -29,6 +29,7 @@ import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; @@ -47,7 +48,7 @@ public class NonGroupedToolSession extends ToolSession { private static final long serialVersionUID = 8063910455683242612L; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "user_id") private User user; Index: lams_common/src/java/org/lamsfoundation/lams/tool/ToolContent.java =================================================================== diff -u -raaa9a8f28fa1b2a222690dbb3a2d7647efb30cd5 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/tool/ToolContent.java (.../ToolContent.java) (revision aaa9a8f28fa1b2a222690dbb3a2d7647efb30cd5) +++ lams_common/src/java/org/lamsfoundation/lams/tool/ToolContent.java (.../ToolContent.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -27,6 +27,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -48,7 +49,7 @@ @GeneratedValue(strategy = GenerationType.IDENTITY) private Long toolContentId; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "tool_id") private Tool tool; Index: lams_common/src/java/org/lamsfoundation/lams/tool/ToolSession.java =================================================================== diff -u -r47043f84205046a23497bf8c57060e2dcadf0c9a -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/tool/ToolSession.java (.../ToolSession.java) (revision 47043f84205046a23497bf8c57060e2dcadf0c9a) +++ lams_common/src/java/org/lamsfoundation/lams/tool/ToolSession.java (.../ToolSession.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -31,6 +31,7 @@ import javax.persistence.DiscriminatorColumn; import javax.persistence.DiscriminatorType; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -54,7 +55,7 @@ public abstract class ToolSession implements Serializable { /** - * + * */ private static final long serialVersionUID = 310605806277808940L; /** Tool session type id for grouped */ @@ -77,7 +78,7 @@ @Column(name = "tool_session_name") private String toolSessionName; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "activity_id") private ToolActivity toolActivity; @@ -90,7 +91,7 @@ @Column(name = "unique_key") private String uniqueKey; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "lesson_id") private Lesson lesson; Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/FavoriteOrganisation.java =================================================================== diff -u -raaa9a8f28fa1b2a222690dbb3a2d7647efb30cd5 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/FavoriteOrganisation.java (.../FavoriteOrganisation.java) (revision aaa9a8f28fa1b2a222690dbb3a2d7647efb30cd5) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/FavoriteOrganisation.java (.../FavoriteOrganisation.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -27,6 +27,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -48,11 +49,11 @@ @GeneratedValue(strategy = GenerationType.IDENTITY) private Integer favoriteOrganisationId; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "user_id") private User user; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "organisation_id") private Organisation organisation; Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java =================================================================== diff -u -raaa9a8f28fa1b2a222690dbb3a2d7647efb30cd5 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java (.../Organisation.java) (revision aaa9a8f28fa1b2a222690dbb3a2d7647efb30cd5) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java (.../Organisation.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -31,6 +31,7 @@ import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -66,21 +67,21 @@ @Column private String description; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "parent_organisation_id") private Organisation parentOrganisation; @Column(name = "create_date") private Date createDate; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "created_by") private User createdBy; @OneToMany(mappedBy = "organisationID", cascade = CascadeType.ALL, orphanRemoval = true) private Set workspaceFolders = new HashSet(); - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "organisation_type_id") private OrganisationType organisationType; @@ -94,7 +95,7 @@ @LazyCollection(LazyCollectionOption.EXTRA) private Set lessons = new HashSet(); - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "organisation_state_id") private OrganisationState organisationState; Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/RolePrivilege.java =================================================================== diff -u -raaa9a8f28fa1b2a222690dbb3a2d7647efb30cd5 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/RolePrivilege.java (.../RolePrivilege.java) (revision aaa9a8f28fa1b2a222690dbb3a2d7647efb30cd5) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/RolePrivilege.java (.../RolePrivilege.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -4,6 +4,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -23,11 +24,11 @@ @GeneratedValue(strategy = GenerationType.IDENTITY) private Long rpId; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "privilege_id") private Privilege privilege; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "role_id") private Role role; Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java =================================================================== diff -u -rcbe532f585efe39250986f20d58cbef855115cf3 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java (.../User.java) (revision cbe532f585efe39250986f20d58cbef855115cf3) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java (.../User.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -153,7 +153,7 @@ @Column(name = "create_date") private Date createDate; - @OneToOne(cascade = CascadeType.ALL) + @OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL) @JoinColumn(name = "workspace_folder_id") private WorkspaceFolder workspaceFolder; Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/UserOrganisation.java =================================================================== diff -u -raaa9a8f28fa1b2a222690dbb3a2d7647efb30cd5 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/UserOrganisation.java (.../UserOrganisation.java) (revision aaa9a8f28fa1b2a222690dbb3a2d7647efb30cd5) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/UserOrganisation.java (.../UserOrganisation.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -30,6 +30,7 @@ import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -58,11 +59,11 @@ @GeneratedValue(strategy = GenerationType.IDENTITY) private Integer userOrganisationId; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "user_id") private User user; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "organisation_id") private Organisation organisation; Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/UserOrganisationRole.java =================================================================== diff -u -raaa9a8f28fa1b2a222690dbb3a2d7647efb30cd5 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/UserOrganisationRole.java (.../UserOrganisationRole.java) (revision aaa9a8f28fa1b2a222690dbb3a2d7647efb30cd5) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/UserOrganisationRole.java (.../UserOrganisationRole.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -27,6 +27,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -48,11 +49,11 @@ @GeneratedValue(strategy = GenerationType.IDENTITY) private Integer userOrganisationRoleId; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "user_organisation_id") private UserOrganisation userOrganisation; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "role_id") private Role role; Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.java =================================================================== diff -u -r47043f84205046a23497bf8c57060e2dcadf0c9a -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.java (.../WorkspaceFolder.java) (revision 47043f84205046a23497bf8c57060e2dcadf0c9a) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.java (.../WorkspaceFolder.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -31,6 +31,7 @@ import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -78,7 +79,7 @@ @Column private String name; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "parent_folder_id") private WorkspaceFolder parentWorkspaceFolder; Index: lams_common/src/java/org/lamsfoundation/lams/workspace/WorkspaceFolderContent.java =================================================================== diff -u -r47043f84205046a23497bf8c57060e2dcadf0c9a -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_common/src/java/org/lamsfoundation/lams/workspace/WorkspaceFolderContent.java (.../WorkspaceFolderContent.java) (revision 47043f84205046a23497bf8c57060e2dcadf0c9a) +++ lams_common/src/java/org/lamsfoundation/lams/workspace/WorkspaceFolderContent.java (.../WorkspaceFolderContent.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -28,6 +28,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -120,7 +121,7 @@ * WorkspaceFolder that contains * this content **/ - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "workspace_folder_id") private WorkspaceFolder workspaceFolder; Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNode.java =================================================================== diff -u -r809352b41790344e447df862668ab048d4dd56e3 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNode.java (.../CrNode.java) (revision 809352b41790344e447df862668ab048d4dd56e3) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNode.java (.../CrNode.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -69,11 +69,11 @@ @Column(name = "next_version_id") private Long nextVersionId; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "workspace_id") private org.lamsfoundation.lams.contentrepository.CrWorkspace crWorkspace; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "parent_nv_id") private org.lamsfoundation.lams.contentrepository.CrNodeVersion parentNodeVersion; Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNodeVersion.java =================================================================== diff -u -r809352b41790344e447df862668ab048d4dd56e3 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNodeVersion.java (.../CrNodeVersion.java) (revision 809352b41790344e447df862668ab048d4dd56e3) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNodeVersion.java (.../CrNodeVersion.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -70,7 +70,7 @@ @Column(name = "user_id") private Integer userId; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "node_id") private org.lamsfoundation.lams.contentrepository.CrNode node; Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNodeVersionProperty.java =================================================================== diff -u -r809352b41790344e447df862668ab048d4dd56e3 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNodeVersionProperty.java (.../CrNodeVersionProperty.java) (revision 809352b41790344e447df862668ab048d4dd56e3) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNodeVersionProperty.java (.../CrNodeVersionProperty.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -21,7 +21,6 @@ * **************************************************************** */ - package org.lamsfoundation.lams.contentrepository; import java.io.Serializable; @@ -33,6 +32,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -65,8 +65,8 @@ @Column private int type; - @ManyToOne - @JoinColumn(name = "nv_id") + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "nv_id") private org.lamsfoundation.lams.contentrepository.CrNodeVersion crNodeVersion; /** full constructor */ @@ -82,7 +82,7 @@ public CrNodeVersionProperty() { } - public Long getId() { + public Long getId() { return this.id; } @@ -157,7 +157,8 @@ /* ** Implementation of IValue interface ** */ - @Transient protected Logger log = Logger.getLogger(CrNodeVersionProperty.class); + @Transient + protected Logger log = Logger.getLogger(CrNodeVersionProperty.class); /** * Returns a string representation of the value. Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrWorkspaceCredential.java =================================================================== diff -u -r809352b41790344e447df862668ab048d4dd56e3 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrWorkspaceCredential.java (.../CrWorkspaceCredential.java) (revision 809352b41790344e447df862668ab048d4dd56e3) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrWorkspaceCredential.java (.../CrWorkspaceCredential.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -21,13 +21,13 @@ * **************************************************************** */ - package org.lamsfoundation.lams.contentrepository; import java.io.Serializable; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -47,13 +47,13 @@ @Column(name = "wc_id") @GeneratedValue(strategy = GenerationType.IDENTITY) private Long wcId; - - @ManyToOne + + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "workspace_id") private org.lamsfoundation.lams.contentrepository.CrWorkspace crWorkspace; - @ManyToOne - @JoinColumn(name = "credential_id") + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "credential_id") private org.lamsfoundation.lams.contentrepository.CrCredential crCredential; /** full constructor */ @@ -75,7 +75,7 @@ this.wcId = wcId; } - public org.lamsfoundation.lams.contentrepository.CrWorkspace getCrWorkspace() { + public org.lamsfoundation.lams.contentrepository.CrWorkspace getCrWorkspace() { return this.crWorkspace; } Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/model/GradebookUserActivityArchive.java =================================================================== diff -u -r6b9fd327fcba9ac3899bbe5c346cdc02a833a780 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/model/GradebookUserActivityArchive.java (.../GradebookUserActivityArchive.java) (revision 6b9fd327fcba9ac3899bbe5c346cdc02a833a780) +++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/model/GradebookUserActivityArchive.java (.../GradebookUserActivityArchive.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -26,6 +26,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; @@ -38,31 +39,31 @@ @Entity @Table(name = "lams_gradebook_user_activity_archive") public class GradebookUserActivityArchive { - + @Id @Column private long uid; - - @ManyToOne + + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "activity_id") private ToolActivity activity; - - @ManyToOne + + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "user_id") private User learner; - + @Column private Double mark; - + @Column private String feedback; @Column(name = "marked_in_gradebook") private Boolean markedInGradebook; - + @Column(name = "update_date") private Date updateDate; - + @Column(name = "archive_date") private Date archiveDate; Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/model/GradebookUserLessonArchive.java =================================================================== diff -u -r6b9fd327fcba9ac3899bbe5c346cdc02a833a780 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/model/GradebookUserLessonArchive.java (.../GradebookUserLessonArchive.java) (revision 6b9fd327fcba9ac3899bbe5c346cdc02a833a780) +++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/model/GradebookUserLessonArchive.java (.../GradebookUserLessonArchive.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -26,6 +26,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; @@ -38,25 +39,25 @@ @Entity @Table(name = "lams_gradebook_user_lesson_archive") public class GradebookUserLessonArchive { - + @Id @Column private long uid; - - @ManyToOne + + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "lesson_id") private Lesson lesson; - - @ManyToOne + + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "user_id") private User learner; - + @Column private Double mark; - + @Column private String feedback; - + @Column(name = "archive_date") private Date archiveDate; Index: lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/Kumalive.java =================================================================== diff -u -rf2b4bc8c20ba17a32f4065e4f1fbeed64cf39b78 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/Kumalive.java (.../Kumalive.java) (revision f2b4bc8c20ba17a32f4065e4f1fbeed64cf39b78) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/Kumalive.java (.../Kumalive.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -51,11 +51,11 @@ @GeneratedValue(strategy = GenerationType.IDENTITY) private Long kumaliveId; - @ManyToOne(optional = false) + @ManyToOne(fetch = FetchType.LAZY, optional = false) @JoinColumn(name = "organisation_id") private Organisation organisation; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "created_by") private User createdBy; Index: lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/KumalivePoll.java =================================================================== diff -u -r7dfa802584b72c21927df5f28425ee7939fcc9c5 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/KumalivePoll.java (.../KumalivePoll.java) (revision 7dfa802584b72c21927df5f28425ee7939fcc9c5) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/KumalivePoll.java (.../KumalivePoll.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -27,7 +27,6 @@ import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.FetchType; @@ -49,26 +48,26 @@ @Column(name = "poll_id") @GeneratedValue(strategy = GenerationType.IDENTITY) private Long pollId; - - @ManyToOne(optional=false) + + @ManyToOne(fetch = FetchType.LAZY, optional = false) @JoinColumn(name = "kumalive_id") private Kumalive kumalive; - + @Column private String name; - + @Column(name = "votes_released") private Boolean votesReleased; - + @Column(name = "voters_released") private Boolean votersReleased; - + @Column(name = "start_date") private Date startDate; - + @Column(name = "finish_date") private Date finishDate; - + @OneToMany(fetch = FetchType.EAGER) @JoinColumn(name = "poll_id") @OrderBy("order_id ASC") Index: lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/KumalivePollAnswer.java =================================================================== diff -u -r7dfa802584b72c21927df5f28425ee7939fcc9c5 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/KumalivePollAnswer.java (.../KumalivePollAnswer.java) (revision 7dfa802584b72c21927df5f28425ee7939fcc9c5) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/KumalivePollAnswer.java (.../KumalivePollAnswer.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -50,32 +50,32 @@ @Column(name = "answer_id") @GeneratedValue(strategy = GenerationType.IDENTITY) private Long answerId; - - @ManyToOne(optional=false) + + @ManyToOne(fetch = FetchType.LAZY, optional = false) @JoinColumn(name = "poll_id") private KumalivePoll poll; - + @Column(name = "order_id") private Short orderId; - + @Column private String name; - + // // // // // - + // @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER) // @JoinColumn(name = "kumalive_id") // @OrderBy("sequence_id ASC") - + @ElementCollection(fetch = FetchType.LAZY) @OrderBy("vote_date ASC") - @MapKeyColumn(name="user_id") - @Column(name="vote_date") - @CollectionTable(name="lams_kumalive_poll_vote", joinColumns=@JoinColumn(name="answer_id")) + @MapKeyColumn(name = "user_id") + @Column(name = "vote_date") + @CollectionTable(name = "lams_kumalive_poll_vote", joinColumns = @JoinColumn(name = "answer_id")) private Map votes = new TreeMap<>(); public KumalivePollAnswer() { Index: lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/KumaliveRubric.java =================================================================== diff -u -r7dfa802584b72c21927df5f28425ee7939fcc9c5 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/KumaliveRubric.java (.../KumaliveRubric.java) (revision 7dfa802584b72c21927df5f28425ee7939fcc9c5) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/KumaliveRubric.java (.../KumaliveRubric.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -26,6 +26,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -44,18 +45,18 @@ @Column(name = "rubric_id") @GeneratedValue(strategy = GenerationType.IDENTITY) private Long rubricId; - - @ManyToOne(optional=false) + + @ManyToOne(fetch = FetchType.LAZY, optional = false) @JoinColumn(name = "organisation_id") private Organisation organisation; - - @ManyToOne + + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "kumalive_id") private Kumalive kumalive; - + @Column(name = "order_id") private Short orderId; - + @Column private String name; Index: lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/KumaliveScore.java =================================================================== diff -u -r7dfa802584b72c21927df5f28425ee7939fcc9c5 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/KumaliveScore.java (.../KumaliveScore.java) (revision 7dfa802584b72c21927df5f28425ee7939fcc9c5) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/KumaliveScore.java (.../KumaliveScore.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -26,6 +26,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -44,18 +45,18 @@ @Column(name = "score_id") @GeneratedValue(strategy = GenerationType.IDENTITY) private Long scoreId; - - @ManyToOne(optional=false) + + @ManyToOne(fetch = FetchType.LAZY, optional = false) @JoinColumn(name = "rubric_id") private KumaliveRubric rubric; - - @ManyToOne + + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "user_id") private User user; - + @Column private Long batch; - + @Column private Short score; Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java =================================================================== diff -u -rdcdc1487609bd4f00afaa93c09272d84ab0cd325 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java (.../Assessment.java) (revision dcdc1487609bd4f00afaa93c09272d84ab0cd325) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java (.../Assessment.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -144,7 +144,7 @@ @Column(name = "submission_deadline") private Date submissionDeadline; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @Cascade(org.hibernate.annotations.CascadeType.SAVE_UPDATE) @JoinColumn(name = "create_by") private AssessmentUser createdBy; Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java =================================================================== diff -u -rdcdc1487609bd4f00afaa93c09272d84ab0cd325 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java (.../AssessmentQuestionResult.java) (revision dcdc1487609bd4f00afaa93c09272d84ab0cd325) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java (.../AssessmentQuestionResult.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -85,11 +85,11 @@ @Column(name = "confidence_level") private int confidenceLevel; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "assessment_question_uid") private AssessmentQuestion assessmentQuestion; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "result_uid") private AssessmentResult assessmentResult; Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentResult.java =================================================================== diff -u -rdcdc1487609bd4f00afaa93c09272d84ab0cd325 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentResult.java (.../AssessmentResult.java) (revision dcdc1487609bd4f00afaa93c09272d84ab0cd325) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentResult.java (.../AssessmentResult.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -79,11 +79,11 @@ @Column private float grade; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "assessment_uid") private Assessment assessment; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "user_uid") private AssessmentUser user; Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentSession.java =================================================================== diff -u -rdcdc1487609bd4f00afaa93c09272d84ab0cd325 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentSession.java (.../AssessmentSession.java) (revision dcdc1487609bd4f00afaa93c09272d84ab0cd325) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentSession.java (.../AssessmentSession.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -30,6 +30,7 @@ import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -52,40 +53,40 @@ @Column @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - + @Column(name = "session_id") private Long sessionId; - + @Column(name = "session_name") private String sessionName; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "assessment_uid") private Assessment assessment; - + @Column(name = "session_start_date") private Date sessionStartDate; - + @Column(name = "session_end_date") private Date sessionEndDate; - + // finish or not @Column private int status; - + @OneToMany(cascade = CascadeType.ALL) @JoinColumn(name = "session_uid") @OrderBy("last_name ASC") private Set assessmentUsers = new HashSet<>(); - - @ManyToOne(cascade = CascadeType.ALL) + + @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL) @JoinColumn(name = "group_leader_uid") private AssessmentUser groupLeader; // ********************************************************** // Get/Set methods // ********************************************************** - + public Long getUid() { return uid; } Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentUser.java =================================================================== diff -u -rdcdc1487609bd4f00afaa93c09272d84ab0cd325 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentUser.java (.../AssessmentUser.java) (revision dcdc1487609bd4f00afaa93c09272d84ab0cd325) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentUser.java (.../AssessmentUser.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -27,6 +27,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -54,32 +55,32 @@ @Column @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - + @Column(name = "user_id") private Long userId; - + @Column(name = "first_name") private String firstName; - + @Column(name = "last_name") private String lastName; - + @Column(name = "login_name") private String loginName; - + @Column(name = "session_finished") private boolean sessionFinished; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "session_uid") private AssessmentSession session; - - @ManyToOne + + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "assessment_uid") private Assessment assessment; // *************** NON Persist Fields ******************** - + // the user access some reousrce question date time. Use in monitoring summary page @Transient private Date accessDate; Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/QuestionReference.java =================================================================== diff -u -rdcdc1487609bd4f00afaa93c09272d84ab0cd325 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/QuestionReference.java (.../QuestionReference.java) (revision dcdc1487609bd4f00afaa93c09272d84ab0cd325) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/QuestionReference.java (.../QuestionReference.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -20,11 +20,11 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.assessment.model; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -64,7 +64,7 @@ @Column(name = "random_question") private boolean randomQuestion; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "question_uid") private AssessmentQuestion question; Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/ChatMessage.java =================================================================== diff -u -r4f55bd929d94e4cfc74607e6b992bc3a35ce25c8 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/ChatMessage.java (.../ChatMessage.java) (revision 4f55bd929d94e4cfc74607e6b992bc3a35ce25c8) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/ChatMessage.java (.../ChatMessage.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -27,6 +27,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -58,15 +59,15 @@ @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "chat_session_uid") private ChatSession chatSession; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "from_user_uid") private ChatUser fromUser; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "to_user_uid") private ChatUser toUser; Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/ChatSession.java =================================================================== diff -u -r4f55bd929d94e4cfc74607e6b992bc3a35ce25c8 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/ChatSession.java (.../ChatSession.java) (revision 4f55bd929d94e4cfc74607e6b992bc3a35ce25c8) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/ChatSession.java (.../ChatSession.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -29,6 +29,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -67,7 +68,7 @@ @Column(name = "session_name") private String sessionName; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "chat_uid") private Chat chat; Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/ChatUser.java =================================================================== diff -u -r4f55bd929d94e4cfc74607e6b992bc3a35ce25c8 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/ChatUser.java (.../ChatUser.java) (revision 4f55bd929d94e4cfc74607e6b992bc3a35ce25c8) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/ChatUser.java (.../ChatUser.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -27,6 +27,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -65,7 +66,7 @@ @Column(name = "login_name") private String loginName; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "chat_session_uid") private ChatSession chatSession; Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/Daco.java =================================================================== diff -u -r862a8e07b6ea55951a9047221ed0a86486b93b71 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/Daco.java (.../Daco.java) (revision 862a8e07b6ea55951a9047221ed0a86486b93b71) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/Daco.java (.../Daco.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -93,7 +93,7 @@ @Column(name = "update_date") private Date updated; - @ManyToOne(cascade = CascadeType.ALL) + @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL) @JoinColumn(name = "create_by") private DacoUser createdBy; Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/DacoAnswer.java =================================================================== diff -u -r862a8e07b6ea55951a9047221ed0a86486b93b71 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/DacoAnswer.java (.../DacoAnswer.java) (revision 862a8e07b6ea55951a9047221ed0a86486b93b71) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/DacoAnswer.java (.../DacoAnswer.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -26,6 +26,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -52,8 +53,8 @@ @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - @ManyToOne - @JoinColumn(name = "user_uid") + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_uid") private DacoUser user; @Column(name = "record_id") @@ -62,9 +63,9 @@ @Column private String answer; - @ManyToOne - @JoinColumn(name = "question_uid") - private DacoQuestion question; + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "question_uid") + private DacoQuestion question; @Column(name = "file_uuid") private Long fileUuid; Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/DacoQuestion.java =================================================================== diff -u -r862a8e07b6ea55951a9047221ed0a86486b93b71 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/DacoQuestion.java (.../DacoQuestion.java) (revision 862a8e07b6ea55951a9047221ed0a86486b93b71) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/DacoQuestion.java (.../DacoQuestion.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -90,11 +90,11 @@ @Column(name = "create_date") private Date createDate; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "create_by") private DacoUser createBy; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "content_uid") private Daco daco; Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/DacoSession.java =================================================================== diff -u -r862a8e07b6ea55951a9047221ed0a86486b93b71 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/DacoSession.java (.../DacoSession.java) (revision 862a8e07b6ea55951a9047221ed0a86486b93b71) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/DacoSession.java (.../DacoSession.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -29,6 +29,7 @@ import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -58,23 +59,23 @@ @Column @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - + @Column(name = "session_id") private Long sessionId; @Column(name = "session_name") private String sessionName; - @ManyToOne - @JoinColumn(name = "content_uid") + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "content_uid") private Daco daco; @Column(name = "session_start_date") private Date sessionStartDate; @Column(name = "session_end_date") private Date sessionEndDate; - + // finish or not @Column private int status; @@ -84,7 +85,7 @@ @OrderBy("createDate") private Set dacoQuestions; - public Long getUid() { + public Long getUid() { return uid; } Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/DacoUser.java =================================================================== diff -u -r862a8e07b6ea55951a9047221ed0a86486b93b71 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/DacoUser.java (.../DacoUser.java) (revision 862a8e07b6ea55951a9047221ed0a86486b93b71) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/DacoUser.java (.../DacoUser.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -79,11 +79,11 @@ @Column(name = "session_finished") private boolean sessionFinished; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "session_uid") private DacoSession session; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "content_uid") private Daco daco; Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.java =================================================================== diff -u -rae5ca71cff855dcaa48d5b4f2989e5411fcaac04 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.java (.../Dokumaran.java) (revision ae5ca71cff855dcaa48d5b4f2989e5411fcaac04) +++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.java (.../Dokumaran.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -27,6 +27,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -68,13 +69,13 @@ @Column(name = "use_select_leader_tool_ouput") private boolean useSelectLeaderToolOuput; - + @Column(name = "allow_multiple_leaders") private boolean allowMultipleLeaders; - + @Column(name = "time_limit") private int timeLimit; - + //date when teacher has started time counter (pressed start button) @Column(name = "time_limit_launched_date") private Date timeLimitLaunchedDate; @@ -84,7 +85,7 @@ @Column(name = "show_line_numbers") private boolean showLineNumbers; - + @Column(name = "shared_pad_id") private String sharedPadId; @@ -104,14 +105,14 @@ private String reflectInstructions; // general information - + @Column(name = "create_date") private Date created; @Column(name = "update_date") private Date updated; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @Cascade(org.hibernate.annotations.CascadeType.SAVE_UPDATE) @JoinColumn(name = "create_by") private DokumaranUser createdBy; @@ -309,7 +310,7 @@ public void setContentId(Long contentId) { this.contentId = contentId; } - + /** * @return Returns the time limitation, that students have to complete an attempt. */ @@ -324,17 +325,17 @@ public void setTimeLimit(int timeLimit) { this.timeLimit = timeLimit; } - + /** - * @return date when teacher has started time counter (pressed start button) - */ - public Date getTimeLimitLaunchedDate() { + * @return date when teacher has started time counter (pressed start button) + */ + public Date getTimeLimitLaunchedDate() { return timeLimitLaunchedDate; - } + } - public void setTimeLimitLaunchedDate(Date timeLimitLaunchedDate) { + public void setTimeLimitLaunchedDate(Date timeLimitLaunchedDate) { this.timeLimitLaunchedDate = timeLimitLaunchedDate; - } + } public boolean isShowChat() { return showChat; @@ -352,18 +353,18 @@ this.showLineNumbers = showLineNumbers; } - public String getSharedPadId() { + public String getSharedPadId() { return sharedPadId; - } + } - public void setSharedPadId(String sharedPadId) { + public void setSharedPadId(String sharedPadId) { this.sharedPadId = sharedPadId; - } - - public boolean isSharedPadEnabled() { - return StringUtils.isNotEmpty(sharedPadId); - } + } + public boolean isSharedPadEnabled() { + return StringUtils.isNotEmpty(sharedPadId); + } + public boolean isUseSelectLeaderToolOuput() { return useSelectLeaderToolOuput; } @@ -372,13 +373,13 @@ this.useSelectLeaderToolOuput = useSelectLeaderToolOuput; } - public boolean isAllowMultipleLeaders() { + public boolean isAllowMultipleLeaders() { return allowMultipleLeaders; - } + } - public void setAllowMultipleLeaders(boolean allowMultipleLeaders) { + public void setAllowMultipleLeaders(boolean allowMultipleLeaders) { this.allowMultipleLeaders = allowMultipleLeaders; - } + } public String getReflectInstructions() { return reflectInstructions; Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranSession.java =================================================================== diff -u -rae5ca71cff855dcaa48d5b4f2989e5411fcaac04 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranSession.java (.../DokumaranSession.java) (revision ae5ca71cff855dcaa48d5b4f2989e5411fcaac04) +++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranSession.java (.../DokumaranSession.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -27,6 +27,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -49,34 +50,34 @@ @Column @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - + @Column(name = "session_id") private Long sessionId; - + @Column(name = "session_name") private String sessionName; - - @ManyToOne + + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "dokumaran_uid") private Dokumaran dokumaran; - + @Column(name = "session_start_date") private Date sessionStartDate; - + @Column(name = "session_end_date") private Date sessionEndDate; - + // finished or not @Column private int status; - - @ManyToOne + + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "group_leader_uid") private DokumaranUser groupLeader; - + @Column(name = "etherpad_group_id") private String etherpadGroupId; - + @Column(name = "etherpad_read_only_id") private String etherpadReadOnlyId; @@ -148,47 +149,47 @@ public void setSessionName(String sessionName) { this.sessionName = sessionName; } - + /** */ - public DokumaranUser getGroupLeader() { + public DokumaranUser getGroupLeader() { return this.groupLeader; - } + } - public void setGroupLeader(DokumaranUser groupLeader) { + public void setGroupLeader(DokumaranUser groupLeader) { this.groupLeader = groupLeader; - } - - /** - * @return Returns the etherpadReadOnlyId - */ - public String getEtherpadGroupId() { + } + + /** + * @return Returns the etherpadReadOnlyId + */ + public String getEtherpadGroupId() { return etherpadGroupId; - } + } - /** - * @param etherpadReadOnlyId - * The etherpadReadOnlyId to set. - */ - public void setEtherpadGroupId(String etherpadGroupId) { + /** + * @param etherpadReadOnlyId + * The etherpadReadOnlyId to set. + */ + public void setEtherpadGroupId(String etherpadGroupId) { this.etherpadGroupId = etherpadGroupId; - } - - /** - * @return Returns the etherpadReadOnlyId - */ - public String getEtherpadReadOnlyId() { + } + + /** + * @return Returns the etherpadReadOnlyId + */ + public String getEtherpadReadOnlyId() { return etherpadReadOnlyId; - } + } - /** - * @param etherpadReadOnlyId - * The etherpadReadOnlyId to set. - */ - public void setEtherpadReadOnlyId(String etherpadReadOnlyId) { + /** + * @param etherpadReadOnlyId + * The etherpadReadOnlyId to set. + */ + public void setEtherpadReadOnlyId(String etherpadReadOnlyId) { this.etherpadReadOnlyId = etherpadReadOnlyId; - } - + } + public String getPadId() { // HashUtil.sha1(DokumaranConstants.DEFAULT_PAD_NAME + sessionId); return etherpadGroupId + "$" + DokumaranConstants.DEFAULT_PAD_NAME; Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranUser.java =================================================================== diff -u -rae5ca71cff855dcaa48d5b4f2989e5411fcaac04 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranUser.java (.../DokumaranUser.java) (revision ae5ca71cff855dcaa48d5b4f2989e5411fcaac04) +++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranUser.java (.../DokumaranUser.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -27,6 +27,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -54,43 +55,43 @@ @Column @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - + @Column(name = "user_id") private Long userId; - + @Column(name = "first_name") private String firstName; - + @Column(name = "last_name") private String lastName; - + @Column(name = "login_name") private String loginName; - + @Column(name = "session_finished") private boolean sessionFinished; - + @Column private boolean leader; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "session_uid") private DokumaranSession session; - - @ManyToOne + + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "dokumaran_uid") private Dokumaran dokumaran; // =============== NON Persisit value: for display use =========== - + // the user access some reousrce item date time. Use in monitoring summary page @Transient private Date accessDate; - + // dokumaran item complete date. Use in monitoring summary page @Transient private Date completeDate; - + // difference between completeDate and accessDate @Transient private Date timeTaken; @@ -223,13 +224,13 @@ this.sessionFinished = sessionFinished; } - public boolean isLeader() { + public boolean isLeader() { return leader; - } + } - public void setLeader(boolean leader) { + public void setLeader(boolean leader) { this.leader = leader; - } + } public Date getAccessDate() { return accessDate; Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/model/Attachment.java =================================================================== diff -u -rb71c9cb2f96eb891545d32aaca8904051d1e00d5 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/model/Attachment.java (.../Attachment.java) (revision b71c9cb2f96eb891545d32aaca8904051d1e00d5) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/model/Attachment.java (.../Attachment.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -27,6 +27,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -49,30 +50,30 @@ public class Attachment implements Cloneable, Comparable { private static final Logger log = Logger.getLogger(Attachment.class); - @Id - @Column - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long uid; - + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long uid; + @Column(name = "file_uuid") private Long fileUuid; - + @Column(name = "file_version_id") private Long fileVersionId; - + @Column(name = "file_type") private String fileType; - + @Column(name = "file_name") private String fileName; - + @Column(name = "create_date") private Date created; - - @ManyToOne - @JoinColumn(name = "message_uid") + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "message_uid") private Message message; - + //Default contruction method public Attachment() { @@ -127,31 +128,31 @@ this.uid = uid; } - public Long getFileVersionId() { + public Long getFileVersionId() { return fileVersionId; } public void setFileVersionId(Long version) { this.fileVersionId = version; } - public String getFileType() { + public String getFileType() { return fileType; } public void setFileType(String type) { this.fileType = type; } - public String getFileName() { + public String getFileName() { return fileName; } public void setFileName(String name) { this.fileName = name; } - public Long getFileUuid() { + public Long getFileUuid() { return fileUuid; } @@ -168,14 +169,13 @@ } public Message getMessage() { - return message; + return message; } public void setMessage(Message message) { - this.message = message; + this.message = message; } - @Override public int compareTo(Attachment o) { if (o == null) { Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/model/Forum.java =================================================================== diff -u -rb71c9cb2f96eb891545d32aaca8904051d1e00d5 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/model/Forum.java (.../Forum.java) (revision b71c9cb2f96eb891545d32aaca8904051d1e00d5) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/model/Forum.java (.../Forum.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -21,7 +21,6 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.forum.model; import java.util.Date; @@ -59,11 +58,11 @@ private static final Logger log = Logger.getLogger(Forum.class); - @Id - @Column - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long uid; - + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long uid; + // tool contentID @Column(name = "content_id") private Long contentId; @@ -119,15 +118,19 @@ @Column(name = "update_date") private Date updated; - /* 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. + /* + * 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 - * @JoinColumn(name = "create_by") + * + * @ManyToOne(fetch = FetchType.LAZY) + * + * @JoinColumn(name = "create_by") */ @OneToOne(fetch = FetchType.EAGER) @JoinColumn(name = "create_by") private ForumUser createdBy; - + // TODO why doesn't this have cascades. Why do we remove the messages manually? @OneToMany(mappedBy = "forum") @OrderBy("created DESC") Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/model/ForumToolSession.java =================================================================== diff -u -rb71c9cb2f96eb891545d32aaca8904051d1e00d5 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/model/ForumToolSession.java (.../ForumToolSession.java) (revision b71c9cb2f96eb891545d32aaca8904051d1e00d5) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/model/ForumToolSession.java (.../ForumToolSession.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -21,14 +21,13 @@ * **************************************************************** */ - - package org.lamsfoundation.lams.tool.forum.model; import java.util.Date; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -58,7 +57,7 @@ @Column(name = "session_name") private String sessionName; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "forum_uid") private Forum forum; @@ -120,7 +119,7 @@ /** * - * + * * @return */ public Date getSessionStartDate() { @@ -177,7 +176,7 @@ } /** - * + * * @param sessionName * The session name to set. */ Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/model/ForumUser.java =================================================================== diff -u -rb71c9cb2f96eb891545d32aaca8904051d1e00d5 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/model/ForumUser.java (.../ForumUser.java) (revision b71c9cb2f96eb891545d32aaca8904051d1e00d5) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/model/ForumUser.java (.../ForumUser.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -21,14 +21,13 @@ * **************************************************************** */ - - package org.lamsfoundation.lams.tool.forum.model; import java.io.Serializable; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -71,7 +70,7 @@ @Column(name = "session_finished") private boolean sessionFinished; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "session_id") private ForumToolSession session; Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/model/Message.java =================================================================== diff -u -rb71c9cb2f96eb891545d32aaca8904051d1e00d5 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/model/Message.java (.../Message.java) (revision b71c9cb2f96eb891545d32aaca8904051d1e00d5) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/model/Message.java (.../Message.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -59,10 +59,10 @@ @Column @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - + @Column private String subject; - + @Column private String body; @@ -80,7 +80,7 @@ @Column(name = "create_date") private Date created; - + @Column(name = "update_date") private Date updated; @@ -93,37 +93,34 @@ @Column(name = "hide_flag") private boolean hideFlag; - @ManyToOne - @JoinColumn(name = "parent_uid") + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "parent_uid") private Message parent; - @ManyToOne - @JoinColumn(name = "forum_session_uid") + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "forum_session_uid") private ForumToolSession toolSession; - - @ManyToOne - @JoinColumn(name = "forum_uid") + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "forum_uid") private Forum forum; - - @ManyToOne - @JoinColumn(name = "create_by") + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "create_by") private ForumUser createdBy; - @ManyToOne - @JoinColumn(name = "modified_by") + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "modified_by") private ForumUser modifiedBy; - - @OneToMany(mappedBy = "message", - cascade = CascadeType.ALL, - orphanRemoval = true, - fetch = FetchType.EAGER) + + @OneToMany(mappedBy = "message", cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER) private Set attachments; - @ManyToOne(cascade = CascadeType.ALL) + @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL) @JoinColumn(name = "report_id") private ForumReport report; - - @OneToMany(fetch = FetchType.EAGER) + + @OneToMany(fetch = FetchType.EAGER) @JoinColumn(name = "authored_parent_uid") private Set sessionClones; Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/model/MessageRating.java =================================================================== diff -u -rb71c9cb2f96eb891545d32aaca8904051d1e00d5 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/model/MessageRating.java (.../MessageRating.java) (revision b71c9cb2f96eb891545d32aaca8904051d1e00d5) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/model/MessageRating.java (.../MessageRating.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -20,13 +20,13 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.forum.model; import java.io.Serializable; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -56,11 +56,11 @@ @Column private float rating; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "user_id") private ForumUser user; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "message_id") private Message message; Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/model/MessageSeq.java =================================================================== diff -u -rb71c9cb2f96eb891545d32aaca8904051d1e00d5 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/model/MessageSeq.java (.../MessageSeq.java) (revision b71c9cb2f96eb891545d32aaca8904051d1e00d5) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/model/MessageSeq.java (.../MessageSeq.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -21,12 +21,11 @@ * **************************************************************** */ - - package org.lamsfoundation.lams.tool.forum.model; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -47,15 +46,15 @@ @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "root_message_uid") private Message rootMessage; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "message_uid") private Message message; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "thread_message_uid") private Message threadMessage; Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/model/Timestamp.java =================================================================== diff -u -rb71c9cb2f96eb891545d32aaca8904051d1e00d5 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/model/Timestamp.java (.../Timestamp.java) (revision b71c9cb2f96eb891545d32aaca8904051d1e00d5) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/model/Timestamp.java (.../Timestamp.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -21,13 +21,13 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.forum.model; import java.util.Date; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -43,20 +43,20 @@ @Entity @Table(name = "tl_lafrum11_timestamp") public class Timestamp implements Cloneable { - + @Id @Column @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long uid; - - @ManyToOne - @JoinColumn(name = "forum_user_uid") + private Long uid; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "forum_user_uid") private ForumUser forumUser; - - @ManyToOne - @JoinColumn(name = "message_uid") + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "message_uid") private Message message; - + @Column(name = "timestamp_date") private Date timestamp; Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.java =================================================================== diff -u -r96068ffc66514c1d25e9adeb96acfa164ab29dd5 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.java (.../ImageGallery.java) (revision 96068ffc66514c1d25e9adeb96acfa164ab29dd5) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.java (.../ImageGallery.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -31,6 +31,7 @@ import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -84,7 +85,7 @@ @Column(name = "define_later") private boolean defineLater; - + @Column(name = "content_in_use") private boolean contentInUse; @@ -96,7 +97,7 @@ @Column(name = "minimum_rates") private int minimumRates; - + @OneToMany(cascade = CascadeType.ALL) @OrderBy("order_id ASC") @JoinColumn(name = "tool_content_id", referencedColumnName = "content_id") @@ -112,14 +113,14 @@ private boolean notifyTeachersOnImageSumbit; // general information - + @Column(name = "create_date") private Date created; @Column(name = "update_date") private Date updated; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @Cascade(org.hibernate.annotations.CascadeType.SAVE_UPDATE) @JoinColumn(name = "create_by") private ImageGalleryUser createdBy; Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.java =================================================================== diff -u -r230b4867ed4f106ca02b646ea23b36469452de3c -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.java (.../ImageGalleryItem.java) (revision 230b4867ed4f106ca02b646ea23b36469452de3c) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.java (.../ImageGalleryItem.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -27,6 +27,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -72,7 +73,7 @@ @Column(name = "create_date") private Date createDate; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "create_by") private ImageGalleryUser createBy; @@ -132,7 +133,7 @@ return image; } - + @Override public String toString() { return new ToStringBuilder(this).append("uid", uid).append(" title", title).toString(); Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItemVisitLog.java =================================================================== diff -u -r230b4867ed4f106ca02b646ea23b36469452de3c -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItemVisitLog.java (.../ImageGalleryItemVisitLog.java) (revision 230b4867ed4f106ca02b646ea23b36469452de3c) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItemVisitLog.java (.../ImageGalleryItemVisitLog.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -21,13 +21,13 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.imageGallery.model; import java.util.Date; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -48,21 +48,21 @@ @Column @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - - @ManyToOne + + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "user_uid") private ImageGalleryUser user; - - @ManyToOne + + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "imageGallery_item_uid") private ImageGalleryItem imageGalleryItem; - + @Column private boolean complete; - + @Column(name = "access_date") private Date accessDate; - + @Column(name = "session_id") private Long sessionId; Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallerySession.java =================================================================== diff -u -r230b4867ed4f106ca02b646ea23b36469452de3c -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallerySession.java (.../ImageGallerySession.java) (revision 230b4867ed4f106ca02b646ea23b36469452de3c) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallerySession.java (.../ImageGallerySession.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -27,6 +27,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -47,23 +48,23 @@ @Column @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - + @Column(name = "session_id") private Long sessionId; - + @Column(name = "session_name") private String sessionName; - - @ManyToOne + + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "imageGallery_uid") private ImageGallery imageGallery; - + @Column(name = "session_start_date") private Date sessionStartDate; - + @Column(name = "session_end_date") private Date sessionEndDate; - + // finish or not @Column private int status; Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryUser.java =================================================================== diff -u -r230b4867ed4f106ca02b646ea23b36469452de3c -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryUser.java (.../ImageGalleryUser.java) (revision 230b4867ed4f106ca02b646ea23b36469452de3c) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryUser.java (.../ImageGalleryUser.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -27,6 +27,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -54,32 +55,32 @@ @Column @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - + @Column(name = "user_id") private Long userId; - + @Column(name = "first_name") private String firstName; - + @Column(name = "last_name") private String lastName; - + @Column(name = "login_name") private String loginName; - + @Column(name = "session_finished") private boolean sessionFinished; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "session_uid") private ImageGallerySession session; - - @ManyToOne + + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "imageGallery_uid") private ImageGallery imageGallery; // =============== NON Persisit value: for display use =========== - + // the user access some resource item date time. Use in monitoring summary page @Transient private Date accessDate; Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageVote.java =================================================================== diff -u -r230b4867ed4f106ca02b646ea23b36469452de3c -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageVote.java (.../ImageVote.java) (revision 230b4867ed4f106ca02b646ea23b36469452de3c) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageVote.java (.../ImageVote.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -20,11 +20,11 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.imageGallery.model; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -50,15 +50,15 @@ @Column @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - + @Column(name = "is_voted") private boolean voted; - - @ManyToOne + + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "create_by") private ImageGalleryUser createBy; - - @ManyToOne + + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "imageGallery_item_uid") private ImageGalleryItem imageGalleryItem; Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridge.java =================================================================== diff -u -r0e19fd8506a5ce83a66acbdd9ed0ddd1d29011d9 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridge.java (.../CommonCartridge.java) (revision 0e19fd8506a5ce83a66acbdd9ed0ddd1d29011d9) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridge.java (.../CommonCartridge.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -31,6 +31,7 @@ import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -92,7 +93,7 @@ @Column(name = "update_date") private Date updated; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @Cascade(org.hibernate.annotations.CascadeType.SAVE_UPDATE) @JoinColumn(name = "create_by") private CommonCartridgeUser createdBy; Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItem.java =================================================================== diff -u -r2b7e3fbbf396542bef8783e204f2f56e8dc7b803 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItem.java (.../CommonCartridgeItem.java) (revision 2b7e3fbbf396542bef8783e204f2f56e8dc7b803) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItem.java (.../CommonCartridgeItem.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -132,7 +132,7 @@ @Column(name = "create_date") private Date createDate; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "create_by") private CommonCartridgeUser createBy; Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItemVisitLog.java =================================================================== diff -u -r2b7e3fbbf396542bef8783e204f2f56e8dc7b803 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItemVisitLog.java (.../CommonCartridgeItemVisitLog.java) (revision 2b7e3fbbf396542bef8783e204f2f56e8dc7b803) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItemVisitLog.java (.../CommonCartridgeItemVisitLog.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -21,13 +21,13 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.commonCartridge.model; import java.util.Date; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -46,21 +46,21 @@ @Column @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - - @ManyToOne + + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "user_uid") private CommonCartridgeUser user; - - @ManyToOne + + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "commonCartridge_item_uid") private CommonCartridgeItem commonCartridgeItem; - + @Column private boolean complete; - + @Column(name = "access_date") private Date accessDate; - + @Column(name = "session_id") private Long sessionId; Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeSession.java =================================================================== diff -u -r2b7e3fbbf396542bef8783e204f2f56e8dc7b803 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeSession.java (.../CommonCartridgeSession.java) (revision 2b7e3fbbf396542bef8783e204f2f56e8dc7b803) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeSession.java (.../CommonCartridgeSession.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -27,6 +27,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -36,7 +37,7 @@ /** * CommonCartridge session - * + * * @author Andrey Balan */ @Entity @@ -47,23 +48,23 @@ @Column @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - + @Column(name = "session_id") private Long sessionId; - + @Column(name = "session_name") private String sessionName; - - @ManyToOne + + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "commonCartridge_uid") private CommonCartridge commonCartridge; - + @Column(name = "session_start_date") private Date sessionStartDate; - + @Column(name = "session_end_date") private Date sessionEndDate; - + //finished or not @Column private int status; @@ -131,7 +132,7 @@ } /** - * + * * @param sessionName * The session name to set. */ Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeUser.java =================================================================== diff -u -r2b7e3fbbf396542bef8783e204f2f56e8dc7b803 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeUser.java (.../CommonCartridgeUser.java) (revision 2b7e3fbbf396542bef8783e204f2f56e8dc7b803) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeUser.java (.../CommonCartridgeUser.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -27,6 +27,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -42,7 +43,7 @@ /** * CommonCartridge - * + * * @author Andrey Balan */ @Entity @@ -54,32 +55,32 @@ @Column @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - + @Column(name = "user_id") private Long userId; - + @Column(name = "first_name") private String firstName; - + @Column(name = "last_name") private String lastName; - + @Column(name = "login_name") private String loginName; - + @Column(name = "session_finished") private boolean sessionFinished; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "session_uid") private CommonCartridgeSession session; - - @ManyToOne + + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "commonCartridge_uid") private CommonCartridge commonCartridge; //=============== NON Persisit value: for display use =========== - + //the user access some reousrce item date time. Use in monitoring summary page @Transient private Date accessDate; @@ -121,7 +122,7 @@ return user; } - + @Override public boolean equals(Object obj) { if (this == obj) { Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McOptsContent.java =================================================================== diff -u -rd03a1456d2d0ee7a482273fe35412c67054f133d -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McOptsContent.java (.../McOptsContent.java) (revision d03a1456d2d0ee7a482273fe35412c67054f133d) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McOptsContent.java (.../McOptsContent.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -26,6 +26,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -61,8 +62,8 @@ @Column private Integer displayOrder; - @ManyToOne - @JoinColumn(name = "mc_que_content_id") + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "mc_que_content_id") private McQueContent mcQueContent; @Transient @@ -168,6 +169,6 @@ } public String formatPrefixLetter(int index) { - return new String(Character.toChars(97 + index)) + ")"; - } + return new String(Character.toChars(97 + index)) + ")"; + } } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McQueContent.java =================================================================== diff -u -rd03a1456d2d0ee7a482273fe35412c67054f133d -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McQueContent.java (.../McQueContent.java) (revision d03a1456d2d0ee7a482273fe35412c67054f133d) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McQueContent.java (.../McQueContent.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -30,6 +30,7 @@ import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -62,7 +63,7 @@ @Column private String question; - + /** * It stores sha1(question) value that allows us to search for the McQueContentc with the same question */ @@ -78,8 +79,8 @@ @Column private String feedback; - @ManyToOne - @JoinColumn(name = "mc_content_id") + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "mc_content_id") private org.lamsfoundation.lams.tool.mc.model.McContent mcContent; // TODO Make this orphanRemoval = true, but first fix McService.createQuestions() to stop mucking around with the collections. @@ -101,7 +102,7 @@ this.mark = mark; this.feedback = feedback; this.mcContent = mcContent; - this.mcOptionsContents = mcOptionsContents != null ? mcOptionsContents : new HashSet() ; + this.mcOptionsContents = mcOptionsContents != null ? mcOptionsContents : new HashSet(); } /** default constructor */ @@ -150,13 +151,14 @@ public void setQuestion(String question) { this.question = question; } - + /** * Returns sha1(question) value that allows us to search for the McQueContent with the same question */ public String getQuestionHash() { return questionHash; } + public void setQuestionHash(String questionHash) { this.questionHash = questionHash; } @@ -189,7 +191,7 @@ * Get an options content record by its uid. Iterates over the set from getMcOptionsContents(). */ public McOptsContent getOptionsContentByUID(Long uid) { - for ( McOptsContent elem : getMcOptionsContents() ) { + for (McOptsContent elem : getMcOptionsContents()) { if (elem.getUid().equals(uid)) { return elem; } @@ -222,7 +224,7 @@ // if the object does not exist yet, then just return any one of 0, -1, 1. Should not make a difference. if (uid == null) { return 1; - } else if ( queContent.getUid() == null ) { + } else if (queContent.getUid() == null) { return -1; } else { return (int) (uid.longValue() - queContent.getUid().longValue()); Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McQueUsr.java =================================================================== diff -u -rd03a1456d2d0ee7a482273fe35412c67054f133d -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McQueUsr.java (.../McQueUsr.java) (revision d03a1456d2d0ee7a482273fe35412c67054f133d) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McQueUsr.java (.../McQueUsr.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -26,6 +26,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -66,8 +67,8 @@ private boolean responseFinalised; //please pay attention this columns is the *sessionUid* and not sessionId (this is due to Ozgur gave wrong name to this field) - @ManyToOne - @JoinColumn(name = "mc_session_id") + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "mc_session_id") private McSession mcSession; @Column(name = "number_attempts") @@ -148,8 +149,7 @@ public String toString() { return new ToStringBuilder(this).append("uid", getUid()).append("queUsrId", getQueUsrId()) .append("username", getUsername()).append("fullname", getFullname()) - .append("responseFinalised", isResponseFinalised()) - .append("numberOfAttempts", getNumberOfAttempts()) + .append("responseFinalised", isResponseFinalised()).append("numberOfAttempts", getNumberOfAttempts()) .append("lastAttemptTotalMark", getLastAttemptTotalMark()).toString(); } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McSession.java =================================================================== diff -u -rd03a1456d2d0ee7a482273fe35412c67054f133d -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McSession.java (.../McSession.java) (revision d03a1456d2d0ee7a482273fe35412c67054f133d) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McSession.java (.../McSession.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -30,6 +30,7 @@ import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -77,18 +78,16 @@ @Column(name = "session_name") private String session_name; - @ManyToOne - @JoinColumn(name = "mc_content_id") + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "mc_content_id") private org.lamsfoundation.lams.tool.mc.model.McContent mcContent; - @OneToMany(mappedBy = "mcSession", - cascade = CascadeType.ALL, - orphanRemoval = true) + @OneToMany(mappedBy = "mcSession", cascade = CascadeType.ALL, orphanRemoval = true) private Set mcQueUsers; - @ManyToOne(cascade = CascadeType.ALL) - @JoinColumn(name = "mc_group_leader_uid") - private McQueUsr groupLeader; + @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL) + @JoinColumn(name = "mc_group_leader_uid") + private McQueUsr groupLeader; /** full constructor */ public McSession(Long mcSessionId, Date sessionStartDate, Date sessionEndDate, String sessionStatus, Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java =================================================================== diff -u -rd03a1456d2d0ee7a482273fe35412c67054f133d -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java (.../McUsrAttempt.java) (revision d03a1456d2d0ee7a482273fe35412c67054f133d) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java (.../McUsrAttempt.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -27,6 +27,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -67,18 +68,18 @@ @Column private boolean passed; - @ManyToOne - @JoinColumn(name = "mc_que_content_id") + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "mc_que_content_id") private McQueContent mcQueContent; - @ManyToOne - @JoinColumn(name = "que_usr_id") + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "que_usr_id") private McQueUsr mcQueUsr; - @ManyToOne - @JoinColumn(name = "mc_que_option_id") + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "mc_que_option_id") private McOptsContent mcOptionsContent; - + @Column(name = "confidence_level") private int confidenceLevel; @@ -217,7 +218,7 @@ public void setAttemptCorrect(boolean attemptCorrect) { this.attemptCorrect = attemptCorrect; } - + public int getConfidenceLevel() { return confidenceLevel; } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/model/QaQueContent.java =================================================================== diff -u -r69092337b728f903f824a74377bd0ebf9391120c -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/model/QaQueContent.java (.../QaQueContent.java) (revision 69092337b728f903f824a74377bd0ebf9391120c) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/model/QaQueContent.java (.../QaQueContent.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -27,6 +27,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -74,7 +75,7 @@ @Column(name = "min_words_limit") private int minWordsLimit; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "qa_content_id") private QaContent qaContent; Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/model/QaQueUsr.java =================================================================== diff -u -r69092337b728f903f824a74377bd0ebf9391120c -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/model/QaQueUsr.java (.../QaQueUsr.java) (revision 69092337b728f903f824a74377bd0ebf9391120c) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/model/QaQueUsr.java (.../QaQueUsr.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -30,6 +30,7 @@ import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -78,12 +79,12 @@ @Column private boolean learnerFinished; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "qa_session_id") private QaSession qaSession; @OneToMany(mappedBy = "qaQueUser", cascade = CascadeType.ALL, orphanRemoval = true) - private SetqaUsrResps; + private Set qaUsrResps; public QaQueUsr() { this.qaUsrResps = new TreeSet(); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/model/QaSession.java =================================================================== diff -u -r69092337b728f903f824a74377bd0ebf9391120c -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/model/QaSession.java (.../QaSession.java) (revision 69092337b728f903f824a74377bd0ebf9391120c) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/model/QaSession.java (.../QaSession.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -31,6 +31,7 @@ import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -82,20 +83,20 @@ @Column(name = "session_name") private String session_name; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "qa_content_id") private QaContent qaContent; @OneToMany(mappedBy = "qaSession", cascade = CascadeType.ALL, orphanRemoval = true) private Set qaQueUsers; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "qa_group_leader_uid") private QaQueUsr groupLeader; public QaSession() { this.qaQueUsers = new TreeSet(); - }; + }; public QaSession(Long qaSessionId, Date session_start_date, Date session_end_date, String session_status, QaContent qaContent, Set qaQueUsers) { Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/model/QaUsrResp.java =================================================================== diff -u -r69092337b728f903f824a74377bd0ebf9391120c -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/model/QaUsrResp.java (.../QaUsrResp.java) (revision 69092337b728f903f824a74377bd0ebf9391120c) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/model/QaUsrResp.java (.../QaUsrResp.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -28,6 +28,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -58,26 +59,26 @@ @Id @Column(name = "response_id") @GeneratedValue(strategy = GenerationType.IDENTITY) -private Long responseId; + private Long responseId; @Column private String answer; @Column(name = "answer_autosaved") - private String answerAutosaved; + private String answerAutosaved; @Column(name = "attempt_time") private Date attemptTime; - @ManyToOne - @JoinColumn(name = "qa_que_content_id") + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "qa_que_content_id") private QaQueContent qaQuestion; @Column private boolean visible; - @ManyToOne - @JoinColumn(name = "que_usr_id") + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "que_usr_id") private QaQueUsr qaQueUser; @Column(name = "time_zone") Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java =================================================================== diff -u -r0a46648d9547d3fca73e1931d4e628be7e1acd7b -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java (.../Resource.java) (revision 0a46648d9547d3fca73e1931d4e628be7e1acd7b) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java (.../Resource.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -31,6 +31,7 @@ import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -107,14 +108,14 @@ private String reflectInstructions; // general infomation - + @Column(name = "create_date") private Date created; @Column(name = "update_date") private Date updated; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @Cascade(org.hibernate.annotations.CascadeType.SAVE_UPDATE) @JoinColumn(name = "create_by") private ResourceUser createdBy; @@ -150,7 +151,7 @@ item.setCreateBy(toContent.getCreatedBy()); } } - + // reset contentId if (toContent.getRatingCriterias() != null) { Set criterias = toContent.getRatingCriterias(); @@ -184,7 +185,7 @@ if (createdBy != null) { resource.setCreatedBy((ResourceUser) createdBy.clone()); } - + // clone ratingCriterias as well if (ratingCriterias != null) { Set newCriterias = new HashSet<>(); @@ -196,7 +197,6 @@ resource.ratingCriterias = newCriterias; } - } catch (CloneNotSupportedException e) { Resource.log.error("When clone " + Resource.class + " failed"); } @@ -441,12 +441,12 @@ this.notifyTeachersOnFileUpload = notifyTeachersOnFileUpload; } - public Set getRatingCriterias() { + public Set getRatingCriterias() { return ratingCriterias; - } + } - public void setRatingCriterias(Set ratingCriterias) { + public void setRatingCriterias(Set ratingCriterias) { this.ratingCriterias = ratingCriterias; - } + } } \ No newline at end of file Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java =================================================================== diff -u -r0a46648d9547d3fca73e1931d4e628be7e1acd7b -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java (.../ResourceItem.java) (revision 0a46648d9547d3fca73e1931d4e628be7e1acd7b) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java (.../ResourceItem.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -115,7 +115,7 @@ @Column(name = "create_date") private Date createDate; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "create_by") private ResourceUser createBy; Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemVisitLog.java =================================================================== diff -u -r0a46648d9547d3fca73e1931d4e628be7e1acd7b -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemVisitLog.java (.../ResourceItemVisitLog.java) (revision 0a46648d9547d3fca73e1931d4e628be7e1acd7b) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemVisitLog.java (.../ResourceItemVisitLog.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -21,13 +21,13 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.rsrc.model; import java.util.Date; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -48,24 +48,24 @@ @Column @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - - @ManyToOne + + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "user_uid") private ResourceUser user; - - @ManyToOne + + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "resource_item_uid") private ResourceItem resourceItem; - + @Column private boolean complete; - + @Column(name = "complete_date") private Date completeDate; - + @Column(name = "access_date") private Date accessDate; - + @Column(name = "session_id") private Long sessionId; Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceSession.java =================================================================== diff -u -r0a46648d9547d3fca73e1931d4e628be7e1acd7b -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceSession.java (.../ResourceSession.java) (revision 0a46648d9547d3fca73e1931d4e628be7e1acd7b) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceSession.java (.../ResourceSession.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -30,6 +30,7 @@ import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -52,27 +53,27 @@ @Column @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - + @Column(name = "session_id") private Long sessionId; - + @Column(name = "session_name") private String sessionName; - - @ManyToOne + + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "resource_uid") private Resource resource; - + @Column(name = "session_start_date") private Date sessionStartDate; - + @Column(name = "session_end_date") private Date sessionEndDate; - + // finish or not @Column private int status; - + @OneToMany(cascade = CascadeType.ALL) @OrderBy("create_date DESC") @JoinColumn(name = "session_uid") Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceUser.java =================================================================== diff -u -r0a46648d9547d3fca73e1931d4e628be7e1acd7b -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceUser.java (.../ResourceUser.java) (revision 0a46648d9547d3fca73e1931d4e628be7e1acd7b) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceUser.java (.../ResourceUser.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -27,6 +27,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -54,32 +55,32 @@ @Column @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - + @Column(name = "user_id") private Long userId; - + @Column(name = "first_name") private String firstName; - + @Column(name = "last_name") private String lastName; - + @Column(name = "login_name") private String loginName; - + @Column(name = "session_finished") private boolean sessionFinished; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "session_uid") private ResourceSession session; - - @ManyToOne + + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "resource_uid") private Resource resource; // =============== NON Persisit value: for display use =========== - + // the user access some resource item date time. Use in monitoring summary page @Transient private Date accessDate; Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/model/LeaderselectionSession.java =================================================================== diff -u -r439dc8c74e7d6a7dd5ba26b021f0806ee19d8291 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/model/LeaderselectionSession.java (.../LeaderselectionSession.java) (revision 439dc8c74e7d6a7dd5ba26b021f0806ee19d8291) +++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/model/LeaderselectionSession.java (.../LeaderselectionSession.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -29,6 +29,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -68,14 +69,14 @@ @Column(name = "session_name") private String sessionName; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "leaderselection_uid") private Leaderselection leaderselection; @OneToMany(mappedBy = "leaderselectionSession") private Set users = new HashSet<>(); - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "group_leader_uid") private LeaderselectionUser groupLeader; Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/model/LeaderselectionUser.java =================================================================== diff -u -r6f9041abdcbc64a47af95ec0932c03c9c04e0838 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/model/LeaderselectionUser.java (.../LeaderselectionUser.java) (revision 6f9041abdcbc64a47af95ec0932c03c9c04e0838) +++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/model/LeaderselectionUser.java (.../LeaderselectionUser.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -21,13 +21,13 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.leaderselection.model; import java.io.Serializable; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -62,8 +62,8 @@ @Column(name = "login_name") private String loginName; - - @ManyToOne + + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "leaderselection_session_uid") private LeaderselectionSession leaderselectionSession; Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/MindmapNode.java =================================================================== diff -u -r0ac951a5cbd9d468de8081247c169a6f92123126 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/MindmapNode.java (.../MindmapNode.java) (revision 0ac951a5cbd9d468de8081247c169a6f92123126) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/MindmapNode.java (.../MindmapNode.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -21,11 +21,11 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.mindmap.model; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -45,12 +45,12 @@ @Column(name = "node_id") @GeneratedValue(strategy = GenerationType.IDENTITY) private Long nodeId; - + @Column(name = "unique_id") private Long uniqueId; - @ManyToOne - @JoinColumn(name = "parent_id") + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "parent_id") private MindmapNode parent; @Column(name = "node_text") @@ -59,18 +59,18 @@ @Column(name = "node_color") private String color; - @ManyToOne - @JoinColumn(name = "session_id") - private MindmapSession session; + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "session_id") + private MindmapSession session; - @ManyToOne - @JoinColumn(name = "user_id") - private MindmapUser user; - - @ManyToOne - @JoinColumn(name = "mindmap_id") - private Mindmap mindmap; + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id") + private MindmapUser user; + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "mindmap_id") + private Mindmap mindmap; + /** default constructor */ public MindmapNode() { } Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/MindmapRequest.java =================================================================== diff -u -r0ac951a5cbd9d468de8081247c169a6f92123126 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/MindmapRequest.java (.../MindmapRequest.java) (revision 0ac951a5cbd9d468de8081247c169a6f92123126) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/MindmapRequest.java (.../MindmapRequest.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -21,11 +21,11 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.mindmap.model; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -47,7 +47,7 @@ @Column @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - + @Column(name = "unique_id") private Long uniqueId; @@ -62,13 +62,13 @@ @Column(name = "node_child_id") private Long nodeChildId; - - @ManyToOne() - @JoinColumn(name = "user_id") + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id") private MindmapUser user; - - @ManyToOne() - @JoinColumn(name = "mindmap_id") + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "mindmap_id") private Mindmap mindmap; /** default constructor */ @@ -148,8 +148,7 @@ public void setMindmap(Mindmap mindmap) { this.mindmap = mindmap; } - - + @Override public String toString() { return "MindmapRequest [uid=" + uid + ", uniqueId=" + uniqueId + ", globalId=" + globalId + ", type=" + type Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/MindmapSession.java =================================================================== diff -u -r0ac951a5cbd9d468de8081247c169a6f92123126 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/MindmapSession.java (.../MindmapSession.java) (revision 0ac951a5cbd9d468de8081247c169a6f92123126) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/MindmapSession.java (.../MindmapSession.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -21,7 +21,6 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.mindmap.model; import java.util.Date; @@ -30,6 +29,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -72,8 +72,8 @@ @Column(name = "session_name") private String sessionName; - @ManyToOne - @JoinColumn(name = "mindmap_uid") + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "mindmap_uid") private Mindmap mindmap; @OneToMany(mappedBy = "mindmapSession") Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/MindmapUser.java =================================================================== diff -u -r0ac951a5cbd9d468de8081247c169a6f92123126 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/MindmapUser.java (.../MindmapUser.java) (revision 0ac951a5cbd9d468de8081247c169a6f92123126) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/MindmapUser.java (.../MindmapUser.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -21,11 +21,11 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.mindmap.model; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -51,7 +51,7 @@ @Column @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - + @Column(name = "user_id") private Long userId; @@ -63,9 +63,9 @@ @Column(name = "login_name") private String loginName; - - @ManyToOne - @JoinColumn(name = "mindmap_session_uid") + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "mindmap_session_uid") private MindmapSession mindmapSession; @Column(name = "finishedActivity") Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/model/NoticeboardSession.java =================================================================== diff -u -rb71c9cb2f96eb891545d32aaca8904051d1e00d5 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/model/NoticeboardSession.java (.../NoticeboardSession.java) (revision b71c9cb2f96eb891545d32aaca8904051d1e00d5) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/model/NoticeboardSession.java (.../NoticeboardSession.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -91,7 +91,7 @@ @Column(name = "session_status") private String sessionStatus; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "nb_content_uid") private NoticeboardContent nbContent; Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/model/NoticeboardUser.java =================================================================== diff -u -r711e4127d79bb67af04a3b7a01155cc395171da5 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/model/NoticeboardUser.java (.../NoticeboardUser.java) (revision 711e4127d79bb67af04a3b7a01155cc395171da5) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/model/NoticeboardUser.java (.../NoticeboardUser.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -27,6 +27,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -65,7 +66,7 @@ @Column(name = "user_id") private Long userId; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "nb_session_uid") private NoticeboardSession nbSession; @@ -74,7 +75,7 @@ @Column private String fullname; - + @Column(name = "user_status") private String userStatus; @@ -107,51 +108,51 @@ this.userStatus = status; } - public String getFullname() { + public String getFullname() { return fullname; } public void setFullname(String fullname) { this.fullname = fullname; } - public NoticeboardSession getNbSession() { + public NoticeboardSession getNbSession() { return nbSession; } public void setNbSession(NoticeboardSession nbSession) { this.nbSession = nbSession; } - public Long getUid() { + public Long getUid() { return uid; } - public void setUid(Long uid) { + public void setUid(Long uid) { this.uid = uid; } - public Long getUserId() { + public Long getUserId() { return userId; } - public void setUserId(Long userId) { + public void setUserId(Long userId) { this.userId = userId; } public String getUsername() { return username; } - public void setUsername(String username) { + public void setUsername(String username) { this.username = username; } public String getUserStatus() { return userStatus; } - public void setUserStatus(String userStatus) { + public void setUserStatus(String userStatus) { this.userStatus = userStatus; } } Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/NotebookSession.java =================================================================== diff -u -rbc098bac007b1eac4ebdf897b0dd8b26365d4762 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/NotebookSession.java (.../NotebookSession.java) (revision bc098bac007b1eac4ebdf897b0dd8b26365d4762) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/NotebookSession.java (.../NotebookSession.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -29,6 +29,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -66,7 +67,7 @@ @Column(name = "session_name") private String sessionName; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "notebook_uid") private Notebook notebook; Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/NotebookUser.java =================================================================== diff -u -rbc098bac007b1eac4ebdf897b0dd8b26365d4762 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/NotebookUser.java (.../NotebookUser.java) (revision bc098bac007b1eac4ebdf897b0dd8b26365d4762) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/NotebookUser.java (.../NotebookUser.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -25,6 +25,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -63,7 +64,7 @@ @Column(name = "login_name") private String loginName; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "notebook_session_uid") private NotebookSession notebookSession; Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/model/PixlrSession.java =================================================================== diff -u -r78cef6f4ac9e7652bbbce787bd054fca65e0763f -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/model/PixlrSession.java (.../PixlrSession.java) (revision 78cef6f4ac9e7652bbbce787bd054fca65e0763f) +++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/model/PixlrSession.java (.../PixlrSession.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -29,6 +29,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -66,7 +67,7 @@ @Column(name = "session_name") private String sessionName; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "pixlr_uid") private Pixlr pixlr; Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/model/PixlrUser.java =================================================================== diff -u -r78cef6f4ac9e7652bbbce787bd054fca65e0763f -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/model/PixlrUser.java (.../PixlrUser.java) (revision 78cef6f4ac9e7652bbbce787bd054fca65e0763f) +++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/model/PixlrUser.java (.../PixlrUser.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -25,6 +25,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -62,7 +63,7 @@ @Column(name = "login_name") private String loginName; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "pixlr_session_uid") private PixlrSession pixlrSession; Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.java =================================================================== diff -u -r96068ffc66514c1d25e9adeb96acfa164ab29dd5 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.java (.../Peerreview.java) (revision 96068ffc66514c1d25e9adeb96acfa164ab29dd5) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.java (.../Peerreview.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -30,6 +30,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -100,7 +101,7 @@ @Column(name = "update_date") private Date updated; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @Cascade(CascadeType.SAVE_UPDATE) @JoinColumn(name = "create_by") private PeerreviewUser createdBy; @@ -110,7 +111,7 @@ @Column(name = "show_ratings_left_for_user") private boolean showRatingsLeftForUser; - + @Column(name = "show_ratings_left_by_user") private boolean showRatingsLeftByUser; @@ -119,13 +120,13 @@ @Column(name = "reflect_instructions") private String reflectInstructions; - + @Column(name = "self_review") private boolean selfReview; @Column(name = "notify_users_of_results") private boolean notifyUsersOfResults; - + // ********************************************************** // Function method for Peerreview // ********************************************************** @@ -430,26 +431,26 @@ } public boolean isSelfReview() { - return selfReview; + return selfReview; } public void setSelfReview(boolean selfReview) { - this.selfReview = selfReview; + this.selfReview = selfReview; } - + public boolean isNotifyUsersOfResults() { - return notifyUsersOfResults; + return notifyUsersOfResults; } public void setNotifyUsersOfResults(boolean notifyUsersOfResults) { - this.notifyUsersOfResults = notifyUsersOfResults; + this.notifyUsersOfResults = notifyUsersOfResults; } public boolean isShowRatingsLeftByUser() { - return showRatingsLeftByUser; + return showRatingsLeftByUser; } public void setShowRatingsLeftByUser(boolean showRatingsLeftByUser) { - this.showRatingsLeftByUser = showRatingsLeftByUser; + this.showRatingsLeftByUser = showRatingsLeftByUser; } } Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/PeerreviewSession.java =================================================================== diff -u -r96068ffc66514c1d25e9adeb96acfa164ab29dd5 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/PeerreviewSession.java (.../PeerreviewSession.java) (revision 96068ffc66514c1d25e9adeb96acfa164ab29dd5) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/PeerreviewSession.java (.../PeerreviewSession.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -27,6 +27,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -50,23 +51,23 @@ @Column @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - + @Column(name = "session_id") private Long sessionId; - + @Column(name = "session_name") private String sessionName; - - @ManyToOne + + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "peerreview_uid") private Peerreview peerreview; - + @Column(name = "session_start_date") private Date sessionStartDate; - + @Column(name = "session_end_date") private Date sessionEndDate; - + // finish or not @Column private int status; Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/PeerreviewUser.java =================================================================== diff -u -r96068ffc66514c1d25e9adeb96acfa164ab29dd5 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/PeerreviewUser.java (.../PeerreviewUser.java) (revision 96068ffc66514c1d25e9adeb96acfa164ab29dd5) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/PeerreviewUser.java (.../PeerreviewUser.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -25,6 +25,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -53,32 +54,32 @@ @Column @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - + @Column(name = "user_id") private Long userId; - + @Column(name = "first_name") private String firstName; - + @Column(name = "last_name") private String lastName; - + @Column(name = "login_name") private String loginName; - + @Column(name = "session_finished") private boolean sessionFinished; - + //status set by monitor to indicate users that shouldn't be rated @Column private boolean hidden; - @ManyToOne - @JoinColumn(name = "session_uid") + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "session_uid") private PeerreviewSession session; - - @ManyToOne - @JoinColumn(name = "peerreview_uid") + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "peerreview_uid") private Peerreview peerreview; public PeerreviewUser() { @@ -231,17 +232,17 @@ public void setSessionFinished(boolean sessionFinished) { this.sessionFinished = sessionFinished; } - + /** - * @return status set by monitor to indicate users that shouldn't be rated - */ - public boolean isHidden() { + * @return status set by monitor to indicate users that shouldn't be rated + */ + public boolean isHidden() { return hidden; - } + } - public void setHidden(boolean hidden) { + public void setHidden(boolean hidden) { this.hidden = hidden; - } + } @Override public boolean equals(Object obj) { Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/model/SubmissionDetails.java =================================================================== diff -u -r7694dd245cc58c5b7beb2348aaefb2762c47dc8d -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/model/SubmissionDetails.java (.../SubmissionDetails.java) (revision 7694dd245cc58c5b7beb2348aaefb2762c47dc8d) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/model/SubmissionDetails.java (.../SubmissionDetails.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -21,7 +21,6 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.sbmt.model; import java.io.Serializable; @@ -30,14 +29,13 @@ import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; -import javax.persistence.MapsId; import javax.persistence.OneToOne; -import javax.persistence.PrimaryKeyJoinColumn; import javax.persistence.Table; import org.apache.commons.lang.builder.EqualsBuilder; @@ -53,7 +51,7 @@ private static Logger log = Logger.getLogger(SubmissionDetails.class); @Id - @Column(name = "submission_id",unique=true, nullable=false) + @Column(name = "submission_id", unique = true, nullable = false) @GeneratedValue(strategy = GenerationType.IDENTITY) private Long submissionID; @@ -75,17 +73,15 @@ @Column(nullable = false) private Boolean removed; - @OneToOne(cascade = CascadeType.ALL) - @PrimaryKeyJoinColumn -// @PrimaryKeyJoinColumn(name="submission_id", referencedColumnName="report_id") + @OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL) private SubmitFilesReport report; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "learner_id") private SubmitUser learner; - + /** persistent field, but not cloned to avoid to clone block */ - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @Cascade(org.hibernate.annotations.CascadeType.SAVE_UPDATE) @JoinColumn(name = "session_id") private SubmitFilesSession submitFileSession; @@ -141,7 +137,7 @@ } return obj; } - + // *********************************************************** // Get / Set methods // *********************************************************** @@ -247,5 +243,4 @@ this.removed = removed; } - } Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/model/SubmitFilesContent.java =================================================================== diff -u -r7694dd245cc58c5b7beb2348aaefb2762c47dc8d -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/model/SubmitFilesContent.java (.../SubmitFilesContent.java) (revision 7694dd245cc58c5b7beb2348aaefb2762c47dc8d) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/model/SubmitFilesContent.java (.../SubmitFilesContent.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -21,14 +21,14 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.sbmt.model; import java.io.Serializable; import java.util.Date; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; @@ -51,15 +51,15 @@ private Long contentID; // basic tab fields - + @Column(nullable = false) private String title; - + @Column(nullable = false) private String instruction; // advance tab fields - + @Column(name = "lock_on_finished") private boolean lockOnFinished; @@ -70,13 +70,13 @@ private boolean notifyTeachersOnFileSubmit; // system level fields - + @Column(name = "define_later") private boolean defineLater; @Column(name = "content_in_use") private boolean contentInUse; - + @Column(name = "use_select_leader_tool_ouput") private boolean useSelectLeaderToolOuput; @@ -101,7 +101,7 @@ @Column(name = "submission_deadline") private Date submissionDeadline; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @Cascade(org.hibernate.annotations.CascadeType.SAVE_UPDATE) @JoinColumn(name = "created_by") private SubmitUser createdBy; @@ -311,12 +311,12 @@ public void setNotifyTeachersOnFileSubmit(boolean notifyTeachersOnFileSubmit) { this.notifyTeachersOnFileSubmit = notifyTeachersOnFileSubmit; } - + public boolean isUseSelectLeaderToolOuput() { - return useSelectLeaderToolOuput; + return useSelectLeaderToolOuput; } public void setUseSelectLeaderToolOuput(boolean useSelectLeaderToolOuput) { - this.useSelectLeaderToolOuput = useSelectLeaderToolOuput; + this.useSelectLeaderToolOuput = useSelectLeaderToolOuput; } } Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/model/SubmitFilesReport.java =================================================================== diff -u -r7694dd245cc58c5b7beb2348aaefb2762c47dc8d -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/model/SubmitFilesReport.java (.../SubmitFilesReport.java) (revision 7694dd245cc58c5b7beb2348aaefb2762c47dc8d) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/model/SubmitFilesReport.java (.../SubmitFilesReport.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -21,59 +21,39 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.sbmt.model; import java.io.Serializable; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Parameter; +import javax.persistence.FetchType; import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.MapsId; import javax.persistence.OneToOne; import javax.persistence.Table; -import javax.persistence.Transient; import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.log4j.Logger; -import org.hibernate.annotations.GenericGenerator; @Entity @Table(name = "tl_lasbmt11_report") public class SubmitFilesReport implements Serializable, Cloneable { private static final long serialVersionUID = -3415065437595925246L; private static Logger log = Logger.getLogger(SubmitFilesReport.class); - + @Id @Column(name = "report_id") private Long reportID; @MapsId - @OneToOne(mappedBy = "report") + @OneToOne(fetch = FetchType.LAZY, mappedBy = "report") @JoinColumn(name = "report_id") private SubmissionDetails details; - - -// @Id -// @GeneratedValue(generator="foreign") -// @GenericGenerator(name="foreign", strategy = "foreign", parameters={ -// @Parameter(name="property", value="person") -// }) -// @Column(name="report_id") - -// @Id -// @Column(name = "report_id") -// @GeneratedValue(strategy = GenerationType.IDENTITY) - - - @Column private String comments; Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/model/SubmitFilesSession.java =================================================================== diff -u -r7694dd245cc58c5b7beb2348aaefb2762c47dc8d -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/model/SubmitFilesSession.java (.../SubmitFilesSession.java) (revision 7694dd245cc58c5b7beb2348aaefb2762c47dc8d) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/model/SubmitFilesSession.java (.../SubmitFilesSession.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -21,7 +21,6 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.sbmt.model; import java.io.Serializable; @@ -32,6 +31,7 @@ import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; @@ -61,22 +61,22 @@ @Column private Integer status; - + @Column(name = "marks_released") private boolean marksReleased; @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true, mappedBy = "submitFileSession") private Set submissionDetails = new HashSet<>(); /** persistent field, but not cloned to avoid to clone block */ - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "content_id") private SubmitFilesContent content; - - @ManyToOne(cascade = CascadeType.ALL) + + @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL) @JoinColumn(name = "group_leader_uid") private SubmitUser groupLeader; - + @Override public String toString() { return new ToStringBuilder(this).append("sessionID", getSessionID()).append("status", getStatus()).toString(); @@ -143,7 +143,6 @@ this.status = status; } - /** * @return Returns the submissionDetails. */ @@ -188,15 +187,15 @@ public void setSessionName(String sessionName) { this.sessionName = sessionName; } - + public SubmitUser getGroupLeader() { - return groupLeader; + return groupLeader; } public void setGroupLeader(SubmitUser groupLeader) { - this.groupLeader = groupLeader; + this.groupLeader = groupLeader; } - + public boolean isMarksReleased() { return marksReleased; } Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/BurningQuestionLike.java =================================================================== diff -u -r22ca3de0e9fe138e44fc36be1abc6fabbbdc4002 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/BurningQuestionLike.java (.../BurningQuestionLike.java) (revision 22ca3de0e9fe138e44fc36be1abc6fabbbdc4002) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/BurningQuestionLike.java (.../BurningQuestionLike.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -2,6 +2,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -20,11 +21,11 @@ @Column @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - - @ManyToOne + + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "burning_question_uid") private ScratchieBurningQuestion burningQuestion; - + @Column(name = "session_id") private Long sessionId; Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieAnswer.java =================================================================== diff -u -r22ca3de0e9fe138e44fc36be1abc6fabbbdc4002 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieAnswer.java (.../ScratchieAnswer.java) (revision 22ca3de0e9fe138e44fc36be1abc6fabbbdc4002) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieAnswer.java (.../ScratchieAnswer.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -20,13 +20,13 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.scratchie.model; import java.util.List; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -62,7 +62,7 @@ @Column(name = "order_id") private Integer orderId; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "scratchie_item_uid") private ScratchieItem scratchieItem; @@ -173,7 +173,7 @@ public void setAttempts(int[] attempts) { this.attempts = attempts; } - + public List getConfidenceLevelDtos() { return confidenceLevelDtos; } Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieAnswerVisitLog.java =================================================================== diff -u -r22ca3de0e9fe138e44fc36be1abc6fabbbdc4002 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieAnswerVisitLog.java (.../ScratchieAnswerVisitLog.java) (revision 22ca3de0e9fe138e44fc36be1abc6fabbbdc4002) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieAnswerVisitLog.java (.../ScratchieAnswerVisitLog.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -21,13 +21,13 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.scratchie.model; import java.util.Date; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -48,14 +48,14 @@ @Column @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - - @ManyToOne + + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "scratchie_answer_uid") private ScratchieAnswer scratchieAnswer; - + @Column(name = "access_date") private Date accessDate; - + @Column(name = "session_id") private Long sessionId; Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieBurningQuestion.java =================================================================== diff -u -r22ca3de0e9fe138e44fc36be1abc6fabbbdc4002 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieBurningQuestion.java (.../ScratchieBurningQuestion.java) (revision 22ca3de0e9fe138e44fc36be1abc6fabbbdc4002) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieBurningQuestion.java (.../ScratchieBurningQuestion.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -20,13 +20,13 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.scratchie.model; import java.util.Date; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -47,20 +47,20 @@ @Column @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - - @ManyToOne + + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "scratchie_item_uid") private ScratchieItem scratchieItem; - + @Column(name = "access_date") private Date accessDate; - + @Column(name = "session_id") private Long sessionId; - + @Column private String question; - + @Column(name = "general_question") private boolean generalQuestion; Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieSession.java =================================================================== diff -u -r22ca3de0e9fe138e44fc36be1abc6fabbbdc4002 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieSession.java (.../ScratchieSession.java) (revision 22ca3de0e9fe138e44fc36be1abc6fabbbdc4002) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieSession.java (.../ScratchieSession.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -30,6 +30,7 @@ import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -54,43 +55,43 @@ @Column @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - + @Column(name = "session_id") private Long sessionId; - + @Column(name = "session_name") private String sessionName; - - @ManyToOne + + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "scratchie_uid") private Scratchie scratchie; - + @Column(name = "session_start_date") private Date sessionStartDate; - + @Column(name = "session_end_date") private Date sessionEndDate; - + //date when user has started activity (pressed start button) that has time limitation @Column(name = "time_limit_launched_date") private Date timeLimitLaunchedDate; - + // finish or not @Column private int status; - + @OneToMany(cascade = CascadeType.ALL) @OrderBy("create_date DESC") @JoinColumn(name = "session_uid") private Set scratchieItems = new HashSet<>(); - - @ManyToOne + + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "group_leader_uid") private ScratchieUser groupLeader; - + @Column private int mark; - + @Column(name = "scratching_finished") private boolean scratchingFinished; Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieUser.java =================================================================== diff -u -r22ca3de0e9fe138e44fc36be1abc6fabbbdc4002 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieUser.java (.../ScratchieUser.java) (revision 22ca3de0e9fe138e44fc36be1abc6fabbbdc4002) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieUser.java (.../ScratchieUser.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -25,6 +25,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -52,28 +53,28 @@ @Column @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - + @Column(name = "user_id") private Long userId; - + @Column(name = "first_name") private String firstName; - + @Column(name = "last_name") private String lastName; - + @Column(name = "login_name") private String loginName; - + @Column(name = "session_finished") private boolean sessionFinished; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "session_uid") private ScratchieSession session; - + //******************** DTO ********************** - + @Transient private Long portraitId; Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/model/ScribeHeading.java =================================================================== diff -u -r3a932581b82347c4b65a2255dce5bf19d8e63c0a -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/model/ScribeHeading.java (.../ScribeHeading.java) (revision 3a932581b82347c4b65a2255dce5bf19d8e63c0a) +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/model/ScribeHeading.java (.../ScribeHeading.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -25,6 +25,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -53,7 +54,7 @@ @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "scribe_uid") private Scribe scribe; Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/model/ScribeReportEntry.java =================================================================== diff -u -r3a932581b82347c4b65a2255dce5bf19d8e63c0a -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/model/ScribeReportEntry.java (.../ScribeReportEntry.java) (revision 3a932581b82347c4b65a2255dce5bf19d8e63c0a) +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/model/ScribeReportEntry.java (.../ScribeReportEntry.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -27,6 +27,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -54,11 +55,11 @@ @Column(name = "entry_text") private String entryText; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "scribe_heading_uid") private ScribeHeading scribeHeading; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "scribe_session_uid") private ScribeSession scribeSession; Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/model/ScribeSession.java =================================================================== diff -u -r3a932581b82347c4b65a2255dce5bf19d8e63c0a -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/model/ScribeSession.java (.../ScribeSession.java) (revision 3a932581b82347c4b65a2255dce5bf19d8e63c0a) +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/model/ScribeSession.java (.../ScribeSession.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -30,6 +30,7 @@ import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -75,7 +76,7 @@ @Column(name = "session_name") private String sessionName; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "scribe_uid") private Scribe scribe; @@ -86,7 +87,7 @@ @JoinColumn(name = "scribe_session_uid") private Set scribeReportEntries; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "appointed_scribe_uid") private ScribeUser appointedScribe; Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/model/ScribeUser.java =================================================================== diff -u -r3a932581b82347c4b65a2255dce5bf19d8e63c0a -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/model/ScribeUser.java (.../ScribeUser.java) (revision 3a932581b82347c4b65a2255dce5bf19d8e63c0a) +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/model/ScribeUser.java (.../ScribeUser.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -25,6 +25,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -66,7 +67,7 @@ @Column(name = "login_name") private String loginName; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "scribe_session_uid") private ScribeSession scribeSession; Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/model/Spreadsheet.java =================================================================== diff -u -rc8d42fdc11b1c7cf274fafac0319b4a2c3bdd505 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/model/Spreadsheet.java (.../Spreadsheet.java) (revision c8d42fdc11b1c7cf274fafac0319b4a2c3bdd505) +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/model/Spreadsheet.java (.../Spreadsheet.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -27,6 +27,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -53,51 +54,51 @@ @Column @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - + @Column(name = "content_id") private Long contentId; - + @Column private String title; - + @Column private String instructions; - + @Column private String code; // advance - + @Column(name = "is_learner_allowed_to_save") private boolean isLearnerAllowedToSave; - + @Column(name = "is_marking_enabled") private boolean isMarkingEnabled; @Column(name = "lock_on_finished") private boolean lockWhenFinished; - + @Column(name = "define_later") private boolean defineLater; - + @Column(name = "content_in_use") private boolean contentInUse; @Column(name = "reflect_on_activity") private boolean reflectOnActivity; - + @Column(name = "reflect_instructions") private String reflectInstructions; // general infomation - + @Column(name = "create_date") private Date created; - + @Column(name = "update_date") private Date updated; - - @ManyToOne + + @ManyToOne(fetch = FetchType.LAZY) @Cascade(org.hibernate.annotations.CascadeType.SAVE_UPDATE) @JoinColumn(name = "create_by") private SpreadsheetUser createdBy; Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/model/SpreadsheetSession.java =================================================================== diff -u -rc8d42fdc11b1c7cf274fafac0319b4a2c3bdd505 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/model/SpreadsheetSession.java (.../SpreadsheetSession.java) (revision c8d42fdc11b1c7cf274fafac0319b4a2c3bdd505) +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/model/SpreadsheetSession.java (.../SpreadsheetSession.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -27,6 +27,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -36,7 +37,7 @@ /** * Spreadsheet session - * + * * @author Andrey Balan */ @Entity @@ -47,23 +48,23 @@ @Column @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - + @Column(name = "session_id") private Long sessionId; - + @Column(name = "session_name") private String sessionName; - - @ManyToOne + + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "spreadsheet_uid") private Spreadsheet spreadsheet; - + @Column(name = "session_start_date") private Date sessionStartDate; - + @Column(name = "session_end_date") private Date sessionEndDate; - + //finish or not @Column private int status; Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/model/SpreadsheetUser.java =================================================================== diff -u -rc8d42fdc11b1c7cf274fafac0319b4a2c3bdd505 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/model/SpreadsheetUser.java (.../SpreadsheetUser.java) (revision c8d42fdc11b1c7cf274fafac0319b4a2c3bdd505) +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/model/SpreadsheetUser.java (.../SpreadsheetUser.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -29,6 +29,7 @@ import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -44,7 +45,7 @@ /** * Spreadsheet user - * + * * @author Andrey Balan */ @Entity @@ -57,36 +58,36 @@ @Column @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - + @Column(name = "user_id") private Long userId; - + @Column(name = "first_name") private String firstName; - + @Column(name = "last_name") private String lastName; - + @Column(name = "login_name") private String loginName; - + @Column(name = "session_finished") private boolean sessionFinished; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "session_uid") private SpreadsheetSession session; - - @ManyToOne + + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "spreadsheet_uid") private Spreadsheet spreadsheet; - - @ManyToOne(cascade = CascadeType.ALL) + + @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL) @JoinColumn(name = "user_modified_spreadsheet_uid") private UserModifiedSpreadsheet userModifiedSpreadsheet; //=============== NON Persisit value: for display use =========== - + //the user access some reousrce item date time. Use in monitoring summary page @Transient private Date accessDate; @@ -232,16 +233,11 @@ public void setAccessDate(Date accessDate) { this.accessDate = accessDate; } - + /** Username displayed in monitoring */ public String getFullUsername() { StringBuilder buf = new StringBuilder(); - buf.append(getLastName()) - .append(" ") - .append(getFirstName()) - .append(" (") - .append(getLoginName()) - .append(")"); + buf.append(getLastName()).append(" ").append(getFirstName()).append(" (").append(getLoginName()).append(")"); return buf.toString(); } Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/model/UserModifiedSpreadsheet.java =================================================================== diff -u -rc8d42fdc11b1c7cf274fafac0319b4a2c3bdd505 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/model/UserModifiedSpreadsheet.java (.../UserModifiedSpreadsheet.java) (revision c8d42fdc11b1c7cf274fafac0319b4a2c3bdd505) +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/model/UserModifiedSpreadsheet.java (.../UserModifiedSpreadsheet.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -21,12 +21,12 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.spreadsheet.model; import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -45,11 +45,11 @@ @Column @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - + @Column(name = "user_modified_spreadsheet") private String userModifiedSpreadsheet; - - @ManyToOne(cascade = CascadeType.ALL) + + @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL) @JoinColumn(name = "mark_id") private SpreadsheetMark mark; Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/Survey.java =================================================================== diff -u -rd7de6a4360d49e6436856f8de9fb5de7166dd3f8 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/Survey.java (.../Survey.java) (revision d7de6a4360d49e6436856f8de9fb5de7166dd3f8) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/Survey.java (.../Survey.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -32,6 +32,7 @@ import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -105,7 +106,7 @@ @Column(name = "submission_deadline") private Date submissionDeadline; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "create_by") @Cascade(org.hibernate.annotations.CascadeType.SAVE_UPDATE) private SurveyUser createdBy; Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyAnswer.java =================================================================== diff -u -rd7de6a4360d49e6436856f8de9fb5de7166dd3f8 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyAnswer.java (.../SurveyAnswer.java) (revision d7de6a4360d49e6436856f8de9fb5de7166dd3f8) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyAnswer.java (.../SurveyAnswer.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -27,6 +27,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -48,11 +49,11 @@ @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "user_uid") private SurveyUser user; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "question_uid") private SurveyQuestion surveyQuestion; Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.java =================================================================== diff -u -rd7de6a4360d49e6436856f8de9fb5de7166dd3f8 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.java (.../SurveyQuestion.java) (revision d7de6a4360d49e6436856f8de9fb5de7166dd3f8) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.java (.../SurveyQuestion.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -31,6 +31,7 @@ import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -86,7 +87,7 @@ @Column(name = "create_date") private Date createDate; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "create_by") private SurveyUser createBy; Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveySession.java =================================================================== diff -u -rd7de6a4360d49e6436856f8de9fb5de7166dd3f8 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveySession.java (.../SurveySession.java) (revision d7de6a4360d49e6436856f8de9fb5de7166dd3f8) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveySession.java (.../SurveySession.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -27,6 +27,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -53,7 +54,7 @@ @Column(name = "session_name") private String sessionName; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "survey_uid") private Survey survey; Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyUser.java =================================================================== diff -u -rd7de6a4360d49e6436856f8de9fb5de7166dd3f8 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyUser.java (.../SurveyUser.java) (revision d7de6a4360d49e6436856f8de9fb5de7166dd3f8) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyUser.java (.../SurveyUser.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -25,6 +25,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -69,11 +70,11 @@ @Column(name = "response_finalized") private boolean responseFinalized; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "session_uid") private SurveySession session; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "survey_uid") private Survey survey; Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskList.java =================================================================== diff -u -r0b3631fb6cd93265967ec5d314313e15999d9061 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskList.java (.../TaskList.java) (revision 0b3631fb6cd93265967ec5d314313e15999d9061) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskList.java (.../TaskList.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -32,6 +32,7 @@ import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -62,37 +63,37 @@ @Column @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - + @Column(name = "content_id") private Long contentId; - + @Column private String title; - + @Column private String instructions; @Column(name = "lock_when_finished") private boolean lockWhenFinished; - + @Column(name = "is_sequential_order") private boolean sequentialOrder; - + @Column(name = "minimum_number_tasks") private int minimumNumberTasks; - + @Column(name = "allow_contribute_tasks") private boolean allowContributeTasks; - + @Column(name = "is_monitor_verification_required") private boolean monitorVerificationRequired; @Column(name = "define_later") private boolean defineLater; - + @Column(name = "content_in_use") private boolean contentInUse; - + @Column(name = "submission_deadline") private Date submissionDeadline; @@ -103,11 +104,11 @@ @Column(name = "create_date") private Date created; - + @Column(name = "update_date") private Date updated; - - @ManyToOne + + @ManyToOne(fetch = FetchType.LAZY) @Cascade(org.hibernate.annotations.CascadeType.SAVE_UPDATE) @JoinColumn(name = "create_by") private TaskListUser createdBy; @@ -119,7 +120,7 @@ @Column(name = "reflect_on_activity") private boolean reflectOnActivity; - + @Column(name = "reflect_instructions") private String reflectInstructions; @@ -306,7 +307,7 @@ /** * Returns TaskList id. - * + * * @return tasklist id */ public Long getUid() { @@ -315,7 +316,7 @@ /** * Sets TaskList id. - * + * * @param uid * tasklist id */ @@ -325,7 +326,7 @@ /** * Returns the tasklist title. - * + * * @return tasklist title. */ public String getTitle() { @@ -334,7 +335,7 @@ /** * Sets the tasklist title - * + * * @param title * tasklist title */ @@ -382,7 +383,7 @@ /** * Return set of TaskListItems - * + * * @return set of TaskListItems */ public Set getTaskListItems() { @@ -391,7 +392,7 @@ /** * Sets set of TaskListItems. - * + * * @param taskListItems * set of TaskListItems */ @@ -403,16 +404,16 @@ * Checks whether this tasklist is in use. * * @return - * * + * */ public boolean isContentInUse() { return contentInUse; } /** * Sets whether this tasklist in use or not. - * + * * @param contentInUse * whether this tasklist in use or not */ @@ -422,18 +423,18 @@ /** * Returns whether this tasklist should be defined later. - * + * * @return whether this tasklist should be defined later - * * + * */ public boolean isDefineLater() { return defineLater; } /** * Sets whether this tasklist should be defined later or not. - * + * * @param defineLater * boolean described whether this tasklist should be defined later or not */ @@ -443,18 +444,18 @@ /** * Returns ContentId - * + * * @return ContentId - * * + * */ public Long getContentId() { return contentId; } /** * Sets ContentId. - * + * * @param contentId * ContentId */ @@ -485,16 +486,16 @@ * Returns if learners are allowed to contribute tasks. * * @return whether learners are allowed to contribute tasks - * * + * */ public boolean isAllowContributeTasks() { return allowContributeTasks; } /** * Sets whether learners are allowed to contribute tasks. - * + * * @param allowContributeTasks * boolean describing whether learners are allowed to contribute tasks */ @@ -504,18 +505,18 @@ /** * Returns whether the learners should be verified by monitor before they can finish tasklist. - * + * * @return whether the learners should be verified by monitor before they can finish tasklist - * * + * */ public boolean isMonitorVerificationRequired() { return monitorVerificationRequired; } /** * Sets whether the learners should be verified by monitor before they can finish tasklist. - * + * * @param monitorVerificationRequired * boolean describing whether the learners should be verified by monitor before they can finish tasklist */ @@ -525,18 +526,18 @@ /** * Returns if the tasks should be done in a sequential order. - * + * * @return if the tasks should be done in a sequential order - * * + * */ public boolean isSequentialOrder() { return sequentialOrder; } /** * Sets if the tasks should be done in a sequential order. - * + * * @param sequentialOrder * if the tasks should be done in a sequential order */ @@ -546,18 +547,18 @@ /** * Returns the minimum number of tasks needed to be completed to finish this activity. - * + * * @return the minimum number of tasks needed to be completed to finish this activity - * * + * */ public int getMinimumNumberTasks() { return minimumNumberTasks; } /** * Sets the minimum number of tasks needed to be completed to finish this activity. - * + * * @param numberTasksToComplete * the minimum number of tasks needed to be completed to finish this activity */ @@ -603,17 +604,17 @@ /** * Returns the number of tasks needed to be completed to finish this activity. - * + * * @return the number of tasks needed to be completed to finish this activity - * + * */ public String getMinimumNumberTasksErrorStr() { return minimumNumberTasksErrorStr; } /** * Sets the number of tasks needed to be completed to finish this activity. - * + * * @param numberTasksToComplete * the number of tasks needed to be completed to finish this activity */ Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItem.java =================================================================== diff -u -r3b9eccb4b8def4d56a62641a0fe4038a60b3afe6 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItem.java (.../TaskListItem.java) (revision 3b9eccb4b8def4d56a62641a0fe4038a60b3afe6) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItem.java (.../TaskListItem.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -31,6 +31,7 @@ import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -62,56 +63,56 @@ @Column private String title; - + @Column private String description; - + @Column(name = "sequence_id") private int sequenceId; @Column(name = "init_item") private String initialItem; - + @Column(name = "organization_xml") private String organizationXml; - + @Column(name = "create_by_author") private boolean isCreateByAuthor; @Column(name = "create_date") private Date createDate; - - @ManyToOne + + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "create_by") private TaskListUser createBy; - + //************ advanced tab *************** @Column(name = "is_required") private boolean isRequired; - + @Column(name = "is_comments_allowed") private boolean isCommentsAllowed; - + @Column(name = "is_comments_required") private boolean isCommentsRequired; - + @Column(name = "is_files_allowed") private boolean isFilesAllowed; - + @Column(name = "is_files_required") private boolean isFilesRequired; - + @Column(name = "is_child_task") private boolean isChildTask; - + @Column(name = "parent_task_name") private String parentTaskName; @OneToMany(cascade = CascadeType.ALL) @JoinColumn(name = "taskList_item_uid") @OrderBy("create_date ASC") private Set attachments = new HashSet(); - + @OneToMany(cascade = CascadeType.ALL) @JoinColumn(name = "taskList_item_uid") @OrderBy("create_date ASC") Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItemAttachment.java =================================================================== diff -u -r0b3631fb6cd93265967ec5d314313e15999d9061 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItemAttachment.java (.../TaskListItemAttachment.java) (revision 0b3631fb6cd93265967ec5d314313e15999d9061) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItemAttachment.java (.../TaskListItemAttachment.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -27,6 +27,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -41,7 +42,7 @@ /** * A Wrapper class for uploaded files. An Attachment cannot exist independently and must belong to a * TaskListItem. - * + * * @author Andrey Balan */ @Entity @@ -69,7 +70,7 @@ @Column(name = "create_date") private Date created; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "create_by") private TaskListUser createBy; Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItemComment.java =================================================================== diff -u -r0b3631fb6cd93265967ec5d314313e15999d9061 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItemComment.java (.../TaskListItemComment.java) (revision 0b3631fb6cd93265967ec5d314313e15999d9061) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItemComment.java (.../TaskListItemComment.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -21,13 +21,13 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.taskList.model; import java.util.Date; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -51,14 +51,14 @@ @Column @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - + @Column private String comment; - - @ManyToOne + + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "create_by") private TaskListUser createBy; - + @Column(name = "create_date") private Date createDate; Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItemVisitLog.java =================================================================== diff -u -r0b3631fb6cd93265967ec5d314313e15999d9061 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItemVisitLog.java (.../TaskListItemVisitLog.java) (revision 0b3631fb6cd93265967ec5d314313e15999d9061) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItemVisitLog.java (.../TaskListItemVisitLog.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -21,13 +21,13 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.taskList.model; import java.util.Date; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -46,21 +46,21 @@ @Column @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - - @ManyToOne + + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "user_uid") private TaskListUser user; - - @ManyToOne - @JoinColumn(name = "taskList_item_uid") + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "taskList_item_uid") private TaskListItem taskListItem; - + @Column private boolean complete; - + @Column(name = "access_date") private Date accessDate; - + @Column(name = "session_id") private Long sessionId; Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListSession.java =================================================================== diff -u -r0b3631fb6cd93265967ec5d314313e15999d9061 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListSession.java (.../TaskListSession.java) (revision 0b3631fb6cd93265967ec5d314313e15999d9061) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListSession.java (.../TaskListSession.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -30,6 +30,7 @@ import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -50,26 +51,26 @@ @Column @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - + @Column(name = "session_id") private Long sessionId; - + @Column(name = "session_name") private String sessionName; - - @ManyToOne + + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "taskList_uid") private TaskList taskList; - + @Column(name = "session_start_date") private Date sessionStartDate; - + @Column(name = "session_end_date") private Date sessionEndDate; - + @Column private int status; - + @OneToMany(cascade = CascadeType.ALL) @JoinColumn(name = "session_uid") @OrderBy("create_date DESC") @@ -139,7 +140,7 @@ } /** - * + * * @param sessionName * The session name to set. */ Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListUser.java =================================================================== diff -u -r0b3631fb6cd93265967ec5d314313e15999d9061 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListUser.java (.../TaskListUser.java) (revision 0b3631fb6cd93265967ec5d314313e15999d9061) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListUser.java (.../TaskListUser.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -27,6 +27,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -52,30 +53,30 @@ @Column @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - + @Column(name = "user_id") private Long userId; - + @Column(name = "first_name") private String firstName; - + @Column(name = "last_name") private String lastName; - + @Column(name = "login_name") private String loginName; - + @Column(name = "session_finished") private boolean sessionFinished; - + @Column(name = "is_verified_by_monitor") private boolean isVerifiedByMonitor; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "session_uid") private TaskListSession session; - - @ManyToOne + + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "taskList_uid") private TaskList taskList; Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/model/VoteQueContent.java =================================================================== diff -u -r374f1e3729c3892074184bbd480ae87bce110cfd -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/model/VoteQueContent.java (.../VoteQueContent.java) (revision 374f1e3729c3892074184bbd480ae87bce110cfd) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/model/VoteQueContent.java (.../VoteQueContent.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -26,6 +26,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -58,7 +59,7 @@ @Column(name = "display_order") private int displayOrder; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "vote_content_id") private VoteContent voteContent; Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/model/VoteQueUsr.java =================================================================== diff -u -r374f1e3729c3892074184bbd480ae87bce110cfd -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/model/VoteQueUsr.java (.../VoteQueUsr.java) (revision 374f1e3729c3892074184bbd480ae87bce110cfd) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/model/VoteQueUsr.java (.../VoteQueUsr.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -29,6 +29,7 @@ import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -74,7 +75,7 @@ @Column private boolean finalScreenRequested; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "vote_session_id") private VoteSession voteSession; Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/model/VoteSession.java =================================================================== diff -u -r374f1e3729c3892074184bbd480ae87bce110cfd -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/model/VoteSession.java (.../VoteSession.java) (revision 374f1e3729c3892074184bbd480ae87bce110cfd) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/model/VoteSession.java (.../VoteSession.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -29,6 +29,7 @@ import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -77,14 +78,14 @@ @Column private String session_name; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "vote_content_id") private VoteContent voteContent; @OneToMany(mappedBy = "voteSession", cascade = CascadeType.ALL, orphanRemoval = true) private Set voteQueUsers; - @ManyToOne(cascade = CascadeType.ALL) + @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL) @JoinColumn(name = "group_leader_uid") private VoteQueUsr groupLeader; Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/model/VoteUsrAttempt.java =================================================================== diff -u -r374f1e3729c3892074184bbd480ae87bce110cfd -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/model/VoteUsrAttempt.java (.../VoteUsrAttempt.java) (revision 374f1e3729c3892074184bbd480ae87bce110cfd) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/model/VoteUsrAttempt.java (.../VoteUsrAttempt.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -27,6 +27,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -70,11 +71,11 @@ @Column private boolean singleUserEntry; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "vote_nomination_content_id") private VoteQueContent voteQueContent; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "que_usr_id") private VoteQueUsr voteQueUsr; Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/model/Wiki.java =================================================================== diff -u -r89c234fa5993540a1c125c31d3c57f00b7fb3efb -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/model/Wiki.java (.../Wiki.java) (revision 89c234fa5993540a1c125c31d3c57f00b7fb3efb) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/model/Wiki.java (.../Wiki.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -29,6 +29,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -127,7 +128,7 @@ @OrderBy("uid ASC") private Set wikiPages; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "wiki_main_page_uid") private WikiPage mainPage; Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/model/WikiPage.java =================================================================== diff -u -r89c234fa5993540a1c125c31d3c57f00b7fb3efb -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/model/WikiPage.java (.../WikiPage.java) (revision 89c234fa5993540a1c125c31d3c57f00b7fb3efb) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/model/WikiPage.java (.../WikiPage.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -6,6 +6,7 @@ import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -37,7 +38,7 @@ @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "wiki_uid") private Wiki parentWiki; @@ -55,15 +56,15 @@ @OrderBy("uid ASC") private Set wikiContentVersions; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "wiki_current_content") private WikiPageContent currentWikiContent; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "wiki_session_uid") private WikiSession wikiSession; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "added_by") private WikiUser addedBy; Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/model/WikiPageContent.java =================================================================== diff -u -r89c234fa5993540a1c125c31d3c57f00b7fb3efb -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/model/WikiPageContent.java (.../WikiPageContent.java) (revision 89c234fa5993540a1c125c31d3c57f00b7fb3efb) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/model/WikiPageContent.java (.../WikiPageContent.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -27,6 +27,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -56,21 +57,21 @@ @Column @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - - @ManyToOne - @JoinColumn(name = "wiki_page_uid") + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "wiki_page_uid") private WikiPage wikiPage; - + @Column private String body; - @ManyToOne - @JoinColumn(name = "editor") + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "editor") private WikiUser editor; - + @Column(name = "edit_date") private Date editDate; - + @Column private Long version; Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/model/WikiSession.java =================================================================== diff -u -r89c234fa5993540a1c125c31d3c57f00b7fb3efb -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/model/WikiSession.java (.../WikiSession.java) (revision 89c234fa5993540a1c125c31d3c57f00b7fb3efb) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/model/WikiSession.java (.../WikiSession.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -21,7 +21,6 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.wiki.model; import java.util.Date; @@ -30,6 +29,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -52,7 +52,7 @@ public class WikiSession implements java.io.Serializable { private static Logger log = Logger.getLogger(WikiSession.class); - private static final long serialVersionUID = 7762187772612318324L; + private static final long serialVersionUID = 7762187772612318324L; @Id @Column @@ -74,8 +74,8 @@ @Column(name = "session_name") private String sessionName; - @ManyToOne - @JoinColumn(name = "wiki_uid") + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "wiki_uid") private Wiki wiki; @OneToMany(mappedBy = "wikiSession") @@ -85,8 +85,8 @@ @OrderBy("uid ASC") private Set wikiPages; // Need a runtime copy for each wikiPage - @ManyToOne - @JoinColumn(name = "wiki_main_page_uid") + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "wiki_main_page_uid") private WikiPage mainPage; //Need a runtime reference to the main page /** default constructor */ Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/model/WikiUser.java =================================================================== diff -u -r89c234fa5993540a1c125c31d3c57f00b7fb3efb -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/model/WikiUser.java (.../WikiUser.java) (revision 89c234fa5993540a1c125c31d3c57f00b7fb3efb) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/model/WikiUser.java (.../WikiUser.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -21,11 +21,11 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.wiki.model; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -48,12 +48,12 @@ @Table(name = "tl_lawiki10_user") public class WikiUser implements java.io.Serializable { - private static final long serialVersionUID = -534126658843778423L; + private static final long serialVersionUID = -534126658843778423L; @Id @Column @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long uid; + private Long uid; @Column(name = "user_id") private Long userId; @@ -67,8 +67,8 @@ @Column(name = "login_name") private String loginName; - @ManyToOne - @JoinColumn(name = "wiki_session_uid") + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "wiki_session_uid") private WikiSession wikiSession; @Column Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/model/Zoom.java =================================================================== diff -u -r7f549341b0c03ba7cd3e0b55f4c1f936ad2da772 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/model/Zoom.java (.../Zoom.java) (revision 7f549341b0c03ba7cd3e0b55f4c1f936ad2da772) +++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/model/Zoom.java (.../Zoom.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -29,6 +29,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -87,7 +88,7 @@ @Column(name = "tool_content_id") private Long toolContentId; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "api_id") private ZoomApi api; Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/model/ZoomSession.java =================================================================== diff -u -r7f549341b0c03ba7cd3e0b55f4c1f936ad2da772 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/model/ZoomSession.java (.../ZoomSession.java) (revision 7f549341b0c03ba7cd3e0b55f4c1f936ad2da772) +++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/model/ZoomSession.java (.../ZoomSession.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -29,6 +29,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -73,7 +74,7 @@ @Column(name = "session_name") private String sessionName; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "zoom_uid") private Zoom zoom; Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/model/ZoomUser.java =================================================================== diff -u -r7f549341b0c03ba7cd3e0b55f4c1f936ad2da772 -r82b696dd440b1d936ba5a910835dd85740eac2f0 --- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/model/ZoomUser.java (.../ZoomUser.java) (revision 7f549341b0c03ba7cd3e0b55f4c1f936ad2da772) +++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/model/ZoomUser.java (.../ZoomUser.java) (revision 82b696dd440b1d936ba5a910835dd85740eac2f0) @@ -25,6 +25,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -56,7 +57,7 @@ @Column(name = "email") private String email; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "zoom_session_uid") private ZoomSession zoomSession;