diff --git a/src/main/java/com/commafeed/backend/dao/FeedEntryContentDAO.java b/src/main/java/com/commafeed/backend/dao/FeedEntryContentDAO.java index 07250ef8..0fc9be9a 100644 --- a/src/main/java/com/commafeed/backend/dao/FeedEntryContentDAO.java +++ b/src/main/java/com/commafeed/backend/dao/FeedEntryContentDAO.java @@ -8,7 +8,6 @@ import com.commafeed.backend.model.FeedEntryContent; import com.commafeed.backend.model.QFeedEntry; import com.commafeed.backend.model.QFeedEntryContent; import com.google.common.collect.Iterables; -import com.mysema.query.types.ConstructorExpression; public class FeedEntryContentDAO extends GenericDAO { @@ -20,7 +19,7 @@ public class FeedEntryContentDAO extends GenericDAO { public Long findExisting(String contentHash, String titleHash) { List list = newQuery().from(content).where(content.contentHash.eq(contentHash), content.titleHash.eq(titleHash)).limit(1) - .list(ConstructorExpression.create(Long.class, content.id)); + .list(content.id); return Iterables.getFirst(list, null); } diff --git a/src/main/java/com/commafeed/backend/dao/FeedEntryDAO.java b/src/main/java/com/commafeed/backend/dao/FeedEntryDAO.java index 8b98dc0b..565fb433 100644 --- a/src/main/java/com/commafeed/backend/dao/FeedEntryDAO.java +++ b/src/main/java/com/commafeed/backend/dao/FeedEntryDAO.java @@ -12,7 +12,6 @@ import com.commafeed.backend.model.QFeed; import com.commafeed.backend.model.QFeedEntry; import com.commafeed.backend.model.QFeedSubscription; import com.google.common.collect.Iterables; -import com.mysema.query.types.ConstructorExpression; public class FeedEntryDAO extends GenericDAO { @@ -24,7 +23,7 @@ public class FeedEntryDAO extends GenericDAO { public Long findExisting(String guid, Feed feed) { List list = newQuery().from(entry).where(entry.guidHash.eq(DigestUtils.sha1Hex(guid)), entry.feed.eq(feed)).limit(1) - .list(ConstructorExpression.create(Long.class, entry.id)); + .list(entry.id); return Iterables.getFirst(list, null); } diff --git a/src/main/java/com/commafeed/backend/dao/FeedEntryTagDAO.java b/src/main/java/com/commafeed/backend/dao/FeedEntryTagDAO.java index 516c8ce0..9509c637 100644 --- a/src/main/java/com/commafeed/backend/dao/FeedEntryTagDAO.java +++ b/src/main/java/com/commafeed/backend/dao/FeedEntryTagDAO.java @@ -8,7 +8,6 @@ import com.commafeed.backend.model.FeedEntry; import com.commafeed.backend.model.FeedEntryTag; import com.commafeed.backend.model.QFeedEntryTag; import com.commafeed.backend.model.User; -import com.mysema.query.types.ConstructorExpression; public class FeedEntryTagDAO extends GenericDAO { @@ -19,7 +18,7 @@ public class FeedEntryTagDAO extends GenericDAO { } public List findByUser(User user) { - return newQuery().from(tag).where(tag.user.eq(user)).distinct().list(ConstructorExpression.create(String.class, tag.name)); + return newQuery().from(tag).where(tag.user.eq(user)).distinct().list(tag.name); } public List findByEntry(User user, FeedEntry entry) {