garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

only allow one thread to update entries for a feed, avoids duplicates if two feeds containing the same entry are updating at the same time

Browse Source
This commit is contained in:
Athou
2013-04-26 18:53:48 +02:00
parent aa3baf5007
commit 56ba907ec5
3 changed files with 79 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/com/commafeed/backend/feeds/FeedRefreshUpdater.java Normal file
View File

@@ -0,0 +1,33 @@
package com.commafeed.backend.feeds;
import java.util.Collection;
import javax.ejb.Asynchronous;
import javax.ejb.Stateless;
import javax.inject.Inject;
import org.apache.commons.collections.CollectionUtils;
import com.commafeed.backend.dao.FeedDAO;
import com.commafeed.backend.model.Feed;
import com.commafeed.backend.model.FeedEntry;
import com.commafeed.backend.services.FeedUpdateService;
@Stateless
public class FeedRefreshUpdater {
@Inject
FeedUpdateService feedUpdateService;
@Inject
FeedDAO feedDAO;
@Asynchronous
public void updateEntries(Feed feed, Collection<FeedEntry> entries) {
if (CollectionUtils.isNotEmpty(entries)) {
feedUpdateService.updateEntries(feed, entries);
}
feedDAO.update(feed);
}
}

5
src/main/java/com/commafeed/backend/feeds/FeedRefreshWorker.java
View File

@@ -20,7 +20,6 @@ import org.slf4j.LoggerFactory;
import com.commafeed.backend.HttpGetter.NotModifiedException; import com.commafeed.backend.HttpGetter.NotModifiedException;
import com.commafeed.backend.model.Feed; import com.commafeed.backend.model.Feed;
import com.commafeed.backend.model.FeedEntry; import com.commafeed.backend.model.FeedEntry;
import com.commafeed.backend.services.FeedUpdateService;
import com.sun.syndication.io.FeedException; import com.sun.syndication.io.FeedException;
public class FeedRefreshWorker { public class FeedRefreshWorker {
@@ -29,7 +28,7 @@ public class FeedRefreshWorker {
.getLogger(FeedRefreshWorker.class); .getLogger(FeedRefreshWorker.class);
@Inject @Inject
FeedUpdateService feedUpdateService; FeedRefreshUpdater feedRefreshUpdater;
@Inject @Inject
FeedFetcher fetcher; FeedFetcher fetcher;
@@ -127,7 +126,7 @@ public class FeedRefreshWorker {
feed.setEtagHeader(fetchedFeed.getFeed().getEtagHeader()); feed.setEtagHeader(fetchedFeed.getFeed().getEtagHeader());
entries = fetchedFeed.getEntries(); entries = fetchedFeed.getEntries();
} }
feedUpdateService.updateEntries(feed, entries); feedRefreshUpdater.updateEntries(feed, entries);
} }

97
src/main/java/com/commafeed/backend/services/FeedUpdateService.java
View File

@@ -5,15 +5,14 @@ import java.util.Calendar;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import javax.ejb.Asynchronous; import javax.ejb.Lock;
import javax.ejb.Stateless; import javax.ejb.LockType;
import javax.ejb.Singleton;
import javax.inject.Inject; import javax.inject.Inject;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import com.commafeed.backend.dao.FeedDAO;
import com.commafeed.backend.dao.FeedEntryDAO; import com.commafeed.backend.dao.FeedEntryDAO;
import com.commafeed.backend.dao.FeedEntryStatusDAO; import com.commafeed.backend.dao.FeedEntryStatusDAO;
import com.commafeed.backend.dao.FeedSubscriptionDAO; import com.commafeed.backend.dao.FeedSubscriptionDAO;
@@ -25,12 +24,9 @@ import com.commafeed.backend.model.FeedEntryStatus;
import com.commafeed.backend.model.FeedSubscription; import com.commafeed.backend.model.FeedSubscription;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
@Stateless @Singleton
public class FeedUpdateService { public class FeedUpdateService {
@Inject
FeedDAO feedDAO;
@Inject @Inject
FeedSubscriptionDAO feedSubscriptionDAO; FeedSubscriptionDAO feedSubscriptionDAO;
@@ -40,63 +36,58 @@ public class FeedUpdateService {
@Inject @Inject
FeedEntryStatusDAO feedEntryStatusDAO; FeedEntryStatusDAO feedEntryStatusDAO;
@Asynchronous @Lock(LockType.WRITE)
public void updateEntries(Feed feed, Collection<FeedEntry> entries) { public void updateEntries(Feed feed, Collection<FeedEntry> entries) {
if (CollectionUtils.isNotEmpty(entries)) { List<FeedEntry> existingEntries = getExistingEntries(entries);
List<FeedEntry> existingEntries = getExistingEntries(entries); List<FeedSubscription> subscriptions = feedSubscriptionDAO
List<FeedSubscription> subscriptions = feedSubscriptionDAO .findByFeed(feed);
.findByFeed(feed);
List<FeedEntry> entryUpdateList = Lists.newArrayList(); List<FeedEntry> entryUpdateList = Lists.newArrayList();
List<FeedEntryStatus> statusUpdateList = Lists.newArrayList(); List<FeedEntryStatus> statusUpdateList = Lists.newArrayList();
for (FeedEntry entry : entries) { for (FeedEntry entry : entries) {
FeedEntry foundEntry = findEntry(existingEntries, entry); FeedEntry foundEntry = findEntry(existingEntries, entry);
if (foundEntry == null) { if (foundEntry == null) {
FeedEntryContent content = entry.getContent(); FeedEntryContent content = entry.getContent();
content.setContent(FeedUtils.handleContent(content content.setContent(FeedUtils.handleContent(content.getContent()));
.getContent())); String title = FeedUtils.handleContent(content.getTitle());
String title = FeedUtils.handleContent(content.getTitle()); if (title != null) {
if (title != null) { content.setTitle(title.substring(0,
content.setTitle(title.substring(0, Math.min(2048, title.length())));
Math.min(2048, title.length()))); }
}
entry.setInserted(Calendar.getInstance().getTime()); entry.setInserted(Calendar.getInstance().getTime());
entry.getFeeds().add(feed); entry.getFeeds().add(feed);
entryUpdateList.add(entry); entryUpdateList.add(entry);
} else { } else {
boolean foundFeed = false; boolean foundFeed = false;
for (Feed existingFeed : foundEntry.getFeeds()) { for (Feed existingFeed : foundEntry.getFeeds()) {
if (ObjectUtils.equals(existingFeed.getId(), if (ObjectUtils.equals(existingFeed.getId(), feed.getId())) {
feed.getId())) { foundFeed = true;
foundFeed = true; break;
break;
}
}
if (!foundFeed) {
foundEntry.getFeeds().add(feed);
entryUpdateList.add(foundEntry);
} }
} }
}
for (FeedEntry entry : entryUpdateList) { if (!foundFeed) {
for (FeedSubscription sub : subscriptions) { foundEntry.getFeeds().add(feed);
FeedEntryStatus status = new FeedEntryStatus(); entryUpdateList.add(foundEntry);
status.setEntry(entry);
status.setSubscription(sub);
statusUpdateList.add(status);
} }
} }
feedEntryDAO.saveOrUpdate(entryUpdateList);
feedEntryStatusDAO.saveOrUpdate(statusUpdateList);
} }
feedDAO.update(feed); for (FeedEntry entry : entryUpdateList) {
for (FeedSubscription sub : subscriptions) {
FeedEntryStatus status = new FeedEntryStatus();
status.setEntry(entry);
status.setSubscription(sub);
statusUpdateList.add(status);
}
}
feedEntryDAO.saveOrUpdate(entryUpdateList);
feedEntryStatusDAO.saveOrUpdate(statusUpdateList);
} }
private FeedEntry findEntry(List<FeedEntry> existingEntries, FeedEntry entry) { private FeedEntry findEntry(List<FeedEntry> existingEntries, FeedEntry entry) {