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

better cleanup method

Browse Source
This commit is contained in:
Athou
2013-07-04 15:43:08 +02:00
parent 73447f26ee
commit 05cb8f7b7e
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/com/commafeed/backend/dao/FeedDAO.java
View File

@@ -16,6 +16,7 @@ import org.apache.commons.lang.StringUtils;
import com.commafeed.backend.feeds.FeedUtils; import com.commafeed.backend.feeds.FeedUtils;
import com.commafeed.backend.model.Feed; import com.commafeed.backend.model.Feed;
import com.commafeed.backend.model.FeedEntry;
import com.commafeed.backend.model.FeedSubscription; import com.commafeed.backend.model.FeedSubscription;
import com.commafeed.backend.model.FeedSubscription_; import com.commafeed.backend.model.FeedSubscription_;
import com.commafeed.backend.model.Feed_; import com.commafeed.backend.model.Feed_;
@@ -25,7 +26,8 @@ import com.google.common.collect.Lists;
@Stateless @Stateless
public class FeedDAO extends GenericDAO<Feed> { public class FeedDAO extends GenericDAO<Feed> {
private List<Predicate> getUpdatablePredicates(Root<Feed> root, Date threshold) { private List<Predicate> getUpdatablePredicates(Root<Feed> root,
Date threshold) {
Predicate neverUpdated = builder.isNull(root.get(Feed_.lastUpdated)); Predicate neverUpdated = builder.isNull(root.get(Feed_.lastUpdated));
Predicate updatedBeforeThreshold = builder.lessThan( Predicate updatedBeforeThreshold = builder.lessThan(
@@ -46,7 +48,8 @@ public class FeedDAO extends GenericDAO<Feed> {
Root<Feed> root = query.from(getType()); Root<Feed> root = query.from(getType());
query.select(builder.count(root)); query.select(builder.count(root));
query.where(getUpdatablePredicates(root, threshold).toArray(new Predicate[0])); query.where(getUpdatablePredicates(root, threshold).toArray(
new Predicate[0]));
TypedQuery<Long> q = em.createQuery(query); TypedQuery<Long> q = em.createQuery(query);
return q.getSingleResult(); return q.getSingleResult();
@@ -56,7 +59,8 @@ public class FeedDAO extends GenericDAO<Feed> {
CriteriaQuery<Feed> query = builder.createQuery(getType()); CriteriaQuery<Feed> query = builder.createQuery(getType());
Root<Feed> root = query.from(getType()); Root<Feed> root = query.from(getType());
query.where(getUpdatablePredicates(root, threshold).toArray(new Predicate[0])); query.where(getUpdatablePredicates(root, threshold).toArray(
new Predicate[0]));
query.orderBy(builder.asc(root.get(Feed_.lastUpdated))); query.orderBy(builder.asc(root.get(Feed_.lastUpdated)));
@@ -74,9 +78,11 @@ public class FeedDAO extends GenericDAO<Feed> {
} }
String normalized = FeedUtils.normalizeURL(url); String normalized = FeedUtils.normalizeURL(url);
feeds = findByField(Feed_.normalizedUrlHash, DigestUtils.sha1Hex(normalized)); feeds = findByField(Feed_.normalizedUrlHash,
DigestUtils.sha1Hex(normalized));
feed = Iterables.getFirst(feeds, null); feed = Iterables.getFirst(feeds, null);
if (feed != null && StringUtils.equals(normalized, feed.getNormalizedUrl())) { if (feed != null
&& StringUtils.equals(normalized, feed.getNormalizedUrl())) {
return feed; return feed;
} }
@@ -106,13 +112,19 @@ public class FeedDAO extends GenericDAO<Feed> {
SetJoin<Feed, FeedSubscription> join = root.join(Feed_.subscriptions, SetJoin<Feed, FeedSubscription> join = root.join(Feed_.subscriptions,
JoinType.LEFT); JoinType.LEFT);
query.where(builder.isNull(join.get(FeedSubscription_.id))); query.where(builder.isNull(join.get(FeedSubscription_.id)));
TypedQuery<Feed> q = em.createQuery(query); TypedQuery<Feed> q = em.createQuery(query);
q.setMaxResults(max); q.setMaxResults(max);
List<Feed> list = q.getResultList(); List<Feed> list = q.getResultList();
int deleted = list.size(); int deleted = list.size();
for (Feed feed : list) { for (Feed feed : list) {
for (FeedEntry entry : feed.getEntries()) {
entry.getFeeds().remove(feed);
em.merge(entry);
if (entry.getFeeds().isEmpty()) {
em.remove(entry);
}
}
feed.getEntries().clear(); feed.getEntries().clear();
delete(feed); delete(feed);
} }