infinite-scrolling

src/main/java/com/commafeed/backend/dao/FeedEntryService.java

@@ -39,21 +39,39 @@ public class FeedEntryService extends GenericDAO<FeedEntry, Long> {
 		em.merge(feed);
 	}
 
-	public List<FeedEntry> getUnreadEntries(Feed feed, User user) {
+	private TypedQuery<FeedEntry> unreadQuery(Feed feed, User user) {
 		String query = "select e from FeedEntry e where e.feed=:feed and not exists (select s from FeedEntryStatus s where s.entry = e and s.user =:user and s.read = true)";
 		TypedQuery<FeedEntry> typedQuery = em.createQuery(query,
 				FeedEntry.class);
 		typedQuery.setParameter("feed", feed);
 		typedQuery.setParameter("user", user);
-		return typedQuery.getResultList();
+		return typedQuery;
 	}
 
-	public List<FeedEntry> getAllEntries(Feed feed) {
+	public List<FeedEntry> getUnreadEntries(Feed feed, User user) {
+		return unreadQuery(feed, user).getResultList();
+	}
+
+	public List<FeedEntry> getUnreadEntries(Feed feed, User user, int offset,
+			int limit) {
+		return unreadQuery(feed, user).setFirstResult(offset)
+				.setMaxResults(limit).getResultList();
+	}
+
+	private TypedQuery<FeedEntry> allQuery(Feed feed) {
 		String query = "select e from FeedEntry e where e.feed=:feed";
 		TypedQuery<FeedEntry> typedQuery = em.createQuery(query,
 				FeedEntry.class);
 		typedQuery.setParameter("feed", feed);
-		return typedQuery.getResultList();
+		return typedQuery;
 	}
 
+	public List<FeedEntry> getAllEntries(Feed feed) {
+		return allQuery(feed).getResultList();
+	}
+
+	public List<FeedEntry> getAllEntries(Feed feed, int offset, int limit) {
+		return allQuery(feed).setFirstResult(offset).setMaxResults(limit)
+				.getResultList();
+	}
 }

src/main/java/com/commafeed/backend/feeds/FeedTimer.java

@@ -50,9 +50,8 @@ public class FeedTimer {
 				feedEntryService
 						.updateEntries(feed.getUrl(), feed.getEntries());
 			} catch (Exception e) {
-				log.info(
-						"Unable to refresh feed " + key + " : "
-								+ e.getMessage(), e);
+				log.info("Unable to refresh feed " + key + " : "
+						+ e.getMessage());
 
 				Feed feed = feeds.get(key);
 				feed.setLastUpdated(Calendar.getInstance().getTime());