diff --git a/README.md b/README.md index 51d545cc..ba665121 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,12 @@ Deploy on your own server (using TomEE, a lightweight JavaEE6 container based on [Safari extension](https://github.com/Athou/commafeed-safari) +Warning - updating from version 1.0.0 +------------------------------------- +If you're updating from version 1.0.0, feed history will be deleted. See why [here](https://www.commafeed.com/announcement/20130725.html). + +The last commit with no data loss has been [tagged](https://github.com/Athou/commafeed/tree/1.0.0). + Deployment on OpenShift ----------------------- diff --git a/dev/EclipseCodeFormatter.xml b/dev/EclipseCodeFormatter.xml new file mode 100644 index 00000000..2077b6df --- /dev/null +++ b/dev/EclipseCodeFormatter.xml @@ -0,0 +1,283 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pom.xml b/pom.xml index e00dd03d..76dc29e7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.commafeed commafeed - 1.0.0 + 1.2.0 war CommaFeed diff --git a/src/main/java/com/commafeed/backend/DatabaseCleaner.java b/src/main/java/com/commafeed/backend/DatabaseCleaner.java index fc5c036d..b853eabf 100644 --- a/src/main/java/com/commafeed/backend/DatabaseCleaner.java +++ b/src/main/java/com/commafeed/backend/DatabaseCleaner.java @@ -1,6 +1,7 @@ package com.commafeed.backend; import java.util.Calendar; +import java.util.Date; import java.util.List; import java.util.concurrent.TimeUnit; @@ -10,7 +11,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.commafeed.backend.dao.FeedDAO; +import com.commafeed.backend.dao.FeedEntryContentDAO; import com.commafeed.backend.dao.FeedEntryDAO; +import com.commafeed.backend.dao.FeedEntryStatusDAO; import com.commafeed.backend.dao.FeedSubscriptionDAO; import com.commafeed.backend.model.Feed; import com.commafeed.backend.model.FeedSubscription; @@ -29,6 +32,12 @@ public class DatabaseCleaner { @Inject FeedSubscriptionDAO feedSubscriptionDAO; + @Inject + FeedEntryContentDAO feedEntryContentDAO; + + @Inject + FeedEntryStatusDAO feedEntryStatusDAO; + @Inject ApplicationSettingsService applicationSettingsService; @@ -45,16 +54,16 @@ public class DatabaseCleaner { return total; } - public long cleanEntriesWithoutFeeds() { + public long cleanContentsWithoutEntries() { long total = 0; int deleted = -1; do { - deleted = feedEntryDAO.deleteWithoutFeeds(100); + deleted = feedEntryContentDAO.deleteWithoutEntries(10); total += deleted; - log.info("removed {} entries without feeds", total); + log.info("removed {} feeds without subscriptions", total); } while (deleted != 0); - log.info("cleanup done: {} entries without feeds deleted", total); + log.info("cleanup done: {} feeds without subscriptions deleted", total); return total; } @@ -88,4 +97,10 @@ public class DatabaseCleaner { } feedDAO.saveOrUpdate(into); } + + public void cleanStatusesOlderThan(Date olderThan) { + log.info("cleaning old read statuses"); + int deleted = feedEntryStatusDAO.deleteOldStatuses(olderThan); + log.info("cleaned {} read statuses", deleted); + } } diff --git a/src/main/java/com/commafeed/backend/DatabaseUpdater.java b/src/main/java/com/commafeed/backend/DatabaseUpdater.java index a4240b69..4ed458e3 100644 --- a/src/main/java/com/commafeed/backend/DatabaseUpdater.java +++ b/src/main/java/com/commafeed/backend/DatabaseUpdater.java @@ -33,18 +33,14 @@ public class DatabaseUpdater { try { Thread currentThread = Thread.currentThread(); ClassLoader classLoader = currentThread.getContextClassLoader(); - ResourceAccessor accessor = new ClassLoaderResourceAccessor( - classLoader); + ResourceAccessor accessor = new ClassLoaderResourceAccessor(classLoader); context = new InitialContext(); - DataSource dataSource = (DataSource) context - .lookup(datasourceName); + DataSource dataSource = (DataSource) context.lookup(datasourceName); connection = dataSource.getConnection(); JdbcConnection jdbcConnection = new JdbcConnection(connection); - Database database = DatabaseFactory.getInstance() - .findCorrectDatabaseImplementation( - jdbcConnection); + Database database = DatabaseFactory.getInstance().findCorrectDatabaseImplementation(jdbcConnection); if (database instanceof PostgresDatabase) { database = new PostgresDatabase() { @@ -56,9 +52,7 @@ public class DatabaseUpdater { database.setConnection(jdbcConnection); } - Liquibase liq = new Liquibase( - "changelogs/db.changelog-master.xml", accessor, - database); + Liquibase liq = new Liquibase("changelogs/db.changelog-master.xml", accessor, database); liq.update("prod"); } finally { if (context != null) { diff --git a/src/main/java/com/commafeed/backend/FixedSizeSortedSet.java b/src/main/java/com/commafeed/backend/FixedSizeSortedSet.java index f0a597ee..0d4ea24b 100644 --- a/src/main/java/com/commafeed/backend/FixedSizeSortedSet.java +++ b/src/main/java/com/commafeed/backend/FixedSizeSortedSet.java @@ -1,62 +1,44 @@ package com.commafeed.backend; -import java.util.Collection; +import java.util.ArrayList; +import java.util.Collections; import java.util.Comparator; import java.util.List; -import java.util.TreeSet; -import org.apache.commons.collections.CollectionUtils; +public class FixedSizeSortedSet { -import com.google.common.collect.Lists; - -public class FixedSizeSortedSet extends TreeSet { - - private static final long serialVersionUID = 1L; + private List inner; private final Comparator comparator; - private final int maxSize; + private final int capacity; - public FixedSizeSortedSet(int maxSize, Comparator comparator) { - super(comparator); - this.maxSize = maxSize; + public FixedSizeSortedSet(int capacity, Comparator comparator) { + this.inner = new ArrayList(Math.max(0, capacity)); + this.capacity = capacity < 0 ? Integer.MAX_VALUE : capacity; this.comparator = comparator; } - @Override - public boolean add(E e) { + public void add(E e) { + int position = Math.abs(Collections.binarySearch(inner, e, comparator) + 1); if (isFull()) { - E last = last(); - int comparison = comparator.compare(e, last); - if (comparison < 0) { - remove(last); - return super.add(e); - } else { - return false; + if (position < inner.size()) { + inner.remove(inner.size() - 1); + inner.add(position, e); } } else { - return super.add(e); + inner.add(position, e); } } - @Override - public boolean addAll(Collection c) { - if (CollectionUtils.isEmpty(c)) { - return false; - } - - boolean success = true; - for (E e : c) { - success &= add(e); - } - return success; + public E last() { + return inner.get(inner.size() - 1); } - + public boolean isFull() { - return size() == maxSize; + return inner.size() == capacity; } - @SuppressWarnings("unchecked") public List asList() { - return (List) Lists.newArrayList(toArray()); + return inner; } } \ No newline at end of file diff --git a/src/main/java/com/commafeed/backend/HttpGetter.java b/src/main/java/com/commafeed/backend/HttpGetter.java index 80afae9c..20504126 100644 --- a/src/main/java/com/commafeed/backend/HttpGetter.java +++ b/src/main/java/com/commafeed/backend/HttpGetter.java @@ -56,9 +56,7 @@ public class HttpGetter { static { try { SSL_CONTEXT = SSLContext.getInstance("TLS"); - SSL_CONTEXT.init(new KeyManager[0], - new TrustManager[] { new DefaultTrustManager() }, - new SecureRandom()); + SSL_CONTEXT.init(new KeyManager[0], new TrustManager[] { new DefaultTrustManager() }, new SecureRandom()); } catch (Exception e) { log.error("Could not configure ssl context"); } @@ -66,8 +64,7 @@ public class HttpGetter { private static final X509HostnameVerifier VERIFIER = new DefaultHostnameVerifier(); - public HttpResult getBinary(String url, int timeout) throws ClientProtocolException, - IOException, NotModifiedException { + public HttpResult getBinary(String url, int timeout) throws ClientProtocolException, IOException, NotModifiedException { return getBinary(url, null, null, timeout); } @@ -85,8 +82,8 @@ public class HttpGetter { * @throws NotModifiedException * if the url hasn't changed since we asked for it last time */ - public HttpResult getBinary(String url, String lastModified, String eTag, int timeout) - throws ClientProtocolException, IOException, NotModifiedException { + public HttpResult getBinary(String url, String lastModified, String eTag, int timeout) throws ClientProtocolException, IOException, + NotModifiedException { HttpResult result = null; long start = System.currentTimeMillis(); @@ -112,8 +109,7 @@ public class HttpGetter { if (code == HttpStatus.SC_NOT_MODIFIED) { throw new NotModifiedException("304 http code"); } else if (code >= 300) { - throw new HttpResponseException(code, - "Server returned HTTP error code " + code); + throw new HttpResponseException(code, "Server returned HTTP error code " + code); } } catch (HttpResponseException e) { @@ -123,14 +119,11 @@ public class HttpGetter { throw e; } } - Header lastModifiedHeader = response - .getFirstHeader(HttpHeaders.LAST_MODIFIED); + Header lastModifiedHeader = response.getFirstHeader(HttpHeaders.LAST_MODIFIED); Header eTagHeader = response.getFirstHeader(HttpHeaders.ETAG); - String lastModifiedResponse = lastModifiedHeader == null ? null - : StringUtils.trimToNull(lastModifiedHeader.getValue()); - if (lastModified != null - && StringUtils.equals(lastModified, lastModifiedResponse)) { + String lastModifiedResponse = lastModifiedHeader == null ? null : StringUtils.trimToNull(lastModifiedHeader.getValue()); + if (lastModified != null && StringUtils.equals(lastModified, lastModifiedResponse)) { throw new NotModifiedException("lastModifiedHeader is the same"); } @@ -147,10 +140,8 @@ public class HttpGetter { long duration = System.currentTimeMillis() - start; Header contentType = entity.getContentType(); - result = new HttpResult(content, contentType == null ? null - : contentType.getValue(), lastModifiedHeader == null ? null - : lastModifiedHeader.getValue(), eTagHeader == null ? null - : eTagHeader.getValue(), duration); + result = new HttpResult(content, contentType == null ? null : contentType.getValue(), lastModifiedHeader == null ? null + : lastModifiedHeader.getValue(), eTagHeader == null ? null : eTagHeader.getValue(), duration); } finally { client.getConnectionManager().shutdown(); } @@ -165,8 +156,7 @@ public class HttpGetter { private String eTag; private long duration; - public HttpResult(byte[] content, String contentType, - String lastModifiedSince, String eTag, long duration) { + public HttpResult(byte[] content, String contentType, String lastModifiedSince, String eTag, long duration) { this.content = content; this.contentType = contentType; this.lastModifiedSince = lastModifiedSince; @@ -209,8 +199,7 @@ public class HttpGetter { HttpProtocolParams.setContentCharset(params, UTF8); HttpConnectionParams.setConnectionTimeout(params, timeout); HttpConnectionParams.setSoTimeout(params, timeout); - client.setHttpRequestRetryHandler(new DefaultHttpRequestRetryHandler(0, - false)); + client.setHttpRequestRetryHandler(new DefaultHttpRequestRetryHandler(0, false)); return new DecompressingHttpClient(client); } @@ -225,13 +214,11 @@ public class HttpGetter { private static class DefaultTrustManager implements X509TrustManager { @Override - public void checkClientTrusted(X509Certificate[] arg0, String arg1) - throws CertificateException { + public void checkClientTrusted(X509Certificate[] arg0, String arg1) throws CertificateException { } @Override - public void checkServerTrusted(X509Certificate[] arg0, String arg1) - throws CertificateException { + public void checkServerTrusted(X509Certificate[] arg0, String arg1) throws CertificateException { } @Override @@ -240,21 +227,18 @@ public class HttpGetter { } } - private static class DefaultHostnameVerifier implements - X509HostnameVerifier { + private static class DefaultHostnameVerifier implements X509HostnameVerifier { @Override public void verify(String string, SSLSocket ssls) throws IOException { } @Override - public void verify(String string, X509Certificate xc) - throws SSLException { + public void verify(String string, X509Certificate xc) throws SSLException { } @Override - public void verify(String string, String[] strings, String[] strings1) - throws SSLException { + public void verify(String string, String[] strings, String[] strings1) throws SSLException { } @Override diff --git a/src/main/java/com/commafeed/backend/MetricsBean.java b/src/main/java/com/commafeed/backend/MetricsBean.java index 0eed4510..fd3035c5 100644 --- a/src/main/java/com/commafeed/backend/MetricsBean.java +++ b/src/main/java/com/commafeed/backend/MetricsBean.java @@ -55,13 +55,11 @@ public class MetricsBean { } - public void entryUpdated(int statusesCount) { + public void entryInserted() { thisHour.entriesInserted++; thisMinute.entriesInserted++; - thisHour.statusesInserted += statusesCount; - thisMinute.statusesInserted += statusesCount; } public void entryCacheHit() { @@ -107,7 +105,6 @@ public class MetricsBean { private int feedsRefreshed; private int feedsUpdated; private int entriesInserted; - private int statusesInserted; private int threadWaited; private int pushNotificationsReceived; private int pushFeedsQueued; @@ -138,14 +135,6 @@ public class MetricsBean { this.entriesInserted = entriesInserted; } - public int getStatusesInserted() { - return statusesInserted; - } - - public void setStatusesInserted(int statusesInserted) { - this.statusesInserted = statusesInserted; - } - public int getThreadWaited() { return threadWaited; } diff --git a/src/main/java/com/commafeed/backend/ScheduledTasks.java b/src/main/java/com/commafeed/backend/ScheduledTasks.java new file mode 100644 index 00000000..d9e58680 --- /dev/null +++ b/src/main/java/com/commafeed/backend/ScheduledTasks.java @@ -0,0 +1,37 @@ +package com.commafeed.backend; + +import java.util.Date; + +import javax.ejb.Schedule; +import javax.ejb.Stateless; +import javax.inject.Inject; +import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.commafeed.backend.services.ApplicationSettingsService; + +@Stateless +public class ScheduledTasks { + protected final static Logger log = LoggerFactory.getLogger(ScheduledTasks.class); + + @Inject + ApplicationSettingsService applicationSettingsService; + + @Inject + DatabaseCleaner cleaner; + + @PersistenceContext + EntityManager em; + + // every day at midnight + @Schedule(hour = "0", persistent = false) + private void cleanupOldStatuses() { + Date threshold = applicationSettingsService.get().getUnreadThreshold(); + if (threshold != null) { + cleaner.cleanStatusesOlderThan(threshold); + } + } +} diff --git a/src/main/java/com/commafeed/backend/StartupBean.java b/src/main/java/com/commafeed/backend/StartupBean.java index fb0c43d6..3f0d5189 100644 --- a/src/main/java/com/commafeed/backend/StartupBean.java +++ b/src/main/java/com/commafeed/backend/StartupBean.java @@ -17,7 +17,7 @@ import org.apache.commons.io.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.commafeed.backend.dao.UserDAO; +import com.commafeed.backend.dao.ApplicationSettingsDAO; import com.commafeed.backend.feeds.FeedRefreshTaskGiver; import com.commafeed.backend.model.ApplicationSettings; import com.commafeed.backend.model.UserRole.Role; @@ -38,7 +38,7 @@ public class StartupBean { DatabaseUpdater databaseUpdater; @Inject - UserDAO userDAO; + ApplicationSettingsDAO applicationSettingsDAO; @Inject UserService userService; @@ -58,7 +58,7 @@ public class StartupBean { startupTime = System.currentTimeMillis(); databaseUpdater.update(); - if (userDAO.getCount() == 0) { + if (applicationSettingsDAO.getCount() == 0) { initialData(); } applicationSettingsService.applyLogLevel(); @@ -79,8 +79,7 @@ public class StartupBean { IOUtils.closeQuietly(is); } for (Object key : props.keySet()) { - supportedLanguages.put(key.toString(), - props.getProperty(key.toString())); + supportedLanguages.put(key.toString(), props.getProperty(key.toString())); } } @@ -92,11 +91,8 @@ public class StartupBean { applicationSettingsService.save(settings); try { - userService.register(USERNAME_ADMIN, "admin", - "admin@commafeed.com", - Arrays.asList(Role.ADMIN, Role.USER), true); - userService.register(USERNAME_DEMO, "demo", "demo@commafeed.com", - Arrays.asList(Role.USER), true); + userService.register(USERNAME_ADMIN, "admin", "admin@commafeed.com", Arrays.asList(Role.ADMIN, Role.USER), true); + userService.register(USERNAME_DEMO, "demo", "demo@commafeed.com", Arrays.asList(Role.USER), true); } catch (Exception e) { log.error(e.getMessage(), e); } diff --git a/src/main/java/com/commafeed/backend/cache/CacheService.java b/src/main/java/com/commafeed/backend/cache/CacheService.java index 232cd1b9..13c19c00 100644 --- a/src/main/java/com/commafeed/backend/cache/CacheService.java +++ b/src/main/java/com/commafeed/backend/cache/CacheService.java @@ -1,34 +1,38 @@ package com.commafeed.backend.cache; import java.util.List; -import java.util.Map; import org.apache.commons.codec.digest.DigestUtils; import com.commafeed.backend.model.Feed; import com.commafeed.backend.model.FeedEntry; +import com.commafeed.backend.model.FeedSubscription; import com.commafeed.backend.model.User; import com.commafeed.frontend.model.Category; public abstract class CacheService { + // feed entries for faster refresh public abstract List getLastEntries(Feed feed); public abstract void setLastEntries(Feed feed, List entries); public String buildUniqueEntryKey(Feed feed, FeedEntry entry) { - return DigestUtils.sha1Hex(entry.getGuid() + - entry.getUrl()); + return DigestUtils.sha1Hex(entry.getGuid() + entry.getUrl()); } - public abstract Category getRootCategory(User user); + // user categories + public abstract Category getUserRootCategory(User user); - public abstract void setRootCategory(User user, Category category); - - public abstract Map getUnreadCounts(User user); + public abstract void setUserRootCategory(User user, Category category); - public abstract void setUnreadCounts(User user, Map map); + public abstract void invalidateUserRootCategory(User... users); - public abstract void invalidateUserData(User... users); + // unread count + public abstract Long getUnreadCount(FeedSubscription sub); + + public abstract void setUnreadCount(FeedSubscription sub, Long count); + + public abstract void invalidateUnreadCount(FeedSubscription... subs); } diff --git a/src/main/java/com/commafeed/backend/cache/NoopCacheService.java b/src/main/java/com/commafeed/backend/cache/NoopCacheService.java index cd2b841f..39f7c0de 100644 --- a/src/main/java/com/commafeed/backend/cache/NoopCacheService.java +++ b/src/main/java/com/commafeed/backend/cache/NoopCacheService.java @@ -2,12 +2,12 @@ package com.commafeed.backend.cache; import java.util.Collections; import java.util.List; -import java.util.Map; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Alternative; import com.commafeed.backend.model.Feed; +import com.commafeed.backend.model.FeedSubscription; import com.commafeed.backend.model.User; import com.commafeed.frontend.model.Category; @@ -25,27 +25,32 @@ public class NoopCacheService extends CacheService { } @Override - public Category getRootCategory(User user) { + public Long getUnreadCount(FeedSubscription sub) { return null; } @Override - public void setRootCategory(User user, Category category) { + public void setUnreadCount(FeedSubscription sub, Long count) { } @Override - public Map getUnreadCounts(User user) { + public void invalidateUnreadCount(FeedSubscription... subs) { + + } + + @Override + public Category getUserRootCategory(User user) { return null; } @Override - public void setUnreadCounts(User user, Map map) { + public void setUserRootCategory(User user, Category category) { } @Override - public void invalidateUserData(User... users) { + public void invalidateUserRootCategory(User... users) { } diff --git a/src/main/java/com/commafeed/backend/cache/RedisCacheService.java b/src/main/java/com/commafeed/backend/cache/RedisCacheService.java index 231b6272..a7ea2f06 100644 --- a/src/main/java/com/commafeed/backend/cache/RedisCacheService.java +++ b/src/main/java/com/commafeed/backend/cache/RedisCacheService.java @@ -1,7 +1,6 @@ package com.commafeed.backend.cache; import java.util.List; -import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; @@ -17,23 +16,22 @@ import redis.clients.jedis.JedisPoolConfig; import redis.clients.jedis.Pipeline; import com.commafeed.backend.model.Feed; +import com.commafeed.backend.model.FeedSubscription; import com.commafeed.backend.model.Models; import com.commafeed.backend.model.User; import com.commafeed.frontend.model.Category; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.type.MapType; import com.google.api.client.util.Lists; @Alternative @ApplicationScoped public class RedisCacheService extends CacheService { - private static final Logger log = LoggerFactory - .getLogger(RedisCacheService.class); + private static final Logger log = LoggerFactory.getLogger(RedisCacheService.class); + private static ObjectMapper mapper = new ObjectMapper(); private JedisPool pool = new JedisPool(new JedisPoolConfig(), "localhost"); - private ObjectMapper mapper = new ObjectMapper(); @Override public List getLastEntries(Feed feed) { @@ -70,11 +68,11 @@ public class RedisCacheService extends CacheService { } @Override - public Category getRootCategory(User user) { + public Category getUserRootCategory(User user) { Category cat = null; Jedis jedis = pool.getResource(); try { - String key = buildRedisRootCategoryKey(user); + String key = buildRedisUserRootCategoryKey(user); String json = jedis.get(key); if (json != null) { cat = mapper.readValue(json, Category.class); @@ -88,10 +86,10 @@ public class RedisCacheService extends CacheService { } @Override - public void setRootCategory(User user, Category category) { + public void setUserRootCategory(User user, Category category) { Jedis jedis = pool.getResource(); try { - String key = buildRedisRootCategoryKey(user); + String key = buildRedisUserRootCategoryKey(user); Pipeline pipe = jedis.pipelined(); pipe.del(key); @@ -106,37 +104,35 @@ public class RedisCacheService extends CacheService { } @Override - public Map getUnreadCounts(User user) { - Map map = null; + public Long getUnreadCount(FeedSubscription sub) { + Long count = null; Jedis jedis = pool.getResource(); try { - String key = buildRedisUnreadCountKey(user); - String json = jedis.get(key); - if (json != null) { - MapType type = mapper.getTypeFactory().constructMapType( - Map.class, Long.class, Long.class); - map = mapper.readValue(json, type); + String key = buildRedisUnreadCountKey(sub); + String countString = jedis.get(key); + if (countString != null) { + count = Long.valueOf(countString); } } catch (Exception e) { log.error(e.getMessage(), e); } finally { pool.returnResource(jedis); } - return map; + return count; } @Override - public void setUnreadCounts(User user, Map map) { + public void setUnreadCount(FeedSubscription sub, Long count) { Jedis jedis = pool.getResource(); try { - String key = buildRedisUnreadCountKey(user); + String key = buildRedisUnreadCountKey(sub); Pipeline pipe = jedis.pipelined(); pipe.del(key); - pipe.set(key, mapper.writeValueAsString(map)); + pipe.set(key, String.valueOf(count)); pipe.expire(key, (int) TimeUnit.MINUTES.toSeconds(30)); pipe.sync(); - } catch (JsonProcessingException e) { + } catch (Exception e) { log.error(e.getMessage(), e); } finally { pool.returnResource(jedis); @@ -144,15 +140,13 @@ public class RedisCacheService extends CacheService { } @Override - public void invalidateUserData(User... users) { + public void invalidateUserRootCategory(User... users) { Jedis jedis = pool.getResource(); try { Pipeline pipe = jedis.pipelined(); if (users != null) { for (User user : users) { - String key = buildRedisRootCategoryKey(user); - pipe.del(key); - key = buildRedisUnreadCountKey(user); + String key = buildRedisUserRootCategoryKey(user); pipe.del(key); } } @@ -162,16 +156,33 @@ public class RedisCacheService extends CacheService { } } - private String buildRedisRootCategoryKey(User user) { - return "root_cat:" + Models.getId(user); - } - - private String buildRedisUnreadCountKey(User user) { - return "unread_count:" + Models.getId(user); + @Override + public void invalidateUnreadCount(FeedSubscription... subs) { + Jedis jedis = pool.getResource(); + try { + Pipeline pipe = jedis.pipelined(); + if (subs != null) { + for (FeedSubscription sub : subs) { + String key = buildRedisUnreadCountKey(sub); + pipe.del(key); + } + } + pipe.sync(); + } finally { + pool.returnResource(jedis); + } } private String buildRedisEntryKey(Feed feed) { - return "feed:" + feed.getId(); + return "f:" + Models.getId(feed); + } + + private String buildRedisUserRootCategoryKey(User user) { + return "c:" + Models.getId(user); + } + + private String buildRedisUnreadCountKey(FeedSubscription sub) { + return "u:" + Models.getId(sub); } } diff --git a/src/main/java/com/commafeed/backend/dao/FeedCategoryDAO.java b/src/main/java/com/commafeed/backend/dao/FeedCategoryDAO.java index 72a1029e..62a2d8bf 100644 --- a/src/main/java/com/commafeed/backend/dao/FeedCategoryDAO.java +++ b/src/main/java/com/commafeed/backend/dao/FeedCategoryDAO.java @@ -26,8 +26,7 @@ public class FeedCategoryDAO extends GenericDAO { CriteriaQuery query = builder.createQuery(getType()); Root root = query.from(getType()); - Join userJoin = (Join) root - .fetch(FeedCategory_.user); + Join userJoin = (Join) root.fetch(FeedCategory_.user); query.where(builder.equal(userJoin.get(User_.id), user.getId())); @@ -38,14 +37,12 @@ public class FeedCategoryDAO extends GenericDAO { CriteriaQuery query = builder.createQuery(getType()); Root root = query.from(getType()); - Predicate p1 = builder.equal( - root.get(FeedCategory_.user).get(User_.id), user.getId()); + Predicate p1 = builder.equal(root.get(FeedCategory_.user).get(User_.id), user.getId()); Predicate p2 = builder.equal(root.get(FeedCategory_.id), id); query.where(p1, p2); - return Iterables.getFirst(cache(em.createQuery(query)).getResultList(), - null); + return Iterables.getFirst(cache(em.createQuery(query)).getResultList(), null); } public FeedCategory findByName(User user, String name, FeedCategory parent) { @@ -60,8 +57,7 @@ public class FeedCategoryDAO extends GenericDAO { if (parent == null) { predicates.add(builder.isNull(root.get(FeedCategory_.parent))); } else { - predicates - .add(builder.equal(root.get(FeedCategory_.parent), parent)); + predicates.add(builder.equal(root.get(FeedCategory_.parent), parent)); } query.where(predicates.toArray(new Predicate[0])); @@ -85,8 +81,7 @@ public class FeedCategoryDAO extends GenericDAO { if (parent == null) { predicates.add(builder.isNull(root.get(FeedCategory_.parent))); } else { - predicates - .add(builder.equal(root.get(FeedCategory_.parent), parent)); + predicates.add(builder.equal(root.get(FeedCategory_.parent), parent)); } query.where(predicates.toArray(new Predicate[0])); @@ -94,8 +89,7 @@ public class FeedCategoryDAO extends GenericDAO { return em.createQuery(query).getResultList(); } - public List findAllChildrenCategories(User user, - FeedCategory parent) { + public List findAllChildrenCategories(User user, FeedCategory parent) { List list = Lists.newArrayList(); List all = findAll(user); for (FeedCategory cat : all) { diff --git a/src/main/java/com/commafeed/backend/dao/FeedDAO.java b/src/main/java/com/commafeed/backend/dao/FeedDAO.java index 3813ebec..3af5f1e1 100644 --- a/src/main/java/com/commafeed/backend/dao/FeedDAO.java +++ b/src/main/java/com/commafeed/backend/dao/FeedDAO.java @@ -39,23 +39,17 @@ public class FeedDAO extends GenericDAO { public List feeds; } - private List getUpdatablePredicates(Root root, - Date threshold) { + private List getUpdatablePredicates(Root root, Date threshold) { - Predicate hasSubscriptions = builder.isNotEmpty(root - .get(Feed_.subscriptions)); + Predicate hasSubscriptions = builder.isNotEmpty(root.get(Feed_.subscriptions)); Predicate neverUpdated = builder.isNull(root.get(Feed_.lastUpdated)); - Predicate updatedBeforeThreshold = builder.lessThan( - root.get(Feed_.lastUpdated), threshold); + Predicate updatedBeforeThreshold = builder.lessThan(root.get(Feed_.lastUpdated), threshold); - Predicate disabledDateIsNull = builder.isNull(root - .get(Feed_.disabledUntil)); - Predicate disabledDateIsInPast = builder.lessThan( - root.get(Feed_.disabledUntil), new Date()); + Predicate disabledDateIsNull = builder.isNull(root.get(Feed_.disabledUntil)); + Predicate disabledDateIsInPast = builder.lessThan(root.get(Feed_.disabledUntil), new Date()); - return Lists.newArrayList(hasSubscriptions, - builder.or(neverUpdated, updatedBeforeThreshold), + return Lists.newArrayList(hasSubscriptions, builder.or(neverUpdated, updatedBeforeThreshold), builder.or(disabledDateIsNull, disabledDateIsInPast)); } @@ -64,8 +58,7 @@ public class FeedDAO extends GenericDAO { Root root = query.from(getType()); query.select(builder.count(root)); - query.where(getUpdatablePredicates(root, threshold).toArray( - new Predicate[0])); + query.where(getUpdatablePredicates(root, threshold).toArray(new Predicate[0])); TypedQuery q = em.createQuery(query); return q.getSingleResult(); @@ -75,8 +68,7 @@ public class FeedDAO extends GenericDAO { CriteriaQuery query = builder.createQuery(getType()); Root root = query.from(getType()); - query.where(getUpdatablePredicates(root, threshold).toArray( - new Predicate[0])); + query.where(getUpdatablePredicates(root, threshold).toArray(new Predicate[0])); query.orderBy(builder.asc(root.get(Feed_.lastUpdated))); @@ -94,11 +86,9 @@ public class FeedDAO extends GenericDAO { } String normalized = FeedUtils.normalizeURL(url); - feeds = findByField(Feed_.normalizedUrlHash, - DigestUtils.sha1Hex(normalized)); + feeds = findByField(Feed_.normalizedUrlHash, DigestUtils.sha1Hex(normalized)); feed = Iterables.getFirst(feeds, null); - if (feed != null - && StringUtils.equals(normalized, feed.getNormalizedUrl())) { + if (feed != null && StringUtils.equals(normalized, feed.getNormalizedUrl())) { return feed; } @@ -110,8 +100,7 @@ public class FeedDAO extends GenericDAO { } public void deleteRelationships(Feed feed) { - Query relationshipDeleteQuery = em - .createNamedQuery("Feed.deleteEntryRelationships"); + Query relationshipDeleteQuery = em.createNamedQuery("Feed.deleteEntryRelationships"); relationshipDeleteQuery.setParameter("feedId", feed.getId()); relationshipDeleteQuery.executeUpdate(); } @@ -120,8 +109,7 @@ public class FeedDAO extends GenericDAO { CriteriaQuery query = builder.createQuery(getType()); Root root = query.from(getType()); - SetJoin join = root.join(Feed_.subscriptions, - JoinType.LEFT); + SetJoin join = root.join(Feed_.subscriptions, JoinType.LEFT); query.where(builder.isNull(join.get(FeedSubscription_.id))); TypedQuery q = em.createQuery(query); q.setMaxResults(max); @@ -138,8 +126,7 @@ public class FeedDAO extends GenericDAO { } public static enum DuplicateMode { - NORMALIZED_URL(Feed_.normalizedUrlHash), LAST_CONTENT( - Feed_.lastContentHash), PUSH_TOPIC(Feed_.pushTopicHash); + NORMALIZED_URL(Feed_.normalizedUrlHash), LAST_CONTENT(Feed_.lastContentHash), PUSH_TOPIC(Feed_.pushTopicHash); private SingularAttribute path; private DuplicateMode(SingularAttribute path) { @@ -151,8 +138,7 @@ public class FeedDAO extends GenericDAO { } } - public List findDuplicates(DuplicateMode mode, int offset, - int limit, long minCount) { + public List findDuplicates(DuplicateMode mode, int offset, int limit, long minCount) { CriteriaQuery query = builder.createQuery(String.class); Root root = query.from(getType()); diff --git a/src/main/java/com/commafeed/backend/dao/FeedEntryContentDAO.java b/src/main/java/com/commafeed/backend/dao/FeedEntryContentDAO.java new file mode 100644 index 00000000..4a244e28 --- /dev/null +++ b/src/main/java/com/commafeed/backend/dao/FeedEntryContentDAO.java @@ -0,0 +1,48 @@ +package com.commafeed.backend.dao; + +import java.util.List; + +import javax.persistence.TypedQuery; +import javax.persistence.criteria.CriteriaQuery; +import javax.persistence.criteria.Join; +import javax.persistence.criteria.JoinType; +import javax.persistence.criteria.Predicate; +import javax.persistence.criteria.Root; + +import com.commafeed.backend.model.FeedEntry; +import com.commafeed.backend.model.FeedEntryContent; +import com.commafeed.backend.model.FeedEntryContent_; +import com.commafeed.backend.model.FeedEntry_; +import com.google.common.collect.Iterables; + +public class FeedEntryContentDAO extends GenericDAO { + + public FeedEntryContent findExisting(String contentHash, String titleHash) { + + CriteriaQuery query = builder.createQuery(getType()); + Root root = query.from(getType()); + + Predicate p1 = builder.equal(root.get(FeedEntryContent_.contentHash), contentHash); + Predicate p2 = builder.equal(root.get(FeedEntryContent_.titleHash), titleHash); + + query.where(p1, p2); + TypedQuery q = em.createQuery(query); + return Iterables.getFirst(q.getResultList(), null); + + } + + public int deleteWithoutEntries(int max) { + CriteriaQuery query = builder.createQuery(getType()); + Root root = query.from(getType()); + + Join join = root.join(FeedEntryContent_.entries, JoinType.LEFT); + query.where(builder.isNull(join.get(FeedEntry_.id))); + TypedQuery q = em.createQuery(query); + q.setMaxResults(max); + + List list = q.getResultList(); + int deleted = list.size(); + return deleted; + + } +} diff --git a/src/main/java/com/commafeed/backend/dao/FeedEntryDAO.java b/src/main/java/com/commafeed/backend/dao/FeedEntryDAO.java index 77c28006..8b50dd2e 100644 --- a/src/main/java/com/commafeed/backend/dao/FeedEntryDAO.java +++ b/src/main/java/com/commafeed/backend/dao/FeedEntryDAO.java @@ -4,77 +4,38 @@ import java.util.Date; import java.util.List; import javax.ejb.Stateless; -import javax.inject.Inject; import javax.persistence.TypedQuery; import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.JoinType; +import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Root; -import javax.persistence.criteria.SetJoin; import org.apache.commons.codec.digest.DigestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.commafeed.backend.model.Feed; import com.commafeed.backend.model.FeedEntry; import com.commafeed.backend.model.FeedEntry_; -import com.commafeed.backend.model.FeedFeedEntry; -import com.commafeed.backend.model.FeedFeedEntry_; -import com.commafeed.backend.services.ApplicationSettingsService; +import com.commafeed.backend.model.Feed_; import com.google.common.collect.Iterables; @Stateless public class FeedEntryDAO extends GenericDAO { - @Inject - ApplicationSettingsService applicationSettingsService; + protected static final Logger log = LoggerFactory.getLogger(FeedEntryDAO.class); - protected static final Logger log = LoggerFactory - .getLogger(FeedEntryDAO.class); + public FeedEntry findExisting(String guid, String url, Long feedId) { - public static class EntryWithFeed { - public FeedEntry entry; - public FeedFeedEntry ffe; - - public EntryWithFeed(FeedEntry entry, FeedFeedEntry ffe) { - this.entry = entry; - this.ffe = ffe; - } - } - - public EntryWithFeed findExisting(String guid, String url, Long feedId) { - - TypedQuery q = em.createNamedQuery( - "EntryStatus.existing", EntryWithFeed.class); - q.setParameter("guidHash", DigestUtils.sha1Hex(guid)); - q.setParameter("url", url); - q.setParameter("feedId", feedId); - - EntryWithFeed result = null; - List list = q.getResultList(); - for (EntryWithFeed ewf : list) { - if (ewf.entry != null && ewf.ffe != null) { - result = ewf; - break; - } - } - if (result == null) { - result = Iterables.getFirst(list, null); - } - return result; - } - - public List findByFeed(Feed feed, int offset, int limit) { CriteriaQuery query = builder.createQuery(getType()); Root root = query.from(getType()); - SetJoin feedsJoin = root.join(FeedEntry_.feedRelationships); - query.where(builder.equal(feedsJoin.get(FeedFeedEntry_.feed), feed)); - query.orderBy(builder.desc(feedsJoin.get(FeedFeedEntry_.entryUpdated))); - TypedQuery q = em.createQuery(query); - limit(q, offset, limit); - setTimeout(q, applicationSettingsService.get().getQueryTimeout()); - return q.getResultList(); + Predicate p1 = builder.equal(root.get(FeedEntry_.guidHash), DigestUtils.sha1Hex(guid)); + Predicate p2 = builder.equal(root.get(FeedEntry_.url), url); + Predicate p3 = builder.equal(root.get(FeedEntry_.feed).get(Feed_.id), feedId); + + query.where(p1, p2, p3); + + List list = em.createQuery(query).getResultList(); + return Iterables.getFirst(list, null); } public int delete(Date olderThan, int max) { @@ -90,20 +51,4 @@ public class FeedEntryDAO extends GenericDAO { delete(list); return deleted; } - - public int deleteWithoutFeeds(int max) { - CriteriaQuery query = builder.createQuery(getType()); - Root root = query.from(getType()); - - SetJoin join = root.join(FeedEntry_.feedRelationships, - JoinType.LEFT); - query.where(builder.isNull(join.get(FeedFeedEntry_.feed))); - TypedQuery q = em.createQuery(query); - q.setMaxResults(max); - - List list = q.getResultList(); - int deleted = list.size(); - delete(list); - return deleted; - } } diff --git a/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java b/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java index e509a03e..a4ea8155 100644 --- a/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java +++ b/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java @@ -10,25 +10,30 @@ import javax.inject.Inject; import javax.persistence.Query; import javax.persistence.TypedQuery; import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Join; import javax.persistence.criteria.Path; import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Root; -import org.apache.commons.lang.StringUtils; import org.apache.commons.lang3.ObjectUtils; +import org.hibernate.Criteria; +import org.hibernate.criterion.CriteriaSpecification; +import org.hibernate.criterion.Disjunction; +import org.hibernate.criterion.MatchMode; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.ProjectionList; +import org.hibernate.criterion.Projections; +import org.hibernate.criterion.Restrictions; +import org.hibernate.sql.JoinType; +import org.hibernate.transform.Transformers; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.commafeed.backend.FixedSizeSortedSet; import com.commafeed.backend.model.FeedEntry; -import com.commafeed.backend.model.FeedEntryContent; import com.commafeed.backend.model.FeedEntryContent_; import com.commafeed.backend.model.FeedEntryStatus; import com.commafeed.backend.model.FeedEntryStatus_; import com.commafeed.backend.model.FeedEntry_; -import com.commafeed.backend.model.FeedFeedEntry; -import com.commafeed.backend.model.FeedFeedEntry_; import com.commafeed.backend.model.FeedSubscription; import com.commafeed.backend.model.Models; import com.commafeed.backend.model.User; @@ -36,27 +41,14 @@ import com.commafeed.backend.model.UserSettings.ReadingOrder; import com.commafeed.backend.services.ApplicationSettingsService; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import com.google.common.collect.Maps; @Stateless public class FeedEntryStatusDAO extends GenericDAO { - protected static Logger log = LoggerFactory - .getLogger(FeedEntryStatusDAO.class); + protected static Logger log = LoggerFactory.getLogger(FeedEntryStatusDAO.class); - private static final Comparator ENTRY_COMPARATOR_DESC = new Comparator() { - @Override - public int compare(FeedEntry o1, FeedEntry o2) { - return ObjectUtils.compare(o2.getUpdated(), o1.getUpdated()); - }; - }; - - private static final Comparator ENTRY_COMPARATOR_ASC = new Comparator() { - @Override - public int compare(FeedEntry o1, FeedEntry o2) { - return ObjectUtils.compare(o1.getUpdated(), o2.getUpdated()); - }; - }; + private static final String ALIAS_STATUS = "status"; + private static final String ALIAS_ENTRY = "entry"; private static final Comparator STATUS_COMPARATOR_DESC = new Comparator() { @Override @@ -81,22 +73,30 @@ public class FeedEntryStatusDAO extends GenericDAO { Root root = query.from(getType()); Predicate p1 = builder.equal(root.get(FeedEntryStatus_.entry), entry); - Predicate p2 = builder.equal(root.get(FeedEntryStatus_.subscription), - sub); + Predicate p2 = builder.equal(root.get(FeedEntryStatus_.subscription), sub); query.where(p1, p2); List statuses = em.createQuery(query).getResultList(); FeedEntryStatus status = Iterables.getFirst(statuses, null); + + return handleStatus(status, sub, entry); + } + + private FeedEntryStatus handleStatus(FeedEntryStatus status, FeedSubscription sub, FeedEntry entry) { if (status == null) { + Date unreadThreshold = applicationSettingsService.get().getUnreadThreshold(); + boolean read = unreadThreshold == null ? false : entry.getUpdated().before(unreadThreshold); status = new FeedEntryStatus(sub.getUser(), sub, entry); - status.setRead(true); + status.setRead(read); + status.setMarkable(!read); + } else { + status.setMarkable(true); } return status; } - public List findStarred(User user, Date newerThan, - int offset, int limit, ReadingOrder order, boolean includeContent) { + public List findStarred(User user, Date newerThan, int offset, int limit, ReadingOrder order, boolean includeContent) { CriteriaQuery query = builder.createQuery(getType()); Root root = query.from(getType()); @@ -108,8 +108,7 @@ public class FeedEntryStatusDAO extends GenericDAO { query.where(predicates.toArray(new Predicate[0])); if (newerThan != null) { - predicates.add(builder.greaterThanOrEqualTo( - root.get(FeedEntryStatus_.entryInserted), newerThan)); + predicates.add(builder.greaterThanOrEqualTo(root.get(FeedEntryStatus_.entryInserted), newerThan)); } orderStatusesBy(query, root, order); @@ -117,200 +116,129 @@ public class FeedEntryStatusDAO extends GenericDAO { TypedQuery q = em.createQuery(query); limit(q, offset, limit); setTimeout(q); - return lazyLoadContent(includeContent, q.getResultList()); + List statuses = q.getResultList(); + for (FeedEntryStatus status : statuses) { + status = handleStatus(status, status.getSubscription(), status.getEntry()); + } + return lazyLoadContent(includeContent, statuses); } - public List findBySubscriptions( - List subscriptions, String keywords, - Date newerThan, int offset, int limit, ReadingOrder order, - boolean includeContent) { + private Criteria buildSearchCriteria(FeedSubscription sub, boolean unreadOnly, String keywords, Date newerThan, int offset, int limit, + ReadingOrder order, boolean includeContent, Date last) { + Criteria criteria = getSession().createCriteria(FeedEntry.class, ALIAS_ENTRY); - int capacity = offset + limit; - Comparator comparator = order == ReadingOrder.desc ? ENTRY_COMPARATOR_DESC - : ENTRY_COMPARATOR_ASC; - FixedSizeSortedSet set = new FixedSizeSortedSet( - capacity < 0 ? Integer.MAX_VALUE : capacity, comparator); - for (FeedSubscription sub : subscriptions) { - CriteriaQuery query = builder - .createQuery(FeedEntry.class); - Root root = query.from(FeedEntry.class); - Join ffeJoin = root - .join(FeedEntry_.feedRelationships); + criteria.add(Restrictions.eq(FeedEntry_.feed.getName(), sub.getFeed())); - List predicates = Lists.newArrayList(); - predicates.add(builder.equal(ffeJoin.get(FeedFeedEntry_.feed), - sub.getFeed())); + if (keywords != null) { + Criteria contentJoin = criteria.createCriteria(FeedEntry_.content.getName(), "content", JoinType.INNER_JOIN); - if (newerThan != null) { - predicates.add(builder.greaterThanOrEqualTo( - root.get(FeedEntry_.inserted), newerThan)); + for (String keyword : keywords.split(" ")) { + Disjunction or = Restrictions.disjunction(); + or.add(Restrictions.ilike(FeedEntryContent_.content.getName(), keyword, MatchMode.ANYWHERE)); + or.add(Restrictions.ilike(FeedEntryContent_.title.getName(), keyword, MatchMode.ANYWHERE)); + contentJoin.add(or); } - - if (keywords != null) { - Join contentJoin = root - .join(FeedEntry_.content); - - String joinedKeywords = StringUtils.join(keywords.toLowerCase() - .split(" "), "%"); - joinedKeywords = "%" + joinedKeywords + "%"; - - Predicate content = builder.like(builder.lower(contentJoin - .get(FeedEntryContent_.content)), joinedKeywords); - Predicate title = builder - .like(builder.lower(contentJoin - .get(FeedEntryContent_.title)), joinedKeywords); - predicates.add(builder.or(content, title)); - } - - if (order != null && !set.isEmpty() && set.isFull()) { - Predicate filter = null; - FeedEntry last = set.last(); - if (order == ReadingOrder.desc) { - filter = builder.greaterThan( - ffeJoin.get(FeedFeedEntry_.entryUpdated), - last.getUpdated()); - } else { - filter = builder.lessThan( - ffeJoin.get(FeedFeedEntry_.entryUpdated), - last.getUpdated()); - } - predicates.add(filter); - } - query.where(predicates.toArray(new Predicate[0])); - orderEntriesBy(query, ffeJoin, order); - TypedQuery q = em.createQuery(query); - limit(q, 0, capacity); - setTimeout(q); - - List list = q.getResultList(); - for (FeedEntry entry : list) { - entry.setSubscription(sub); - } - set.addAll(list); } + Criteria statusJoin = criteria.createCriteria(FeedEntry_.statuses.getName(), ALIAS_STATUS, JoinType.LEFT_OUTER_JOIN, + Restrictions.eq(FeedEntryStatus_.subscription.getName(), sub)); - List entries = set.asList(); - int size = entries.size(); - if (size < offset) { - return Lists.newArrayList(); - } + if (unreadOnly) { - entries = entries.subList(Math.max(offset, 0), size); + Disjunction or = Restrictions.disjunction(); + or.add(Restrictions.isNull(FeedEntryStatus_.read.getName())); + or.add(Restrictions.eq(FeedEntryStatus_.read.getName(), false)); + statusJoin.add(or); - List results = Lists.newArrayList(); - for (FeedEntry entry : entries) { - FeedSubscription subscription = entry.getSubscription(); - results.add(getStatus(subscription, entry)); - } - - return lazyLoadContent(includeContent, results); - } - - public List findUnreadBySubscriptions( - List subscriptions, Date newerThan, int offset, - int limit, ReadingOrder order, boolean includeContent) { - - int capacity = offset + limit; - Comparator comparator = order == ReadingOrder.desc ? STATUS_COMPARATOR_DESC - : STATUS_COMPARATOR_ASC; - FixedSizeSortedSet set = new FixedSizeSortedSet( - capacity < 0 ? Integer.MAX_VALUE : capacity, comparator); - for (FeedSubscription sub : subscriptions) { - CriteriaQuery query = builder - .createQuery(getType()); - Root root = query.from(getType()); - - List predicates = Lists.newArrayList(); - - predicates.add(builder.equal( - root.get(FeedEntryStatus_.subscription), sub)); - predicates.add(builder.isFalse(root.get(FeedEntryStatus_.read))); - - if (newerThan != null) { - predicates.add(builder.greaterThanOrEqualTo( - root.get(FeedEntryStatus_.entryInserted), newerThan)); + Date unreadThreshold = applicationSettingsService.get().getUnreadThreshold(); + if (unreadThreshold != null) { + criteria.add(Restrictions.ge(FeedEntry_.updated.getName(), unreadThreshold)); } - - if (order != null && !set.isEmpty() && set.isFull()) { - Predicate filter = null; - FeedEntryStatus last = set.last(); - if (order == ReadingOrder.desc) { - filter = builder.greaterThan( - root.get(FeedEntryStatus_.entryUpdated), - last.getEntryUpdated()); - } else { - filter = builder.lessThan( - root.get(FeedEntryStatus_.entryUpdated), - last.getEntryUpdated()); - } - predicates.add(filter); - } - query.where(predicates.toArray(new Predicate[0])); - orderStatusesBy(query, root, order); - - TypedQuery q = em.createQuery(query); - limit(q, -1, limit); - setTimeout(q); - - List list = q.getResultList(); - set.addAll(list); } - List entries = set.asList(); - int size = entries.size(); - if (size < offset) { - return Lists.newArrayList(); - } - - entries = entries.subList(Math.max(offset, 0), size); - return lazyLoadContent(includeContent, entries); - } - - public List findAllUnread(User user, Date newerThan, - int offset, int limit, ReadingOrder order, boolean includeContent) { - - CriteriaQuery query = builder.createQuery(getType()); - Root root = query.from(getType()); - - List predicates = Lists.newArrayList(); - - predicates.add(builder.equal(root.get(FeedEntryStatus_.user), user)); - predicates.add(builder.isFalse(root.get(FeedEntryStatus_.read))); - if (newerThan != null) { - predicates.add(builder.greaterThanOrEqualTo( - root.get(FeedEntryStatus_.entryInserted), newerThan)); + criteria.add(Restrictions.ge(FeedEntry_.inserted.getName(), newerThan)); } - query.where(predicates.toArray(new Predicate[0])); - orderStatusesBy(query, root, order); - - TypedQuery q = em.createQuery(query); - limit(q, offset, limit); - setTimeout(q); - - return lazyLoadContent(includeContent, q.getResultList()); - } - - /** - * Map between subscriptionId and unread count - */ - @SuppressWarnings("rawtypes") - public Map getUnreadCount(User user) { - Map map = Maps.newHashMap(); - Query query = em.createNamedQuery("EntryStatus.unreadCounts"); - query.setParameter("user", user); - setTimeout(query); - List resultList = query.getResultList(); - for (Object o : resultList) { - Object[] array = (Object[]) o; - map.put((Long) array[0], (Long) array[1]); + if (last != null) { + if (order == ReadingOrder.desc) { + criteria.add(Restrictions.gt(FeedEntry_.updated.getName(), last)); + } else { + criteria.add(Restrictions.lt(FeedEntry_.updated.getName(), last)); + } } - return map; + + if (order != null) { + Order o = null; + if (order == ReadingOrder.asc) { + o = Order.asc(FeedEntry_.updated.getName()); + } else { + o = Order.desc(FeedEntry_.updated.getName()); + } + criteria.addOrder(o); + } + if (offset > -1) { + criteria.setFirstResult(offset); + } + if (limit > -1) { + criteria.setMaxResults(limit); + } + int timeout = applicationSettingsService.get().getQueryTimeout(); + if (timeout > 0) { + criteria.setTimeout(timeout); + } + return criteria; } - private List lazyLoadContent(boolean includeContent, - List results) { + @SuppressWarnings("unchecked") + public List findBySubscriptions(List subscriptions, boolean unreadOnly, String keywords, + Date newerThan, int offset, int limit, ReadingOrder order, boolean includeContent) { + + int capacity = offset + limit; + Comparator comparator = order == ReadingOrder.desc ? STATUS_COMPARATOR_DESC : STATUS_COMPARATOR_ASC; + FixedSizeSortedSet set = new FixedSizeSortedSet(capacity, comparator); + for (FeedSubscription sub : subscriptions) { + Date last = (order != null && set.isFull()) ? set.last().getEntryUpdated() : null; + Criteria criteria = buildSearchCriteria(sub, unreadOnly, keywords, newerThan, -1, capacity, order, includeContent, last); + criteria.setResultTransformer(CriteriaSpecification.ALIAS_TO_ENTITY_MAP); + List> list = criteria.list(); + for (Map map : list) { + FeedEntryStatus status = (FeedEntryStatus) map.get(ALIAS_STATUS); + FeedEntry entry = (FeedEntry) map.get(ALIAS_ENTRY); + entry.setSubscription(sub); + + status = handleStatus(status, sub, entry); + + status.setEntry(entry); + set.add(status); + } + } + + List statuses = set.asList(); + int size = statuses.size(); + if (size < offset) { + return Lists.newArrayList(); + } + + statuses = statuses.subList(Math.max(offset, 0), size); + return lazyLoadContent(includeContent, statuses); + } + + @SuppressWarnings("unchecked") + public Long getUnreadCount(FeedSubscription subscription) { + Long count = null; + Criteria criteria = buildSearchCriteria(subscription, true, null, null, -1, -1, null, false, null); + ProjectionList projection = Projections.projectionList(); + projection.add(Projections.rowCount(), "count"); + criteria.setProjection(projection); + criteria.setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP); + List> list = criteria.list(); + for (Map row : list) { + count = row.get("count"); + } + return count; + } + + private List lazyLoadContent(boolean includeContent, List results) { if (includeContent) { for (FeedEntryStatus status : results) { Models.initialize(status.getSubscription().getFeed()); @@ -320,18 +248,11 @@ public class FeedEntryStatusDAO extends GenericDAO { return results; } - private void orderEntriesBy(CriteriaQuery query, - Path ffeJoin, ReadingOrder order) { - orderBy(query, ffeJoin.get(FeedFeedEntry_.entryUpdated), order); - } - - private void orderStatusesBy(CriteriaQuery query, - Path statusJoin, ReadingOrder order) { + private void orderStatusesBy(CriteriaQuery query, Path statusJoin, ReadingOrder order) { orderBy(query, statusJoin.get(FeedEntryStatus_.entryUpdated), order); } - private void orderBy(CriteriaQuery query, Path date, - ReadingOrder order) { + private void orderBy(CriteriaQuery query, Path date, ReadingOrder order) { if (order != null) { if (order == ReadingOrder.asc) { query.orderBy(builder.asc(date)); @@ -345,43 +266,10 @@ public class FeedEntryStatusDAO extends GenericDAO { setTimeout(query, applicationSettingsService.get().getQueryTimeout()); } - public void markAllEntries(User user, Date olderThan) { - List statuses = findAllUnread(user, null, -1, -1, - null, false); - markList(statuses, olderThan); - } - - public void markSubscriptionEntries(List subscriptions, - Date olderThan) { - List statuses = findUnreadBySubscriptions( - subscriptions, null, -1, -1, null, false); - markList(statuses, olderThan); - } - - public void markStarredEntries(User user, Date olderThan) { - List statuses = findStarred(user, null, -1, -1, null, - false); - markList(statuses, olderThan); - } - - private void markList(List statuses, Date olderThan) { - List list = Lists.newArrayList(); - for (FeedEntryStatus status : statuses) { - if (!status.isRead()) { - Date inserted = status.getEntry().getInserted(); - if (olderThan == null || inserted == null - || olderThan.after(inserted)) { - if (status.isStarred()) { - status.setRead(true); - list.add(status); - } else { - delete(status); - } - - } - } - } - saveOrUpdate(list); + public int deleteOldStatuses(Date olderThan) { + Query query = em.createNamedQuery("Statuses.deleteOld"); + query.setParameter("date", olderThan); + return query.executeUpdate(); } } diff --git a/src/main/java/com/commafeed/backend/dao/FeedSubscriptionDAO.java b/src/main/java/com/commafeed/backend/dao/FeedSubscriptionDAO.java index 2bfafa3f..3b1d856d 100644 --- a/src/main/java/com/commafeed/backend/dao/FeedSubscriptionDAO.java +++ b/src/main/java/com/commafeed/backend/dao/FeedSubscriptionDAO.java @@ -28,8 +28,7 @@ public class FeedSubscriptionDAO extends GenericDAO { CriteriaQuery query = builder.createQuery(getType()); Root root = query.from(getType()); - Predicate p1 = builder.equal( - root.get(FeedSubscription_.user).get(User_.id), user.getId()); + Predicate p1 = builder.equal(root.get(FeedSubscription_.user).get(User_.id), user.getId()); Predicate p2 = builder.equal(root.get(FeedSubscription_.id), id); root.fetch(FeedSubscription_.feed, JoinType.LEFT); @@ -37,8 +36,7 @@ public class FeedSubscriptionDAO extends GenericDAO { query.where(p1, p2); - FeedSubscription sub = Iterables.getFirst(cache(em.createQuery(query)) - .getResultList(), null); + FeedSubscription sub = Iterables.getFirst(cache(em.createQuery(query)).getResultList(), null); initRelations(sub); return sub; } @@ -47,10 +45,8 @@ public class FeedSubscriptionDAO extends GenericDAO { CriteriaQuery query = builder.createQuery(getType()); Root root = query.from(getType()); - query.where(builder.equal(root.get(FeedSubscription_.feed) - .get(Feed_.id), feed.getId())); - List list = cache(em.createQuery(query)) - .getResultList(); + query.where(builder.equal(root.get(FeedSubscription_.feed).get(Feed_.id), feed.getId())); + List list = cache(em.createQuery(query)).getResultList(); initRelations(list); return list; } @@ -60,18 +56,15 @@ public class FeedSubscriptionDAO extends GenericDAO { CriteriaQuery query = builder.createQuery(getType()); Root root = query.from(getType()); - Predicate p1 = builder.equal( - root.get(FeedSubscription_.user).get(User_.id), user.getId()); - Predicate p2 = builder.equal( - root.get(FeedSubscription_.feed).get(Feed_.id), feed.getId()); + Predicate p1 = builder.equal(root.get(FeedSubscription_.user).get(User_.id), user.getId()); + Predicate p2 = builder.equal(root.get(FeedSubscription_.feed).get(Feed_.id), feed.getId()); root.fetch(FeedSubscription_.feed, JoinType.LEFT); root.fetch(FeedSubscription_.category, JoinType.LEFT); query.where(p1, p2); - FeedSubscription sub = Iterables.getFirst(cache(em.createQuery(query)) - .getResultList(), null); + FeedSubscription sub = Iterables.getFirst(cache(em.createQuery(query)).getResultList(), null); initRelations(sub); return sub; } @@ -84,57 +77,46 @@ public class FeedSubscriptionDAO extends GenericDAO { root.fetch(FeedSubscription_.feed, JoinType.LEFT); root.fetch(FeedSubscription_.category, JoinType.LEFT); - query.where(builder.equal(root.get(FeedSubscription_.user) - .get(User_.id), user.getId())); + query.where(builder.equal(root.get(FeedSubscription_.user).get(User_.id), user.getId())); - List list = cache(em.createQuery(query)) - .getResultList(); + List list = cache(em.createQuery(query)).getResultList(); initRelations(list); return list; } - public List findByCategory(User user, - FeedCategory category) { + public List findByCategory(User user, FeedCategory category) { CriteriaQuery query = builder.createQuery(getType()); Root root = query.from(getType()); - Predicate p1 = builder.equal( - root.get(FeedSubscription_.user).get(User_.id), user.getId()); + Predicate p1 = builder.equal(root.get(FeedSubscription_.user).get(User_.id), user.getId()); Predicate p2 = null; if (category == null) { - p2 = builder.isNull( - root.get(FeedSubscription_.category)); + p2 = builder.isNull(root.get(FeedSubscription_.category)); } else { - p2 = builder.equal( - root.get(FeedSubscription_.category).get(FeedCategory_.id), - category.getId()); + p2 = builder.equal(root.get(FeedSubscription_.category).get(FeedCategory_.id), category.getId()); } query.where(p1, p2); - List list = cache(em.createQuery(query)) - .getResultList(); + List list = cache(em.createQuery(query)).getResultList(); initRelations(list); return list; } - - public List findByCategories(User user, - List categories) { - List categoryIds = Lists.transform(categories, - new Function() { - @Override - public Long apply(FeedCategory input) { - return input.getId(); - } - }); + public List findByCategories(User user, List categories) { + + List categoryIds = Lists.transform(categories, new Function() { + @Override + public Long apply(FeedCategory input) { + return input.getId(); + } + }); List subscriptions = Lists.newArrayList(); for (FeedSubscription sub : findAll(user)) { - if (sub.getCategory() != null - && categoryIds.contains(sub.getCategory().getId())) { + if (sub.getCategory() != null && categoryIds.contains(sub.getCategory().getId())) { subscriptions.add(sub); } } diff --git a/src/main/java/com/commafeed/backend/dao/GenericDAO.java b/src/main/java/com/commafeed/backend/dao/GenericDAO.java index 28b3504d..1354c0f7 100644 --- a/src/main/java/com/commafeed/backend/dao/GenericDAO.java +++ b/src/main/java/com/commafeed/backend/dao/GenericDAO.java @@ -35,8 +35,13 @@ public abstract class GenericDAO { builder = em.getCriteriaBuilder(); } - public void saveOrUpdate(Collection models) { + public Session getSession() { Session session = em.unwrap(Session.class); + return session; + } + + public void saveOrUpdate(Collection models) { + Session session = getSession(); int i = 1; for (AbstractModel model : models) { session.saveOrUpdate(model); @@ -91,8 +96,7 @@ public abstract class GenericDAO { return q.getResultList(); } - public List findAll(int startIndex, int count, String orderBy, - boolean asc) { + public List findAll(int startIndex, int count, String orderBy, boolean asc) { CriteriaQuery query = builder.createQuery(getType()); Root root = query.from(getType()); @@ -121,8 +125,7 @@ public abstract class GenericDAO { return findByField(field, value, false); } - protected List findByField(Attribute field, V value, - boolean cache) { + protected List findByField(Attribute field, V value, boolean cache) { CriteriaQuery query = builder.createQuery(getType()); Root root = query.from(getType()); @@ -152,7 +155,7 @@ public abstract class GenericDAO { query.unwrap(Query.class).setCacheable(true); return query; } - + 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/dao/UserDAO.java b/src/main/java/com/commafeed/backend/dao/UserDAO.java index 7fb8b12e..0a9b24e7 100644 --- a/src/main/java/com/commafeed/backend/dao/UserDAO.java +++ b/src/main/java/com/commafeed/backend/dao/UserDAO.java @@ -18,11 +18,10 @@ public class UserDAO extends GenericDAO { CriteriaQuery query = builder.createQuery(getType()); Root root = query.from(getType()); - query.where(builder.equal(builder.lower(root.get(User_.name)), - name.toLowerCase())); + query.where(builder.equal(builder.lower(root.get(User_.name)), name.toLowerCase())); TypedQuery q = em.createQuery(query); cache(q); - + User user = null; try { user = q.getSingleResult(); @@ -38,7 +37,7 @@ public class UserDAO extends GenericDAO { query.where(builder.equal(root.get(User_.apiKey), key)); TypedQuery q = em.createQuery(query); cache(q); - + User user = null; try { user = q.getSingleResult(); diff --git a/src/main/java/com/commafeed/backend/dao/UserRoleDAO.java b/src/main/java/com/commafeed/backend/dao/UserRoleDAO.java index b438af87..b4336a22 100644 --- a/src/main/java/com/commafeed/backend/dao/UserRoleDAO.java +++ b/src/main/java/com/commafeed/backend/dao/UserRoleDAO.java @@ -33,8 +33,7 @@ public class UserRoleDAO extends GenericDAO { CriteriaQuery query = builder.createQuery(getType()); Root root = query.from(getType()); - query.where(builder.equal(root.get(UserRole_.user).get(User_.id), - user.getId())); + query.where(builder.equal(root.get(UserRole_.user).get(User_.id), user.getId())); return cache(em.createQuery(query)).getResultList(); } diff --git a/src/main/java/com/commafeed/backend/dao/UserSettingsDAO.java b/src/main/java/com/commafeed/backend/dao/UserSettingsDAO.java index 4742c8bf..9c43586a 100644 --- a/src/main/java/com/commafeed/backend/dao/UserSettingsDAO.java +++ b/src/main/java/com/commafeed/backend/dao/UserSettingsDAO.java @@ -18,8 +18,7 @@ public class UserSettingsDAO extends GenericDAO { CriteriaQuery query = builder.createQuery(getType()); Root root = query.from(getType()); - query.where(builder.equal(root.get(UserSettings_.user).get(User_.id), - user.getId())); + query.where(builder.equal(root.get(UserSettings_.user).get(User_.id), user.getId())); UserSettings settings = null; try { diff --git a/src/main/java/com/commafeed/backend/feeds/FaviconFetcher.java b/src/main/java/com/commafeed/backend/feeds/FaviconFetcher.java index e2cb3342..b9434f96 100644 --- a/src/main/java/com/commafeed/backend/feeds/FaviconFetcher.java +++ b/src/main/java/com/commafeed/backend/feeds/FaviconFetcher.java @@ -27,12 +27,9 @@ public class FaviconFetcher { private static long MAX_ICON_LENGTH = 20000; private static int TIMEOUT = 4000; - protected static List ICON_MIMETYPES = Arrays.asList( - "image/x-icon", "image/vnd.microsoft.icon", "image/ico", - "image/icon", "text/ico", "application/ico", "image/x-ms-bmp", - "image/x-bmp", "image/gif", "image/png", "image/jpeg"); - private static List ICON_MIMETYPE_BLACKLIST = Arrays.asList( - "application/xml", "text/html"); + protected static List ICON_MIMETYPES = Arrays.asList("image/x-icon", "image/vnd.microsoft.icon", "image/ico", "image/icon", + "text/ico", "application/ico", "image/x-ms-bmp", "image/x-bmp", "image/gif", "image/png", "image/jpeg"); + private static List ICON_MIMETYPE_BLACKLIST = Arrays.asList("application/xml", "text/html"); @Inject HttpGetter getter; @@ -101,14 +98,12 @@ public class FaviconFetcher { } if (length < MIN_ICON_LENGTH) { - log.debug("Length {} below MIN_ICON_LENGTH {}", length, - MIN_ICON_LENGTH); + log.debug("Length {} below MIN_ICON_LENGTH {}", length, MIN_ICON_LENGTH); return false; } if (length > MAX_ICON_LENGTH) { - log.debug("Length {} greater than MAX_ICON_LENGTH {}", length, - MAX_ICON_LENGTH); + log.debug("Length {} greater than MAX_ICON_LENGTH {}", length, MAX_ICON_LENGTH); return false; } @@ -126,8 +121,7 @@ public class FaviconFetcher { return null; } - Elements icons = doc - .select("link[rel~=(?i)^(shortcut|icon|shortcut icon)$]"); + Elements icons = doc.select("link[rel~=(?i)^(shortcut|icon|shortcut icon)$]"); if (icons.isEmpty()) { log.debug("No icon found in page {}", url); diff --git a/src/main/java/com/commafeed/backend/feeds/FeedFetcher.java b/src/main/java/com/commafeed/backend/feeds/FeedFetcher.java index eea8802e..09f53fe5 100644 --- a/src/main/java/com/commafeed/backend/feeds/FeedFetcher.java +++ b/src/main/java/com/commafeed/backend/feeds/FeedFetcher.java @@ -30,18 +30,15 @@ public class FeedFetcher { @Inject HttpGetter getter; - public FetchedFeed fetch(String feedUrl, boolean extractFeedUrlFromHtml, - String lastModified, String eTag, Date lastPublishedDate, - String lastContentHash) throws FeedException, - ClientProtocolException, IOException, NotModifiedException { + public FetchedFeed fetch(String feedUrl, boolean extractFeedUrlFromHtml, String lastModified, String eTag, Date lastPublishedDate, + String lastContentHash) throws FeedException, ClientProtocolException, IOException, NotModifiedException { log.debug("Fetching feed {}", feedUrl); FetchedFeed fetchedFeed = null; int timeout = 20000; HttpResult result = getter.getBinary(feedUrl, lastModified, eTag, timeout); if (extractFeedUrlFromHtml) { - String extractedUrl = extractFeedUrl( - StringUtils.newStringUtf8(result.getContent()), feedUrl); + String extractedUrl = extractFeedUrl(StringUtils.newStringUtf8(result.getContent()), feedUrl); if (org.apache.commons.lang.StringUtils.isNotBlank(extractedUrl)) { result = getter.getBinary(extractedUrl, lastModified, eTag, timeout); feedUrl = extractedUrl; @@ -54,18 +51,15 @@ public class FeedFetcher { } String hash = DigestUtils.sha1Hex(content); - if (lastContentHash != null && hash != null - && lastContentHash.equals(hash)) { + if (lastContentHash != null && hash != null && lastContentHash.equals(hash)) { log.debug("content hash not modified: {}", feedUrl); throw new NotModifiedException("content hash not modified"); } fetchedFeed = parser.parse(feedUrl, content); - if (lastPublishedDate != null - && fetchedFeed.getFeed().getLastPublishedDate() != null - && lastPublishedDate.getTime() == fetchedFeed.getFeed() - .getLastPublishedDate().getTime()) { + if (lastPublishedDate != null && fetchedFeed.getFeed().getLastPublishedDate() != null + && lastPublishedDate.getTime() == fetchedFeed.getFeed().getLastPublishedDate().getTime()) { log.debug("publishedDate not modified: {}", feedUrl); throw new NotModifiedException("publishedDate not modified"); } diff --git a/src/main/java/com/commafeed/backend/feeds/FeedParser.java b/src/main/java/com/commafeed/backend/feeds/FeedParser.java index cbbdc2ac..81617b71 100644 --- a/src/main/java/com/commafeed/backend/feeds/FeedParser.java +++ b/src/main/java/com/commafeed/backend/feeds/FeedParser.java @@ -5,7 +5,6 @@ import java.text.DateFormat; import java.util.Date; import java.util.List; -import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.SystemUtils; import org.jdom.Element; @@ -34,12 +33,10 @@ public class FeedParser { private static Logger log = LoggerFactory.getLogger(FeedParser.class); private static final String ATOM_10_URI = "http://www.w3.org/2005/Atom"; - private static final Namespace ATOM_10_NS = Namespace - .getNamespace(ATOM_10_URI); + private static final Namespace ATOM_10_NS = Namespace.getNamespace(ATOM_10_URI); private static final Date START = new Date(86400000); - private static final Date END = new Date( - 1000l * Integer.MAX_VALUE - 86400000); + private static final Date END = new Date(1000l * Integer.MAX_VALUE - 86400000); private static final Function CONTENT_TO_STRING = new Function() { public String apply(SyndContent content) { @@ -56,11 +53,9 @@ public class FeedParser { try { String encoding = FeedUtils.guessEncoding(xml); - String xmlString = FeedUtils.trimInvalidXmlCharacters(new String( - xml, encoding)); + String xmlString = FeedUtils.trimInvalidXmlCharacters(new String(xml, encoding)); if (xmlString == null) { - throw new FeedException("Input string is null for url " - + feedUrl); + throw new FeedException("Input string is null for url " + feedUrl); } InputSource source = new InputSource(new StringReader(xmlString)); SyndFeed rss = new SyndFeedInput().build(source); @@ -89,21 +84,16 @@ public class FeedParser { continue; } entry.setGuid(FeedUtils.truncate(guid, 2048)); - entry.setGuidHash(DigestUtils.sha1Hex(guid)); - entry.setUrl(FeedUtils.truncate( - FeedUtils.toAbsoluteUrl(item.getLink(), feed.getLink()), - 2048)); + entry.setUrl(FeedUtils.truncate(FeedUtils.toAbsoluteUrl(item.getLink(), feed.getLink()), 2048)); entry.setUpdated(validateDate(getEntryUpdateDate(item), true)); - entry.setAuthor(item.getAuthor()); FeedEntryContent content = new FeedEntryContent(); content.setContent(getContent(item)); content.setTitle(getTitle(item)); - SyndEnclosure enclosure = (SyndEnclosure) Iterables.getFirst( - item.getEnclosures(), null); + content.setAuthor(StringUtils.trimToNull(item.getAuthor())); + SyndEnclosure enclosure = (SyndEnclosure) Iterables.getFirst(item.getEnclosures(), null); if (enclosure != null) { - content.setEnclosureUrl(FeedUtils.truncate( - enclosure.getUrl(), 2048)); + content.setEnclosureUrl(FeedUtils.truncate(enclosure.getUrl(), 2048)); content.setEnclosureType(enclosure.getType()); } entry.setContent(content); @@ -113,21 +103,17 @@ public class FeedParser { Date lastEntryDate = null; Date publishedDate = validateDate(rss.getPublishedDate(), false); if (!entries.isEmpty()) { - List sortedTimestamps = FeedUtils - .getSortedTimestamps(entries); + List sortedTimestamps = FeedUtils.getSortedTimestamps(entries); Long timestamp = sortedTimestamps.get(0); lastEntryDate = new Date(timestamp); publishedDate = getFeedPublishedDate(publishedDate, entries); } feed.setLastPublishedDate(validateDate(publishedDate, true)); - feed.setAverageEntryInterval(FeedUtils - .averageTimeBetweenEntries(entries)); + feed.setAverageEntryInterval(FeedUtils.averageTimeBetweenEntries(entries)); feed.setLastEntryDate(lastEntryDate); } catch (Exception e) { - throw new FeedException(String.format( - "Could not parse feed from %s : %s", feedUrl, - e.getMessage()), e); + throw new FeedException(String.format("Could not parse feed from %s : %s", feedUrl, e.getMessage()), e); } return fetchedFeed; } @@ -146,8 +132,7 @@ public class FeedParser { for (Object object : elements) { if (object instanceof Element) { Element element = (Element) object; - if ("link".equals(element.getName()) - && ATOM_10_NS.equals(element.getNamespace())) { + if ("link".equals(element.getName()) && ATOM_10_NS.equals(element.getNamespace())) { SyndLink link = new SyndLinkImpl(); link.setRel(element.getAttributeValue("rel")); link.setHref(element.getAttributeValue("href")); @@ -158,8 +143,7 @@ public class FeedParser { } } - private Date getFeedPublishedDate(Date publishedDate, - List entries) { + private Date getFeedPublishedDate(Date publishedDate, List entries) { for (FeedEntry entry : entries) { if (publishedDate == null || entry.getUpdated().getTime() > publishedDate.getTime()) { @@ -199,14 +183,11 @@ public class FeedParser { private String getContent(SyndEntry item) { String content = null; if (item.getContents().isEmpty()) { - content = item.getDescription() == null ? null : item - .getDescription().getValue(); + content = item.getDescription() == null ? null : item.getDescription().getValue(); } else { - content = StringUtils.join(Collections2.transform( - item.getContents(), CONTENT_TO_STRING), - SystemUtils.LINE_SEPARATOR); + content = StringUtils.join(Collections2.transform(item.getContents(), CONTENT_TO_STRING), SystemUtils.LINE_SEPARATOR); } - return content; + return StringUtils.trimToNull(content); } private String getTitle(SyndEntry item) { @@ -219,15 +200,14 @@ public class FeedParser { title = "(no title)"; } } - return title; + return StringUtils.trimToNull(title); } @SuppressWarnings("unchecked") private String findHub(SyndFeed feed) { for (SyndLink l : (List) feed.getLinks()) { if ("hub".equalsIgnoreCase(l.getRel())) { - log.debug("found hub {} for feed {}", l.getHref(), - feed.getLink()); + log.debug("found hub {} for feed {}", l.getHref(), feed.getLink()); return l.getHref(); } } @@ -238,8 +218,7 @@ public class FeedParser { private String findSelf(SyndFeed feed) { for (SyndLink l : (List) feed.getLinks()) { if ("self".equalsIgnoreCase(l.getRel())) { - log.debug("found self {} for feed {}", l.getHref(), - feed.getLink()); + log.debug("found self {} for feed {}", l.getHref(), feed.getLink()); return l.getHref(); } } diff --git a/src/main/java/com/commafeed/backend/feeds/FeedRefreshExecutor.java b/src/main/java/com/commafeed/backend/feeds/FeedRefreshExecutor.java index 31f16c3c..066594f5 100644 --- a/src/main/java/com/commafeed/backend/feeds/FeedRefreshExecutor.java +++ b/src/main/java/com/commafeed/backend/feeds/FeedRefreshExecutor.java @@ -12,32 +12,28 @@ import org.slf4j.LoggerFactory; public class FeedRefreshExecutor { - private static Logger log = LoggerFactory - .getLogger(FeedRefreshExecutor.class); + private static Logger log = LoggerFactory.getLogger(FeedRefreshExecutor.class); private String poolName; private ThreadPoolExecutor pool; private LinkedBlockingDeque queue; - public FeedRefreshExecutor(final String poolName, int threads, - int queueCapacity) { + public FeedRefreshExecutor(final String poolName, int threads, int queueCapacity) { log.info("Creating pool {} with {} threads", poolName, threads); this.poolName = poolName; - pool = new ThreadPoolExecutor(threads, threads, 0, - TimeUnit.MILLISECONDS, - queue = new LinkedBlockingDeque(queueCapacity) { - private static final long serialVersionUID = 1L; + pool = new ThreadPoolExecutor(threads, threads, 0, TimeUnit.MILLISECONDS, queue = new LinkedBlockingDeque(queueCapacity) { + private static final long serialVersionUID = 1L; - @Override - public boolean offer(Runnable r) { - Task task = (Task) r; - if (task.isUrgent()) { - return offerFirst(r); - } else { - return offerLast(r); - } - } - }); + @Override + public boolean offer(Runnable r) { + Task task = (Task) r; + if (task.isUrgent()) { + return offerFirst(r); + } else { + return offerLast(r); + } + } + }); pool.setRejectedExecutionHandler(new RejectedExecutionHandler() { @Override public void rejectedExecution(Runnable r, ThreadPoolExecutor e) { @@ -50,8 +46,7 @@ public class FeedRefreshExecutor { queue.put(r); } } catch (InterruptedException e1) { - log.error(poolName - + " interrupted while waiting for queue.", e1); + log.error(poolName + " interrupted while waiting for queue.", e1); } } }); @@ -80,13 +75,11 @@ public class FeedRefreshExecutor { try { Thread.sleep(100); } catch (InterruptedException e) { - log.error( - "{} interrupted while waiting for threads to finish.", - poolName); + log.error("{} interrupted while waiting for threads to finish.", poolName); } } } - + private static class NamedThreadFactory implements ThreadFactory { private final ThreadGroup group; private final AtomicInteger threadNumber = new AtomicInteger(1); @@ -94,15 +87,12 @@ public class FeedRefreshExecutor { private NamedThreadFactory(String poolName) { SecurityManager s = System.getSecurityManager(); - group = (s != null) ? s.getThreadGroup() : - Thread.currentThread().getThreadGroup(); + group = (s != null) ? s.getThreadGroup() : Thread.currentThread().getThreadGroup(); namePrefix = poolName + "-thread-"; } public Thread newThread(Runnable r) { - Thread t = new Thread(group, r, - namePrefix + threadNumber.getAndIncrement(), - 0); + Thread t = new Thread(group, r, namePrefix + threadNumber.getAndIncrement(), 0); if (t.isDaemon()) t.setDaemon(false); if (t.getPriority() != Thread.NORM_PRIORITY) diff --git a/src/main/java/com/commafeed/backend/feeds/FeedRefreshTaskGiver.java b/src/main/java/com/commafeed/backend/feeds/FeedRefreshTaskGiver.java index 46dd12d5..29c0d291 100644 --- a/src/main/java/com/commafeed/backend/feeds/FeedRefreshTaskGiver.java +++ b/src/main/java/com/commafeed/backend/feeds/FeedRefreshTaskGiver.java @@ -52,8 +52,7 @@ public class FeedRefreshTaskGiver { @PostConstruct public void init() { - backgroundThreads = applicationSettingsService.get() - .getBackgroundThreads(); + backgroundThreads = applicationSettingsService.get().getBackgroundThreads(); executor = Executors.newFixedThreadPool(1); } @@ -125,8 +124,7 @@ public class FeedRefreshTaskGiver { public void add(Feed feed) { Date threshold = getThreshold(); - if (feed.getLastUpdated() == null - || feed.getLastUpdated().before(threshold)) { + if (feed.getLastUpdated() == null || feed.getLastUpdated().before(threshold)) { addQueue.add(feed); } } diff --git a/src/main/java/com/commafeed/backend/feeds/FeedRefreshUpdater.java b/src/main/java/com/commafeed/backend/feeds/FeedRefreshUpdater.java index e212e33a..b8c0c632 100644 --- a/src/main/java/com/commafeed/backend/feeds/FeedRefreshUpdater.java +++ b/src/main/java/com/commafeed/backend/feeds/FeedRefreshUpdater.java @@ -1,7 +1,9 @@ package com.commafeed.backend.feeds; +import java.util.Arrays; import java.util.Collection; import java.util.Date; +import java.util.Iterator; import java.util.List; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Lock; @@ -11,6 +13,7 @@ import javax.annotation.PreDestroy; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; +import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang3.time.DateUtils; import org.slf4j.Logger; @@ -25,6 +28,7 @@ import com.commafeed.backend.feeds.FeedRefreshExecutor.Task; import com.commafeed.backend.model.ApplicationSettings; import com.commafeed.backend.model.Feed; import com.commafeed.backend.model.FeedEntry; +import com.commafeed.backend.model.FeedEntryContent; import com.commafeed.backend.model.FeedSubscription; import com.commafeed.backend.pubsubhubbub.SubscriptionHandler; import com.commafeed.backend.services.ApplicationSettingsService; @@ -35,8 +39,7 @@ import com.google.common.util.concurrent.Striped; @ApplicationScoped public class FeedRefreshUpdater { - protected static Logger log = LoggerFactory - .getLogger(FeedRefreshUpdater.class); + protected static Logger log = LoggerFactory.getLogger(FeedRefreshUpdater.class); @Inject FeedUpdateService feedUpdateService; @@ -109,10 +112,9 @@ public class FeedRefreshUpdater { if (!lastEntries.contains(cacheKey)) { log.debug("cache miss for {}", entry.getUrl()); if (subscriptions == null) { - subscriptions = feedSubscriptionDAO - .findByFeed(feed); + subscriptions = feedSubscriptionDAO.findByFeed(feed); } - ok &= updateEntry(feed, entry, subscriptions); + ok &= addEntry(feed, entry, subscriptions); metricsBean.entryCacheMiss(); } else { log.debug("cache hit for {}", entry.getUrl()); @@ -139,27 +141,40 @@ public class FeedRefreshUpdater { } } - private boolean updateEntry(final Feed feed, final FeedEntry entry, - final List subscriptions) { + private boolean addEntry(final Feed feed, final FeedEntry entry, final List subscriptions) { boolean success = false; - String key = StringUtils.trimToEmpty(entry.getGuid() + entry.getUrl()); - Lock lock = locks.get(key); - boolean locked = false; + // lock on feed, make sure we are not updating the same feed twice at + // the same time + String key1 = StringUtils.trimToEmpty("" + feed.getId()); + + // lock on content, make sure we are not updating the same entry + // twice at the same time + FeedEntryContent content = entry.getContent(); + String key2 = DigestUtils.sha1Hex(StringUtils.trimToEmpty(content.getContent() + content.getTitle())); + + Iterator iterator = locks.bulkGet(Arrays.asList(key1, key2)).iterator(); + Lock lock1 = iterator.next(); + Lock lock2 = iterator.next(); + boolean locked1 = false; + boolean locked2 = false; try { - locked = lock.tryLock(1, TimeUnit.MINUTES); - if (locked) { + locked1 = lock1.tryLock(1, TimeUnit.MINUTES); + locked2 = lock2.tryLock(1, TimeUnit.MINUTES); + if (locked1 && locked2) { feedUpdateService.updateEntry(feed, entry, subscriptions); success = true; } else { - log.error("lock timeout for " + feed.getUrl() + " - " + key); + log.error("lock timeout for " + feed.getUrl() + " - " + key1); } } catch (InterruptedException e) { - log.error("interrupted while waiting for lock for " + feed.getUrl() - + " : " + e.getMessage(), e); + log.error("interrupted while waiting for lock for " + feed.getUrl() + " : " + e.getMessage(), e); } finally { - if (locked) { - lock.unlock(); + if (locked1) { + lock1.unlock(); + } + if (locked2) { + lock2.unlock(); } } return success; diff --git a/src/main/java/com/commafeed/backend/feeds/FeedRefreshWorker.java b/src/main/java/com/commafeed/backend/feeds/FeedRefreshWorker.java index fa6fc857..24ee964e 100644 --- a/src/main/java/com/commafeed/backend/feeds/FeedRefreshWorker.java +++ b/src/main/java/com/commafeed/backend/feeds/FeedRefreshWorker.java @@ -25,8 +25,7 @@ import com.sun.syndication.io.FeedException; @ApplicationScoped public class FeedRefreshWorker { - private static Logger log = LoggerFactory - .getLogger(FeedRefreshWorker.class); + private static Logger log = LoggerFactory.getLogger(FeedRefreshWorker.class); @Inject FeedRefreshUpdater feedRefreshUpdater; @@ -52,8 +51,7 @@ public class FeedRefreshWorker { private void init() { ApplicationSettings settings = applicationSettingsService.get(); int threads = settings.getBackgroundThreads(); - pool = new FeedRefreshExecutor("feed-refresh-worker", threads, - 20 * threads); + pool = new FeedRefreshExecutor("feed-refresh-worker", threads, 20 * threads); } @PreDestroy @@ -95,8 +93,7 @@ public class FeedRefreshWorker { private void update(Feed feed) { Date now = new Date(); try { - FetchedFeed fetchedFeed = fetcher.fetch(feed.getUrl(), false, - feed.getLastModifiedHeader(), feed.getEtagHeader(), + FetchedFeed fetchedFeed = fetcher.fetch(feed.getUrl(), false, feed.getLastModifiedHeader(), feed.getEtagHeader(), feed.getLastPublishedDate(), feed.getLastContentHash()); // stops here if NotModifiedException or any other exception is // thrown @@ -104,21 +101,17 @@ public class FeedRefreshWorker { Date disabledUntil = null; if (applicationSettingsService.get().isHeavyLoad()) { - disabledUntil = FeedUtils.buildDisabledUntil(fetchedFeed - .getFeed().getLastEntryDate(), fetchedFeed.getFeed() + disabledUntil = FeedUtils.buildDisabledUntil(fetchedFeed.getFeed().getLastEntryDate(), fetchedFeed.getFeed() .getAverageEntryInterval()); } feed.setLastUpdateSuccess(now); feed.setLink(fetchedFeed.getFeed().getLink()); - feed.setLastModifiedHeader(fetchedFeed.getFeed() - .getLastModifiedHeader()); + feed.setLastModifiedHeader(fetchedFeed.getFeed().getLastModifiedHeader()); feed.setEtagHeader(fetchedFeed.getFeed().getEtagHeader()); feed.setLastContentHash(fetchedFeed.getFeed().getLastContentHash()); - feed.setLastPublishedDate(fetchedFeed.getFeed() - .getLastPublishedDate()); - feed.setAverageEntryInterval(fetchedFeed.getFeed() - .getAverageEntryInterval()); + feed.setLastPublishedDate(fetchedFeed.getFeed().getLastPublishedDate()); + feed.setAverageEntryInterval(fetchedFeed.getFeed().getAverageEntryInterval()); feed.setLastEntryDate(fetchedFeed.getFeed().getLastEntryDate()); feed.setErrorCount(0); @@ -129,14 +122,11 @@ public class FeedRefreshWorker { feedRefreshUpdater.updateFeed(feed, entries); } catch (NotModifiedException e) { - log.debug("Feed not modified : {} - {}", feed.getUrl(), - e.getMessage()); + log.debug("Feed not modified : {} - {}", feed.getUrl(), e.getMessage()); Date disabledUntil = null; if (applicationSettingsService.get().isHeavyLoad()) { - disabledUntil = FeedUtils - .buildDisabledUntil(feed.getLastEntryDate(), - feed.getAverageEntryInterval()); + disabledUntil = FeedUtils.buildDisabledUntil(feed.getLastEntryDate(), feed.getAverageEntryInterval()); } feed.setErrorCount(0); feed.setMessage(null); @@ -144,8 +134,7 @@ public class FeedRefreshWorker { taskGiver.giveBack(feed); } catch (Exception e) { - String message = "Unable to refresh feed " + feed.getUrl() + " : " - + e.getMessage(); + String message = "Unable to refresh feed " + feed.getUrl() + " : " + e.getMessage(); if (e instanceof FeedException) { log.debug(e.getClass().getName() + " " + message, e); } else { @@ -154,8 +143,7 @@ public class FeedRefreshWorker { feed.setErrorCount(feed.getErrorCount() + 1); feed.setMessage(message); - feed.setDisabledUntil(FeedUtils.buildDisabledUntil(feed - .getErrorCount())); + feed.setDisabledUntil(FeedUtils.buildDisabledUntil(feed.getErrorCount())); taskGiver.giveBack(feed); } diff --git a/src/main/java/com/commafeed/backend/feeds/FeedUtils.java b/src/main/java/com/commafeed/backend/feeds/FeedUtils.java index 024332e9..ab2ffd6c 100644 --- a/src/main/java/com/commafeed/backend/feeds/FeedUtils.java +++ b/src/main/java/com/commafeed/backend/feeds/FeedUtils.java @@ -41,10 +41,8 @@ public class FeedUtils { protected static Logger log = LoggerFactory.getLogger(FeedUtils.class); private static final String ESCAPED_QUESTION_MARK = Pattern.quote("?"); - private static final List ALLOWED_IFRAME_CSS_RULES = Arrays.asList( - "height", "width", "border"); - private static final char[] DISALLOWED_IFRAME_CSS_RULE_CHARACTERS = new char[] { - '(', ')' }; + private static final List ALLOWED_IFRAME_CSS_RULES = Arrays.asList("height", "width", "border"); + private static final char[] DISALLOWED_IFRAME_CSS_RULE_CHARACTERS = new char[] { '(', ')' }; public static String truncate(String string, int length) { if (string != null) { @@ -54,8 +52,8 @@ public class FeedUtils { } /** - * Detect feed encoding by using the declared encoding in the xml processing - * instruction and by detecting the characters used in the feed + * Detect feed encoding by using the declared encoding in the xml processing instruction and by detecting the characters used in the + * feed * */ public static String guessEncoding(byte[] bytes) { @@ -87,8 +85,7 @@ public class FeedUtils { } /** - * Normalize the url. The resulting url is not meant to be fetched but - * rather used as a mean to identify a feed and avoid duplicates + * Normalize the url. The resulting url is not meant to be fetched but rather used as a mean to identify a feed and avoid duplicates */ public static String normalizeURL(String url) { if (url == null) { @@ -113,13 +110,11 @@ public class FeedUtils { normalized = normalized.replace("//www.", "//"); // feedproxy redirects to feedburner - normalized = normalized.replace("feedproxy.google.com", - "feeds.feedburner.com"); + normalized = normalized.replace("feedproxy.google.com", "feeds.feedburner.com"); // feedburner feeds have a special treatment if (normalized.split(ESCAPED_QUESTION_MARK)[0].contains("feedburner.com")) { - normalized = normalized.replace("feeds2.feedburner.com", - "feeds.feedburner.com"); + normalized = normalized.replace("feeds2.feedburner.com", "feeds.feedburner.com"); normalized = normalized.split(ESCAPED_QUESTION_MARK)[0]; normalized = StringUtils.removeEnd(normalized, "/"); } @@ -146,17 +141,13 @@ public class FeedUtils { return encoding; } - public static String handleContent(String content, String baseUri, - boolean keepTextOnly) { + public static String handleContent(String content, String baseUri, boolean keepTextOnly) { if (StringUtils.isNotBlank(content)) { baseUri = StringUtils.trimToEmpty(baseUri); Whitelist whitelist = new Whitelist(); - whitelist.addTags("a", "b", "blockquote", "br", "caption", "cite", - "code", "col", "colgroup", "dd", "div", "dl", "dt", "em", - "h1", "h2", "h3", "h4", "h5", "h6", "i", "iframe", "img", - "li", "ol", "p", "pre", "q", "small", "strike", "strong", - "sub", "sup", "table", "tbody", "td", "tfoot", "th", - "thead", "tr", "u", "ul"); + whitelist.addTags("a", "b", "blockquote", "br", "caption", "cite", "code", "col", "colgroup", "dd", "div", "dl", "dt", "em", + "h1", "h2", "h3", "h4", "h5", "h6", "i", "iframe", "img", "li", "ol", "p", "pre", "q", "small", "strike", "strong", + "sub", "sup", "table", "tbody", "td", "tfoot", "th", "thead", "tr", "u", "ul"); whitelist.addAttributes("div", "dir"); whitelist.addAttributes("pre", "dir"); @@ -167,22 +158,16 @@ public class FeedUtils { whitelist.addAttributes("blockquote", "cite"); whitelist.addAttributes("col", "span", "width"); whitelist.addAttributes("colgroup", "span", "width"); - whitelist.addAttributes("iframe", "src", "height", "width", - "allowfullscreen", "frameborder", "style"); - whitelist.addAttributes("img", "align", "alt", "height", "src", - "title", "width"); + whitelist.addAttributes("iframe", "src", "height", "width", "allowfullscreen", "frameborder", "style"); + whitelist.addAttributes("img", "align", "alt", "height", "src", "title", "width"); whitelist.addAttributes("ol", "start", "type"); whitelist.addAttributes("q", "cite"); - whitelist.addAttributes("table", "border", "bordercolor", - "summary", "width"); - whitelist.addAttributes("td", "border", "bordercolor", "abbr", - "axis", "colspan", "rowspan", "width"); - whitelist.addAttributes("th", "border", "bordercolor", "abbr", - "axis", "colspan", "rowspan", "scope", "width"); + whitelist.addAttributes("table", "border", "bordercolor", "summary", "width"); + whitelist.addAttributes("td", "border", "bordercolor", "abbr", "axis", "colspan", "rowspan", "width"); + whitelist.addAttributes("th", "border", "bordercolor", "abbr", "axis", "colspan", "rowspan", "scope", "width"); whitelist.addAttributes("ul", "type"); - whitelist.addProtocols("a", "href", "ftp", "http", "https", - "mailto"); + whitelist.addProtocols("a", "href", "ftp", "http", "https", "mailto"); whitelist.addProtocols("blockquote", "cite", "http", "https"); whitelist.addProtocols("img", "src", "http", "https"); whitelist.addProtocols("q", "cite", "http", "https"); @@ -199,8 +184,7 @@ public class FeedUtils { e.attr("style", escaped); } - clean.outputSettings(new OutputSettings().escapeMode( - EscapeMode.base).prettyPrint(false)); + clean.outputSettings(new OutputSettings().escapeMode(EscapeMode.base).prettyPrint(false)); Element body = clean.body(); if (keepTextOnly) { content = body.text(); @@ -215,9 +199,7 @@ public class FeedUtils { List rules = Lists.newArrayList(); CSSOMParser parser = new CSSOMParser(); try { - CSSStyleDeclaration decl = parser - .parseStyleDeclaration(new InputSource(new StringReader( - orig))); + CSSStyleDeclaration decl = parser.parseStyleDeclaration(new InputSource(new StringReader(orig))); for (int i = 0; i < decl.getLength(); i++) { String property = decl.item(i); @@ -226,11 +208,8 @@ public class FeedUtils { continue; } - if (ALLOWED_IFRAME_CSS_RULES.contains(property) - && StringUtils.containsNone(value, - DISALLOWED_IFRAME_CSS_RULE_CHARACTERS)) { - rules.add(property + ":" + decl.getPropertyValue(property) - + ";"); + if (ALLOWED_IFRAME_CSS_RULES.contains(property) && StringUtils.containsNone(value, DISALLOWED_IFRAME_CSS_RULE_CHARACTERS)) { + rules.add(property + ":" + decl.getPropertyValue(property) + ";"); } } } catch (IOException e) { @@ -278,8 +257,7 @@ public class FeedUtils { } if (c >= 32 || c == 9 || c == 10 || c == 13) { - if (!Character.isHighSurrogate(c) - && !Character.isLowSurrogate(c)) { + if (!Character.isHighSurrogate(c) && !Character.isLowSurrogate(c)) { sb.append(c); } } @@ -306,8 +284,7 @@ public class FeedUtils { /** * When the feed was refreshed successfully */ - public static Date buildDisabledUntil(Date publishedDate, - Long averageEntryInterval) { + public static Date buildDisabledUntil(Date publishedDate, Long averageEntryInterval) { Date now = new Date(); if (publishedDate == null) { @@ -325,8 +302,7 @@ public class FeedUtils { } else if (averageEntryInterval != null) { // use average time between entries to decide when to refresh next int factor = 2; - return new Date(Math.min(DateUtils.addHours(now, 6).getTime(), - now.getTime() + averageEntryInterval / factor)); + return new Date(Math.min(DateUtils.addHours(now, 6).getTime(), now.getTime() + averageEntryInterval / factor)); } else { // unknown case, recheck in 24 hours return DateUtils.addHours(now, 24); @@ -378,14 +354,11 @@ public class FeedUtils { return baseUrl + url; } - public static String getFaviconUrl(FeedSubscription subscription, - String publicUrl) { - return removeTrailingSlash(publicUrl) + "/rest/feed/favicon/" - + subscription.getId(); + public static String getFaviconUrl(FeedSubscription subscription, String publicUrl) { + return removeTrailingSlash(publicUrl) + "/rest/feed/favicon/" + subscription.getId(); } - public static String proxyImages(String content, String publicUrl, - boolean proxyImages) { + public static String proxyImages(String content, String publicUrl, boolean proxyImages) { if (!proxyImages) { return content; } @@ -398,8 +371,7 @@ public class FeedUtils { for (Element element : elements) { String href = element.attr("src"); if (href != null) { - String proxy = removeTrailingSlash(publicUrl) - + "/rest/server/proxy?u=" + imageProxyEncoder(href); + String proxy = removeTrailingSlash(publicUrl) + "/rest/server/proxy?u=" + imageProxyEncoder(href); element.attr("src", proxy); } } diff --git a/src/main/java/com/commafeed/backend/feeds/OPMLExporter.java b/src/main/java/com/commafeed/backend/feeds/OPMLExporter.java index 9fe07119..a75faac1 100644 --- a/src/main/java/com/commafeed/backend/feeds/OPMLExporter.java +++ b/src/main/java/com/commafeed/backend/feeds/OPMLExporter.java @@ -28,13 +28,11 @@ public class OPMLExporter { public Opml export(User user) { Opml opml = new Opml(); opml.setFeedType("opml_1.1"); - opml.setTitle(String.format("%s subscriptions in CommaFeed", - user.getName())); + opml.setTitle(String.format("%s subscriptions in CommaFeed", user.getName())); opml.setCreated(new Date()); List categories = feedCategoryDAO.findAll(user); - List subscriptions = feedSubscriptionDAO - .findAll(user); + List subscriptions = feedSubscriptionDAO.findAll(user); for (FeedCategory cat : categories) { opml.getOutlines().add(buildCategoryOutline(cat, subscriptions)); @@ -50,20 +48,17 @@ public class OPMLExporter { } @SuppressWarnings("unchecked") - private Outline buildCategoryOutline(FeedCategory cat, - List subscriptions) { + private Outline buildCategoryOutline(FeedCategory cat, List subscriptions) { Outline outline = new Outline(); outline.setText(cat.getName()); outline.setTitle(cat.getName()); for (FeedCategory child : cat.getChildren()) { - outline.getChildren().add( - buildCategoryOutline(child, subscriptions)); + outline.getChildren().add(buildCategoryOutline(child, subscriptions)); } for (FeedSubscription sub : subscriptions) { - if (sub.getCategory() != null - && sub.getCategory().getId().equals(cat.getId())) { + if (sub.getCategory() != null && sub.getCategory().getId().equals(cat.getId())) { outline.getChildren().add(buildSubscriptionOutline(sub)); } } @@ -76,11 +71,9 @@ public class OPMLExporter { outline.setText(sub.getTitle()); outline.setTitle(sub.getTitle()); outline.setType("rss"); - outline.getAttributes().add( - new Attribute("xmlUrl", sub.getFeed().getUrl())); + outline.getAttributes().add(new Attribute("xmlUrl", sub.getFeed().getUrl())); if (sub.getFeed().getLink() != null) { - outline.getAttributes().add( - new Attribute("htmlUrl", sub.getFeed().getLink())); + outline.getAttributes().add(new Attribute("htmlUrl", sub.getFeed().getLink())); } return outline; } diff --git a/src/main/java/com/commafeed/backend/feeds/OPMLImporter.java b/src/main/java/com/commafeed/backend/feeds/OPMLImporter.java index ed8cb57e..b41e17bc 100644 --- a/src/main/java/com/commafeed/backend/feeds/OPMLImporter.java +++ b/src/main/java/com/commafeed/backend/feeds/OPMLImporter.java @@ -63,13 +63,12 @@ public class OPMLImporter { if (name == null) { name = FeedUtils.truncate(outline.getTitle(), 128); } - FeedCategory category = feedCategoryDAO.findByName(user, name, - parent); + FeedCategory category = feedCategoryDAO.findByName(user, name, parent); if (category == null) { if (StringUtils.isBlank(name)) { name = "Unnamed category"; } - + category = new FeedCategory(); category.setName(name); category.setParent(parent); @@ -91,15 +90,13 @@ public class OPMLImporter { } // make sure we continue with the import process even a feed failed try { - feedSubscriptionService.subscribe(user, outline.getXmlUrl(), - name, parent); + feedSubscriptionService.subscribe(user, outline.getXmlUrl(), name, parent); } catch (FeedSubscriptionException e) { throw e; } catch (Exception e) { - log.error("error while importing {}: {}", outline.getXmlUrl(), - e.getMessage()); + log.error("error while importing {}: {}", outline.getXmlUrl(), e.getMessage()); } } - cache.invalidateUserData(user); + cache.invalidateUserRootCategory(user); } } diff --git a/src/main/java/com/commafeed/backend/model/AbstractModel.java b/src/main/java/com/commafeed/backend/model/AbstractModel.java index 523da2fc..8809b6e9 100644 --- a/src/main/java/com/commafeed/backend/model/AbstractModel.java +++ b/src/main/java/com/commafeed/backend/model/AbstractModel.java @@ -14,7 +14,12 @@ public abstract class AbstractModel implements Serializable { @Id @GeneratedValue(strategy = GenerationType.TABLE, generator = "gen") - @TableGenerator(name = "gen", table = "hibernate_sequences", pkColumnName = "sequence_name", valueColumnName = "sequence_next_hi_value", allocationSize = 1000) + @TableGenerator( + name = "gen", + table = "hibernate_sequences", + pkColumnName = "sequence_name", + valueColumnName = "sequence_next_hi_value", + allocationSize = 1000) private Long id; public Long getId() { diff --git a/src/main/java/com/commafeed/backend/model/ApplicationSettings.java b/src/main/java/com/commafeed/backend/model/ApplicationSettings.java index e6a18df3..a9fbfcfb 100644 --- a/src/main/java/com/commafeed/backend/model/ApplicationSettings.java +++ b/src/main/java/com/commafeed/backend/model/ApplicationSettings.java @@ -1,5 +1,7 @@ package com.commafeed.backend.model; +import java.util.Date; + import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; @@ -7,8 +9,11 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; +import org.apache.commons.lang3.time.DateUtils; import org.apache.log4j.Level; +import com.fasterxml.jackson.annotation.JsonIgnore; + @Entity @Table(name = "APPLICATIONSETTINGS") @SuppressWarnings("serial") @@ -35,10 +40,19 @@ public class ApplicationSettings extends AbstractModel { private boolean imageProxyEnabled; private int queryTimeout; private boolean crawlingPaused; + private int keepStatusDays = 0; @Column(length = 255) private String announcement; + @JsonIgnore + public Date getUnreadThreshold() { + int keepStatusDays = getKeepStatusDays(); + return keepStatusDays > 0 ? DateUtils.addDays(new Date(), -1 * keepStatusDays) : null; + } + + /* getters and setters below */ + public String getPublicUrl() { return publicUrl; } @@ -123,8 +137,7 @@ public class ApplicationSettings extends AbstractModel { return googleAnalyticsTrackingCode; } - public void setGoogleAnalyticsTrackingCode( - String googleAnalyticsTrackingCode) { + public void setGoogleAnalyticsTrackingCode(String googleAnalyticsTrackingCode) { this.googleAnalyticsTrackingCode = googleAnalyticsTrackingCode; } @@ -200,4 +213,12 @@ public class ApplicationSettings extends AbstractModel { this.crawlingPaused = crawlingPaused; } + public int getKeepStatusDays() { + return keepStatusDays; + } + + public void setKeepStatusDays(int keepStatusDays) { + this.keepStatusDays = keepStatusDays; + } + } diff --git a/src/main/java/com/commafeed/backend/model/Feed.java b/src/main/java/com/commafeed/backend/model/Feed.java index f29c3c8d..56aa2570 100644 --- a/src/main/java/com/commafeed/backend/model/Feed.java +++ b/src/main/java/com/commafeed/backend/model/Feed.java @@ -4,6 +4,7 @@ import java.util.Date; import java.util.Set; import javax.persistence.Cacheable; +import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.OneToMany; @@ -107,8 +108,8 @@ public class Feed extends AbstractModel { @Column(length = 40) private String lastContentHash; - @OneToMany(mappedBy = "feed") - private Set entryRelationships; + @OneToMany(mappedBy = "feed", cascade = CascadeType.REMOVE) + private Set entries; @OneToMany(mappedBy = "feed") private Set subscriptions; @@ -135,8 +136,7 @@ public class Feed extends AbstractModel { private Date pushLastPing; /** - * Denotes a feed that needs to be refreshed before others. Currently used - * when a feed is queued manually for refresh. Not persisted. + * Denotes a feed that needs to be refreshed before others. Currently used when a feed is queued manually for refresh. Not persisted. */ @Transient private boolean urgent; @@ -325,12 +325,12 @@ public class Feed extends AbstractModel { this.normalizedUrlHash = normalizedUrlHash; } - public Set getEntryRelationships() { - return entryRelationships; + public Set getEntries() { + return entries; } - public void setEntryRelationships(Set entryRelationships) { - this.entryRelationships = entryRelationships; + public void setEntries(Set entries) { + this.entries = entries; } } diff --git a/src/main/java/com/commafeed/backend/model/FeedEntry.java b/src/main/java/com/commafeed/backend/model/FeedEntry.java index 486d42b1..22ef3c31 100644 --- a/src/main/java/com/commafeed/backend/model/FeedEntry.java +++ b/src/main/java/com/commafeed/backend/model/FeedEntry.java @@ -9,6 +9,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.FetchType; import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; import javax.persistence.OneToMany; import javax.persistence.OneToOne; import javax.persistence.Table; @@ -32,8 +33,8 @@ public class FeedEntry extends AbstractModel { @Column(length = 40, nullable = false) private String guidHash; - @OneToMany(mappedBy = "entry", cascade = CascadeType.REMOVE) - private Set feedRelationships; + @ManyToOne(fetch = FetchType.LAZY) + private Feed feed; @OneToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY, optional = false) @JoinColumn(nullable = false, updatable = false) @@ -42,9 +43,6 @@ public class FeedEntry extends AbstractModel { @Column(length = 2048) private String url; - @Column(name = "author", length = 128) - private String author; - @Temporal(TemporalType.TIMESTAMP) private Date inserted; @@ -116,20 +114,12 @@ public class FeedEntry extends AbstractModel { this.guidHash = guidHash; } - public String getAuthor() { - return author; + public Feed getFeed() { + return feed; } - public void setAuthor(String author) { - this.author = author; - } - - public Set getFeedRelationships() { - return feedRelationships; - } - - public void setFeedRelationships(Set feedRelationships) { - this.feedRelationships = feedRelationships; + public void setFeed(Feed feed) { + this.feed = feed; } public FeedSubscription getSubscription() { diff --git a/src/main/java/com/commafeed/backend/model/FeedEntryContent.java b/src/main/java/com/commafeed/backend/model/FeedEntryContent.java index 7b4ccde8..551f0dc5 100644 --- a/src/main/java/com/commafeed/backend/model/FeedEntryContent.java +++ b/src/main/java/com/commafeed/backend/model/FeedEntryContent.java @@ -1,9 +1,12 @@ package com.commafeed.backend.model; +import java.util.Set; + import javax.persistence.Cacheable; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Lob; +import javax.persistence.OneToMany; import javax.persistence.Table; import org.hibernate.annotations.Cache; @@ -18,17 +21,29 @@ public class FeedEntryContent extends AbstractModel { @Column(length = 2048) private String title; + + @Column(length = 40) + private String titleHash; @Lob @Column(length = Integer.MAX_VALUE) private String content; + @Column(length = 40) + private String contentHash; + + @Column(name = "author", length = 128) + private String author; + @Column(length = 2048) private String enclosureUrl; @Column(length = 255) private String enclosureType; + @OneToMany(mappedBy = "content") + private Set entries; + public String getContent() { return content; } @@ -61,4 +76,36 @@ public class FeedEntryContent extends AbstractModel { this.title = title; } + public String getContentHash() { + return contentHash; + } + + public void setContentHash(String contentHash) { + this.contentHash = contentHash; + } + + public String getAuthor() { + return author; + } + + public void setAuthor(String author) { + this.author = author; + } + + public Set getEntries() { + return entries; + } + + public void setEntries(Set entries) { + this.entries = entries; + } + + public String getTitleHash() { + return titleHash; + } + + public void setTitleHash(String titleHash) { + this.titleHash = titleHash; + } + } diff --git a/src/main/java/com/commafeed/backend/model/FeedEntryStatus.java b/src/main/java/com/commafeed/backend/model/FeedEntryStatus.java index 57fa82b4..8e0bf918 100644 --- a/src/main/java/com/commafeed/backend/model/FeedEntryStatus.java +++ b/src/main/java/com/commafeed/backend/model/FeedEntryStatus.java @@ -11,6 +11,7 @@ import javax.persistence.ManyToOne; import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; +import javax.persistence.Transient; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; @@ -34,6 +35,9 @@ public class FeedEntryStatus extends AbstractModel { private boolean read; private boolean starred; + @Transient + private boolean markable; + /** * Denormalization starts here */ @@ -116,4 +120,12 @@ public class FeedEntryStatus extends AbstractModel { this.user = user; } + public boolean isMarkable() { + return markable; + } + + public void setMarkable(boolean markable) { + this.markable = markable; + } + } diff --git a/src/main/java/com/commafeed/backend/model/FeedFeedEntry.java b/src/main/java/com/commafeed/backend/model/FeedFeedEntry.java deleted file mode 100644 index cd76d8f2..00000000 --- a/src/main/java/com/commafeed/backend/model/FeedFeedEntry.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.commafeed.backend.model; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Cacheable; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -import org.hibernate.annotations.Cache; -import org.hibernate.annotations.CacheConcurrencyStrategy; - -@Entity -@Table(name = "FEED_FEEDENTRIES") -@SuppressWarnings("serial") -@Cacheable -@Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) -public class FeedFeedEntry implements Serializable { - - @Id - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "FEED_ID") - private Feed feed; - - @Id - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "FEEDENTRY_ID") - private FeedEntry entry; - - @Temporal(TemporalType.TIMESTAMP) - private Date entryUpdated; - - public FeedFeedEntry() { - - } - - public FeedFeedEntry(Feed feed, FeedEntry entry) { - this.feed = feed; - this.entry = entry; - this.entryUpdated = entry.getUpdated(); - } - - public Feed getFeed() { - return feed; - } - - public void setFeed(Feed feed) { - this.feed = feed; - } - - public FeedEntry getEntry() { - return entry; - } - - public void setEntry(FeedEntry entry) { - this.entry = entry; - } - - public Date getEntryUpdated() { - return entryUpdated; - } - - public void setEntryUpdated(Date entryUpdated) { - this.entryUpdated = entryUpdated; - } - -} diff --git a/src/main/java/com/commafeed/backend/model/User.java b/src/main/java/com/commafeed/backend/model/User.java index 7a57cb1f..f059a4b5 100644 --- a/src/main/java/com/commafeed/backend/model/User.java +++ b/src/main/java/com/commafeed/backend/model/User.java @@ -55,8 +55,7 @@ public class User extends AbstractModel { @Temporal(TemporalType.TIMESTAMP) private Date recoverPasswordTokenDate; - @OneToMany(mappedBy = "user", cascade = { CascadeType.PERSIST, - CascadeType.REMOVE }) + @OneToMany(mappedBy = "user", cascade = { CascadeType.PERSIST, CascadeType.REMOVE }) private Set roles = Sets.newHashSet(); @OneToMany(mappedBy = "user", fetch = FetchType.LAZY, cascade = CascadeType.REMOVE) diff --git a/src/main/java/com/commafeed/backend/pubsubhubbub/SubscriptionHandler.java b/src/main/java/com/commafeed/backend/pubsubhubbub/SubscriptionHandler.java index bfc5e4ae..930821d7 100644 --- a/src/main/java/com/commafeed/backend/pubsubhubbub/SubscriptionHandler.java +++ b/src/main/java/com/commafeed/backend/pubsubhubbub/SubscriptionHandler.java @@ -26,8 +26,7 @@ import com.google.common.collect.Lists; public class SubscriptionHandler { - private static Logger log = LoggerFactory - .getLogger(SubscriptionHandler.class); + private static Logger log = LoggerFactory.getLogger(SubscriptionHandler.class); @Inject ApplicationSettingsService applicationSettingsService; @@ -47,16 +46,13 @@ public class SubscriptionHandler { String hub = feed.getPushHub(); String topic = feed.getPushTopic(); - String publicUrl = FeedUtils - .removeTrailingSlash(applicationSettingsService.get() - .getPublicUrl()); + String publicUrl = FeedUtils.removeTrailingSlash(applicationSettingsService.get().getPublicUrl()); log.debug("sending new pubsub subscription to {} for {}", hub, topic); HttpPost post = new HttpPost(hub); List nvp = Lists.newArrayList(); - nvp.add(new BasicNameValuePair("hub.callback", publicUrl - + "/rest/push/callback")); + nvp.add(new BasicNameValuePair("hub.callback", publicUrl + "/rest/push/callback")); nvp.add(new BasicNameValuePair("hub.topic", topic)); nvp.add(new BasicNameValuePair("hub.mode", "subscribe")); nvp.add(new BasicNameValuePair("hub.verify", "async")); @@ -65,8 +61,7 @@ public class SubscriptionHandler { nvp.add(new BasicNameValuePair("hub.lease_seconds", "")); post.setHeader(HttpHeaders.USER_AGENT, "CommaFeed"); - post.setHeader(HttpHeaders.CONTENT_TYPE, - MediaType.APPLICATION_FORM_URLENCODED); + post.setHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_FORM_URLENCODED); HttpClient client = HttpGetter.newClient(20000); try { @@ -77,23 +72,19 @@ public class SubscriptionHandler { if (code != 204 && code != 202 && code != 200) { String message = EntityUtils.toString(response.getEntity()); String pushpressError = " is value is not allowed. You may only subscribe to"; - if (code == 400 - && StringUtils.contains(message, pushpressError)) { + if (code == 400 && StringUtils.contains(message, pushpressError)) { String[] tokens = message.split(" "); feed.setPushTopic(tokens[tokens.length - 1]); taskGiver.giveBack(feed); - log.debug("handled pushpress subfeed {} : {}", topic, - feed.getPushTopic()); + log.debug("handled pushpress subfeed {} : {}", topic, feed.getPushTopic()); } else { - throw new Exception("Unexpected response code: " + code - + " " + response.getStatusLine().getReasonPhrase() - + " - " + message); + throw new Exception("Unexpected response code: " + code + " " + response.getStatusLine().getReasonPhrase() + " - " + + message); } } log.debug("subscribed to {} for {}", hub, topic); } catch (Exception e) { - log.error("Could not subscribe to {} for {} : " + e.getMessage(), - hub, topic); + log.error("Could not subscribe to {} for {} : " + e.getMessage(), hub, topic); } finally { client.getConnectionManager().shutdown(); } diff --git a/src/main/java/com/commafeed/backend/rome/OPML11Generator.java b/src/main/java/com/commafeed/backend/rome/OPML11Generator.java index ae88fdc2..26883ffe 100644 --- a/src/main/java/com/commafeed/backend/rome/OPML11Generator.java +++ b/src/main/java/com/commafeed/backend/rome/OPML11Generator.java @@ -4,8 +4,7 @@ import org.jdom.Element; import com.sun.syndication.feed.opml.Opml; -public class OPML11Generator extends - com.sun.syndication.io.impl.OPML10Generator { +public class OPML11Generator extends com.sun.syndication.io.impl.OPML10Generator { public OPML11Generator() { super("opml_1.1"); diff --git a/src/main/java/com/commafeed/backend/rome/OPML11Parser.java b/src/main/java/com/commafeed/backend/rome/OPML11Parser.java index a5524ba8..f3b52cd8 100644 --- a/src/main/java/com/commafeed/backend/rome/OPML11Parser.java +++ b/src/main/java/com/commafeed/backend/rome/OPML11Parser.java @@ -6,20 +6,17 @@ import org.jdom.Element; import com.sun.syndication.io.impl.OPML10Parser; public class OPML11Parser extends OPML10Parser { - - public OPML11Parser() { - super("opml_1.1"); - } + + public OPML11Parser() { + super("opml_1.1"); + } @Override public boolean isMyType(Document document) { Element e = document.getRootElement(); - if (e.getName().equals("opml") - && (e.getChild("head") == null || e.getChild("head").getChild( - "docs") == null) - && (e.getAttributeValue("version") == null || e - .getAttributeValue("version").equals("1.1"))) { + if (e.getName().equals("opml") && (e.getChild("head") == null || e.getChild("head").getChild("docs") == null) + && (e.getAttributeValue("version") == null || e.getAttributeValue("version").equals("1.1"))) { return true; } diff --git a/src/main/java/com/commafeed/backend/rome/RSSRDF10Parser.java b/src/main/java/com/commafeed/backend/rome/RSSRDF10Parser.java index 2e4c5110..45995237 100644 --- a/src/main/java/com/commafeed/backend/rome/RSSRDF10Parser.java +++ b/src/main/java/com/commafeed/backend/rome/RSSRDF10Parser.java @@ -26,8 +26,7 @@ public class RSSRDF10Parser extends RSS10Parser { Element rssRoot = document.getRootElement(); Namespace defaultNS = rssRoot.getNamespace(); - List additionalNSs = Lists.newArrayList(rssRoot - .getAdditionalNamespaces()); + List additionalNSs = Lists.newArrayList(rssRoot.getAdditionalNamespaces()); List children = rssRoot.getChildren(); if (CollectionUtils.isNotEmpty(children)) { Element child = children.get(0); diff --git a/src/main/java/com/commafeed/backend/services/ApplicationSettingsService.java b/src/main/java/com/commafeed/backend/services/ApplicationSettingsService.java index e08266ba..2ef75cd5 100644 --- a/src/main/java/com/commafeed/backend/services/ApplicationSettingsService.java +++ b/src/main/java/com/commafeed/backend/services/ApplicationSettingsService.java @@ -29,8 +29,7 @@ public class ApplicationSettingsService { public ApplicationSettings get() { if (settings == null) { - settings = Iterables.getFirst(applicationSettingsDAO.findAll(), - null); + settings = Iterables.getFirst(applicationSettingsDAO.findAll(), null); } return settings; } diff --git a/src/main/java/com/commafeed/backend/services/FeedEntryContentService.java b/src/main/java/com/commafeed/backend/services/FeedEntryContentService.java new file mode 100644 index 00000000..eeeeae6a --- /dev/null +++ b/src/main/java/com/commafeed/backend/services/FeedEntryContentService.java @@ -0,0 +1,37 @@ +package com.commafeed.backend.services; + +import javax.inject.Inject; + +import org.apache.commons.codec.digest.DigestUtils; +import org.apache.commons.lang.StringUtils; + +import com.commafeed.backend.dao.FeedEntryContentDAO; +import com.commafeed.backend.feeds.FeedUtils; +import com.commafeed.backend.model.FeedEntryContent; + +public class FeedEntryContentService { + + @Inject + FeedEntryContentDAO feedEntryContentDAO; + + /** + * this is NOT thread-safe + */ + public FeedEntryContent findOrCreate(FeedEntryContent content, String baseUrl) { + + String contentHash = DigestUtils.sha1Hex(StringUtils.trimToEmpty(content.getContent())); + String titleHash = DigestUtils.sha1Hex(StringUtils.trimToEmpty(content.getTitle())); + FeedEntryContent existing = feedEntryContentDAO.findExisting(contentHash, titleHash); + if (existing == null) { + content.setContentHash(contentHash); + content.setTitleHash(titleHash); + + content.setAuthor(FeedUtils.truncate(FeedUtils.handleContent(content.getAuthor(), baseUrl, true), 128)); + content.setTitle(FeedUtils.truncate(FeedUtils.handleContent(content.getTitle(), baseUrl, true), 2048)); + content.setContent(FeedUtils.handleContent(content.getContent(), baseUrl, false)); + existing = content; + feedEntryContentDAO.saveOrUpdate(existing); + } + return existing; + } +} diff --git a/src/main/java/com/commafeed/backend/services/FeedEntryService.java b/src/main/java/com/commafeed/backend/services/FeedEntryService.java index 065c7f13..a47ace05 100644 --- a/src/main/java/com/commafeed/backend/services/FeedEntryService.java +++ b/src/main/java/com/commafeed/backend/services/FeedEntryService.java @@ -1,8 +1,12 @@ package com.commafeed.backend.services; +import java.util.Date; +import java.util.List; + import javax.ejb.Stateless; import javax.inject.Inject; +import com.commafeed.backend.cache.CacheService; import com.commafeed.backend.dao.FeedEntryDAO; import com.commafeed.backend.dao.FeedEntryStatusDAO; import com.commafeed.backend.dao.FeedSubscriptionDAO; @@ -10,6 +14,7 @@ import com.commafeed.backend.model.FeedEntry; import com.commafeed.backend.model.FeedEntryStatus; import com.commafeed.backend.model.FeedSubscription; import com.commafeed.backend.model.User; +import com.google.common.collect.Lists; @Stateless public class FeedEntryService { @@ -19,14 +24,15 @@ public class FeedEntryService { @Inject FeedSubscriptionDAO feedSubscriptionDAO; - - @Inject + + @Inject FeedEntryDAO feedEntryDAO; - public void markEntry(User user, Long entryId, Long subscriptionId, - boolean read) { - FeedSubscription sub = feedSubscriptionDAO.findById(user, - subscriptionId); + @Inject + CacheService cache; + + public void markEntry(User user, Long entryId, Long subscriptionId, boolean read) { + FeedSubscription sub = feedSubscriptionDAO.findById(user, subscriptionId); if (sub == null) { return; } @@ -37,32 +43,17 @@ public class FeedEntryService { } FeedEntryStatus status = feedEntryStatusDAO.getStatus(sub, entry); - - if (read) { - if (status.getId() != null) { - if (status.isStarred()) { - status.setRead(true); - feedEntryStatusDAO.saveOrUpdate(status); - } else { - feedEntryStatusDAO.delete(status); - } - } - } else { - if (status.getId() == null) { - status = new FeedEntryStatus(user, sub, entry); - status.setSubscription(sub); - } - status.setRead(false); + if (status.isMarkable()) { + status.setRead(read); feedEntryStatusDAO.saveOrUpdate(status); + cache.invalidateUnreadCount(sub); + cache.invalidateUserRootCategory(user); } - } - public void starEntry(User user, Long entryId, Long subscriptionId, - boolean starred) { + public void starEntry(User user, Long entryId, Long subscriptionId, boolean starred) { - FeedSubscription sub = feedSubscriptionDAO.findById(user, - subscriptionId); + FeedSubscription sub = feedSubscriptionDAO.findById(user, subscriptionId); if (sub == null) { return; } @@ -73,24 +64,33 @@ public class FeedEntryService { } FeedEntryStatus status = feedEntryStatusDAO.getStatus(sub, entry); + status.setStarred(starred); + feedEntryStatusDAO.saveOrUpdate(status); + } - if (!starred) { - if (status.getId() != null) { - if (!status.isRead()) { - status.setStarred(false); - feedEntryStatusDAO.saveOrUpdate(status); - } else { - feedEntryStatusDAO.delete(status); + public void markSubscriptionEntries(User user, List subscriptions, Date olderThan) { + List statuses = feedEntryStatusDAO.findBySubscriptions(subscriptions, true, null, null, -1, -1, null, false); + markList(statuses, olderThan); + cache.invalidateUnreadCount(subscriptions.toArray(new FeedSubscription[0])); + cache.invalidateUserRootCategory(user); + } + + public void markStarredEntries(User user, Date olderThan) { + List statuses = feedEntryStatusDAO.findStarred(user, null, -1, -1, null, false); + markList(statuses, olderThan); + } + + private void markList(List statuses, Date olderThan) { + List list = Lists.newArrayList(); + for (FeedEntryStatus status : statuses) { + if (!status.isRead()) { + Date inserted = status.getEntry().getInserted(); + if (olderThan == null || inserted == null || olderThan.after(inserted)) { + status.setRead(true); + list.add(status); } } - } else { - if (status.getId() == null) { - status = new FeedEntryStatus(user, sub, entry); - status.setSubscription(sub); - status.setRead(true); - } - status.setStarred(true); - feedEntryStatusDAO.saveOrUpdate(status); } + feedEntryStatusDAO.saveOrUpdate(list); } } diff --git a/src/main/java/com/commafeed/backend/services/FeedSubscriptionService.java b/src/main/java/com/commafeed/backend/services/FeedSubscriptionService.java index 8ebeae9e..81ebf654 100644 --- a/src/main/java/com/commafeed/backend/services/FeedSubscriptionService.java +++ b/src/main/java/com/commafeed/backend/services/FeedSubscriptionService.java @@ -18,17 +18,14 @@ import com.commafeed.backend.feeds.FeedRefreshTaskGiver; import com.commafeed.backend.feeds.FeedUtils; import com.commafeed.backend.model.Feed; import com.commafeed.backend.model.FeedCategory; -import com.commafeed.backend.model.FeedEntry; -import com.commafeed.backend.model.FeedEntryStatus; import com.commafeed.backend.model.FeedSubscription; import com.commafeed.backend.model.Models; import com.commafeed.backend.model.User; -import com.google.api.client.util.Lists; +import com.google.api.client.util.Maps; public class FeedSubscriptionService { - private static Logger log = LoggerFactory - .getLogger(FeedSubscriptionService.class); + private static Logger log = LoggerFactory.getLogger(FeedSubscriptionService.class); @SuppressWarnings("serial") @ApplicationException @@ -59,63 +56,62 @@ public class FeedSubscriptionService { @Inject CacheService cache; - public Feed subscribe(User user, String url, String title, - FeedCategory category) { + public Feed subscribe(User user, String url, String title, FeedCategory category) { final String pubUrl = applicationSettingsService.get().getPublicUrl(); if (StringUtils.isBlank(pubUrl)) { - throw new FeedSubscriptionException( - "Public URL of this CommaFeed instance is not set"); + throw new FeedSubscriptionException("Public URL of this CommaFeed instance is not set"); } if (url.startsWith(pubUrl)) { - throw new FeedSubscriptionException( - "Could not subscribe to a feed from this CommaFeed instance"); + throw new FeedSubscriptionException("Could not subscribe to a feed from this CommaFeed instance"); } Feed feed = feedService.findOrCreate(url); FeedSubscription sub = feedSubscriptionDAO.findByFeed(user, feed); - boolean newSubscription = false; if (sub == null) { sub = new FeedSubscription(); sub.setFeed(feed); sub.setUser(user); - newSubscription = true; } sub.setCategory(category); sub.setPosition(0); sub.setTitle(FeedUtils.truncate(title, 128)); feedSubscriptionDAO.saveOrUpdate(sub); - if (newSubscription) { - try { - List statuses = Lists.newArrayList(); - List allEntries = feedEntryDAO.findByFeed(feed, 0, - 10); - for (FeedEntry entry : allEntries) { - FeedEntryStatus status = new FeedEntryStatus(user, sub, entry); - status.setRead(false); - status.setSubscription(sub); - statuses.add(status); - } - feedEntryStatusDAO.saveOrUpdate(statuses); - } catch (Exception e) { - log.error( - "could not fetch initial statuses when importing {} : {}", - feed.getUrl(), e.getMessage()); - } - } taskGiver.add(feed); + cache.invalidateUserRootCategory(user); return feed; } + public boolean unsubscribe(User user, Long subId) { + FeedSubscription sub = feedSubscriptionDAO.findById(user, subId); + if (sub != null) { + feedSubscriptionDAO.delete(sub); + cache.invalidateUserRootCategory(user); + return true; + } else { + return false; + } + } + + public Long getUnreadCount(FeedSubscription sub) { + Long count = cache.getUnreadCount(sub); + if (count == null) { + log.debug("unread count cache miss for {}", Models.getId(sub)); + count = feedEntryStatusDAO.getUnreadCount(sub); + cache.setUnreadCount(sub, count); + } + return count; + } + public Map getUnreadCount(User user) { - Map map = cache.getUnreadCounts(user); - if (map == null) { - log.debug("unread count cache miss for {}", Models.getId(user)); - map = feedEntryStatusDAO.getUnreadCount(user); - cache.setUnreadCounts(user, map); + Map map = Maps.newHashMap(); + List subs = feedSubscriptionDAO.findAll(user); + for (FeedSubscription sub : subs) { + map.put(sub.getId(), getUnreadCount(sub)); } return map; } + } diff --git a/src/main/java/com/commafeed/backend/services/FeedUpdateService.java b/src/main/java/com/commafeed/backend/services/FeedUpdateService.java index cf7369cb..d27449fb 100644 --- a/src/main/java/com/commafeed/backend/services/FeedUpdateService.java +++ b/src/main/java/com/commafeed/backend/services/FeedUpdateService.java @@ -8,25 +8,23 @@ import javax.inject.Inject; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; +import org.apache.commons.codec.digest.DigestUtils; + import com.commafeed.backend.MetricsBean; import com.commafeed.backend.cache.CacheService; import com.commafeed.backend.dao.FeedEntryDAO; -import com.commafeed.backend.dao.FeedEntryDAO.EntryWithFeed; import com.commafeed.backend.dao.FeedEntryStatusDAO; import com.commafeed.backend.dao.FeedSubscriptionDAO; -import com.commafeed.backend.feeds.FeedUtils; import com.commafeed.backend.model.Feed; import com.commafeed.backend.model.FeedEntry; import com.commafeed.backend.model.FeedEntryContent; -import com.commafeed.backend.model.FeedEntryStatus; -import com.commafeed.backend.model.FeedFeedEntry; import com.commafeed.backend.model.FeedSubscription; import com.commafeed.backend.model.User; import com.google.common.collect.Lists; @Stateless public class FeedUpdateService { - + @PersistenceContext protected EntityManager em; @@ -45,47 +43,33 @@ public class FeedUpdateService { @Inject CacheService cache; - public void updateEntry(Feed feed, FeedEntry entry, - List subscriptions) { + @Inject + FeedEntryContentService feedEntryContentService; - EntryWithFeed existing = feedEntryDAO.findExisting(entry.getGuid(), - entry.getUrl(), feed.getId()); + /** + * this is NOT thread-safe + */ + public void updateEntry(Feed feed, FeedEntry entry, List subscriptions) { - FeedEntry update = null; - FeedFeedEntry ffe = null; - if (existing == null) { - entry.setAuthor(FeedUtils.truncate(FeedUtils.handleContent( - entry.getAuthor(), feed.getLink(), true), 128)); - FeedEntryContent content = entry.getContent(); - content.setTitle(FeedUtils.truncate(FeedUtils.handleContent( - content.getTitle(), feed.getLink(), true), 2048)); - content.setContent(FeedUtils.handleContent(content.getContent(), - feed.getLink(), false)); - - entry.setInserted(new Date()); - ffe = new FeedFeedEntry(feed, entry); - - update = entry; - } else if (existing.ffe == null) { - ffe = new FeedFeedEntry(feed, existing.entry); - update = existing.entry; + FeedEntry existing = feedEntryDAO.findExisting(entry.getGuid(), entry.getUrl(), feed.getId()); + if (existing != null) { + return; } - if (update != null) { - List statusUpdateList = Lists.newArrayList(); - List users = Lists.newArrayList(); - for (FeedSubscription sub : subscriptions) { - User user = sub.getUser(); - FeedEntryStatus status = new FeedEntryStatus(user, sub, update); - status.setSubscription(sub); - statusUpdateList.add(status); - users.add(user); - } - cache.invalidateUserData(users.toArray(new User[0])); - feedEntryDAO.saveOrUpdate(update); - feedEntryStatusDAO.saveOrUpdate(statusUpdateList); - em.persist(ffe); - metricsBean.entryUpdated(statusUpdateList.size()); + FeedEntryContent content = feedEntryContentService.findOrCreate(entry.getContent(), feed.getLink()); + entry.setGuidHash(DigestUtils.sha1Hex(entry.getGuid())); + entry.setContent(content); + entry.setInserted(new Date()); + entry.setFeed(feed); + + List users = Lists.newArrayList(); + for (FeedSubscription sub : subscriptions) { + User user = sub.getUser(); + users.add(user); } + feedEntryDAO.saveOrUpdate(entry); + metricsBean.entryInserted(); + cache.invalidateUnreadCount(subscriptions.toArray(new FeedSubscription[0])); + cache.invalidateUserRootCategory(users.toArray(new User[0])); } } diff --git a/src/main/java/com/commafeed/backend/services/MailService.java b/src/main/java/com/commafeed/backend/services/MailService.java index 585f4e1c..a6de7d37 100644 --- a/src/main/java/com/commafeed/backend/services/MailService.java +++ b/src/main/java/com/commafeed/backend/services/MailService.java @@ -26,8 +26,7 @@ public class MailService implements Serializable { @Inject ApplicationSettingsService applicationSettingsService; - public void sendMail(User user, String subject, String content) - throws Exception { + public void sendMail(User user, String subject, String content) throws Exception { ApplicationSettings settings = applicationSettingsService.get(); @@ -50,8 +49,7 @@ public class MailService implements Serializable { Message message = new MimeMessage(session); message.setFrom(new InternetAddress(username, "CommaFeed")); - message.setRecipients(Message.RecipientType.TO, - InternetAddress.parse(dest)); + message.setRecipients(Message.RecipientType.TO, InternetAddress.parse(dest)); message.setSubject("CommaFeed - " + subject); message.setContent(content, "text/html; charset=utf-8"); diff --git a/src/main/java/com/commafeed/backend/services/PasswordEncryptionService.java b/src/main/java/com/commafeed/backend/services/PasswordEncryptionService.java index 64ff1c1d..6777e47e 100644 --- a/src/main/java/com/commafeed/backend/services/PasswordEncryptionService.java +++ b/src/main/java/com/commafeed/backend/services/PasswordEncryptionService.java @@ -53,8 +53,7 @@ public class PasswordEncryptionService implements Serializable { // http://blog.crackpassword.com/2010/09/smartphone-forensics-cracking-blackberry-backup-passwords/ int iterations = 20000; - KeySpec spec = new PBEKeySpec(password.toCharArray(), salt, iterations, - derivedKeyLength); + KeySpec spec = new PBEKeySpec(password.toCharArray(), salt, iterations, derivedKeyLength); byte[] bytes = null; try { diff --git a/src/main/java/com/commafeed/backend/services/UserService.java b/src/main/java/com/commafeed/backend/services/UserService.java index 0bab2450..653ce0d0 100644 --- a/src/main/java/com/commafeed/backend/services/UserService.java +++ b/src/main/java/com/commafeed/backend/services/UserService.java @@ -48,15 +48,13 @@ public class UserService { User user = userDAO.findByName(name); if (user != null && !user.isDisabled()) { - boolean authenticated = encryptionService.authenticate(password, - user.getPassword(), user.getSalt()); + boolean authenticated = encryptionService.authenticate(password, user.getPassword(), user.getSalt()); if (authenticated) { Date lastLogin = user.getLastLogin(); Date now = new Date(); // only update lastLogin field every hour in order to not // invalidate the cache everytime someone logs in - if (lastLogin == null - || lastLogin.before(DateUtils.addHours(now, -1))) { + if (lastLogin == null || lastLogin.before(DateUtils.addHours(now, -1))) { user.setLastLogin(now); userDAO.saveOrUpdate(user); } @@ -66,39 +64,30 @@ public class UserService { return null; } - public User register(String name, String password, String email, - Collection roles) { + public User register(String name, String password, String email, Collection roles) { return register(name, password, email, roles, false); } - public User register(String name, String password, String email, - Collection roles, boolean forceRegistration) { + public User register(String name, String password, String email, Collection roles, boolean forceRegistration) { Preconditions.checkNotNull(name); - Preconditions.checkArgument(StringUtils.length(name) <= 32, - "Name too long (32 characters maximum)"); + Preconditions.checkArgument(StringUtils.length(name) <= 32, "Name too long (32 characters maximum)"); Preconditions.checkNotNull(password); if (!forceRegistration) { - Preconditions.checkState(applicationSettingsService.get() - .isAllowRegistrations(), + Preconditions.checkState(applicationSettingsService.get().isAllowRegistrations(), "Registrations are closed on this CommaFeed instance"); Preconditions.checkNotNull(email); - Preconditions.checkArgument(StringUtils.length(name) >= 3, - "Name too short (3 characters minimum)"); - Preconditions.checkArgument( - forceRegistration || StringUtils.length(password) >= 6, - "Password too short (6 characters maximum)"); - Preconditions.checkArgument(StringUtils.contains(email, "@"), - "Invalid email address"); + Preconditions.checkArgument(StringUtils.length(name) >= 3, "Name too short (3 characters minimum)"); + Preconditions + .checkArgument(forceRegistration || StringUtils.length(password) >= 6, "Password too short (6 characters maximum)"); + Preconditions.checkArgument(StringUtils.contains(email, "@"), "Invalid email address"); } - Preconditions.checkArgument(userDAO.findByName(name) == null, - "Name already taken"); + Preconditions.checkArgument(userDAO.findByName(name) == null, "Name already taken"); if (StringUtils.isNotBlank(email)) { - Preconditions.checkArgument(userDAO.findByEmail(email) == null, - "Email already taken"); + Preconditions.checkArgument(userDAO.findByEmail(email) == null, "Email already taken"); } User user = new User(); @@ -122,8 +111,7 @@ public class UserService { } public String generateApiKey(User user) { - byte[] key = encryptionService.getEncryptedPassword(UUID.randomUUID() - .toString(), user.getSalt()); + byte[] key = encryptionService.getEncryptedPassword(UUID.randomUUID().toString(), user.getSalt()); return DigestUtils.sha1Hex(key); } } diff --git a/src/main/java/com/commafeed/frontend/CommaFeedApplication.java b/src/main/java/com/commafeed/frontend/CommaFeedApplication.java index eb5fe68d..63624c2c 100644 --- a/src/main/java/com/commafeed/frontend/CommaFeedApplication.java +++ b/src/main/java/com/commafeed/frontend/CommaFeedApplication.java @@ -49,15 +49,12 @@ import com.commafeed.frontend.utils.exception.DisplayExceptionPage; public class CommaFeedApplication extends AuthenticatedWebApplication { - private static Logger log = LoggerFactory - .getLogger(CommaFeedApplication.class); + private static Logger log = LoggerFactory.getLogger(CommaFeedApplication.class); public CommaFeedApplication() { super(); - String prod = ResourceBundle.getBundle("application").getString( - "production"); - setConfigurationType(Boolean.valueOf(prod) ? RuntimeConfigurationType.DEPLOYMENT - : RuntimeConfigurationType.DEVELOPMENT); + String prod = ResourceBundle.getBundle("application").getString("production"); + setConfigurationType(Boolean.valueOf(prod) ? RuntimeConfigurationType.DEPLOYMENT : RuntimeConfigurationType.DEVELOPMENT); } @Override @@ -66,16 +63,16 @@ public class CommaFeedApplication extends AuthenticatedWebApplication { mountPage("welcome", WelcomePage.class); mountPage("demo", DemoLoginPage.class); - + mountPage("recover", PasswordRecoveryPage.class); mountPage("recover2", PasswordRecoveryCallbackPage.class); - + mountPage("logout", LogoutPage.class); mountPage("error", DisplayExceptionPage.class); - -// mountPage("google/import/redirect", GoogleImportRedirectPage.class); -// mountPage(GoogleImportCallbackPage.PAGE_PATH, -// GoogleImportCallbackPage.class); + + // mountPage("google/import/redirect", GoogleImportRedirectPage.class); + // mountPage(GoogleImportCallbackPage.PAGE_PATH, + // GoogleImportCallbackPage.class); mountPage("next", NextUnreadRedirectPage.class); @@ -89,8 +86,7 @@ public class CommaFeedApplication extends AuthenticatedWebApplication { setHeaderResponseDecorator(new IHeaderResponseDecorator() { @Override public IHeaderResponse decorate(IHeaderResponse response) { - return new JavaScriptFilteredIntoFooterHeaderResponse(response, - "footer-container"); + return new JavaScriptFilteredIntoFooterHeaderResponse(response, "footer-container"); } }); @@ -100,61 +96,52 @@ public class CommaFeedApplication extends AuthenticatedWebApplication { AjaxRequestTarget target = cycle.find(AjaxRequestTarget.class); // redirect to the error page if ajax request, render error on // current page otherwise - RedirectPolicy policy = target == null ? RedirectPolicy.NEVER_REDIRECT - : RedirectPolicy.AUTO_REDIRECT; - return new RenderPageRequestHandler(new PageProvider( - new DisplayExceptionPage(ex)), policy); + RedirectPolicy policy = target == null ? RedirectPolicy.NEVER_REDIRECT : RedirectPolicy.AUTO_REDIRECT; + return new RenderPageRequestHandler(new PageProvider(new DisplayExceptionPage(ex)), policy); } }); } private void setupSecurity() { - getSecuritySettings().setAuthenticationStrategy( - new DefaultAuthenticationStrategy("LoggedIn") { + getSecuritySettings().setAuthenticationStrategy(new DefaultAuthenticationStrategy("LoggedIn") { - private CookieUtils cookieUtils = null; + private CookieUtils cookieUtils = null; - @Override - protected CookieUtils getCookieUtils() { + @Override + protected CookieUtils getCookieUtils() { - if (cookieUtils == null) { - cookieUtils = new CookieUtils() { - @Override - protected void initializeCookie(Cookie cookie) { - super.initializeCookie(cookie); - cookie.setHttpOnly(true); - } - }; + if (cookieUtils == null) { + cookieUtils = new CookieUtils() { + @Override + protected void initializeCookie(Cookie cookie) { + super.initializeCookie(cookie); + cookie.setHttpOnly(true); } - return cookieUtils; - } - }); - getSecuritySettings().setAuthorizationStrategy( - new IAuthorizationStrategy() { + }; + } + return cookieUtils; + } + }); + getSecuritySettings().setAuthorizationStrategy(new IAuthorizationStrategy() { - @Override - public boolean isInstantiationAuthorized( - Class componentClass) { - boolean authorized = true; + @Override + public boolean isInstantiationAuthorized(Class componentClass) { + boolean authorized = true; - boolean restricted = componentClass - .isAnnotationPresent(SecurityCheck.class); - if (restricted) { - SecurityCheck annotation = componentClass - .getAnnotation(SecurityCheck.class); - Roles roles = CommaFeedSession.get().getRoles(); - authorized = roles.hasAnyRole(new Roles(annotation - .value().name())); - } - return authorized; - } + boolean restricted = componentClass.isAnnotationPresent(SecurityCheck.class); + if (restricted) { + SecurityCheck annotation = componentClass.getAnnotation(SecurityCheck.class); + Roles roles = CommaFeedSession.get().getRoles(); + authorized = roles.hasAnyRole(new Roles(annotation.value().name())); + } + return authorized; + } - @Override - public boolean isActionAuthorized(Component component, - Action action) { - return true; - } - }); + @Override + public boolean isActionAuthorized(Component component, Action action) { + return true; + } + }); } @Override @@ -164,10 +151,8 @@ public class CommaFeedApplication extends AuthenticatedWebApplication { protected void setupInjection() { try { - BeanManager beanManager = (BeanManager) new InitialContext() - .lookup("java:comp/BeanManager"); - new CdiConfiguration(beanManager).setPropagation( - ConversationPropagation.NONE).configure(this); + BeanManager beanManager = (BeanManager) new InitialContext().lookup("java:comp/BeanManager"); + new CdiConfiguration(beanManager).setPropagation(ConversationPropagation.NONE).configure(this); } catch (NamingException e) { log.warn("Could not locate bean manager. CDI is disabled."); } diff --git a/src/main/java/com/commafeed/frontend/model/Entry.java b/src/main/java/com/commafeed/frontend/model/Entry.java index 41ae271e..b6125d26 100644 --- a/src/main/java/com/commafeed/frontend/model/Entry.java +++ b/src/main/java/com/commafeed/frontend/model/Entry.java @@ -24,8 +24,7 @@ import com.wordnik.swagger.annotations.ApiProperty; @ApiClass("Entry details") public class Entry implements Serializable { - public static Entry build(FeedEntryStatus status, String publicUrl, - boolean proxyImages) { + public static Entry build(FeedEntryStatus status, String publicUrl, boolean proxyImages) { Entry entry = new Entry(); FeedEntry feedEntry = status.getEntry(); @@ -33,14 +32,14 @@ public class Entry implements Serializable { entry.setRead(status.isRead()); entry.setStarred(status.isStarred()); + entry.setMarkable(status.isMarkable()); entry.setId(String.valueOf(feedEntry.getId())); entry.setGuid(feedEntry.getGuid()); entry.setTitle(feedEntry.getContent().getTitle()); - entry.setContent(FeedUtils.proxyImages(feedEntry.getContent() - .getContent(), publicUrl, proxyImages)); + entry.setContent(FeedUtils.proxyImages(feedEntry.getContent().getContent(), publicUrl, proxyImages)); entry.setRtl(FeedUtils.isRTL(feedEntry)); - entry.setAuthor(feedEntry.getAuthor()); + entry.setAuthor(feedEntry.getContent().getAuthor()); entry.setEnclosureUrl(feedEntry.getContent().getEnclosureUrl()); entry.setEnclosureType(feedEntry.getContent().getEnclosureType()); entry.setDate(feedEntry.getUpdated()); @@ -124,6 +123,9 @@ public class Entry implements Serializable { @ApiProperty("starred status") private boolean starred; + @ApiProperty("wether the entry is still markable (old entry statuses are discarded)") + private boolean markable; + public String getId() { return id; } @@ -268,4 +270,12 @@ public class Entry implements Serializable { this.insertedDate = insertedDate; } + public boolean isMarkable() { + return markable; + } + + public void setMarkable(boolean markable) { + this.markable = markable; + } + } diff --git a/src/main/java/com/commafeed/frontend/model/Subscription.java b/src/main/java/com/commafeed/frontend/model/Subscription.java index ba1633e6..0c30766e 100644 --- a/src/main/java/com/commafeed/frontend/model/Subscription.java +++ b/src/main/java/com/commafeed/frontend/model/Subscription.java @@ -20,8 +20,7 @@ import com.wordnik.swagger.annotations.ApiProperty; @ApiClass("User information") public class Subscription implements Serializable { - public static Subscription build(FeedSubscription subscription, - String publicUrl, long unreadCount) { + public static Subscription build(FeedSubscription subscription, String publicUrl, long unreadCount) { Date now = new Date(); FeedCategory category = subscription.getCategory(); Feed feed = subscription.getFeed(); @@ -35,12 +34,9 @@ public class Subscription implements Serializable { sub.setFeedLink(feed.getLink()); sub.setIconUrl(FeedUtils.getFaviconUrl(subscription, publicUrl)); sub.setLastRefresh(feed.getLastUpdated()); - sub.setNextRefresh((feed.getDisabledUntil() != null && feed - .getDisabledUntil().before(now)) ? null : feed - .getDisabledUntil()); + sub.setNextRefresh((feed.getDisabledUntil() != null && feed.getDisabledUntil().before(now)) ? null : feed.getDisabledUntil()); sub.setUnread(unreadCount); - sub.setCategoryId(category == null ? null : String.valueOf(category - .getId())); + sub.setCategoryId(category == null ? null : String.valueOf(category.getId())); return sub; } diff --git a/src/main/java/com/commafeed/frontend/model/request/FeedInfoRequest.java b/src/main/java/com/commafeed/frontend/model/request/FeedInfoRequest.java index 1ea511d7..5ae18cde 100644 --- a/src/main/java/com/commafeed/frontend/model/request/FeedInfoRequest.java +++ b/src/main/java/com/commafeed/frontend/model/request/FeedInfoRequest.java @@ -14,7 +14,7 @@ import com.wordnik.swagger.annotations.ApiProperty; @XmlAccessorType(XmlAccessType.FIELD) @ApiClass("Feed information request") public class FeedInfoRequest implements Serializable { - + @ApiProperty(value = "feed url", required = true) private String url; @@ -25,7 +25,5 @@ public class FeedInfoRequest implements Serializable { public void setUrl(String url) { this.url = url; } - - } diff --git a/src/main/java/com/commafeed/frontend/model/request/MarkRequest.java b/src/main/java/com/commafeed/frontend/model/request/MarkRequest.java index 03891204..5c48cd37 100644 --- a/src/main/java/com/commafeed/frontend/model/request/MarkRequest.java +++ b/src/main/java/com/commafeed/frontend/model/request/MarkRequest.java @@ -24,7 +24,9 @@ public class MarkRequest implements Serializable { @ApiProperty(value = "mark as read or unread") private boolean read; - @ApiProperty(value = "only entries older than this, pass the timestamp you got from the entry list to prevent marking an entry that was not retrieved", required = false) + @ApiProperty( + value = "only entries older than this, pass the timestamp you got from the entry list to prevent marking an entry that was not retrieved", + required = false) private Long olderThan; public String getId() { diff --git a/src/main/java/com/commafeed/frontend/pages/BasePage.java b/src/main/java/com/commafeed/frontend/pages/BasePage.java index 6a9a955c..65ecd881 100644 --- a/src/main/java/com/commafeed/frontend/pages/BasePage.java +++ b/src/main/java/com/commafeed/frontend/pages/BasePage.java @@ -79,15 +79,12 @@ public abstract class BasePage extends WebPage { if (user != null) { UserSettings settings = userSettingsDAO.findByUser(user); if (settings != null) { - lang = settings.getLanguage() == null ? "en" : settings - .getLanguage(); - theme = settings.getTheme() == null ? "default" : settings - .getTheme(); + lang = settings.getLanguage() == null ? "en" : settings.getLanguage(); + theme = settings.getTheme() == null ? "default" : settings.getTheme(); } } - add(new TransparentWebMarkupContainer("html").setMarkupId( - "theme-" + theme).add(new AttributeModifier("lang", lang))); + add(new TransparentWebMarkupContainer("html").setMarkupId("theme-" + theme).add(new AttributeModifier("lang", lang))); settings = applicationSettingsService.get(); add(new HeaderResponseContainer("footer-container", "footer-container")); @@ -107,8 +104,7 @@ public abstract class BasePage extends WebPage { if (getApplication().getConfigurationType() == RuntimeConfigurationType.DEPLOYMENT) { long startupTime = startupBean.getStartupTime(); String suffix = "?" + startupTime; - response.render(JavaScriptHeaderItem.forUrl("static/all.js" - + suffix)); + response.render(JavaScriptHeaderItem.forUrl("static/all.js" + suffix)); response.render(CssHeaderItem.forUrl("static/all.css" + suffix)); } else { response.render(JavaScriptHeaderItem.forUrl("wro/lib.js")); diff --git a/src/main/java/com/commafeed/frontend/pages/DemoLoginPage.java b/src/main/java/com/commafeed/frontend/pages/DemoLoginPage.java index df552b6e..98daa197 100644 --- a/src/main/java/com/commafeed/frontend/pages/DemoLoginPage.java +++ b/src/main/java/com/commafeed/frontend/pages/DemoLoginPage.java @@ -16,8 +16,7 @@ public class DemoLoginPage extends WebPage { UserService userService; public DemoLoginPage() { - CommaFeedSession.get().authenticate(StartupBean.USERNAME_DEMO, - StartupBean.USERNAME_DEMO); + CommaFeedSession.get().authenticate(StartupBean.USERNAME_DEMO, StartupBean.USERNAME_DEMO); setResponsePage(getApplication().getHomePage()); } } diff --git a/src/main/java/com/commafeed/frontend/pages/GoogleImportCallbackPage.java b/src/main/java/com/commafeed/frontend/pages/GoogleImportCallbackPage.java index ad0f4ca9..3b65d843 100644 --- a/src/main/java/com/commafeed/frontend/pages/GoogleImportCallbackPage.java +++ b/src/main/java/com/commafeed/frontend/pages/GoogleImportCallbackPage.java @@ -55,8 +55,7 @@ public class GoogleImportCallbackPage extends WebPage { if (request.getQueryString() != null) { urlBuffer.append('?').append(request.getQueryString()); } - AuthorizationCodeResponseUrl responseUrl = new AuthorizationCodeResponseUrl( - urlBuffer.toString()); + AuthorizationCodeResponseUrl responseUrl = new AuthorizationCodeResponseUrl(urlBuffer.toString()); String code = responseUrl.getCode(); if (responseUrl.getError() != null) { @@ -73,8 +72,8 @@ public class GoogleImportCallbackPage extends WebPage { HttpTransport httpTransport = new NetHttpTransport(); JacksonFactory jsonFactory = new JacksonFactory(); - AuthorizationCodeTokenRequest tokenRequest = new AuthorizationCodeTokenRequest( - httpTransport, jsonFactory, new GenericUrl(TOKEN_URL), code); + AuthorizationCodeTokenRequest tokenRequest = new AuthorizationCodeTokenRequest(httpTransport, jsonFactory, new GenericUrl( + TOKEN_URL), code); tokenRequest.setRedirectUri(redirectUri); tokenRequest.put("client_id", clientId); tokenRequest.put("client_secret", clientSecret); @@ -87,16 +86,13 @@ public class GoogleImportCallbackPage extends WebPage { TokenResponse tokenResponse = tokenRequest.execute(); String accessToken = tokenResponse.getAccessToken(); - HttpRequest httpRequest = httpTransport.createRequestFactory() - .buildGetRequest(new GenericUrl(EXPORT_URL)); - BearerToken.authorizationHeaderAccessMethod().intercept( - httpRequest, accessToken); + HttpRequest httpRequest = httpTransport.createRequestFactory().buildGetRequest(new GenericUrl(EXPORT_URL)); + BearerToken.authorizationHeaderAccessMethod().intercept(httpRequest, accessToken); String opml = httpRequest.execute().parseAsString(); User user = CommaFeedSession.get().getUser(); if (user != null) { if (StartupBean.USERNAME_DEMO.equals(user.getName())) { - throw new DisplayException( - "Import is disabled for the demo account"); + throw new DisplayException("Import is disabled for the demo account"); } importer.importOpml(CommaFeedSession.get().getUser(), opml); } diff --git a/src/main/java/com/commafeed/frontend/pages/GoogleImportRedirectPage.java b/src/main/java/com/commafeed/frontend/pages/GoogleImportRedirectPage.java index 37cbe42b..ed60cbe2 100644 --- a/src/main/java/com/commafeed/frontend/pages/GoogleImportRedirectPage.java +++ b/src/main/java/com/commafeed/frontend/pages/GoogleImportRedirectPage.java @@ -15,8 +15,7 @@ import com.commafeed.backend.services.ApplicationSettingsService; @SuppressWarnings("serial") public class GoogleImportRedirectPage extends WebPage { - private static Logger log = Logger - .getLogger(GoogleImportRedirectPage.class); + private static Logger log = Logger.getLogger(GoogleImportRedirectPage.class); private static final String SCOPE = "https://www.google.com/reader/subscriptions/export email profile"; private static final String AUTH_URL = "https://accounts.google.com/o/oauth2/auth"; diff --git a/src/main/java/com/commafeed/frontend/pages/HomePage.java b/src/main/java/com/commafeed/frontend/pages/HomePage.java index 75f1dd29..17c801ac 100644 --- a/src/main/java/com/commafeed/frontend/pages/HomePage.java +++ b/src/main/java/com/commafeed/frontend/pages/HomePage.java @@ -18,16 +18,12 @@ public class HomePage extends BasePage { public void renderHead(IHeaderResponse response) { super.renderHead(response); - response.render(CssHeaderItem.forReference( - new UserCustomCssReference() { - @Override - protected String getCss() { - UserSettings settings = userSettingsDAO - .findByUser(CommaFeedSession.get().getUser()); - return settings == null ? null : settings - .getCustomCss(); - } - }, new PageParameters().add("_t", System.currentTimeMillis()), - null)); + response.render(CssHeaderItem.forReference(new UserCustomCssReference() { + @Override + protected String getCss() { + UserSettings settings = userSettingsDAO.findByUser(CommaFeedSession.get().getUser()); + return settings == null ? null : settings.getCustomCss(); + } + }, new PageParameters().add("_t", System.currentTimeMillis()), null)); } } diff --git a/src/main/java/com/commafeed/frontend/pages/NextUnreadRedirectPage.java b/src/main/java/com/commafeed/frontend/pages/NextUnreadRedirectPage.java index 5235e9bd..80f90e18 100755 --- a/src/main/java/com/commafeed/frontend/pages/NextUnreadRedirectPage.java +++ b/src/main/java/com/commafeed/frontend/pages/NextUnreadRedirectPage.java @@ -52,20 +52,15 @@ public class NextUnreadRedirectPage extends WebPage { } List statuses = null; - if (StringUtils.isBlank(categoryId) - || CategoryREST.ALL.equals(categoryId)) { - statuses = feedEntryStatusDAO.findAllUnread(user, null, 0, 1, - order, true); + if (StringUtils.isBlank(categoryId) || CategoryREST.ALL.equals(categoryId)) { + List subs = feedSubscriptionDAO.findAll(user); + statuses = feedEntryStatusDAO.findBySubscriptions(subs, true, null, null, 0, 1, order, true); } else { - FeedCategory category = feedCategoryDAO.findById(user, - Long.valueOf(categoryId)); + FeedCategory category = feedCategoryDAO.findById(user, Long.valueOf(categoryId)); if (category != null) { - List children = feedCategoryDAO - .findAllChildrenCategories(user, category); - List subscriptions = feedSubscriptionDAO - .findByCategories(user, children); - statuses = feedEntryStatusDAO.findUnreadBySubscriptions( - subscriptions, null, 0, 1, order, true); + List children = feedCategoryDAO.findAllChildrenCategories(user, category); + List subscriptions = feedSubscriptionDAO.findByCategories(user, children); + statuses = feedEntryStatusDAO.findBySubscriptions(subscriptions, true, null, null, 0, 1, order, true); } } diff --git a/src/main/java/com/commafeed/frontend/pages/PasswordRecoveryCallbackPage.java b/src/main/java/com/commafeed/frontend/pages/PasswordRecoveryCallbackPage.java index 2dd9f3c4..a889b29f 100644 --- a/src/main/java/com/commafeed/frontend/pages/PasswordRecoveryCallbackPage.java +++ b/src/main/java/com/commafeed/frontend/pages/PasswordRecoveryCallbackPage.java @@ -40,12 +40,10 @@ public class PasswordRecoveryCallbackPage extends BasePage { if (user == null) { throw new DisplayException("email not found"); } - if (user.getRecoverPasswordToken() == null - || !user.getRecoverPasswordToken().equals(token)) { + if (user.getRecoverPasswordToken() == null || !user.getRecoverPasswordToken().equals(token)) { throw new DisplayException("invalid token"); } - if (user.getRecoverPasswordTokenDate().before( - DateUtils.addDays(new Date(), -2))) { + if (user.getRecoverPasswordTokenDate().before(DateUtils.addDays(new Date(), -2))) { throw new DisplayException("token expired"); } @@ -57,8 +55,7 @@ public class PasswordRecoveryCallbackPage extends BasePage { protected void onSubmit() { String passwd = password.getObject(); if (StringUtils.equals(passwd, confirm.getObject())) { - byte[] password = encryptionService.getEncryptedPassword( - passwd, user.getSalt()); + byte[] password = encryptionService.getEncryptedPassword(passwd, user.getSalt()); user.setPassword(password); user.setApiKey(userService.generateApiKey(user)); user.setRecoverPasswordToken(null); @@ -71,10 +68,8 @@ public class PasswordRecoveryCallbackPage extends BasePage { } }; add(form); - form.add(new PasswordTextField("password", password).setResetPassword( - true).add(StringValidator.minimumLength(6))); - form.add(new PasswordTextField("confirm", confirm).setResetPassword( - true).add(StringValidator.minimumLength(6))); + form.add(new PasswordTextField("password", password).setResetPassword(true).add(StringValidator.minimumLength(6))); + form.add(new PasswordTextField("confirm", confirm).setResetPassword(true).add(StringValidator.minimumLength(6))); form.add(new BookmarkablePageLink("cancel", HomePage.class)); diff --git a/src/main/java/com/commafeed/frontend/pages/PasswordRecoveryPage.java b/src/main/java/com/commafeed/frontend/pages/PasswordRecoveryPage.java index 38e1537a..99b47bbc 100644 --- a/src/main/java/com/commafeed/frontend/pages/PasswordRecoveryPage.java +++ b/src/main/java/com/commafeed/frontend/pages/PasswordRecoveryPage.java @@ -21,8 +21,7 @@ import com.commafeed.frontend.pages.components.BootstrapFeedbackPanel; @SuppressWarnings("serial") public class PasswordRecoveryPage extends BasePage { - private static Logger log = LoggerFactory - .getLogger(PasswordRecoveryPage.class); + private static Logger log = LoggerFactory.getLogger(PasswordRecoveryPage.class); public PasswordRecoveryPage() { @@ -37,12 +36,10 @@ public class PasswordRecoveryPage extends BasePage { error("Email not found."); } else { try { - user.setRecoverPasswordToken(DigestUtils.sha1Hex(UUID - .randomUUID().toString())); + user.setRecoverPasswordToken(DigestUtils.sha1Hex(UUID.randomUUID().toString())); user.setRecoverPasswordTokenDate(new Date()); userDAO.saveOrUpdate(user); - mailService.sendMail(user, "Password recovery", - buildEmailContent(user)); + mailService.sendMail(user, "Password recovery", buildEmailContent(user)); info("Email sent."); } catch (Exception e) { log.error(e.getMessage(), e); @@ -67,9 +64,7 @@ public class PasswordRecoveryPage extends BasePage { private String buildEmailContent(User user) throws Exception { - String publicUrl = FeedUtils - .removeTrailingSlash(applicationSettingsService.get() - .getPublicUrl()); + String publicUrl = FeedUtils.removeTrailingSlash(applicationSettingsService.get().getPublicUrl()); publicUrl += "/recover2"; return String @@ -78,11 +73,7 @@ public class PasswordRecoveryPage extends BasePage { } private String callbackUrl(User user, String publicUrl) throws Exception { - return new URIBuilder(publicUrl) - .addParameter(PasswordRecoveryCallbackPage.PARAM_EMAIL, - user.getEmail()) - .addParameter(PasswordRecoveryCallbackPage.PARAM_TOKEN, - user.getRecoverPasswordToken()).build().toURL() - .toString(); + return new URIBuilder(publicUrl).addParameter(PasswordRecoveryCallbackPage.PARAM_EMAIL, user.getEmail()) + .addParameter(PasswordRecoveryCallbackPage.PARAM_TOKEN, user.getRecoverPasswordToken()).build().toURL().toString(); } } diff --git a/src/main/java/com/commafeed/frontend/pages/TestRssPage.java b/src/main/java/com/commafeed/frontend/pages/TestRssPage.java index c705236e..12019485 100644 --- a/src/main/java/com/commafeed/frontend/pages/TestRssPage.java +++ b/src/main/java/com/commafeed/frontend/pages/TestRssPage.java @@ -53,8 +53,7 @@ public class TestRssPage extends WebPage { } catch (InterruptedException e) { // do nothing } - getRequestCycle().scheduleRequestHandlerAfterCurrent( - new TextRequestHandler("text/xml", "UTF-8", writer.toString())); + getRequestCycle().scheduleRequestHandlerAfterCurrent(new TextRequestHandler("text/xml", "UTF-8", writer.toString())); } } diff --git a/src/main/java/com/commafeed/frontend/pages/WelcomePage.java b/src/main/java/com/commafeed/frontend/pages/WelcomePage.java index 01f6c9ca..5ca84a74 100644 --- a/src/main/java/com/commafeed/frontend/pages/WelcomePage.java +++ b/src/main/java/com/commafeed/frontend/pages/WelcomePage.java @@ -15,16 +15,14 @@ public class WelcomePage extends BasePage { ApplicationSettingsService applicationSettingsService; public WelcomePage() { - add(new BookmarkablePageLink("logo-link", getApplication() - .getHomePage())); + add(new BookmarkablePageLink("logo-link", getApplication().getHomePage())); add(new BookmarkablePageLink("demo-login", DemoLoginPage.class)); add(new LoginPanel("login")); add(new RegisterPanel("register") { @Override protected void onConfigure() { super.onConfigure(); - setVisibilityAllowed(applicationSettingsService.get() - .isAllowRegistrations()); + setVisibilityAllowed(applicationSettingsService.get().isAllowRegistrations()); } }); } diff --git a/src/main/java/com/commafeed/frontend/pages/components/LoginPanel.java b/src/main/java/com/commafeed/frontend/pages/components/LoginPanel.java index 86e387f1..d727262e 100644 --- a/src/main/java/com/commafeed/frontend/pages/components/LoginPanel.java +++ b/src/main/java/com/commafeed/frontend/pages/components/LoginPanel.java @@ -19,11 +19,9 @@ public class LoginPanel extends SignInPanel { public LoginPanel(String id) { super(id); - replace(new BootstrapFeedbackPanel("feedback", - new ContainerFeedbackMessageFilter(this))); + replace(new BootstrapFeedbackPanel("feedback", new ContainerFeedbackMessageFilter(this))); Form form = (Form) get("signInForm"); - form.add(new BookmarkablePageLink("recover", - PasswordRecoveryPage.class){ + form.add(new BookmarkablePageLink("recover", PasswordRecoveryPage.class) { @Override protected void onConfigure() { super.onConfigure(); diff --git a/src/main/java/com/commafeed/frontend/pages/components/RegisterPanel.java b/src/main/java/com/commafeed/frontend/pages/components/RegisterPanel.java index d0e414e9..0df3a279 100644 --- a/src/main/java/com/commafeed/frontend/pages/components/RegisterPanel.java +++ b/src/main/java/com/commafeed/frontend/pages/components/RegisterPanel.java @@ -45,62 +45,51 @@ public class RegisterPanel extends Panel { IModel model = Model.of(new RegistrationRequest()); - Form form = new StatelessForm( - "form", model) { + Form form = new StatelessForm("form", model) { @Override protected void onSubmit() { if (applicationSettingsService.get().isAllowRegistrations()) { RegistrationRequest req = getModelObject(); - userService.register(req.getName(), req.getPassword(), - req.getEmail(), Arrays.asList(Role.USER)); + userService.register(req.getName(), req.getPassword(), req.getEmail(), Arrays.asList(Role.USER)); - IAuthenticationStrategy strategy = getApplication() - .getSecuritySettings().getAuthenticationStrategy(); + IAuthenticationStrategy strategy = getApplication().getSecuritySettings().getAuthenticationStrategy(); strategy.save(req.getName(), req.getPassword()); - CommaFeedSession.get().signIn(req.getName(), - req.getPassword()); + CommaFeedSession.get().signIn(req.getName(), req.getPassword()); } setResponsePage(getApplication().getHomePage()); } }; add(form); - add(new BootstrapFeedbackPanel("feedback", - new ContainerFeedbackMessageFilter(form))); + add(new BootstrapFeedbackPanel("feedback", new ContainerFeedbackMessageFilter(form))); RegistrationRequest p = MF.p(RegistrationRequest.class); - form.add(new RequiredTextField("name", MF.m(model, p.getName())) - .add(StringValidator.lengthBetween(3, 32)).add( - new IValidator() { - @Override - public void validate( - IValidatable validatable) { - String name = validatable.getValue(); - User user = userDAO.findByName(name); - if (user != null) { - validatable.error(new ValidationError( - "Name is already taken.")); - } - } - })); - form.add(new PasswordTextField("password", MF.m(model, p.getPassword())) - .setResetPassword(false).add(StringValidator.minimumLength(6))); - form.add(new RequiredTextField("email", MF.m(model, - p.getEmail())) { + form.add(new RequiredTextField("name", MF.m(model, p.getName())).add(StringValidator.lengthBetween(3, 32)).add( + new IValidator() { + @Override + public void validate(IValidatable validatable) { + String name = validatable.getValue(); + User user = userDAO.findByName(name); + if (user != null) { + validatable.error(new ValidationError("Name is already taken.")); + } + } + })); + form.add(new PasswordTextField("password", MF.m(model, p.getPassword())).setResetPassword(false).add( + StringValidator.minimumLength(6))); + form.add(new RequiredTextField("email", MF.m(model, p.getEmail())) { @Override protected String getInputType() { return "email"; } - }.add(RfcCompliantEmailAddressValidator.getInstance()).add( - new IValidator() { - @Override - public void validate(IValidatable validatable) { - String email = validatable.getValue(); - User user = userDAO.findByEmail(email); - if (user != null) { - validatable.error(new ValidationError( - "Email is already taken.")); - } - } - })); + }.add(RfcCompliantEmailAddressValidator.getInstance()).add(new IValidator() { + @Override + public void validate(IValidatable validatable) { + String email = validatable.getValue(); + User user = userDAO.findByEmail(email); + if (user != null) { + validatable.error(new ValidationError("Email is already taken.")); + } + } + })); } } diff --git a/src/main/java/com/commafeed/frontend/resources/SassImportProcessor.java b/src/main/java/com/commafeed/frontend/resources/SassImportProcessor.java index 473c0c95..18862691 100644 --- a/src/main/java/com/commafeed/frontend/resources/SassImportProcessor.java +++ b/src/main/java/com/commafeed/frontend/resources/SassImportProcessor.java @@ -12,8 +12,7 @@ import ro.isdc.wro.model.resource.processor.impl.css.CssImportPreProcessor; public class SassImportProcessor extends CssImportPreProcessor { @Override - protected String doTransform(String cssContent, List foundImports) - throws IOException { + protected String doTransform(String cssContent, List foundImports) throws IOException { for (Resource resource : foundImports) { String uri = resource.getUri(); int lastSlash = uri.lastIndexOf('/'); diff --git a/src/main/java/com/commafeed/frontend/resources/SassOnlyProcessor.java b/src/main/java/com/commafeed/frontend/resources/SassOnlyProcessor.java index f4a6cffe..3b22d41e 100644 --- a/src/main/java/com/commafeed/frontend/resources/SassOnlyProcessor.java +++ b/src/main/java/com/commafeed/frontend/resources/SassOnlyProcessor.java @@ -15,10 +15,8 @@ import ro.isdc.wro.model.resource.SupportedResourceType; public class SassOnlyProcessor extends RubySassCssProcessor { @Override - public void process(Resource resource, Reader reader, Writer writer) - throws IOException { - if (resource.getUri().endsWith(".sass") - || resource.getUri().endsWith(".scss")) { + public void process(Resource resource, Reader reader, Writer writer) throws IOException { + if (resource.getUri().endsWith(".sass") || resource.getUri().endsWith(".scss")) { super.process(resource, reader, writer); } else { writer.write(IOUtils.toString(reader)); diff --git a/src/main/java/com/commafeed/frontend/resources/TimestampProcessor.java b/src/main/java/com/commafeed/frontend/resources/TimestampProcessor.java index 2b7e35fd..d844ff7a 100644 --- a/src/main/java/com/commafeed/frontend/resources/TimestampProcessor.java +++ b/src/main/java/com/commafeed/frontend/resources/TimestampProcessor.java @@ -17,8 +17,7 @@ public class TimestampProcessor implements ResourcePreProcessor { private static final String NOW = "" + System.currentTimeMillis(); @Override - public void process(Resource resource, Reader reader, Writer writer) - throws IOException { + public void process(Resource resource, Reader reader, Writer writer) throws IOException { String content = IOUtils.toString(reader); content = content.replace("${timestamp}", NOW); writer.write(content); diff --git a/src/main/java/com/commafeed/frontend/resources/UserCustomCssReference.java b/src/main/java/com/commafeed/frontend/resources/UserCustomCssReference.java index 601d5d75..f13131ce 100644 --- a/src/main/java/com/commafeed/frontend/resources/UserCustomCssReference.java +++ b/src/main/java/com/commafeed/frontend/resources/UserCustomCssReference.java @@ -24,10 +24,8 @@ public abstract class UserCustomCssReference extends ResourceReference { resourceResponse.setTextEncoding("UTF-8"); resourceResponse.setWriteCallback(new WriteCallback() { @Override - public void writeData(Attributes attributes) - throws IOException { - attributes.getResponse().write( - StringUtils.trimToEmpty(getCss())); + public void writeData(Attributes attributes) throws IOException { + attributes.getResponse().write(StringUtils.trimToEmpty(getCss())); } }); return resourceResponse; diff --git a/src/main/java/com/commafeed/frontend/resources/WroAdditionalProvider.java b/src/main/java/com/commafeed/frontend/resources/WroAdditionalProvider.java index 9a07e8dd..950ad329 100644 --- a/src/main/java/com/commafeed/frontend/resources/WroAdditionalProvider.java +++ b/src/main/java/com/commafeed/frontend/resources/WroAdditionalProvider.java @@ -10,7 +10,7 @@ import com.google.api.client.util.Maps; /** * Build-time solution - * + * */ public class WroAdditionalProvider implements ProcessorProvider { diff --git a/src/main/java/com/commafeed/frontend/resources/WroManagerFactory.java b/src/main/java/com/commafeed/frontend/resources/WroManagerFactory.java index f96df571..6f44ccca 100644 --- a/src/main/java/com/commafeed/frontend/resources/WroManagerFactory.java +++ b/src/main/java/com/commafeed/frontend/resources/WroManagerFactory.java @@ -7,7 +7,7 @@ import ro.isdc.wro.model.resource.processor.ResourcePreProcessor; /** * Runtime solution - * + * */ public class WroManagerFactory extends ConfigurableWroManagerFactory { diff --git a/src/main/java/com/commafeed/frontend/rest/Enums.java b/src/main/java/com/commafeed/frontend/rest/Enums.java index f217aaca..fc590d29 100644 --- a/src/main/java/com/commafeed/frontend/rest/Enums.java +++ b/src/main/java/com/commafeed/frontend/rest/Enums.java @@ -1,6 +1,5 @@ package com.commafeed.frontend.rest; - public class Enums { public enum Type { diff --git a/src/main/java/com/commafeed/frontend/rest/JsonProvider.java b/src/main/java/com/commafeed/frontend/rest/JsonProvider.java index 39831bcf..3d21fa89 100644 --- a/src/main/java/com/commafeed/frontend/rest/JsonProvider.java +++ b/src/main/java/com/commafeed/frontend/rest/JsonProvider.java @@ -17,18 +17,14 @@ import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; public class JsonProvider extends JacksonJsonProvider { @Override - public void writeTo(Object value, Class type, Type genericType, - Annotation[] annotations, MediaType mediaType, - MultivaluedMap httpHeaders, - OutputStream entityStream) throws IOException { + public void writeTo(Object value, Class type, Type genericType, Annotation[] annotations, MediaType mediaType, + MultivaluedMap httpHeaders, OutputStream entityStream) throws IOException { - httpHeaders.putSingle(HttpHeaders.CONTENT_TYPE, mediaType.toString() - + ";charset=UTF-8"); + httpHeaders.putSingle(HttpHeaders.CONTENT_TYPE, mediaType.toString() + ";charset=UTF-8"); httpHeaders.putSingle(HttpHeaders.CACHE_CONTROL, "no-cache"); httpHeaders.putSingle(HttpHeaders.PRAGMA, "no-cache"); - super.writeTo(value, type, genericType, annotations, mediaType, - httpHeaders, entityStream); + super.writeTo(value, type, genericType, annotations, mediaType, httpHeaders, entityStream); } } diff --git a/src/main/java/com/commafeed/frontend/rest/resources/AbstractREST.java b/src/main/java/com/commafeed/frontend/rest/resources/AbstractREST.java index 8f0c5377..bc2ba7bc 100644 --- a/src/main/java/com/commafeed/frontend/rest/resources/AbstractREST.java +++ b/src/main/java/com/commafeed/frontend/rest/resources/AbstractREST.java @@ -51,8 +51,7 @@ public abstract class AbstractREST { ServletWebResponse swresp = new ServletWebResponse(swreq, response); RequestCycle cycle = app.createRequestCycle(swreq, swresp); ThreadContext.setRequestCycle(cycle); - CommaFeedSession session = (CommaFeedSession) app - .fetchCreateAndSetSession(cycle); + CommaFeedSession session = (CommaFeedSession) app.fetchCreateAndSetSession(cycle); if (session.getUser() == null) { cookieLogin(app, session); @@ -63,8 +62,7 @@ public abstract class AbstractREST { } private void cookieLogin(CommaFeedApplication app, CommaFeedSession session) { - IAuthenticationStrategy authenticationStrategy = app - .getSecuritySettings().getAuthenticationStrategy(); + IAuthenticationStrategy authenticationStrategy = app.getSecuritySettings().getAuthenticationStrategy(); String[] data = authenticationStrategy.load(); if (data != null && data.length > 1) { session.signIn(data[0], data[1]); @@ -98,8 +96,7 @@ public abstract class AbstractREST { boolean allowed = true; User user = null; Method method = context.getMethod(); - SecurityCheck check = method.isAnnotationPresent(SecurityCheck.class) ? method - .getAnnotation(SecurityCheck.class) : method + SecurityCheck check = method.isAnnotationPresent(SecurityCheck.class) ? method.getAnnotation(SecurityCheck.class) : method .getDeclaringClass().getAnnotation(SecurityCheck.class); if (check != null) { @@ -113,11 +110,9 @@ public abstract class AbstractREST { } if (!allowed) { if (user == null) { - return Response.status(Status.UNAUTHORIZED) - .entity("You are not authorized to do this.").build(); + return Response.status(Status.UNAUTHORIZED).entity("You are not authorized to do this.").build(); } else { - return Response.status(Status.FORBIDDEN) - .entity("You are not authorized to do this.").build(); + return Response.status(Status.FORBIDDEN).entity("You are not authorized to do this.").build(); } } diff --git a/src/main/java/com/commafeed/frontend/rest/resources/AbstractResourceREST.java b/src/main/java/com/commafeed/frontend/rest/resources/AbstractResourceREST.java index fc7ed233..8cbebf01 100644 --- a/src/main/java/com/commafeed/frontend/rest/resources/AbstractResourceREST.java +++ b/src/main/java/com/commafeed/frontend/rest/resources/AbstractResourceREST.java @@ -33,40 +33,33 @@ public abstract class AbstractResourceREST extends AbstractREST { @GET @SecurityCheck(value = Role.NONE) @ApiOperation(value = "Returns information about API parameters", responseClass = "com.wordnik.swagger.core.Documentation") - public Response getHelp(@Context Application app, - @Context HttpHeaders headers, @Context UriInfo uriInfo) { + public Response getHelp(@Context Application app, @Context HttpHeaders headers, @Context UriInfo uriInfo) { TypeUtil.addAllowablePackage(Entries.class.getPackage().getName()); TypeUtil.addAllowablePackage(MarkRequest.class.getPackage().getName()); String apiVersion = ApiDocumentationREST.API_VERSION; String swaggerVersion = SwaggerSpec.version(); - String basePath = ApiDocumentationREST - .getBasePath(applicationSettingsService.get().getPublicUrl()); + String basePath = ApiDocumentationREST.getBasePath(applicationSettingsService.get().getPublicUrl()); Class resource = null; String path = prependSlash(uriInfo.getPath()); for (Class klass : app.getClasses()) { Api api = klass.getAnnotation(Api.class); - if (api != null && api.value() != null - && StringUtils.equals(prependSlash(api.value()), path)) { + if (api != null && api.value() != null && StringUtils.equals(prependSlash(api.value()), path)) { resource = klass; break; } } if (resource == null) { - return Response - .status(Status.NOT_FOUND) - .entity("Api annotation not found on class " - + getClass().getName()).build(); + return Response.status(Status.NOT_FOUND).entity("Api annotation not found on class " + getClass().getName()).build(); } Api api = resource.getAnnotation(Api.class); String apiPath = api.value(); String apiListingPath = api.value(); - Documentation doc = new HelpApi(null).filterDocs(JaxrsApiReader.read( - resource, apiVersion, swaggerVersion, basePath, apiPath), + Documentation doc = new HelpApi(null).filterDocs(JaxrsApiReader.read(resource, apiVersion, swaggerVersion, basePath, apiPath), headers, uriInfo, apiListingPath, apiPath); doc.setSwaggerVersion(swaggerVersion); diff --git a/src/main/java/com/commafeed/frontend/rest/resources/AdminREST.java b/src/main/java/com/commafeed/frontend/rest/resources/AdminREST.java index 3761cd74..638a9039 100644 --- a/src/main/java/com/commafeed/frontend/rest/resources/AdminREST.java +++ b/src/main/java/com/commafeed/frontend/rest/resources/AdminREST.java @@ -102,24 +102,18 @@ public class AdminREST extends AbstractResourceREST { roles.add(Role.ADMIN); } try { - userService.register(userModel.getName(), - userModel.getPassword(), userModel.getEmail(), roles, - true); + userService.register(userModel.getName(), userModel.getPassword(), userModel.getEmail(), roles, true); } catch (Exception e) { - return Response.status(Status.CONFLICT).entity(e.getMessage()) - .build(); + return Response.status(Status.CONFLICT).entity(e.getMessage()).build(); } } else { User user = userDAO.findById(id); - if (StartupBean.USERNAME_ADMIN.equals(user.getName()) - && !userModel.isEnabled()) { - return Response.status(Status.FORBIDDEN) - .entity("You cannot disable the admin user.").build(); + if (StartupBean.USERNAME_ADMIN.equals(user.getName()) && !userModel.isEnabled()) { + return Response.status(Status.FORBIDDEN).entity("You cannot disable the admin user.").build(); } user.setName(userModel.getName()); if (StringUtils.isNotBlank(userModel.getPassword())) { - user.setPassword(encryptionService.getEncryptedPassword( - userModel.getPassword(), user.getSalt())); + user.setPassword(encryptionService.getEncryptedPassword(userModel.getPassword(), user.getSalt())); } user.setEmail(userModel.getEmail()); user.setDisabled(!userModel.isEnabled()); @@ -130,10 +124,7 @@ public class AdminREST extends AbstractResourceREST { userRoleDAO.saveOrUpdate(new UserRole(user, Role.ADMIN)); } else if (!userModel.isAdmin() && roles.contains(Role.ADMIN)) { if (StartupBean.USERNAME_ADMIN.equals(user.getName())) { - return Response - .status(Status.FORBIDDEN) - .entity("You cannot remove the admin role from the admin user.") - .build(); + return Response.status(Status.FORBIDDEN).entity("You cannot remove the admin role from the admin user.").build(); } for (UserRole userRole : userRoleDAO.findAll(user)) { if (userRole.getRole() == Role.ADMIN) { @@ -150,8 +141,7 @@ public class AdminREST extends AbstractResourceREST { @Path("/user/get/{id}") @GET @ApiOperation(value = "Get user information", notes = "Get user information", responseClass = "com.commafeed.frontend.model.UserModel") - public Response getUser( - @ApiParam(value = "user id", required = true) @PathParam("id") Long id) { + public Response getUser(@ApiParam(value = "user id", required = true) @PathParam("id") Long id) { Preconditions.checkNotNull(id); User user = userDAO.findById(id); UserModel userModel = new UserModel(); @@ -205,8 +195,7 @@ public class AdminREST extends AbstractResourceREST { return Response.status(Status.NOT_FOUND).build(); } if (StartupBean.USERNAME_ADMIN.equals(user.getName())) { - return Response.status(Status.FORBIDDEN) - .entity("You cannot delete the admin user.").build(); + return Response.status(Status.FORBIDDEN).entity("You cannot delete the admin user.").build(); } userService.unregister(user); return Response.ok().build(); @@ -214,7 +203,10 @@ public class AdminREST extends AbstractResourceREST { @Path("/settings") @GET - @ApiOperation(value = "Retrieve application settings", notes = "Retrieve application settings", responseClass = "com.commafeed.backend.model.ApplicationSettings") + @ApiOperation( + value = "Retrieve application settings", + notes = "Retrieve application settings", + responseClass = "com.commafeed.backend.model.ApplicationSettings") public Response getSettings() { return Response.ok(applicationSettingsService.get()).build(); } @@ -222,8 +214,7 @@ public class AdminREST extends AbstractResourceREST { @Path("/settings") @POST @ApiOperation(value = "Save application settings", notes = "Save application settings") - public Response saveSettings( - @ApiParam(required = true) ApplicationSettings settings) { + public Response saveSettings(@ApiParam(required = true) ApplicationSettings settings) { Preconditions.checkNotNull(settings); applicationSettingsService.save(settings); return Response.ok().build(); @@ -232,8 +223,7 @@ public class AdminREST extends AbstractResourceREST { @Path("/metrics") @GET @ApiOperation(value = "Retrieve server metrics") - public Response getMetrics( - @QueryParam("backlog") @DefaultValue("false") boolean backlog) { + public Response getMetrics(@QueryParam("backlog") @DefaultValue("false") boolean backlog) { Map map = Maps.newLinkedHashMap(); map.put("lastMinute", metricsBean.getLastMinute()); map.put("lastHour", metricsBean.getLastHour()); @@ -254,43 +244,44 @@ public class AdminREST extends AbstractResourceREST { @ApiOperation(value = "Feeds cleanup", notes = "Delete feeds without subscriptions and entries without feeds") public Response cleanupFeeds() { Map map = Maps.newHashMap(); - map.put("feeds_without_subscriptions", - cleaner.cleanFeedsWithoutSubscriptions()); - map.put("entries_without_feeds", cleaner.cleanEntriesWithoutFeeds()); + map.put("feeds_without_subscriptions", cleaner.cleanFeedsWithoutSubscriptions()); + return Response.ok(map).build(); + } + + @Path("/cleanup/content") + @GET + @ApiOperation(value = "Content cleanup", notes = "Delete contents without entries") + public Response cleanupContents() { + Map map = Maps.newHashMap(); + map.put("contents_without_entries", cleaner.cleanContentsWithoutEntries()); return Response.ok(map).build(); } @Path("/cleanup/entries") @GET @ApiOperation(value = "Entries cleanup", notes = "Delete entries older than given date") - public Response cleanupEntries( - @QueryParam("days") @DefaultValue("30") int days) { + public Response cleanupEntries(@QueryParam("days") @DefaultValue("30") int days) { Map map = Maps.newHashMap(); - map.put("old entries", - cleaner.cleanEntriesOlderThan(days, TimeUnit.DAYS)); + map.put("old_entries", cleaner.cleanEntriesOlderThan(days, TimeUnit.DAYS)); return Response.ok(map).build(); } @Path("/cleanup/findDuplicateFeeds") @GET @ApiOperation(value = "Find duplicate feeds") - public Response findDuplicateFeeds(@QueryParam("mode") DuplicateMode mode, - @QueryParam("page") int page, @QueryParam("limit") int limit, - @QueryParam("minCount") long minCount) { - List list = feedDAO.findDuplicates(mode, limit * page, - limit, minCount); + public Response findDuplicateFeeds(@QueryParam("mode") DuplicateMode mode, @QueryParam("page") int page, + @QueryParam("limit") int limit, @QueryParam("minCount") long minCount) { + List list = feedDAO.findDuplicates(mode, limit * page, limit, minCount); return Response.ok(list).build(); } @Path("/cleanup/merge") @POST @ApiOperation(value = "Merge feeds", notes = "Merge feeds together") - public Response mergeFeeds( - @ApiParam(required = true) FeedMergeRequest request) { + public Response mergeFeeds(@ApiParam(required = true) FeedMergeRequest request) { Feed into = feedDAO.findById(request.getIntoFeedId()); if (into == null) { - return Response.status(Status.BAD_REQUEST) - .entity("'into feed' not found").build(); + return Response.status(Status.BAD_REQUEST).entity("'into feed' not found").build(); } List feeds = Lists.newArrayList(); @@ -300,8 +291,7 @@ public class AdminREST extends AbstractResourceREST { } if (feeds.isEmpty()) { - return Response.status(Status.BAD_REQUEST) - .entity("'from feeds' empty").build(); + return Response.status(Status.BAD_REQUEST).entity("'from feeds' empty").build(); } cleaner.mergeFeeds(into, feeds); diff --git a/src/main/java/com/commafeed/frontend/rest/resources/ApiDocumentationREST.java b/src/main/java/com/commafeed/frontend/rest/resources/ApiDocumentationREST.java index 542f4210..e411b45a 100644 --- a/src/main/java/com/commafeed/frontend/rest/resources/ApiDocumentationREST.java +++ b/src/main/java/com/commafeed/frontend/rest/resources/ApiDocumentationREST.java @@ -40,14 +40,12 @@ public class ApiDocumentationREST extends AbstractREST { } Api api = resource.getAnnotation(Api.class); if (api != null) { - doc.addApi(new DocumentationEndPoint(api.value(), api - .description())); + doc.addApi(new DocumentationEndPoint(api.value(), api.description())); } } doc.setSwaggerVersion(SwaggerSpec.version()); - doc.setBasePath(getBasePath(applicationSettingsService.get() - .getPublicUrl())); + doc.setBasePath(getBasePath(applicationSettingsService.get().getPublicUrl())); doc.setApiVersion(API_VERSION); return Response.ok().entity(doc).build(); diff --git a/src/main/java/com/commafeed/frontend/rest/resources/CategoryREST.java b/src/main/java/com/commafeed/frontend/rest/resources/CategoryREST.java index aece8099..f017a261 100644 --- a/src/main/java/com/commafeed/frontend/rest/resources/CategoryREST.java +++ b/src/main/java/com/commafeed/frontend/rest/resources/CategoryREST.java @@ -33,6 +33,7 @@ import com.commafeed.backend.model.FeedSubscription; import com.commafeed.backend.model.User; import com.commafeed.backend.model.UserRole.Role; import com.commafeed.backend.model.UserSettings.ReadingOrder; +import com.commafeed.backend.services.FeedEntryService; import com.commafeed.backend.services.FeedSubscriptionService; import com.commafeed.frontend.SecurityCheck; import com.commafeed.frontend.model.Category; @@ -68,6 +69,9 @@ public class CategoryREST extends AbstractResourceREST { @Inject FeedEntryStatusDAO feedEntryStatusDAO; + @Inject + FeedEntryService feedEntryService; + @Inject FeedCategoryDAO feedCategoryDAO; @@ -82,14 +86,20 @@ public class CategoryREST extends AbstractResourceREST { @Path("/entries") @GET - @ApiOperation(value = "Get category entries", notes = "Get a list of category entries", responseClass = "com.commafeed.frontend.model.Entries") + @ApiOperation( + value = "Get category entries", + notes = "Get a list of category entries", + responseClass = "com.commafeed.frontend.model.Entries") public Response getCategoryEntries( - @ApiParam(value = "id of the category, 'all' or 'starred'", required = true) @QueryParam("id") String id, - @ApiParam(value = "all entries or only unread ones", allowableValues = "all,unread", required = true) @DefaultValue("unread") @QueryParam("readType") ReadType readType, - @ApiParam(value = "only entries newer than this") @QueryParam("newerThan") Long newerThan, - @ApiParam(value = "offset for paging") @DefaultValue("0") @QueryParam("offset") int offset, - @ApiParam(value = "limit for paging, default 20, maximum 50") @DefaultValue("20") @QueryParam("limit") int limit, - @ApiParam(value = "date ordering", allowableValues = "asc,desc") @QueryParam("order") @DefaultValue("desc") ReadingOrder order) { + @ApiParam(value = "id of the category, 'all' or 'starred'", required = true) @QueryParam("id") String id, @ApiParam( + value = "all entries or only unread ones", + allowableValues = "all,unread", + required = true) @DefaultValue("unread") @QueryParam("readType") ReadType readType, @ApiParam( + value = "only entries newer than this") @QueryParam("newerThan") Long newerThan, + @ApiParam(value = "offset for paging") @DefaultValue("0") @QueryParam("offset") int offset, @ApiParam( + value = "limit for paging, default 20, maximum 50") @DefaultValue("20") @QueryParam("limit") int limit, @ApiParam( + value = "date ordering", + allowableValues = "asc,desc") @QueryParam("order") @DefaultValue("desc") ReadingOrder order) { Preconditions.checkNotNull(readType); limit = Math.min(limit, 50); @@ -101,60 +111,38 @@ public class CategoryREST extends AbstractResourceREST { id = ALL; } - Date newerThanDate = newerThan == null ? null : new Date( - Long.valueOf(newerThan)); + Date newerThanDate = newerThan == null ? null : new Date(Long.valueOf(newerThan)); if (ALL.equals(id)) { entries.setName("All"); - List list = null; - List subscriptions = feedSubscriptionDAO - .findAll(getUser()); - if (unreadOnly) { - list = feedEntryStatusDAO.findAllUnread(getUser(), - newerThanDate, offset, limit + 1, order, true); - } else { - list = feedEntryStatusDAO.findBySubscriptions(subscriptions, - null, newerThanDate, offset, limit + 1, order, true); - } + List subscriptions = feedSubscriptionDAO.findAll(getUser()); + List list = feedEntryStatusDAO.findBySubscriptions(subscriptions, unreadOnly, null, newerThanDate, offset, + limit + 1, order, true); for (FeedEntryStatus status : list) { entries.getEntries().add( - Entry.build(status, applicationSettingsService.get() - .getPublicUrl(), applicationSettingsService - .get().isImageProxyEnabled())); + Entry.build(status, applicationSettingsService.get().getPublicUrl(), applicationSettingsService.get() + .isImageProxyEnabled())); } } else if (STARRED.equals(id)) { entries.setName("Starred"); - List starred = feedEntryStatusDAO.findStarred( - getUser(), newerThanDate, offset, limit + 1, order, true); + List starred = feedEntryStatusDAO.findStarred(getUser(), newerThanDate, offset, limit + 1, order, true); for (FeedEntryStatus status : starred) { entries.getEntries().add( - Entry.build(status, applicationSettingsService.get() - .getPublicUrl(), applicationSettingsService - .get().isImageProxyEnabled())); + Entry.build(status, applicationSettingsService.get().getPublicUrl(), applicationSettingsService.get() + .isImageProxyEnabled())); } } else { - FeedCategory parent = feedCategoryDAO.findById(getUser(), - Long.valueOf(id)); + FeedCategory parent = feedCategoryDAO.findById(getUser(), Long.valueOf(id)); if (parent != null) { - List categories = feedCategoryDAO - .findAllChildrenCategories(getUser(), parent); - List subs = feedSubscriptionDAO - .findByCategories(getUser(), categories); - List list = null; - if (unreadOnly) { - list = feedEntryStatusDAO.findUnreadBySubscriptions(subs, - newerThanDate, offset, limit + 1, order, true); - } else { - list = feedEntryStatusDAO.findBySubscriptions(subs, null, - newerThanDate, offset, limit + 1, order, true); - } + List categories = feedCategoryDAO.findAllChildrenCategories(getUser(), parent); + List subs = feedSubscriptionDAO.findByCategories(getUser(), categories); + List list = feedEntryStatusDAO.findBySubscriptions(subs, unreadOnly, null, newerThanDate, offset, + limit + 1, order, true); for (FeedEntryStatus status : list) { entries.getEntries().add( - Entry.build(status, applicationSettingsService - .get().getPublicUrl(), - applicationSettingsService.get() - .isImageProxyEnabled())); + Entry.build(status, applicationSettingsService.get().getPublicUrl(), applicationSettingsService.get() + .isImageProxyEnabled())); } entries.setName(parent.getName()); } @@ -186,8 +174,7 @@ public class CategoryREST extends AbstractResourceREST { int offset = 0; int limit = 20; - Entries entries = (Entries) getCategoryEntries(id, readType, null, - offset, limit, order).getEntity(); + Entries entries = (Entries) getCategoryEntries(id, readType, null, offset, limit, order).getEntity(); SyndFeed feed = new SyndFeedImpl(); feed.setFeedType("rss_2.0"); @@ -216,36 +203,30 @@ public class CategoryREST extends AbstractResourceREST { @Path("/mark") @POST @ApiOperation(value = "Mark category entries", notes = "Mark feed entries of this category as read") - public Response markCategoryEntries( - @ApiParam(value = "category id, or 'all'", required = true) MarkRequest req) { + public Response markCategoryEntries(@ApiParam(value = "category id, or 'all'", required = true) MarkRequest req) { Preconditions.checkNotNull(req); Preconditions.checkNotNull(req.getId()); - Date olderThan = req.getOlderThan() == null ? null : new Date( - req.getOlderThan()); + Date olderThan = req.getOlderThan() == null ? null : new Date(req.getOlderThan()); if (ALL.equals(req.getId())) { - feedEntryStatusDAO.markAllEntries(getUser(), olderThan); + List subscriptions = feedSubscriptionDAO.findAll(getUser()); + feedEntryService.markSubscriptionEntries(getUser(), subscriptions, olderThan); } else if (STARRED.equals(req.getId())) { - feedEntryStatusDAO.markStarredEntries(getUser(), olderThan); + feedEntryService.markStarredEntries(getUser(), olderThan); } else { - FeedCategory parent = feedCategoryDAO.findById(getUser(), - Long.valueOf(req.getId())); - List categories = feedCategoryDAO - .findAllChildrenCategories(getUser(), parent); - List subs = feedSubscriptionDAO.findByCategories( - getUser(), categories); - feedEntryStatusDAO.markSubscriptionEntries(subs, olderThan); + FeedCategory parent = feedCategoryDAO.findById(getUser(), Long.valueOf(req.getId())); + List categories = feedCategoryDAO.findAllChildrenCategories(getUser(), parent); + List subs = feedSubscriptionDAO.findByCategories(getUser(), categories); + feedEntryService.markSubscriptionEntries(getUser(), subs, olderThan); } - cache.invalidateUserData(getUser()); return Response.ok(Status.OK).build(); } @Path("/add") @POST @ApiOperation(value = "Add a category", notes = "Add a new feed category") - public Response addCategory( - @ApiParam(required = true) AddCategoryRequest req) { + public Response addCategory(@ApiParam(required = true) AddCategoryRequest req) { Preconditions.checkNotNull(req); Preconditions.checkNotNull(req.getName()); @@ -260,7 +241,7 @@ public class CategoryREST extends AbstractResourceREST { cat.setParent(parent); } feedCategoryDAO.saveOrUpdate(cat); - cache.invalidateUserData(getUser()); + cache.invalidateUserRootCategory(getUser()); return Response.ok().build(); } @@ -274,24 +255,21 @@ public class CategoryREST extends AbstractResourceREST { FeedCategory cat = feedCategoryDAO.findById(getUser(), req.getId()); if (cat != null) { - List subs = feedSubscriptionDAO.findByCategory( - getUser(), cat); + List subs = feedSubscriptionDAO.findByCategory(getUser(), cat); for (FeedSubscription sub : subs) { sub.setCategory(null); } feedSubscriptionDAO.saveOrUpdate(subs); - List categories = feedCategoryDAO - .findAllChildrenCategories(getUser(), cat); + List categories = feedCategoryDAO.findAllChildrenCategories(getUser(), cat); for (FeedCategory child : categories) { - if (!child.getId().equals(cat.getId()) - && child.getParent().getId().equals(cat.getId())) { + if (!child.getId().equals(cat.getId()) && child.getParent().getId().equals(cat.getId())) { child.setParent(null); } } feedCategoryDAO.saveOrUpdate(categories); feedCategoryDAO.delete(cat); - cache.invalidateUserData(getUser()); + cache.invalidateUserRootCategory(getUser()); return Response.ok().build(); } else { return Response.status(Status.NOT_FOUND).build(); @@ -301,43 +279,35 @@ public class CategoryREST extends AbstractResourceREST { @POST @Path("/modify") @ApiOperation(value = "Rename a category", notes = "Rename an existing feed category") - public Response modifyCategory( - @ApiParam(required = true) CategoryModificationRequest req) { + public Response modifyCategory(@ApiParam(required = true) CategoryModificationRequest req) { Preconditions.checkNotNull(req); Preconditions.checkNotNull(req.getId()); - FeedCategory category = feedCategoryDAO - .findById(getUser(), req.getId()); + FeedCategory category = feedCategoryDAO.findById(getUser(), req.getId()); if (StringUtils.isNotBlank(req.getName())) { category.setName(req.getName()); } FeedCategory parent = null; - if (req.getParentId() != null - && !CategoryREST.ALL.equals(req.getParentId()) - && !StringUtils.equals(req.getParentId(), - String.valueOf(req.getId()))) { - parent = feedCategoryDAO.findById(getUser(), - Long.valueOf(req.getParentId())); + if (req.getParentId() != null && !CategoryREST.ALL.equals(req.getParentId()) + && !StringUtils.equals(req.getParentId(), String.valueOf(req.getId()))) { + parent = feedCategoryDAO.findById(getUser(), Long.valueOf(req.getParentId())); } category.setParent(parent); if (req.getPosition() != null) { - List categories = feedCategoryDAO.findByParent( - getUser(), parent); + List categories = feedCategoryDAO.findByParent(getUser(), parent); Collections.sort(categories, new Comparator() { @Override public int compare(FeedCategory o1, FeedCategory o2) { - return ObjectUtils.compare(o1.getPosition(), - o2.getPosition()); + return ObjectUtils.compare(o1.getPosition(), o2.getPosition()); } }); int existingIndex = -1; for (int i = 0; i < categories.size(); i++) { - if (ObjectUtils.equals(categories.get(i).getId(), - category.getId())) { + if (ObjectUtils.equals(categories.get(i).getId(), category.getId())) { existingIndex = i; } } @@ -345,8 +315,7 @@ public class CategoryREST extends AbstractResourceREST { categories.remove(existingIndex); } - categories.add(Math.min(req.getPosition(), categories.size()), - category); + categories.add(Math.min(req.getPosition(), categories.size()), category); for (int i = 0; i < categories.size(); i++) { categories.get(i).setPosition(i); } @@ -356,7 +325,7 @@ public class CategoryREST extends AbstractResourceREST { } feedCategoryDAO.saveOrUpdate(category); - cache.invalidateUserData(getUser()); + cache.invalidateUserRootCategory(getUser()); return Response.ok(Status.OK).build(); } @@ -367,14 +336,13 @@ public class CategoryREST extends AbstractResourceREST { Preconditions.checkNotNull(req); Preconditions.checkNotNull(req.getId()); - FeedCategory category = feedCategoryDAO.findById(getUser(), - Long.valueOf(req.getId())); + FeedCategory category = feedCategoryDAO.findById(getUser(), Long.valueOf(req.getId())); if (category == null) { return Response.status(Status.NOT_FOUND).build(); } category.setCollapsed(req.isCollapse()); feedCategoryDAO.saveOrUpdate(category); - cache.invalidateUserData(getUser()); + cache.invalidateUserRootCategory(getUser()); return Response.ok(Status.OK).build(); } @@ -383,8 +351,7 @@ public class CategoryREST extends AbstractResourceREST { @ApiOperation(value = "Get unread count for feed subscriptions", responseClass = "List[com.commafeed.frontend.model.UnreadCount]") public Response getUnreadCount() { List list = Lists.newArrayList(); - Map unreadCount = feedSubscriptionService - .getUnreadCount(getUser()); + Map unreadCount = feedSubscriptionService.getUnreadCount(getUser()); for (Map.Entry e : unreadCount.entrySet()) { list.add(new UnreadCount(e.getKey(), e.getValue())); } @@ -393,39 +360,37 @@ public class CategoryREST extends AbstractResourceREST { @GET @Path("/get") - @ApiOperation(value = "Get feed categories", notes = "Get all categories and subscriptions of the user", responseClass = "com.commafeed.frontend.model.Category") + @ApiOperation( + value = "Get feed categories", + notes = "Get all categories and subscriptions of the user", + responseClass = "com.commafeed.frontend.model.Category") public Response getSubscriptions() { User user = getUser(); - Category root = cache.getRootCategory(user); + Category root = cache.getUserRootCategory(user); if (root == null) { - log.debug("root category cache miss for {}", user.getName()); + log.debug("tree cache miss for {}", user.getId()); List categories = feedCategoryDAO.findAll(user); - List subscriptions = feedSubscriptionDAO - .findAll(getUser()); - Map unreadCount = feedSubscriptionService - .getUnreadCount(getUser()); + List subscriptions = feedSubscriptionDAO.findAll(user); + Map unreadCount = feedSubscriptionService.getUnreadCount(user); root = buildCategory(null, categories, subscriptions, unreadCount); root.setId("all"); root.setName("All"); - cache.setRootCategory(user, root); + cache.setUserRootCategory(user, root); } + return Response.ok(root).build(); } - private Category buildCategory(Long id, List categories, - List subscriptions, Map unreadCount) { + private Category buildCategory(Long id, List categories, List subscriptions, Map unreadCount) { Category category = new Category(); category.setId(String.valueOf(id)); category.setExpanded(true); for (FeedCategory c : categories) { - if ((id == null && c.getParent() == null) - || (c.getParent() != null && ObjectUtils.equals(c - .getParent().getId(), id))) { - Category child = buildCategory(c.getId(), categories, - subscriptions, unreadCount); + if ((id == null && c.getParent() == null) || (c.getParent() != null && ObjectUtils.equals(c.getParent().getId(), id))) { + Category child = buildCategory(c.getId(), categories, subscriptions, unreadCount); child.setId(String.valueOf(c.getId())); child.setName(c.getName()); child.setPosition(c.getPosition()); @@ -445,13 +410,10 @@ public class CategoryREST extends AbstractResourceREST { for (FeedSubscription subscription : subscriptions) { if ((id == null && subscription.getCategory() == null) - || (subscription.getCategory() != null && ObjectUtils - .equals(subscription.getCategory().getId(), id))) { + || (subscription.getCategory() != null && ObjectUtils.equals(subscription.getCategory().getId(), id))) { Long size = unreadCount.get(subscription.getId()); long unread = size == null ? 0 : size; - Subscription sub = Subscription - .build(subscription, applicationSettingsService.get() - .getPublicUrl(), unread); + Subscription sub = Subscription.build(subscription, applicationSettingsService.get().getPublicUrl(), unread); category.getFeeds().add(sub); } } diff --git a/src/main/java/com/commafeed/frontend/rest/resources/EntryREST.java b/src/main/java/com/commafeed/frontend/rest/resources/EntryREST.java index f3cbea79..697ff6fa 100644 --- a/src/main/java/com/commafeed/frontend/rest/resources/EntryREST.java +++ b/src/main/java/com/commafeed/frontend/rest/resources/EntryREST.java @@ -1,5 +1,6 @@ package com.commafeed.frontend.rest.resources; +import java.util.Iterator; import java.util.List; import javax.inject.Inject; @@ -12,8 +13,8 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; import org.apache.commons.lang.StringUtils; +import org.jsoup.Jsoup; -import com.commafeed.backend.cache.CacheService; import com.commafeed.backend.dao.FeedEntryStatusDAO; import com.commafeed.backend.dao.FeedSubscriptionDAO; import com.commafeed.backend.model.FeedEntryStatus; @@ -26,7 +27,6 @@ import com.commafeed.frontend.model.request.MarkRequest; import com.commafeed.frontend.model.request.MultipleMarkRequest; import com.commafeed.frontend.model.request.StarRequest; import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; import com.wordnik.swagger.annotations.Api; import com.wordnik.swagger.annotations.ApiOperation; import com.wordnik.swagger.annotations.ApiParam; @@ -44,29 +44,22 @@ public class EntryREST extends AbstractResourceREST { @Inject FeedSubscriptionDAO feedSubscriptionDAO; - @Inject - CacheService cache; - @Path("/mark") @POST @ApiOperation(value = "Mark a feed entry", notes = "Mark a feed entry as read/unread") - public Response markFeedEntry( - @ApiParam(value = "Mark Request", required = true) MarkRequest req) { + public Response markFeedEntry(@ApiParam(value = "Mark Request", required = true) MarkRequest req) { Preconditions.checkNotNull(req); Preconditions.checkNotNull(req.getId()); Preconditions.checkNotNull(req.getFeedId()); - feedEntryService.markEntry(getUser(), Long.valueOf(req.getId()), - req.getFeedId(), req.isRead()); - cache.invalidateUserData(getUser()); + feedEntryService.markEntry(getUser(), Long.valueOf(req.getId()), req.getFeedId(), req.isRead()); return Response.ok(Status.OK).build(); } @Path("/markMultiple") @POST @ApiOperation(value = "Mark multiple feed entries", notes = "Mark feed entries as read/unread") - public Response markFeedEntries( - @ApiParam(value = "Multiple Mark Request", required = true) MultipleMarkRequest req) { + public Response markFeedEntries(@ApiParam(value = "Multiple Mark Request", required = true) MultipleMarkRequest req) { Preconditions.checkNotNull(req); Preconditions.checkNotNull(req.getRequests()); @@ -80,45 +73,76 @@ public class EntryREST extends AbstractResourceREST { @Path("/star") @POST @ApiOperation(value = "Mark a feed entry", notes = "Mark a feed entry as read/unread") - public Response starFeedEntry( - @ApiParam(value = "Star Request", required = true) StarRequest req) { + public Response starFeedEntry(@ApiParam(value = "Star Request", required = true) StarRequest req) { Preconditions.checkNotNull(req); Preconditions.checkNotNull(req.getId()); Preconditions.checkNotNull(req.getFeedId()); - feedEntryService.starEntry(getUser(), Long.valueOf(req.getId()), - req.getFeedId(), req.isStarred()); + feedEntryService.starEntry(getUser(), Long.valueOf(req.getId()), req.getFeedId(), req.isStarred()); return Response.ok(Status.OK).build(); } @Path("/search") @GET - @ApiOperation(value = "Search for entries", notes = "Look through title and content of entries by keywords", responseClass = "com.commafeed.frontend.model.Entries") + @ApiOperation( + value = "Search for entries", + notes = "Look through title and content of entries by keywords", + responseClass = "com.commafeed.frontend.model.Entries") public Response searchEntries( @ApiParam(value = "keywords separated by spaces, 3 characters minimum", required = true) @QueryParam("keywords") String keywords, - @ApiParam(value = "offset for paging") @DefaultValue("0") @QueryParam("offset") int offset, - @ApiParam(value = "limit for paging") @DefaultValue("-1") @QueryParam("limit") int limit) { + @ApiParam(value = "offset for paging") @DefaultValue("0") @QueryParam("offset") int offset, @ApiParam( + value = "limit for paging") @DefaultValue("-1") @QueryParam("limit") int limit) { keywords = StringUtils.trimToEmpty(keywords); limit = Math.min(limit, 50); Preconditions.checkArgument(StringUtils.length(keywords) >= 3); Entries entries = new Entries(); - List list = Lists.newArrayList(); List subs = feedSubscriptionDAO.findAll(getUser()); - List entriesStatus = feedEntryStatusDAO - .findBySubscriptions(subs, keywords, null, offset, limit, - ReadingOrder.desc, true); + List entriesStatus = feedEntryStatusDAO.findBySubscriptions(subs, false, keywords, null, offset, limit + 1, + ReadingOrder.desc, true); for (FeedEntryStatus status : entriesStatus) { - list.add(Entry.build(status, applicationSettingsService.get() - .getPublicUrl(), applicationSettingsService.get() - .isImageProxyEnabled())); + entries.getEntries().add( + Entry.build(status, applicationSettingsService.get().getPublicUrl(), applicationSettingsService.get() + .isImageProxyEnabled())); } + boolean hasMore = entries.getEntries().size() > limit; + if (hasMore) { + entries.setHasMore(true); + entries.getEntries().remove(entries.getEntries().size() - 1); + } + + removeUnwanted(entries.getEntries(), keywords); + entries.setName("Search for : " + keywords); - entries.getEntries().addAll(list); + entries.setTimestamp(System.currentTimeMillis()); return Response.ok(entries).build(); } + private void removeUnwanted(List entries, String keywords) { + Iterator it = entries.iterator(); + while (it.hasNext()) { + Entry entry = it.next(); + boolean keep = true; + for (String keyword : keywords.split(" ")) { + String content = Jsoup.parse(entry.getContent()).text(); + if (!StringUtils.containsIgnoreCase(content, keyword)) { + keep = false; + break; + } + + String title = Jsoup.parse(entry.getTitle()).text(); + if (!StringUtils.containsIgnoreCase(title, keyword)) { + keep = false; + break; + } + } + if (!keep) { + it.remove(); + } + } + } + } diff --git a/src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java b/src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java index 79f6fc6e..3f9ca8cf 100644 --- a/src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java +++ b/src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java @@ -55,6 +55,7 @@ import com.commafeed.backend.model.FeedEntryStatus; import com.commafeed.backend.model.FeedSubscription; import com.commafeed.backend.model.UserRole.Role; import com.commafeed.backend.model.UserSettings.ReadingOrder; +import com.commafeed.backend.services.FeedEntryService; import com.commafeed.backend.services.FeedSubscriptionService; import com.commafeed.frontend.SecurityCheck; import com.commafeed.frontend.model.Entries; @@ -97,6 +98,9 @@ public class FeedREST extends AbstractResourceREST { @Inject FeedSubscriptionDAO feedSubscriptionDAO; + @Inject + FeedEntryService feedEntryService; + @Inject FeedSubscriptionService feedSubscriptionService; @@ -124,13 +128,15 @@ public class FeedREST extends AbstractResourceREST { @Path("/entries") @GET @ApiOperation(value = "Get feed entries", notes = "Get a list of feed entries", responseClass = "com.commafeed.frontend.model.Entries") - public Response getFeedEntries( - @ApiParam(value = "id of the feed", required = true) @QueryParam("id") String id, - @ApiParam(value = "all entries or only unread ones", allowableValues = "all,unread", required = true) @DefaultValue("unread") @QueryParam("readType") ReadType readType, - @ApiParam(value = "only entries newer than this") @QueryParam("newerThan") Long newerThan, - @ApiParam(value = "offset for paging") @DefaultValue("0") @QueryParam("offset") int offset, - @ApiParam(value = "limit for paging, default 20, maximum 50") @DefaultValue("20") @QueryParam("limit") int limit, - @ApiParam(value = "date ordering", allowableValues = "asc,desc") @QueryParam("order") @DefaultValue("desc") ReadingOrder order) { + public Response getFeedEntries(@ApiParam(value = "id of the feed", required = true) @QueryParam("id") String id, @ApiParam( + value = "all entries or only unread ones", + allowableValues = "all,unread", + required = true) @DefaultValue("unread") @QueryParam("readType") ReadType readType, @ApiParam( + value = "only entries newer than this") @QueryParam("newerThan") Long newerThan, + @ApiParam(value = "offset for paging") @DefaultValue("0") @QueryParam("offset") int offset, @ApiParam( + value = "limit for paging, default 20, maximum 50") @DefaultValue("20") @QueryParam("limit") int limit, @ApiParam( + value = "date ordering", + allowableValues = "asc,desc") @QueryParam("order") @DefaultValue("desc") ReadingOrder order) { Preconditions.checkNotNull(id); Preconditions.checkNotNull(readType); @@ -141,33 +147,22 @@ public class FeedREST extends AbstractResourceREST { Entries entries = new Entries(); boolean unreadOnly = readType == ReadType.unread; - Date newerThanDate = newerThan == null ? null : new Date( - Long.valueOf(newerThan)); + Date newerThanDate = newerThan == null ? null : new Date(Long.valueOf(newerThan)); - FeedSubscription subscription = feedSubscriptionDAO.findById(getUser(), - Long.valueOf(id)); + FeedSubscription subscription = feedSubscriptionDAO.findById(getUser(), Long.valueOf(id)); if (subscription != null) { entries.setName(subscription.getTitle()); entries.setMessage(subscription.getFeed().getMessage()); entries.setErrorCount(subscription.getFeed().getErrorCount()); entries.setFeedLink(subscription.getFeed().getLink()); - List list = null; - if (unreadOnly) { - list = feedEntryStatusDAO.findUnreadBySubscriptions( - Arrays.asList(subscription), newerThanDate, offset, - limit + 1, order, true); - } else { - list = feedEntryStatusDAO.findBySubscriptions( - Arrays.asList(subscription), null, newerThanDate, - offset, limit + 1, order, true); - } + List list = feedEntryStatusDAO.findBySubscriptions(Arrays.asList(subscription), unreadOnly, null, + newerThanDate, offset, limit + 1, order, true); for (FeedEntryStatus status : list) { entries.getEntries().add( - Entry.build(status, applicationSettingsService.get() - .getPublicUrl(), applicationSettingsService - .get().isImageProxyEnabled())); + Entry.build(status, applicationSettingsService.get().getPublicUrl(), applicationSettingsService.get() + .isImageProxyEnabled())); } boolean hasMore = entries.getEntries().size() > limit; @@ -186,8 +181,7 @@ public class FeedREST extends AbstractResourceREST { @ApiOperation(value = "Get feed entries as a feed", notes = "Get a feed of feed entries") @Produces(MediaType.APPLICATION_XML) @SecurityCheck(value = Role.USER, apiKeyAllowed = true) - public Response getFeedEntriesAsFeed( - @ApiParam(value = "id of the feed", required = true) @QueryParam("id") String id) { + public Response getFeedEntriesAsFeed(@ApiParam(value = "id of the feed", required = true) @QueryParam("id") String id) { Preconditions.checkNotNull(id); @@ -196,8 +190,7 @@ public class FeedREST extends AbstractResourceREST { int offset = 0; int limit = 20; - Entries entries = (Entries) getFeedEntries(id, readType, null, offset, - limit, order).getEntity(); + Entries entries = (Entries) getFeedEntries(id, readType, null, offset, limit, order).getEntity(); SyndFeed feed = new SyndFeedImpl(); feed.setFeedType("rss_2.0"); @@ -228,16 +221,13 @@ public class FeedREST extends AbstractResourceREST { url = StringUtils.trimToEmpty(url); url = prependHttp(url); try { - FetchedFeed feed = feedFetcher.fetch(url, true, null, null, null, - null); + FetchedFeed feed = feedFetcher.fetch(url, true, null, null, null, null); info = new FeedInfo(); info.setUrl(feed.getFeed().getUrl()); info.setTitle(feed.getTitle()); } catch (Exception e) { - throw new WebApplicationException(e, Response - .status(Status.INTERNAL_SERVER_ERROR) - .entity(e.getMessage()).build()); + throw new WebApplicationException(e, Response.status(Status.INTERNAL_SERVER_ERROR).entity(e.getMessage()).build()); } return info; } @@ -245,8 +235,7 @@ public class FeedREST extends AbstractResourceREST { @POST @Path("/fetch") @ApiOperation(value = "Fetch a feed", notes = "Fetch a feed by its url", responseClass = "com.commafeed.frontend.model.FeedInfo") - public Response fetchFeed( - @ApiParam(value = "feed url", required = true) FeedInfoRequest req) { + public Response fetchFeed(@ApiParam(value = "feed url", required = true) FeedInfoRequest req) { Preconditions.checkNotNull(req); Preconditions.checkNotNull(req.getUrl()); @@ -254,8 +243,7 @@ public class FeedREST extends AbstractResourceREST { try { info = fetchFeedInternal(req.getUrl()); } catch (Exception e) { - return Response.status(Status.INTERNAL_SERVER_ERROR) - .entity(e.getMessage()).build(); + return Response.status(Status.INTERNAL_SERVER_ERROR).entity(e.getMessage()).build(); } return Response.ok(info).build(); } @@ -268,8 +256,7 @@ public class FeedREST extends AbstractResourceREST { Preconditions.checkNotNull(req); Preconditions.checkNotNull(req.getId()); - FeedSubscription sub = feedSubscriptionDAO.findById(getUser(), - req.getId()); + FeedSubscription sub = feedSubscriptionDAO.findById(getUser(), req.getId()); if (sub != null) { Feed feed = sub.getFeed(); feed.setUrgent(true); @@ -283,54 +270,43 @@ public class FeedREST extends AbstractResourceREST { @Path("/mark") @POST @ApiOperation(value = "Mark feed entries", notes = "Mark feed entries as read (unread is not supported)") - public Response markFeedEntries( - @ApiParam(value = "Mark request") MarkRequest req) { + public Response markFeedEntries(@ApiParam(value = "Mark request") MarkRequest req) { Preconditions.checkNotNull(req); Preconditions.checkNotNull(req.getId()); - Date olderThan = req.getOlderThan() == null ? null : new Date( - req.getOlderThan()); + Date olderThan = req.getOlderThan() == null ? null : new Date(req.getOlderThan()); - FeedSubscription subscription = feedSubscriptionDAO.findById(getUser(), - Long.valueOf(req.getId())); + FeedSubscription subscription = feedSubscriptionDAO.findById(getUser(), Long.valueOf(req.getId())); if (subscription != null) { - feedEntryStatusDAO.markSubscriptionEntries( - Arrays.asList(subscription), olderThan); + feedEntryService.markSubscriptionEntries(getUser(), Arrays.asList(subscription), olderThan); } - cache.invalidateUserData(getUser()); return Response.ok(Status.OK).build(); } @GET @Path("/get/{id}") @ApiOperation(value = "", notes = "") - public Response get( - @ApiParam(value = "user id", required = true) @PathParam("id") Long id) { + public Response get(@ApiParam(value = "user id", required = true) @PathParam("id") Long id) { Preconditions.checkNotNull(id); FeedSubscription sub = feedSubscriptionDAO.findById(getUser(), id); if (sub == null) { return Response.status(Status.NOT_FOUND).build(); } - Long unreadCount = feedSubscriptionService.getUnreadCount(getUser()) - .get(id); + Long unreadCount = feedSubscriptionService.getUnreadCount(getUser()).get(id); if (unreadCount == null) { unreadCount = new Long(0); } - return Response.ok( - Subscription.build(sub, applicationSettingsService.get() - .getPublicUrl(), unreadCount)).build(); + return Response.ok(Subscription.build(sub, applicationSettingsService.get().getPublicUrl(), unreadCount)).build(); } @GET @Path("/favicon/{id}") @ApiOperation(value = "Fetch a feed's icon", notes = "Fetch a feed's icon") - public Response getFavicon( - @ApiParam(value = "subscription id") @PathParam("id") Long id) { + public Response getFavicon(@ApiParam(value = "subscription id") @PathParam("id") Long id) { Preconditions.checkNotNull(id); - FeedSubscription subscription = feedSubscriptionDAO.findById(getUser(), - id); + FeedSubscription subscription = feedSubscriptionDAO.findById(getUser(), id); if (subscription == null) { return Response.status(Status.NOT_FOUND).build(); } @@ -340,11 +316,8 @@ public class FeedREST extends AbstractResourceREST { ResponseBuilder builder = null; if (icon == null) { - String baseUrl = FeedUtils - .removeTrailingSlash(applicationSettingsService.get() - .getPublicUrl()); - builder = Response.status(Status.MOVED_PERMANENTLY).location( - URI.create(baseUrl + "/images/default_favicon.gif")); + String baseUrl = FeedUtils.removeTrailingSlash(applicationSettingsService.get().getPublicUrl()); + builder = Response.status(Status.MOVED_PERMANENTLY).location(URI.create(baseUrl + "/images/default_favicon.gif")); } else { builder = Response.ok(icon, "image/x-icon"); } @@ -366,8 +339,7 @@ public class FeedREST extends AbstractResourceREST { @POST @Path("/subscribe") @ApiOperation(value = "Subscribe to a feed", notes = "Subscribe to a feed") - public Response subscribe( - @ApiParam(value = "subscription request", required = true) SubscribeRequest req) { + public Response subscribe(@ApiParam(value = "subscription request", required = true) SubscribeRequest req) { Preconditions.checkNotNull(req); Preconditions.checkNotNull(req.getTitle()); Preconditions.checkNotNull(req.getUrl()); @@ -376,28 +348,21 @@ public class FeedREST extends AbstractResourceREST { try { url = fetchFeedInternal(url).getUrl(); - FeedCategory category = CategoryREST.ALL - .equals(req.getCategoryId()) ? null : feedCategoryDAO - .findById(Long.valueOf(req.getCategoryId())); + FeedCategory category = CategoryREST.ALL.equals(req.getCategoryId()) ? null : feedCategoryDAO.findById(Long.valueOf(req + .getCategoryId())); FeedInfo info = fetchFeedInternal(url); - feedSubscriptionService.subscribe(getUser(), info.getUrl(), - req.getTitle(), category); + feedSubscriptionService.subscribe(getUser(), info.getUrl(), req.getTitle(), category); } catch (Exception e) { log.info("Failed to subscribe to URL {}: {}", url, e.getMessage()); - return Response - .status(Status.SERVICE_UNAVAILABLE) - .entity("Failed to subscribe to URL " + url + ": " - + e.getMessage()).build(); + return Response.status(Status.SERVICE_UNAVAILABLE).entity("Failed to subscribe to URL " + url + ": " + e.getMessage()).build(); } - cache.invalidateUserData(getUser()); return Response.ok(Status.OK).build(); } @GET @Path("/subscribe") @ApiOperation(value = "Subscribe to a feed", notes = "Subscribe to a feed") - public Response subscribe( - @ApiParam(value = "feed url", required = true) @QueryParam("url") String url) { + public Response subscribe(@ApiParam(value = "feed url", required = true) @QueryParam("url") String url) { try { Preconditions.checkNotNull(url); @@ -406,14 +371,11 @@ public class FeedREST extends AbstractResourceREST { url = fetchFeedInternal(url).getUrl(); FeedInfo info = fetchFeedInternal(url); - feedSubscriptionService.subscribe(getUser(), info.getUrl(), - info.getTitle(), null); + feedSubscriptionService.subscribe(getUser(), info.getUrl(), info.getTitle(), null); } catch (Exception e) { log.info("Could not subscribe to url {} : {}", url, e.getMessage()); } - return Response.temporaryRedirect( - URI.create(applicationSettingsService.get().getPublicUrl())) - .build(); + return Response.temporaryRedirect(URI.create(applicationSettingsService.get().getPublicUrl())).build(); } private String prependHttp(String url) { @@ -430,11 +392,8 @@ public class FeedREST extends AbstractResourceREST { Preconditions.checkNotNull(req); Preconditions.checkNotNull(req.getId()); - FeedSubscription sub = feedSubscriptionDAO.findById(getUser(), - req.getId()); - if (sub != null) { - feedSubscriptionDAO.delete(sub); - cache.invalidateUserData(getUser()); + boolean deleted = feedSubscriptionService.unsubscribe(getUser(), req.getId()); + if (deleted) { return Response.ok(Status.OK).build(); } else { return Response.status(Status.NOT_FOUND).build(); @@ -444,41 +403,34 @@ public class FeedREST extends AbstractResourceREST { @POST @Path("/modify") @ApiOperation(value = "Modify a subscription", notes = "Modify a feed subscription") - public Response modify( - @ApiParam(value = "subscription id", required = true) FeedModificationRequest req) { + public Response modify(@ApiParam(value = "subscription id", required = true) FeedModificationRequest req) { Preconditions.checkNotNull(req); Preconditions.checkNotNull(req.getId()); - FeedSubscription subscription = feedSubscriptionDAO.findById(getUser(), - req.getId()); + FeedSubscription subscription = feedSubscriptionDAO.findById(getUser(), req.getId()); if (StringUtils.isNotBlank(req.getName())) { subscription.setTitle(req.getName()); } FeedCategory parent = null; - if (req.getCategoryId() != null - && !CategoryREST.ALL.equals(req.getCategoryId())) { - parent = feedCategoryDAO.findById(getUser(), - Long.valueOf(req.getCategoryId())); + if (req.getCategoryId() != null && !CategoryREST.ALL.equals(req.getCategoryId())) { + parent = feedCategoryDAO.findById(getUser(), Long.valueOf(req.getCategoryId())); } subscription.setCategory(parent); if (req.getPosition() != null) { - List subs = feedSubscriptionDAO.findByCategory( - getUser(), parent); + List subs = feedSubscriptionDAO.findByCategory(getUser(), parent); Collections.sort(subs, new Comparator() { @Override public int compare(FeedSubscription o1, FeedSubscription o2) { - return ObjectUtils.compare(o1.getPosition(), - o2.getPosition()); + return ObjectUtils.compare(o1.getPosition(), o2.getPosition()); } }); int existingIndex = -1; for (int i = 0; i < subs.size(); i++) { - if (ObjectUtils.equals(subs.get(i).getId(), - subscription.getId())) { + if (ObjectUtils.equals(subs.get(i).getId(), subscription.getId())) { existingIndex = i; } } @@ -494,7 +446,7 @@ public class FeedREST extends AbstractResourceREST { } else { feedSubscriptionDAO.saveOrUpdate(subscription); } - cache.invalidateUserData(getUser()); + cache.invalidateUserRootCategory(getUser()); return Response.ok(Status.OK).build(); } @@ -506,22 +458,19 @@ public class FeedREST extends AbstractResourceREST { String publicUrl = applicationSettingsService.get().getPublicUrl(); if (StringUtils.isBlank(publicUrl)) { - throw new WebApplicationException(Response - .status(Status.INTERNAL_SERVER_ERROR) + throw new WebApplicationException(Response.status(Status.INTERNAL_SERVER_ERROR) .entity("Set the public URL in the admin section.").build()); } if (StartupBean.USERNAME_DEMO.equals(getUser().getName())) { - return Response.status(Status.FORBIDDEN) - .entity("Import is disabled for the demo account").build(); + return Response.status(Status.FORBIDDEN).entity("Import is disabled for the demo account").build(); } try { FileItemFactory factory = new DiskFileItemFactory(1000000, null); ServletFileUpload upload = new ServletFileUpload(factory); for (FileItem item : upload.parseRequest(request)) { if ("file".equals(item.getFieldName())) { - String opml = IOUtils.toString(item.getInputStream(), - "UTF-8"); + String opml = IOUtils.toString(item.getInputStream(), "UTF-8"); if (StringUtils.isNotBlank(opml)) { opmlImporter.importOpml(getUser(), opml); } @@ -529,14 +478,9 @@ public class FeedREST extends AbstractResourceREST { } } } catch (Exception e) { - throw new WebApplicationException(Response - .status(Status.INTERNAL_SERVER_ERROR) - .entity(e.getMessage()).build()); + throw new WebApplicationException(Response.status(Status.INTERNAL_SERVER_ERROR).entity(e.getMessage()).build()); } - cache.invalidateUserData(getUser()); - return Response.temporaryRedirect( - URI.create(applicationSettingsService.get().getPublicUrl())) - .build(); + return Response.temporaryRedirect(URI.create(applicationSettingsService.get().getPublicUrl())).build(); } @GET @@ -550,8 +494,7 @@ public class FeedREST extends AbstractResourceREST { try { opmlString = output.outputString(opml); } catch (Exception e) { - return Response.status(Status.INTERNAL_SERVER_ERROR).entity(e) - .build(); + return Response.status(Status.INTERNAL_SERVER_ERROR).entity(e).build(); } return Response.ok(opmlString).build(); } diff --git a/src/main/java/com/commafeed/frontend/rest/resources/PubSubHubbubCallbackREST.java b/src/main/java/com/commafeed/frontend/rest/resources/PubSubHubbubCallbackREST.java index 63aae0b4..a1577741 100644 --- a/src/main/java/com/commafeed/frontend/rest/resources/PubSubHubbubCallbackREST.java +++ b/src/main/java/com/commafeed/frontend/rest/resources/PubSubHubbubCallbackREST.java @@ -33,8 +33,7 @@ import com.google.api.client.repackaged.com.google.common.base.Preconditions; @Path("/push") public class PubSubHubbubCallbackREST { - private static Logger log = LoggerFactory - .getLogger(PubSubHubbubCallbackREST.class); + private static Logger log = LoggerFactory.getLogger(PubSubHubbubCallbackREST.class); @Context HttpServletRequest request; @@ -57,13 +56,10 @@ public class PubSubHubbubCallbackREST { @Path("/callback") @GET @Produces(MediaType.TEXT_PLAIN) - public Response verify(@QueryParam("hub.mode") String mode, - @QueryParam("hub.topic") String topic, - @QueryParam("hub.challenge") String challenge, - @QueryParam("hub.lease_seconds") String leaseSeconds, + public Response verify(@QueryParam("hub.mode") String mode, @QueryParam("hub.topic") String topic, + @QueryParam("hub.challenge") String challenge, @QueryParam("hub.lease_seconds") String leaseSeconds, @QueryParam("hub.verify_token") String verifyToken) { - if (!applicationSettingsService.get() - .isPubsubhubbub()) { + if (!applicationSettingsService.get().isPubsubhubbub()) { return Response.status(Status.FORBIDDEN).entity("pubsubhubbub is disabled").build(); } @@ -76,8 +72,7 @@ public class PubSubHubbubCallbackREST { if (feeds.isEmpty() == false) { for (Feed feed : feeds) { - log.debug("activated push notifications for {}", - feed.getPushTopic()); + log.debug("activated push notifications for {}", feed.getPushTopic()); feed.setPushLastPing(new Date()); } feedDAO.saveOrUpdate(feeds); @@ -92,8 +87,7 @@ public class PubSubHubbubCallbackREST { @POST @Consumes({ MediaType.APPLICATION_ATOM_XML, "application/rss+xml" }) public Response callback() { - if (!applicationSettingsService.get() - .isPubsubhubbub()) { + if (!applicationSettingsService.get().isPubsubhubbub()) { return Response.status(Status.FORBIDDEN).entity("pubsubhubbub is disabled").build(); } try { diff --git a/src/main/java/com/commafeed/frontend/rest/resources/ServerREST.java b/src/main/java/com/commafeed/frontend/rest/resources/ServerREST.java index 44ea0a6e..5be802de 100644 --- a/src/main/java/com/commafeed/frontend/rest/resources/ServerREST.java +++ b/src/main/java/com/commafeed/frontend/rest/resources/ServerREST.java @@ -34,10 +34,8 @@ public class ServerREST extends AbstractResourceREST { ApplicationPropertiesService properties = ApplicationPropertiesService.get(); ServerInfo infos = new ServerInfo(); - infos.setAnnouncement(applicationSettingsService.get() - .getAnnouncement()); - infos.getSupportedLanguages().putAll( - startupBean.getSupportedLanguages()); + infos.setAnnouncement(applicationSettingsService.get().getAnnouncement()); + infos.getSupportedLanguages().putAll(startupBean.getSupportedLanguages()); infos.setVersion(properties.getVersion()); infos.setGitCommit(properties.getGitCommit()); return Response.ok(infos).build(); @@ -57,8 +55,7 @@ public class ServerREST extends AbstractResourceREST { HttpResult result = httpGetter.getBinary(url, 20000); return Response.ok(result.getContent()).build(); } catch (Exception e) { - return Response.status(Status.SERVICE_UNAVAILABLE) - .entity(e.getMessage()).build(); + return Response.status(Status.SERVICE_UNAVAILABLE).entity(e.getMessage()).build(); } } } diff --git a/src/main/java/com/commafeed/frontend/rest/resources/UserREST.java b/src/main/java/com/commafeed/frontend/rest/resources/UserREST.java index 87f22719..6793cc31 100644 --- a/src/main/java/com/commafeed/frontend/rest/resources/UserREST.java +++ b/src/main/java/com/commafeed/frontend/rest/resources/UserREST.java @@ -12,7 +12,6 @@ import javax.ws.rs.core.Response.Status; import org.apache.commons.lang.StringUtils; import com.commafeed.backend.StartupBean; -import com.commafeed.backend.cache.CacheService; import com.commafeed.backend.dao.UserDAO; import com.commafeed.backend.dao.UserRoleDAO; import com.commafeed.backend.dao.UserSettingsDAO; @@ -58,15 +57,15 @@ public class UserREST extends AbstractResourceREST { @Inject PasswordEncryptionService encryptionService; - @Inject - CacheService cache; - @Inject ApplicationSettingsService applicationSettingsService; @Path("/settings") @GET - @ApiOperation(value = "Retrieve user settings", notes = "Retrieve user settings", responseClass = "com.commafeed.frontend.model.Settings") + @ApiOperation( + value = "Retrieve user settings", + notes = "Retrieve user settings", + responseClass = "com.commafeed.frontend.model.Settings") public Response getSettings() { Settings s = new Settings(); UserSettings settings = userSettingsDAO.findByUser(getUser()); @@ -149,16 +148,13 @@ public class UserREST extends AbstractResourceREST { @Path("/profile") @POST @ApiOperation(value = "Save user's profile") - public Response save( - @ApiParam(required = true) ProfileModificationRequest request) { + public Response save(@ApiParam(required = true) ProfileModificationRequest request) { User user = getUser(); - Preconditions.checkArgument(StringUtils.isBlank(request.getPassword()) - || request.getPassword().length() >= 6); + Preconditions.checkArgument(StringUtils.isBlank(request.getPassword()) || request.getPassword().length() >= 6); if (StringUtils.isNotBlank(request.getEmail())) { User u = userDAO.findByEmail(request.getEmail()); - Preconditions.checkArgument(u == null - || user.getId().equals(u.getId())); + Preconditions.checkArgument(u == null || user.getId().equals(u.getId())); } if (StartupBean.USERNAME_DEMO.equals(user.getName())) { @@ -167,8 +163,7 @@ public class UserREST extends AbstractResourceREST { user.setEmail(StringUtils.trimToNull(request.getEmail())); if (StringUtils.isNotBlank(request.getPassword())) { - byte[] password = encryptionService.getEncryptedPassword( - request.getPassword(), user.getSalt()); + byte[] password = encryptionService.getEncryptedPassword(request.getPassword(), user.getSalt()); user.setPassword(password); user.setApiKey(userService.generateApiKey(user)); } @@ -185,12 +180,10 @@ public class UserREST extends AbstractResourceREST { @SecurityCheck(Role.NONE) public Response register(@ApiParam(required = true) RegistrationRequest req) { try { - userService.register(req.getName(), req.getPassword(), - req.getEmail(), Arrays.asList(Role.USER)); + userService.register(req.getName(), req.getPassword(), req.getEmail(), Arrays.asList(Role.USER)); return Response.ok().build(); } catch (Exception e) { - return Response.status(Status.INTERNAL_SERVER_ERROR) - .entity(e.getMessage()).build(); + return Response.status(Status.INTERNAL_SERVER_ERROR).entity(e.getMessage()).build(); } } @@ -199,12 +192,10 @@ public class UserREST extends AbstractResourceREST { @POST @ApiOperation(value = "Delete the user account") public Response delete() { - if (StartupBean.USERNAME_ADMIN.equals(getUser().getName()) - || StartupBean.USERNAME_DEMO.equals(getUser().getName())) { + if (StartupBean.USERNAME_ADMIN.equals(getUser().getName()) || StartupBean.USERNAME_DEMO.equals(getUser().getName())) { return Response.status(Status.FORBIDDEN).build(); } userService.unregister(getUser()); - cache.invalidateUserData(getUser()); return Response.ok().build(); } } diff --git a/src/main/java/com/commafeed/frontend/utils/InternationalizationDevelopmentFilter.java b/src/main/java/com/commafeed/frontend/utils/InternationalizationDevelopmentFilter.java index de5cbb1e..bdf9c0f5 100644 --- a/src/main/java/com/commafeed/frontend/utils/InternationalizationDevelopmentFilter.java +++ b/src/main/java/com/commafeed/frontend/utils/InternationalizationDevelopmentFilter.java @@ -29,14 +29,12 @@ import com.commafeed.backend.services.ApplicationPropertiesService; import com.commafeed.frontend.CommaFeedSession; /** - * Replace variables from templates on the fly in dev mode only. In production - * the substitution is done at build-time. + * Replace variables from templates on the fly in dev mode only. In production the substitution is done at build-time. * */ public class InternationalizationDevelopmentFilter implements Filter { - private static Logger log = LoggerFactory - .getLogger(InternationalizationDevelopmentFilter.class); + private static Logger log = LoggerFactory.getLogger(InternationalizationDevelopmentFilter.class); @Inject UserSettingsDAO userSettingsDAO; @@ -55,8 +53,7 @@ public class InternationalizationDevelopmentFilter implements Filter { } @Override - public void doFilter(ServletRequest request, ServletResponse response, - FilterChain chain) throws IOException, ServletException { + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { if (production) { chain.doFilter(request, response); @@ -64,8 +61,7 @@ public class InternationalizationDevelopmentFilter implements Filter { } final ServletOutputStream wrapper = new ServletOutputStreamWrapper(); - ServletResponse interceptor = new HttpServletResponseWrapper( - (HttpServletResponse) response) { + ServletResponse interceptor = new HttpServletResponseWrapper((HttpServletResponse) response) { @Override public ServletOutputStream getOutputStream() throws IOException { @@ -74,10 +70,8 @@ public class InternationalizationDevelopmentFilter implements Filter { }; chain.doFilter(request, interceptor); - UserSettings settings = userSettingsDAO.findByUser(CommaFeedSession - .get().getUser()); - String lang = (settings == null || settings.getLanguage() == null) ? "en" - : settings.getLanguage(); + UserSettings settings = userSettingsDAO.findByUser(CommaFeedSession.get().getUser()); + String lang = (settings == null || settings.getLanguage() == null) ? "en" : settings.getLanguage(); byte[] bytes = translate(wrapper.toString(), lang).getBytes("UTF-8"); response.setContentLength(bytes.length); @@ -91,8 +85,7 @@ public class InternationalizationDevelopmentFilter implements Filter { Properties props = new Properties(); InputStream is = null; try { - is = getClass() - .getResourceAsStream("/i18n/" + lang + ".properties"); + is = getClass().getResourceAsStream("/i18n/" + lang + ".properties"); props.load(new InputStreamReader(is, "UTF-8")); } catch (Exception e) { log.error(e.getMessage(), e); @@ -111,8 +104,7 @@ public class InternationalizationDevelopmentFilter implements Filter { while (m.find()) { String var = m.group(1); Object replacement = props.get(var); - String replacementValue = replacement == null ? var : replacement - .toString().split("#")[0]; + String replacementValue = replacement == null ? var : replacement.toString().split("#")[0]; m.appendReplacement(sb, replacementValue); } m.appendTail(sb); diff --git a/src/main/java/com/commafeed/frontend/utils/ModelFactory.java b/src/main/java/com/commafeed/frontend/utils/ModelFactory.java index 07a12612..f6764f2c 100644 --- a/src/main/java/com/commafeed/frontend/utils/ModelFactory.java +++ b/src/main/java/com/commafeed/frontend/utils/ModelFactory.java @@ -38,7 +38,7 @@ public class ModelFactory { * */ public static class MF { - + public static String i(T proxiedValue) { return ModelFactory.invokedProperty(proxiedValue); } diff --git a/src/main/java/com/commafeed/frontend/utils/WicketUtils.java b/src/main/java/com/commafeed/frontend/utils/WicketUtils.java index 881e9b20..6efcf64f 100644 --- a/src/main/java/com/commafeed/frontend/utils/WicketUtils.java +++ b/src/main/java/com/commafeed/frontend/utils/WicketUtils.java @@ -17,16 +17,12 @@ import org.apache.wicket.util.template.PackageTextTemplate; public class WicketUtils { - public static void loadJS(IHeaderResponse response, Class klass, - String fileName) { - HeaderItem result = JavaScriptHeaderItem - .forReference(new JavaScriptResourceReference(klass, fileName - + ".js")); + public static void loadJS(IHeaderResponse response, Class klass, String fileName) { + HeaderItem result = JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(klass, fileName + ".js")); response.render(result); } - public static void loadJS(IHeaderResponse response, Class klass, - String fileName, Map variables) { + public static void loadJS(IHeaderResponse response, Class klass, String fileName, Map variables) { HeaderItem result = null; PackageTextTemplate template = null; try { @@ -40,14 +36,12 @@ public class WicketUtils { } public static HttpServletRequest getHttpServletRequest() { - ServletWebRequest servletWebRequest = (ServletWebRequest) RequestCycle - .get().getRequest(); + ServletWebRequest servletWebRequest = (ServletWebRequest) RequestCycle.get().getRequest(); return servletWebRequest.getContainerRequest(); } public static HttpServletResponse getHttpServletResponse() { - WebResponse webResponse = (WebResponse) RequestCycle.get() - .getResponse(); + WebResponse webResponse = (WebResponse) RequestCycle.get().getResponse(); return (HttpServletResponse) webResponse.getContainerResponse(); } } diff --git a/src/main/java/com/commafeed/frontend/utils/exception/DisplayExceptionPage.java b/src/main/java/com/commafeed/frontend/utils/exception/DisplayExceptionPage.java index 5e3ce5e3..d94d1946 100644 --- a/src/main/java/com/commafeed/frontend/utils/exception/DisplayExceptionPage.java +++ b/src/main/java/com/commafeed/frontend/utils/exception/DisplayExceptionPage.java @@ -20,8 +20,7 @@ public class DisplayExceptionPage extends BasePage { add(new Label("message", t.getMessage())); - add(new BookmarkablePageLink("homepage", getApplication() - .getHomePage())); + add(new BookmarkablePageLink("homepage", getApplication().getHomePage())); StringWriter stringWriter = new StringWriter(); t.printStackTrace(new PrintWriter(stringWriter)); diff --git a/src/main/java/liquibase/integration/cdi/CDIBootstrap.java b/src/main/java/liquibase/integration/cdi/CDIBootstrap.java index 54bd231e..3b66db14 100644 --- a/src/main/java/liquibase/integration/cdi/CDIBootstrap.java +++ b/src/main/java/liquibase/integration/cdi/CDIBootstrap.java @@ -21,8 +21,7 @@ public class CDIBootstrap implements Extension { void afterBeanDiscovery(@Observes AfterBeanDiscovery abd, BeanManager bm) { } - void afterDeploymentValidation(@Observes AfterDeploymentValidation event, - BeanManager manager) { + void afterDeploymentValidation(@Observes AfterDeploymentValidation event, BeanManager manager) { } @Produces diff --git a/src/main/resources/META-INF/orm.xml b/src/main/resources/META-INF/orm.xml index 368beb8d..46f570e0 100644 --- a/src/main/resources/META-INF/orm.xml +++ b/src/main/resources/META-INF/orm.xml @@ -5,20 +5,8 @@ http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd"> - - select s.subscription.id, count(s) from FeedEntryStatus s where s.user=:user and s.read=false group by s.subscription.id - - - - select new com.commafeed.backend.dao.FeedEntryDAO$EntryWithFeed(e, f) FROM FeedEntry e LEFT JOIN e.feedRelationships f WITH f.feed.id = :feedId where e.guidHash = :guidHash and e.url = :url - - - - delete from FeedEntryStatus s where s.id in :ids - - - - delete from FeedFeedEntry ffe where ffe.feed.id = :feedId + + delete from FeedEntryStatus s where s.entryInserted < :date and s.starred = false \ No newline at end of file diff --git a/src/main/resources/changelogs/db.changelog-1.1.xml b/src/main/resources/changelogs/db.changelog-1.1.xml index ee98620e..074d71a9 100644 --- a/src/main/resources/changelogs/db.changelog-1.1.xml +++ b/src/main/resources/changelogs/db.changelog-1.1.xml @@ -346,4 +346,20 @@ + + + + + + + + + + + + + read_status = false and starred = false + + + diff --git a/src/main/resources/changelogs/db.changelog-1.2.xml b/src/main/resources/changelogs/db.changelog-1.2.xml new file mode 100644 index 00000000..34297474 --- /dev/null +++ b/src/main/resources/changelogs/db.changelog-1.2.xml @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/changelogs/db.changelog-master.xml b/src/main/resources/changelogs/db.changelog-master.xml index 498aa813..3fb6e8e1 100644 --- a/src/main/resources/changelogs/db.changelog-master.xml +++ b/src/main/resources/changelogs/db.changelog-master.xml @@ -5,5 +5,6 @@ - + + \ No newline at end of file diff --git a/src/main/webapp/js/controllers.js b/src/main/webapp/js/controllers.js index 3c0170b5..56ed4643 100644 --- a/src/main/webapp/js/controllers.js +++ b/src/main/webapp/js/controllers.js @@ -46,7 +46,7 @@ function($scope, FeedService, CategoryService, MobileService) { $scope.open = function() { $scope.sub = { - categoryId: $scope.sub.categoryId + categoryId: $scope.sub.categoryId || 'all' }; $scope.isOpen = true; }; diff --git a/src/main/webapp/templates/admin.settings.html b/src/main/webapp/templates/admin.settings.html index 53f69ff9..5ae9b83b 100644 --- a/src/main/webapp/templates/admin.settings.html +++ b/src/main/webapp/templates/admin.settings.html @@ -163,6 +163,14 @@ ng-model="settings.queryTimeout" /> +
+ +
+ + 0 = keep forever +
+
diff --git a/src/main/webapp/templates/feeds.view.html b/src/main/webapp/templates/feeds.view.html index ffdceef1..d187ab7a 100644 --- a/src/main/webapp/templates/feeds.view.html +++ b/src/main/webapp/templates/feeds.view.html @@ -79,7 +79,7 @@ -