diff --git a/src/main/java/com/commafeed/backend/HttpGetter.java b/src/main/java/com/commafeed/backend/HttpGetter.java index 23627321..abdfcf38 100644 --- a/src/main/java/com/commafeed/backend/HttpGetter.java +++ b/src/main/java/com/commafeed/backend/HttpGetter.java @@ -192,7 +192,7 @@ public class HttpGetter { private long duration; private String urlAfterRedirect; - public HttpResult(byte[] content, String contentType, String lastModifiedSince, String eTag, long duration, String urlAfterRedirect) { + private HttpResult(byte[] content, String contentType, String lastModifiedSince, String eTag, long duration, String urlAfterRedirect) { this.content = content; this.contentType = contentType; this.lastModifiedSince = lastModifiedSince; diff --git a/src/main/java/com/commafeed/backend/dao/FeedCategoryDAO.java b/src/main/java/com/commafeed/backend/dao/FeedCategoryDAO.java index 7e26201c..fd47e85b 100644 --- a/src/main/java/com/commafeed/backend/dao/FeedCategoryDAO.java +++ b/src/main/java/com/commafeed/backend/dao/FeedCategoryDAO.java @@ -59,7 +59,7 @@ public class FeedCategoryDAO extends GenericDAO { return list; } - public boolean isChild(FeedCategory child, FeedCategory parent) { + private boolean isChild(FeedCategory child, FeedCategory parent) { if (parent == null) { return true; } diff --git a/src/main/java/com/commafeed/backend/dao/FeedEntryDAO.java b/src/main/java/com/commafeed/backend/dao/FeedEntryDAO.java index 565fb433..d20c5bcc 100644 --- a/src/main/java/com/commafeed/backend/dao/FeedEntryDAO.java +++ b/src/main/java/com/commafeed/backend/dao/FeedEntryDAO.java @@ -34,13 +34,6 @@ public class FeedEntryDAO extends GenericDAO { .list(entry); } - public int delete(Feed feed, int max) { - List list = newQuery().from(entry).where(entry.feed.eq(feed)).limit(max).list(entry); - int deleted = list.size(); - delete(list); - return deleted; - } - public int delete(Date olderThan, int max) { List list = newQuery().from(entry).where(entry.inserted.lt(olderThan)).limit(max).list(entry); int deleted = list.size(); diff --git a/src/main/java/com/commafeed/backend/dao/GenericDAO.java b/src/main/java/com/commafeed/backend/dao/GenericDAO.java index f773fd79..338ada5f 100644 --- a/src/main/java/com/commafeed/backend/dao/GenericDAO.java +++ b/src/main/java/com/commafeed/backend/dao/GenericDAO.java @@ -11,7 +11,7 @@ import com.mysema.query.jpa.hibernate.HibernateQuery; public abstract class GenericDAO extends AbstractDAO { - public GenericDAO(SessionFactory sessionFactory) { + protected GenericDAO(SessionFactory sessionFactory) { super(sessionFactory); } @@ -56,9 +56,4 @@ public abstract class GenericDAO extends AbstractDAO return objects.size(); } - protected void setTimeout(javax.persistence.Query query, int queryTimeout) { - if (queryTimeout > 0) { - query.setHint("javax.persistence.query.timeout", queryTimeout); - } - } } diff --git a/src/main/java/com/commafeed/backend/service/FeedSubscriptionService.java b/src/main/java/com/commafeed/backend/service/FeedSubscriptionService.java index 1d77b668..d4e693bb 100644 --- a/src/main/java/com/commafeed/backend/service/FeedSubscriptionService.java +++ b/src/main/java/com/commafeed/backend/service/FeedSubscriptionService.java @@ -28,7 +28,7 @@ public class FeedSubscriptionService { @SuppressWarnings("serial") public static class FeedSubscriptionException extends RuntimeException { - public FeedSubscriptionException(String msg) { + private FeedSubscriptionException(String msg) { super(msg); } } @@ -87,16 +87,6 @@ public class FeedSubscriptionService { } } - public UnreadCount getUnreadCount(User user, FeedSubscription sub) { - UnreadCount count = cache.getUnreadCount(sub); - if (count == null) { - log.debug("unread count cache miss for {}", Models.getId(sub)); - count = feedEntryStatusDAO.getUnreadCount(user, sub); - cache.setUnreadCount(sub, count); - } - return count; - } - public Map getUnreadCount(User user) { Map map = Maps.newHashMap(); List subs = feedSubscriptionDAO.findAll(user); @@ -106,4 +96,14 @@ public class FeedSubscriptionService { return map; } + private UnreadCount getUnreadCount(User user, FeedSubscription sub) { + UnreadCount count = cache.getUnreadCount(sub); + if (count == null) { + log.debug("unread count cache miss for {}", Models.getId(sub)); + count = feedEntryStatusDAO.getUnreadCount(user, sub); + cache.setUnreadCount(sub, count); + } + return count; + } + } diff --git a/src/main/java/com/commafeed/frontend/model/FeedCount.java b/src/main/java/com/commafeed/frontend/model/FeedCount.java deleted file mode 100644 index 2f1ba048..00000000 --- a/src/main/java/com/commafeed/frontend/model/FeedCount.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.commafeed.frontend.model; - -import java.io.Serializable; -import java.util.List; - -import lombok.Data; - -import com.commafeed.backend.model.Feed; -import com.google.common.collect.Lists; -import com.wordnik.swagger.annotations.ApiModel; - -@ApiModel("Feed count") -@Data -public class FeedCount implements Serializable { - - private static final long serialVersionUID = 1L; - - private String value; - private List feeds = Lists.newArrayList();; - - public FeedCount(String value) { - this.value = value; - } - -} diff --git a/src/main/java/com/commafeed/frontend/servlet/NextUnreadServlet.java b/src/main/java/com/commafeed/frontend/servlet/NextUnreadServlet.java index 71a2a13c..05f8208e 100644 --- a/src/main/java/com/commafeed/frontend/servlet/NextUnreadServlet.java +++ b/src/main/java/com/commafeed/frontend/servlet/NextUnreadServlet.java @@ -31,8 +31,8 @@ import com.google.common.collect.Iterables; @RequiredArgsConstructor public class NextUnreadServlet extends HttpServlet { - public static final String PARAM_CATEGORYID = "category"; - public static final String PARAM_READINGORDER = "order"; + private static final String PARAM_CATEGORYID = "category"; + private static final String PARAM_READINGORDER = "order"; private final SessionFactory sessionFactory; private final FeedSubscriptionDAO feedSubscriptionDAO;