Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert for the moment as it breaks pubsub handling

Browse Source
This commit is contained in:
Athou
2013-05-30 11:52:40 +02:00
parent 34d47b3250
commit 4da9fca7ea
6 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/commafeed/backend/model/Feed.java
View File

@@ -9,6 +9,7 @@ import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.ManyToMany;
import javax.persistence.OneToMany;
import javax.persistence.OneToOne;
import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
@@ -68,11 +69,9 @@ public class Feed extends AbstractModel {
@Column(length = 255)
private String etagHeader;
@OneToMany(fetch = FetchType.LAZY, mappedBy = "feed", cascade = {
@OneToOne(fetch = FetchType.LAZY, mappedBy = "feed", cascade = {
CascadeType.PERSIST, CascadeType.MERGE })
// use a onetomany relationship for push info to avoid hibernate automatic
// lazy loading of onetoone optional relationships
private Set<FeedPushInfo> pushInfo;
private FeedPushInfo pushInfo;
@ManyToMany(mappedBy = "feeds")
private Set<FeedEntry> entries = Sets.newHashSet();
@@ -184,11 +183,11 @@ public class Feed extends AbstractModel {
this.lastUpdateSuccess = lastUpdateSuccess;
}
public Set<FeedPushInfo> getPushInfo() {
public FeedPushInfo getPushInfo() {
return pushInfo;
}
public void setPushInfo(Set<FeedPushInfo> pushInfo) {
public void setPushInfo(FeedPushInfo pushInfo) {
this.pushInfo = pushInfo;
}