garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

injetions cleanup

Browse Source
This commit is contained in:
Athou
2013-04-13 09:17:38 +02:00
parent f148fd3ead
commit 544ebb8e86
4 changed files with 1 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/commafeed/backend/dao/UserDAO.java
View File

@@ -1,7 +1,6 @@
package com.commafeed.backend.dao; package com.commafeed.backend.dao;
import javax.ejb.Stateless; import javax.ejb.Stateless;
import javax.inject.Inject;
import javax.persistence.NoResultException; import javax.persistence.NoResultException;
import javax.persistence.TypedQuery; import javax.persistence.TypedQuery;
import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.CriteriaQuery;
@@ -9,15 +8,11 @@ import javax.persistence.criteria.Root;
import com.commafeed.backend.model.User; import com.commafeed.backend.model.User;
import com.commafeed.backend.model.User_; import com.commafeed.backend.model.User_;
import com.commafeed.backend.services.PasswordEncryptionService;
@Stateless @Stateless
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class UserDAO extends GenericDAO<User> { public class UserDAO extends GenericDAO<User> {
@Inject
PasswordEncryptionService encryptionService;
public User findByName(String name) { public User findByName(String name) {
CriteriaQuery<User> query = builder.createQuery(getType()); CriteriaQuery<User> query = builder.createQuery(getType());

8
src/main/java/com/commafeed/backend/feeds/FeedRefreshWorker.java
View File

@@ -2,7 +2,6 @@ package com.commafeed.backend.feeds;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.concurrent.locks.ReentrantLock;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.ejb.Asynchronous; import javax.ejb.Asynchronous;
@@ -22,10 +21,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import com.commafeed.backend.dao.FeedDAO; import com.commafeed.backend.dao.FeedDAO;
import com.commafeed.backend.dao.FeedEntryDAO;
import com.commafeed.backend.model.Feed; import com.commafeed.backend.model.Feed;
import com.commafeed.backend.services.FeedUpdateService; import com.commafeed.backend.services.FeedUpdateService;
import com.google.common.collect.Iterables;
@Stateless @Stateless
@TransactionManagement(TransactionManagementType.BEAN) @TransactionManagement(TransactionManagementType.BEAN)
@@ -34,17 +31,12 @@ public class FeedRefreshWorker {
private static Logger log = LoggerFactory private static Logger log = LoggerFactory
.getLogger(FeedRefreshWorker.class); .getLogger(FeedRefreshWorker.class);
private static final ReentrantLock lock = new ReentrantLock();
@Inject @Inject
FeedFetcher fetcher; FeedFetcher fetcher;
@Inject @Inject
FeedDAO feedDAO; FeedDAO feedDAO;
@Inject
FeedEntryDAO feedEntryDAO;
@Inject @Inject
FeedUpdateService feedUpdateService; FeedUpdateService feedUpdateService;

4
src/main/java/com/commafeed/backend/feeds/OPMLImporter.java
View File

@@ -8,7 +8,6 @@ import javax.inject.Inject;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import com.commafeed.backend.dao.FeedCategoryDAO; import com.commafeed.backend.dao.FeedCategoryDAO;
import com.commafeed.backend.dao.FeedDAO;
import com.commafeed.backend.model.FeedCategory; import com.commafeed.backend.model.FeedCategory;
import com.commafeed.backend.model.User; import com.commafeed.backend.model.User;
import com.commafeed.backend.services.FeedSubscriptionService; import com.commafeed.backend.services.FeedSubscriptionService;
@@ -19,9 +18,6 @@ import com.sun.syndication.io.WireFeedInput;
public class OPMLImporter { public class OPMLImporter {
@Inject
FeedDAO feedDAO;
@Inject @Inject
FeedSubscriptionService feedSubscriptionService; FeedSubscriptionService feedSubscriptionService;

7
src/main/java/com/commafeed/backend/services/FeedSubscriptionService.java
View File

@@ -5,7 +5,6 @@ import java.util.List;
import javax.ejb.Stateless; import javax.ejb.Stateless;
import javax.inject.Inject; import javax.inject.Inject;
import com.commafeed.backend.dao.FeedCategoryDAO;
import com.commafeed.backend.dao.FeedDAO; import com.commafeed.backend.dao.FeedDAO;
import com.commafeed.backend.dao.FeedEntryDAO; import com.commafeed.backend.dao.FeedEntryDAO;
import com.commafeed.backend.dao.FeedEntryStatusDAO; import com.commafeed.backend.dao.FeedEntryStatusDAO;
@@ -21,9 +20,6 @@ import com.google.api.client.util.Lists;
@Stateless @Stateless
public class FeedSubscriptionService { public class FeedSubscriptionService {
@Inject
FeedCategoryDAO feedCategoryDAO;
@Inject @Inject
FeedDAO feedDAO; FeedDAO feedDAO;
@@ -60,8 +56,7 @@ public class FeedSubscriptionService {
if (newSubscription) { if (newSubscription) {
List<FeedEntryStatus> statuses = Lists.newArrayList(); List<FeedEntryStatus> statuses = Lists.newArrayList();
List<FeedEntry> allEntries = feedEntryDAO.findByFeed(feed, 0, List<FeedEntry> allEntries = feedEntryDAO.findByFeed(feed, 0, 10);
10);
for (FeedEntry entry : allEntries) { for (FeedEntry entry : allEntries) {
FeedEntryStatus status = new FeedEntryStatus(); FeedEntryStatus status = new FeedEntryStatus();
status.setEntry(entry); status.setEntry(entry);