From edbe326c0af7d56c8c8f085c1704f1b98607386b Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Thu, 16 May 2013 14:34:29 +0200
Subject: [PATCH] move the join on entries as the first join

---
 .../backend/dao/FeedEntryStatusDAO.java       | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java b/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java
index 3bbafc0f..03bf09c6 100644
--- a/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java
+++ b/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java
@@ -66,12 +66,12 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
 
 		List<Predicate> predicates = Lists.newArrayList();
 
+		Join<FeedEntryStatus, FeedEntry> entryJoin = (Join<FeedEntryStatus, FeedEntry>) root
+				.fetch(FeedEntryStatus_.entry);
 		Join<FeedEntryStatus, FeedSubscription> subJoin = (Join<FeedEntryStatus, FeedSubscription>) root
 				.fetch(FeedEntryStatus_.subscription);
 		subJoin.fetch(FeedSubscription_.feed);
 
-		Join<FeedEntryStatus, FeedEntry> entryJoin = (Join<FeedEntryStatus, FeedEntry>) root
-				.fetch(FeedEntryStatus_.entry);
 		Join<FeedEntry, FeedEntryContent> contentJoin = (Join<FeedEntry, FeedEntryContent>) entryJoin
 				.fetch(FeedEntry_.content);
 
@@ -104,11 +104,12 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
 
 		List<Predicate> predicates = Lists.newArrayList();
 
+		Join<FeedEntryStatus, FeedEntry> entryJoin = (Join<FeedEntryStatus, FeedEntry>) root
+				.fetch(FeedEntryStatus_.entry);
+
 		Join<FeedEntryStatus, FeedSubscription> subJoin = (Join<FeedEntryStatus, FeedSubscription>) root
 				.fetch(FeedEntryStatus_.subscription);
 		subJoin.fetch(FeedSubscription_.feed);
-		Join<FeedEntryStatus, FeedEntry> entryJoin = (Join<FeedEntryStatus, FeedEntry>) root
-				.fetch(FeedEntryStatus_.entry);
 
 		predicates
 				.add(builder.equal(subJoin.get(FeedSubscription_.user), user));
@@ -138,11 +139,11 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
 
 		List<Predicate> predicates = Lists.newArrayList();
 
+		Join<FeedEntryStatus, FeedEntry> entryJoin = (Join<FeedEntryStatus, FeedEntry>) root
+				.fetch(FeedEntryStatus_.entry);
 		Join<FeedEntryStatus, FeedSubscription> subJoin = (Join<FeedEntryStatus, FeedSubscription>) root
 				.fetch(FeedEntryStatus_.subscription);
 		subJoin.fetch(FeedSubscription_.feed);
-		Join<FeedEntryStatus, FeedEntry> entryJoin = (Join<FeedEntryStatus, FeedEntry>) root
-				.fetch(FeedEntryStatus_.entry);
 
 		predicates
 				.add(builder.equal(subJoin.get(FeedSubscription_.user), user));
@@ -193,11 +194,11 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
 
 		List<Predicate> predicates = Lists.newArrayList();
 
+		Join<FeedEntryStatus, FeedEntry> entryJoin = (Join<FeedEntryStatus, FeedEntry>) root
+				.fetch(FeedEntryStatus_.entry);
 		Join<FeedEntryStatus, FeedSubscription> subJoin = (Join<FeedEntryStatus, FeedSubscription>) root
 				.fetch(FeedEntryStatus_.subscription);
 		subJoin.fetch(FeedSubscription_.feed);
-		Join<FeedEntryStatus, FeedEntry> entryJoin = (Join<FeedEntryStatus, FeedEntry>) root
-				.fetch(FeedEntryStatus_.entry);
 
 		predicates
 				.add(builder.equal(subJoin.get(FeedSubscription_.user), user));
@@ -237,11 +238,11 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
 
 		List<Predicate> predicates = Lists.newArrayList();
 
+		Join<FeedEntryStatus, FeedEntry> entryJoin = (Join<FeedEntryStatus, FeedEntry>) root
+				.fetch(FeedEntryStatus_.entry);
 		Join<FeedEntryStatus, FeedSubscription> subJoin = (Join<FeedEntryStatus, FeedSubscription>) root
 				.fetch(FeedEntryStatus_.subscription);
 		subJoin.fetch(FeedSubscription_.feed);
-		Join<FeedEntryStatus, FeedEntry> entryJoin = (Join<FeedEntryStatus, FeedEntry>) root
-				.fetch(FeedEntryStatus_.entry);
 
 		predicates
 				.add(builder.equal(subJoin.get(FeedSubscription_.user), user));