From 544ebb8e86d61ca5aef9c8bf5f29db6cd7375ed6 Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Sat, 13 Apr 2013 09:17:38 +0200
Subject: [PATCH] injetions cleanup

---
 src/main/java/com/commafeed/backend/dao/UserDAO.java      | 5 -----
 .../com/commafeed/backend/feeds/FeedRefreshWorker.java    | 8 --------
 .../java/com/commafeed/backend/feeds/OPMLImporter.java    | 4 ----
 .../backend/services/FeedSubscriptionService.java         | 7 +------
 4 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/src/main/java/com/commafeed/backend/dao/UserDAO.java b/src/main/java/com/commafeed/backend/dao/UserDAO.java
index 16605816..9e6d17ef 100644
--- a/src/main/java/com/commafeed/backend/dao/UserDAO.java
+++ b/src/main/java/com/commafeed/backend/dao/UserDAO.java
@@ -1,7 +1,6 @@
 package com.commafeed.backend.dao;
 
 import javax.ejb.Stateless;
-import javax.inject.Inject;
 import javax.persistence.NoResultException;
 import javax.persistence.TypedQuery;
 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.services.PasswordEncryptionService;
 
 @Stateless
 @SuppressWarnings("serial")
 public class UserDAO extends GenericDAO<User> {
 
-	@Inject
-	PasswordEncryptionService encryptionService;
-
 	public User findByName(String name) {
 
 		CriteriaQuery<User> query = builder.createQuery(getType());
diff --git a/src/main/java/com/commafeed/backend/feeds/FeedRefreshWorker.java b/src/main/java/com/commafeed/backend/feeds/FeedRefreshWorker.java
index 95cf8a76..c0e68421 100644
--- a/src/main/java/com/commafeed/backend/feeds/FeedRefreshWorker.java
+++ b/src/main/java/com/commafeed/backend/feeds/FeedRefreshWorker.java
@@ -2,7 +2,6 @@ package com.commafeed.backend.feeds;
 
 import java.util.Calendar;
 import java.util.Date;
-import java.util.concurrent.locks.ReentrantLock;
 
 import javax.annotation.Resource;
 import javax.ejb.Asynchronous;
@@ -22,10 +21,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.commafeed.backend.dao.FeedDAO;
-import com.commafeed.backend.dao.FeedEntryDAO;
 import com.commafeed.backend.model.Feed;
 import com.commafeed.backend.services.FeedUpdateService;
-import com.google.common.collect.Iterables;
 
 @Stateless
 @TransactionManagement(TransactionManagementType.BEAN)
@@ -34,17 +31,12 @@ public class FeedRefreshWorker {
 	private static Logger log = LoggerFactory
 			.getLogger(FeedRefreshWorker.class);
 
-	private static final ReentrantLock lock = new ReentrantLock();
-
 	@Inject
 	FeedFetcher fetcher;
 
 	@Inject
 	FeedDAO feedDAO;
 
-	@Inject
-	FeedEntryDAO feedEntryDAO;
-
 	@Inject
 	FeedUpdateService feedUpdateService;
 
diff --git a/src/main/java/com/commafeed/backend/feeds/OPMLImporter.java b/src/main/java/com/commafeed/backend/feeds/OPMLImporter.java
index ec2345b2..3b9217cd 100644
--- a/src/main/java/com/commafeed/backend/feeds/OPMLImporter.java
+++ b/src/main/java/com/commafeed/backend/feeds/OPMLImporter.java
@@ -8,7 +8,6 @@ import javax.inject.Inject;
 import org.apache.commons.lang.StringUtils;
 
 import com.commafeed.backend.dao.FeedCategoryDAO;
-import com.commafeed.backend.dao.FeedDAO;
 import com.commafeed.backend.model.FeedCategory;
 import com.commafeed.backend.model.User;
 import com.commafeed.backend.services.FeedSubscriptionService;
@@ -19,9 +18,6 @@ import com.sun.syndication.io.WireFeedInput;
 
 public class OPMLImporter {
 
-	@Inject
-	FeedDAO feedDAO;
-
 	@Inject
 	FeedSubscriptionService feedSubscriptionService;
 
diff --git a/src/main/java/com/commafeed/backend/services/FeedSubscriptionService.java b/src/main/java/com/commafeed/backend/services/FeedSubscriptionService.java
index 7d292336..0732f8a0 100644
--- a/src/main/java/com/commafeed/backend/services/FeedSubscriptionService.java
+++ b/src/main/java/com/commafeed/backend/services/FeedSubscriptionService.java
@@ -5,7 +5,6 @@ import java.util.List;
 import javax.ejb.Stateless;
 import javax.inject.Inject;
 
-import com.commafeed.backend.dao.FeedCategoryDAO;
 import com.commafeed.backend.dao.FeedDAO;
 import com.commafeed.backend.dao.FeedEntryDAO;
 import com.commafeed.backend.dao.FeedEntryStatusDAO;
@@ -21,9 +20,6 @@ import com.google.api.client.util.Lists;
 @Stateless
 public class FeedSubscriptionService {
 
-	@Inject
-	FeedCategoryDAO feedCategoryDAO;
-
 	@Inject
 	FeedDAO feedDAO;
 
@@ -60,8 +56,7 @@ public class FeedSubscriptionService {
 
 		if (newSubscription) {
 			List<FeedEntryStatus> statuses = Lists.newArrayList();
-			List<FeedEntry> allEntries = feedEntryDAO.findByFeed(feed, 0,
-					10);
+			List<FeedEntry> allEntries = feedEntryDAO.findByFeed(feed, 0, 10);
 			for (FeedEntry entry : allEntries) {
 				FeedEntryStatus status = new FeedEntryStatus();
 				status.setEntry(entry);