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

cache subscriptions and categories

Browse Source
This commit is contained in:
Athou
2013-06-27 12:46:25 +02:00
parent 42a26b86ed
commit 57e08fdd36
4 changed files with 69 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/commafeed/backend/dao/FeedCategoryDAO.java
View File

@@ -5,6 +5,7 @@ import java.util.List;
import javax.ejb.Stateless; import javax.ejb.Stateless;
import javax.persistence.NoResultException; import javax.persistence.NoResultException;
import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Join;
import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root; import javax.persistence.criteria.Root;
@@ -13,33 +14,38 @@ import org.apache.commons.lang.ObjectUtils;
import com.commafeed.backend.model.FeedCategory; import com.commafeed.backend.model.FeedCategory;
import com.commafeed.backend.model.FeedCategory_; import com.commafeed.backend.model.FeedCategory_;
import com.commafeed.backend.model.User; import com.commafeed.backend.model.User;
import com.commafeed.backend.model.User_;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
@Stateless @Stateless
public class FeedCategoryDAO extends GenericDAO<FeedCategory> { public class FeedCategoryDAO extends GenericDAO<FeedCategory> {
@SuppressWarnings("unchecked")
public List<FeedCategory> findAll(User user) { public List<FeedCategory> findAll(User user) {
CriteriaQuery<FeedCategory> query = builder.createQuery(getType()); CriteriaQuery<FeedCategory> query = builder.createQuery(getType());
Root<FeedCategory> root = query.from(getType()); Root<FeedCategory> root = query.from(getType());
Join<FeedCategory, User> userJoin = (Join<FeedCategory, User>) root
.fetch(FeedCategory_.user);
query.where(builder.equal(root.get(FeedCategory_.user), user)); query.where(builder.equal(userJoin.get(User_.id), user.getId()));
root.fetch(FeedCategory_.user.getName());
return em.createQuery(query).getResultList(); return cache(em.createQuery(query)).getResultList();
} }
public FeedCategory findById(User user, Long id) { public FeedCategory findById(User user, Long id) {
CriteriaQuery<FeedCategory> query = builder.createQuery(getType()); CriteriaQuery<FeedCategory> query = builder.createQuery(getType());
Root<FeedCategory> root = query.from(getType()); Root<FeedCategory> root = query.from(getType());
Predicate p1 = builder.equal(root.get(FeedCategory_.user), user); Predicate p1 = builder.equal(
root.get(FeedCategory_.user).get(User_.id), user.getId());
Predicate p2 = builder.equal(root.get(FeedCategory_.id), id); Predicate p2 = builder.equal(root.get(FeedCategory_.id), id);
query.where(p1, p2); query.where(p1, p2);
return Iterables.getFirst(em.createQuery(query).getResultList(), null); return Iterables.getFirst(cache(em.createQuery(query)).getResultList(),
null);
} }
public FeedCategory findByName(User user, String name, FeedCategory parent) { public FeedCategory findByName(User user, String name, FeedCategory parent) {

77
src/main/java/com/commafeed/backend/dao/FeedSubscriptionDAO.java
View File

@@ -8,11 +8,16 @@ import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root; import javax.persistence.criteria.Root;
import org.hibernate.Hibernate;
import com.commafeed.backend.model.Feed; import com.commafeed.backend.model.Feed;
import com.commafeed.backend.model.FeedCategory; import com.commafeed.backend.model.FeedCategory;
import com.commafeed.backend.model.FeedCategory_;
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.User; import com.commafeed.backend.model.User;
import com.commafeed.backend.model.User_;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
@Stateless @Stateless
@@ -22,7 +27,8 @@ public class FeedSubscriptionDAO extends GenericDAO<FeedSubscription> {
CriteriaQuery<FeedSubscription> query = builder.createQuery(getType()); CriteriaQuery<FeedSubscription> query = builder.createQuery(getType());
Root<FeedSubscription> root = query.from(getType()); Root<FeedSubscription> root = query.from(getType());
Predicate p1 = builder.equal(root.get(FeedSubscription_.user), user); Predicate p1 = builder.equal(
root.get(FeedSubscription_.user).get(User_.id), user.getId());
Predicate p2 = builder.equal(root.get(FeedSubscription_.id), id); Predicate p2 = builder.equal(root.get(FeedSubscription_.id), id);
root.fetch(FeedSubscription_.feed, JoinType.LEFT); root.fetch(FeedSubscription_.feed, JoinType.LEFT);
@@ -30,11 +36,22 @@ public class FeedSubscriptionDAO extends GenericDAO<FeedSubscription> {
query.where(p1, p2); query.where(p1, p2);
return Iterables.getFirst(em.createQuery(query).getResultList(), null); FeedSubscription sub = Iterables.getFirst(cache(em.createQuery(query))
.getResultList(), null);
initRelations(sub);
return sub;
} }
public List<FeedSubscription> findByFeed(Feed feed) { public List<FeedSubscription> findByFeed(Feed feed) {
return findByField(FeedSubscription_.feed, feed); CriteriaQuery<FeedSubscription> query = builder.createQuery(getType());
Root<FeedSubscription> root = query.from(getType());
query.where(builder.equal(root.get(FeedSubscription_.feed)
.get(Feed_.id), feed.getId()));
List<FeedSubscription> list = cache(em.createQuery(query))
.getResultList();
initRelations(list);
return list;
} }
public FeedSubscription findByFeed(User user, Feed feed) { public FeedSubscription findByFeed(User user, Feed feed) {
@@ -42,15 +59,20 @@ public class FeedSubscriptionDAO extends GenericDAO<FeedSubscription> {
CriteriaQuery<FeedSubscription> query = builder.createQuery(getType()); CriteriaQuery<FeedSubscription> query = builder.createQuery(getType());
Root<FeedSubscription> root = query.from(getType()); Root<FeedSubscription> root = query.from(getType());
Predicate p1 = builder.equal(root.get(FeedSubscription_.user), user); Predicate p1 = builder.equal(
Predicate p2 = builder.equal(root.get(FeedSubscription_.feed), feed); root.get(FeedSubscription_.user).get(User_.id), user.getId());
Predicate p2 = builder.equal(
root.get(FeedSubscription_.feed).get(Feed_.id), feed.getId());
root.fetch(FeedSubscription_.feed, JoinType.LEFT); root.fetch(FeedSubscription_.feed, JoinType.LEFT);
root.fetch(FeedSubscription_.category, JoinType.LEFT); root.fetch(FeedSubscription_.category, JoinType.LEFT);
query.where(p1, p2); query.where(p1, p2);
return Iterables.getFirst(em.createQuery(query).getResultList(), null); FeedSubscription sub = Iterables.getFirst(cache(em.createQuery(query))
.getResultList(), null);
initRelations(sub);
return sub;
} }
public List<FeedSubscription> findAll(User user) { public List<FeedSubscription> findAll(User user) {
@@ -61,9 +83,13 @@ public class FeedSubscriptionDAO extends GenericDAO<FeedSubscription> {
root.fetch(FeedSubscription_.feed, JoinType.LEFT); root.fetch(FeedSubscription_.feed, JoinType.LEFT);
root.fetch(FeedSubscription_.category, JoinType.LEFT); root.fetch(FeedSubscription_.category, JoinType.LEFT);
query.where(builder.equal(root.get(FeedSubscription_.user), user)); query.where(builder.equal(root.get(FeedSubscription_.user)
.get(User_.id), user.getId()));
return em.createQuery(query).getResultList(); List<FeedSubscription> list = cache(em.createQuery(query))
.getResultList();
initRelations(list);
return list;
} }
public List<FeedSubscription> findByCategory(User user, public List<FeedSubscription> findByCategory(User user,
@@ -72,25 +98,30 @@ public class FeedSubscriptionDAO extends GenericDAO<FeedSubscription> {
CriteriaQuery<FeedSubscription> query = builder.createQuery(getType()); CriteriaQuery<FeedSubscription> query = builder.createQuery(getType());
Root<FeedSubscription> root = query.from(getType()); Root<FeedSubscription> root = query.from(getType());
Predicate p1 = builder.equal(root.get(FeedSubscription_.user), user); Predicate p1 = builder.equal(
Predicate p2 = builder.equal(root.get(FeedSubscription_.category), root.get(FeedSubscription_.user).get(User_.id), user.getId());
category); Predicate p2 = builder.equal(
root.get(FeedSubscription_.category).get(FeedCategory_.id),
category.getId());
query.where(p1, p2); query.where(p1, p2);
return em.createQuery(query).getResultList(); List<FeedSubscription> list = cache(em.createQuery(query))
.getResultList();
initRelations(list);
return list;
} }
public List<FeedSubscription> findWithoutCategories(User user) { private void initRelations(List<FeedSubscription> list) {
for (FeedSubscription sub : list) {
CriteriaQuery<FeedSubscription> query = builder.createQuery(getType()); initRelations(sub);
Root<FeedSubscription> root = query.from(getType()); }
}
Predicate p1 = builder.equal(root.get(FeedSubscription_.user), user);
Predicate p2 = builder.isNull(root.get(FeedSubscription_.category)); private void initRelations(FeedSubscription sub) {
if (sub != null) {
query.where(p1, p2); Hibernate.initialize(sub.getFeed());
Hibernate.initialize(sub.getCategory());
return em.createQuery(query).getResultList(); }
} }
} }

2
src/main/java/com/commafeed/backend/model/FeedCategory.java
View File

@@ -28,9 +28,11 @@ public class FeedCategory extends AbstractModel {
@ManyToOne(fetch = FetchType.LAZY) @ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(nullable = false) @JoinColumn(nullable = false)
@Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
private User user; private User user;
@ManyToOne(fetch = FetchType.LAZY) @ManyToOne(fetch = FetchType.LAZY)
@Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
private FeedCategory parent; private FeedCategory parent;
@OneToMany(mappedBy = "parent") @OneToMany(mappedBy = "parent")

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

@@ -24,16 +24,19 @@ public class FeedSubscription extends AbstractModel {
@ManyToOne(fetch = FetchType.LAZY) @ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(nullable = false) @JoinColumn(nullable = false)
@Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
private User user; private User user;
@ManyToOne(fetch = FetchType.LAZY) @ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(nullable = false) @JoinColumn(nullable = false)
@Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
private Feed feed; private Feed feed;
@Column(length = 128, nullable = false) @Column(length = 128, nullable = false)
private String title; private String title;
@ManyToOne(fetch = FetchType.LAZY) @ManyToOne(fetch = FetchType.LAZY)
@Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
private FeedCategory category; private FeedCategory category;
@OneToMany(mappedBy = "subscription", cascade = CascadeType.REMOVE) @OneToMany(mappedBy = "subscription", cascade = CascadeType.REMOVE)