Skip to content

Commit 367a302

Browse files
committed
fixed intermittent null scheduler
1 parent 86c12b7 commit 367a302

2 files changed

Lines changed: 4 additions & 6 deletions

File tree

src/main/java/edu/tamu/app/model/AbstractScheduler.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313

1414
import org.hibernate.annotations.Fetch;
1515

16-
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
17-
1816
import edu.tamu.framework.model.BaseEntity;
1917

2018
import static javax.persistence.InheritanceType.JOINED;
@@ -24,9 +22,8 @@
2422
@Inheritance(strategy = JOINED)
2523
public abstract class AbstractScheduler extends BaseEntity implements Scheduler {
2624

27-
@OneToMany(fetch = EAGER, cascade = CascadeType.ALL, orphanRemoval = true)
25+
@OneToMany(fetch = EAGER, cascade = { CascadeType.ALL }, orphanRemoval = true)
2826
@Fetch(value = SELECT)
29-
@JsonIgnoreProperties("scheduler")
3027
private List<Schedule> schedules;
3128

3229
@Column(nullable = false)

src/main/java/edu/tamu/app/model/Schedule.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,19 @@ public class Schedule extends BaseEntity {
2828
@Column(nullable = false)
2929
private Long scheduledPostingEnd;
3030

31-
@ManyToOne
31+
@ManyToOne(optional = false)
3232
@JsonIgnoreProperties("schedules")
3333
private AbstractScheduler scheduler;
3434

3535
@ElementCollection(fetch = FetchType.EAGER)
3636
@MapKeyColumn(name = "key")
3737
@Column(name = "value")
3838
@CollectionTable(name = "schedule_data", joinColumns = @JoinColumn(name = "schedule_id"))
39-
private Map<String, String> scheduleData = new HashMap<String, String>();
39+
private Map<String, String> scheduleData;
4040

4141
public Schedule() {
4242
super();
43+
setScheduleData(new HashMap<String, String>());
4344
}
4445

4546
public Schedule(Long start, Long end) {

0 commit comments

Comments
 (0)