simplify queries

This commit is contained in:
Athou
2014-08-13 12:59:06 +02:00
parent d6b98f1518
commit 95bbcce941
3 changed files with 3 additions and 6 deletions

View File

@@ -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<FeedEntryContent> {
@@ -20,7 +19,7 @@ public class FeedEntryContentDAO extends GenericDAO<FeedEntryContent> {
public Long findExisting(String contentHash, String titleHash) {
List<Long> 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);
}

View File

@@ -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<FeedEntry> {
@@ -24,7 +23,7 @@ public class FeedEntryDAO extends GenericDAO<FeedEntry> {
public Long findExisting(String guid, Feed feed) {
List<Long> 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);
}

View File

@@ -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<FeedEntryTag> {
@@ -19,7 +18,7 @@ public class FeedEntryTagDAO extends GenericDAO<FeedEntryTag> {
}
public List<String> 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<FeedEntryTag> findByEntry(User user, FeedEntry entry) {