From b8a8a2b86d86b7e47e145e5db7c8c75273362e62 Mon Sep 17 00:00:00 2001 From: Athou Date: Wed, 12 Jun 2013 16:57:31 +0200 Subject: [PATCH] relationships are not nullable, no point in doing a left join --- .../backend/dao/FeedEntryStatusDAO.java | 45 +++++++++---------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java b/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java index 7bb167c7..55274a84 100644 --- a/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java +++ b/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java @@ -10,7 +10,6 @@ import javax.persistence.Query; import javax.persistence.TypedQuery; import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Join; -import javax.persistence.criteria.JoinType; import javax.persistence.criteria.Path; import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Root; @@ -70,13 +69,13 @@ public class FeedEntryStatusDAO extends GenericDAO { List predicates = Lists.newArrayList(); - Join entryJoin = root.join( - FeedEntryStatus_.entry, JoinType.LEFT); - Join subJoin = root.join( - FeedEntryStatus_.subscription, JoinType.LEFT); + Join entryJoin = root + .join(FeedEntryStatus_.entry); + Join subJoin = root + .join(FeedEntryStatus_.subscription); - Join contentJoin = entryJoin.join( - FeedEntry_.content, JoinType.LEFT); + Join contentJoin = entryJoin + .join(FeedEntry_.content); predicates .add(builder.equal(subJoin.get(FeedSubscription_.user), user)); @@ -112,11 +111,11 @@ public class FeedEntryStatusDAO extends GenericDAO { List predicates = Lists.newArrayList(); - Join entryJoin = root.join( - FeedEntryStatus_.entry, JoinType.LEFT); + Join entryJoin = root + .join(FeedEntryStatus_.entry); - Join subJoin = root.join( - FeedEntryStatus_.subscription, JoinType.LEFT); + Join subJoin = root + .join(FeedEntryStatus_.subscription); predicates .add(builder.equal(subJoin.get(FeedSubscription_.user), user)); @@ -149,10 +148,10 @@ public class FeedEntryStatusDAO extends GenericDAO { List predicates = Lists.newArrayList(); - Join entryJoin = root.join( - FeedEntryStatus_.entry, JoinType.LEFT); - Join subJoin = root.join( - FeedEntryStatus_.subscription, JoinType.LEFT); + Join entryJoin = root + .join(FeedEntryStatus_.entry); + Join subJoin = root + .join(FeedEntryStatus_.subscription); predicates .add(builder.equal(subJoin.get(FeedSubscription_.user), user)); @@ -189,10 +188,10 @@ public class FeedEntryStatusDAO extends GenericDAO { List predicates = Lists.newArrayList(); - Join entryJoin = root.join( - FeedEntryStatus_.entry, JoinType.LEFT); - Join subJoin = root.join( - FeedEntryStatus_.subscription, JoinType.LEFT); + Join entryJoin = root + .join(FeedEntryStatus_.entry); + Join subJoin = root + .join(FeedEntryStatus_.subscription); predicates .add(builder.equal(subJoin.get(FeedSubscription_.user), user)); @@ -234,10 +233,10 @@ public class FeedEntryStatusDAO extends GenericDAO { List predicates = Lists.newArrayList(); - Join entryJoin = root.join( - FeedEntryStatus_.entry, JoinType.LEFT); - Join subJoin = root.join( - FeedEntryStatus_.subscription, JoinType.LEFT); + Join entryJoin = root + .join(FeedEntryStatus_.entry); + Join subJoin = root + .join(FeedEntryStatus_.subscription); predicates .add(builder.equal(subJoin.get(FeedSubscription_.user), user));