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

method to merge feeds

Browse Source
This commit is contained in:
Athou
2013-07-02 14:57:00 +02:00
parent f230ad74b1
commit a7f5f9ee00
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,6 @@ import java.util.Date;
import java.util.Set;
import javax.persistence.Cacheable;
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.ManyToMany;
@@ -111,7 +110,7 @@ public class Feed extends AbstractModel {
@Column(length = 40)
private String lastContentHash;
@ManyToMany(mappedBy = "feeds", cascade = CascadeType.REMOVE)
@ManyToMany(mappedBy = "feeds")
private Set<FeedEntry> entries = Sets.newHashSet();
@OneToMany(mappedBy = "feed")