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

move injection points where they belong

Browse Source
This commit is contained in:
Athou
2013-07-02 16:10:59 +02:00
parent d2a053a53c
commit beaf39c8e6
10 changed files with 176 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/commafeed/backend/services/FeedService.java
View File

@@ -1,7 +1,5 @@
package com.commafeed.backend.services;
import java.util.List;
import javax.ejb.Lock;
import javax.ejb.LockType;
import javax.ejb.Singleton;
@@ -13,7 +11,6 @@ import com.commafeed.backend.dao.FeedDAO;
import com.commafeed.backend.dao.FeedSubscriptionDAO;
import com.commafeed.backend.feeds.FeedUtils;
import com.commafeed.backend.model.Feed;
import com.commafeed.backend.model.FeedSubscription;
@Singleton
public class FeedService {
@@ -39,19 +36,4 @@ public class FeedService {
return feed;
}
public void mergeFeeds(Feed into, List<Feed> feeds) {
for (Feed feed : feeds) {
if (into.getId().equals(feed.getId())) {
continue;
}
List<FeedSubscription> subs = feedSubscriptionDAO.findByFeed(feed);
for (FeedSubscription sub : subs) {
sub.setFeed(into);
}
feedSubscriptionDAO.saveOrUpdate(subs);
feedDAO.delete(feed);
}
feedDAO.saveOrUpdate(into);
}
}