diff --git a/src/main/java/com/commafeed/backend/StartupBean.java b/src/main/java/com/commafeed/backend/StartupBean.java index d12cc7ac..28c0bf2f 100644 --- a/src/main/java/com/commafeed/backend/StartupBean.java +++ b/src/main/java/com/commafeed/backend/StartupBean.java @@ -7,6 +7,8 @@ import java.util.concurrent.Future; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; +import javax.ejb.ConcurrencyManagement; +import javax.ejb.ConcurrencyManagementType; import javax.ejb.Singleton; import javax.ejb.Startup; import javax.inject.Inject; @@ -27,6 +29,7 @@ import com.google.api.client.util.Lists; @Startup @Singleton +@ConcurrencyManagement(ConcurrencyManagementType.BEAN) public class StartupBean { private static Logger log = LoggerFactory.getLogger(StartupBean.class); @@ -65,8 +68,10 @@ public class StartupBean { } ApplicationSettings settings = applicationSettingsService.get(); + log.info("Starting {} background threads", + settings.getBackgroundThreads()); for (int i = 0; i < settings.getBackgroundThreads(); i++) { - Future thread = worker.start(); + Future thread = worker.start("Thread " + i); threads.add(thread); } diff --git a/src/main/java/com/commafeed/backend/dao/ApplicationSettingsDAO.java b/src/main/java/com/commafeed/backend/dao/ApplicationSettingsDAO.java index b0ed013c..97b69973 100644 --- a/src/main/java/com/commafeed/backend/dao/ApplicationSettingsDAO.java +++ b/src/main/java/com/commafeed/backend/dao/ApplicationSettingsDAO.java @@ -4,7 +4,6 @@ import javax.ejb.Stateless; import com.commafeed.backend.model.ApplicationSettings; -@SuppressWarnings("serial") @Stateless public class ApplicationSettingsDAO extends GenericDAO { diff --git a/src/main/java/com/commafeed/backend/dao/FeedCategoryDAO.java b/src/main/java/com/commafeed/backend/dao/FeedCategoryDAO.java index 79fd0f0f..6161b349 100644 --- a/src/main/java/com/commafeed/backend/dao/FeedCategoryDAO.java +++ b/src/main/java/com/commafeed/backend/dao/FeedCategoryDAO.java @@ -15,7 +15,6 @@ import com.google.common.collect.Lists; import com.uaihebert.model.EasyCriteria; @Stateless -@SuppressWarnings("serial") public class FeedCategoryDAO extends GenericDAO { public List findAll(User user) { diff --git a/src/main/java/com/commafeed/backend/dao/FeedDAO.java b/src/main/java/com/commafeed/backend/dao/FeedDAO.java index f000cf08..5348a950 100644 --- a/src/main/java/com/commafeed/backend/dao/FeedDAO.java +++ b/src/main/java/com/commafeed/backend/dao/FeedDAO.java @@ -20,7 +20,6 @@ import com.google.common.collect.Iterables; import com.uaihebert.model.EasyCriteria; @Stateless -@SuppressWarnings("serial") public class FeedDAO extends GenericDAO { public List findNextUpdatable(int count) { diff --git a/src/main/java/com/commafeed/backend/dao/FeedEntryDAO.java b/src/main/java/com/commafeed/backend/dao/FeedEntryDAO.java index 8d3043e1..2e3a60a2 100644 --- a/src/main/java/com/commafeed/backend/dao/FeedEntryDAO.java +++ b/src/main/java/com/commafeed/backend/dao/FeedEntryDAO.java @@ -16,7 +16,6 @@ import com.google.api.client.util.Lists; import com.uaihebert.model.EasyCriteria; @Stateless -@SuppressWarnings("serial") public class FeedEntryDAO extends GenericDAO { public List findByGuids(List guids) { diff --git a/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java b/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java index 952856bb..3f3c0f20 100644 --- a/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java +++ b/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java @@ -29,7 +29,6 @@ import com.google.api.client.util.Maps; import com.uaihebert.model.EasyCriteria; @Stateless -@SuppressWarnings("serial") public class FeedEntryStatusDAO extends GenericDAO { public FeedEntryStatus findById(User user, Long id) { diff --git a/src/main/java/com/commafeed/backend/dao/FeedSubscriptionDAO.java b/src/main/java/com/commafeed/backend/dao/FeedSubscriptionDAO.java index 7a8fcaf7..c5b68b3b 100644 --- a/src/main/java/com/commafeed/backend/dao/FeedSubscriptionDAO.java +++ b/src/main/java/com/commafeed/backend/dao/FeedSubscriptionDAO.java @@ -14,7 +14,6 @@ import com.uaihebert.factory.EasyCriteriaFactory; import com.uaihebert.model.EasyCriteria; @Stateless -@SuppressWarnings("serial") public class FeedSubscriptionDAO extends GenericDAO { public FeedSubscription findById(User user, Long id) { diff --git a/src/main/java/com/commafeed/backend/dao/GenericDAO.java b/src/main/java/com/commafeed/backend/dao/GenericDAO.java index 10fd6c13..3081d391 100644 --- a/src/main/java/com/commafeed/backend/dao/GenericDAO.java +++ b/src/main/java/com/commafeed/backend/dao/GenericDAO.java @@ -1,6 +1,5 @@ package com.commafeed.backend.dao; -import java.io.Serializable; import java.util.Arrays; import java.util.List; @@ -20,8 +19,7 @@ import com.uaihebert.factory.EasyCriteriaFactory; import com.uaihebert.model.EasyCriteria; @SuppressWarnings("serial") -public abstract class GenericDAO implements - Serializable { +public abstract class GenericDAO { private TypeToken type = new TypeToken(getClass()) { }; diff --git a/src/main/java/com/commafeed/backend/dao/UserDAO.java b/src/main/java/com/commafeed/backend/dao/UserDAO.java index 9e6d17ef..48f22ef4 100644 --- a/src/main/java/com/commafeed/backend/dao/UserDAO.java +++ b/src/main/java/com/commafeed/backend/dao/UserDAO.java @@ -10,7 +10,6 @@ import com.commafeed.backend.model.User; import com.commafeed.backend.model.User_; @Stateless -@SuppressWarnings("serial") public class UserDAO extends GenericDAO { public User findByName(String name) { diff --git a/src/main/java/com/commafeed/backend/dao/UserRoleDAO.java b/src/main/java/com/commafeed/backend/dao/UserRoleDAO.java index 7751ecca..2f6416ee 100644 --- a/src/main/java/com/commafeed/backend/dao/UserRoleDAO.java +++ b/src/main/java/com/commafeed/backend/dao/UserRoleDAO.java @@ -11,7 +11,6 @@ import com.commafeed.backend.model.UserRole.Role; import com.commafeed.backend.model.UserRole_; import com.google.common.collect.Sets; -@SuppressWarnings("serial") @Stateless public class UserRoleDAO extends GenericDAO { diff --git a/src/main/java/com/commafeed/backend/dao/UserSettingsDAO.java b/src/main/java/com/commafeed/backend/dao/UserSettingsDAO.java index 26346e52..aaee4ed9 100644 --- a/src/main/java/com/commafeed/backend/dao/UserSettingsDAO.java +++ b/src/main/java/com/commafeed/backend/dao/UserSettingsDAO.java @@ -10,7 +10,6 @@ import com.uaihebert.factory.EasyCriteriaFactory; import com.uaihebert.model.EasyCriteria; @Stateless -@SuppressWarnings("serial") public class UserSettingsDAO extends GenericDAO { public UserSettings findByUser(User user) { diff --git a/src/main/java/com/commafeed/backend/feeds/FeedRefreshWorker.java b/src/main/java/com/commafeed/backend/feeds/FeedRefreshWorker.java index c5fbdcf9..9ffd2616 100644 --- a/src/main/java/com/commafeed/backend/feeds/FeedRefreshWorker.java +++ b/src/main/java/com/commafeed/backend/feeds/FeedRefreshWorker.java @@ -52,7 +52,8 @@ public class FeedRefreshWorker { private boolean running = true; @Asynchronous - public Future start() { + public Future start(String threadName) { + log.info("{} starting", threadName); while (running) { try { Feed feed = getNextFeed();