From 61039dcd7eb7322b85d1df6263a4deedbcf9b325 Mon Sep 17 00:00:00 2001 From: tyler Date: Mon, 5 Sep 2016 05:09:57 -0400 Subject: [PATCH] remove some whitespace, put tuples assignment back on one line --- .../commafeed/backend/dao/FeedEntryStatusDAO.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java b/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java index ae05c008..2973393f 100644 --- a/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java +++ b/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java @@ -234,22 +234,21 @@ public class FeedEntryStatusDAO extends GenericDAO { } else { comparator = STATUS_COMPARATOR_ASC; } - + FixedSizeSortedSet set = new FixedSizeSortedSet(capacity, comparator); for (FeedSubscription sub : subs) { FeedEntryStatus last = (order != null && set.isFull()) ? set.last() : null; HibernateQuery query = buildQuery(user, sub, unreadOnly, keywords, newerThan, -1, capacity, order, last, tag); - List tuples; - tuples = query.select(entry.id, entry.updated, status.id, entry.content.title).fetch(); - + List tuples = query.select(entry.id, entry.updated, status.id, entry.content.title).fetch(); + for (Tuple tuple : tuples) { Long id = tuple.get(entry.id); Date updated = tuple.get(entry.updated); Long statusId = tuple.get(status.id); - + FeedEntryContent content = new FeedEntryContent(); content.setTitle(tuple.get(entry.content.title)); - + FeedEntry entry = new FeedEntry(); entry.setId(id); entry.setUpdated(updated); @@ -260,7 +259,7 @@ public class FeedEntryStatusDAO extends GenericDAO { status.setEntryUpdated(updated); status.setEntry(entry); status.setSubscription(sub); - + set.add(status); } }