Index: lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java =================================================================== diff -u -r66bda55b4291ff10c230b0ab5227dab5fa058a8a -rdd2d980b18a138b7fbde17e7d21e911e9be435d9 --- lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java (.../Lesson.java) (revision 66bda55b4291ff10c230b0ab5227dab5fa058a8a) +++ lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java (.../Lesson.java) (revision dd2d980b18a138b7fbde17e7d21e911e9be435d9) @@ -50,8 +50,6 @@ import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; -import org.hibernate.annotations.Cache; -import org.hibernate.annotations.CacheConcurrencyStrategy; import org.lamsfoundation.lams.gradebook.GradebookUserLesson; import org.lamsfoundation.lams.learningdesign.LearningDesign; import org.lamsfoundation.lams.lesson.dto.LessonDetailsDTO; @@ -198,15 +196,15 @@ @Column(name = "previous_state_id") private Integer previousLessonStateId; - @ManyToOne(fetch = FetchType.EAGER) + @ManyToOne @JoinColumn(name = "learning_design_id") private LearningDesign learningDesign; - @OneToOne(cascade = CascadeType.ALL, fetch = FetchType.EAGER) + @OneToOne(cascade = CascadeType.ALL) @JoinColumn(name = "class_grouping_id") private LessonClass lessonClass; - @ManyToOne(fetch = FetchType.EAGER) + @ManyToOne @JoinColumn(name = "organisation_id") private Organisation organisation;