From 0d730128f7adee27e96da31cf7ea928f19bfdf77 Mon Sep 17 00:00:00 2001 From: Athou Date: Sun, 11 Aug 2013 11:45:32 +0200 Subject: [PATCH] use lombok slf4j annotation --- src/main/java/com/commafeed/backend/DatabaseCleaner.java | 6 ++---- src/main/java/com/commafeed/backend/HttpGetter.java | 7 +++---- src/main/java/com/commafeed/backend/ScheduledTasks.java | 4 ---- src/main/java/com/commafeed/backend/StartupBean.java | 6 +++--- .../com/commafeed/backend/cache/RedisCacheService.java | 6 ++---- src/main/java/com/commafeed/backend/dao/FeedEntryDAO.java | 4 ---- .../com/commafeed/backend/dao/FeedEntryStatusDAO.java | 4 ---- .../java/com/commafeed/backend/feeds/FaviconFetcher.java | 7 +++---- .../java/com/commafeed/backend/feeds/FeedFetcher.java | 7 +++---- src/main/java/com/commafeed/backend/feeds/FeedParser.java | 7 +++---- .../com/commafeed/backend/feeds/FeedRefreshExecutor.java | 6 ++---- .../com/commafeed/backend/feeds/FeedRefreshTaskGiver.java | 7 +++---- .../com/commafeed/backend/feeds/FeedRefreshUpdater.java | 7 +++---- .../com/commafeed/backend/feeds/FeedRefreshWorker.java | 7 +++---- src/main/java/com/commafeed/backend/feeds/FeedUtils.java | 7 +++---- .../java/com/commafeed/backend/feeds/OPMLImporter.java | 7 +++---- .../backend/pubsubhubbub/SubscriptionHandler.java | 7 +++---- .../backend/services/FeedSubscriptionService.java | 7 +++---- .../java/com/commafeed/backend/services/MailService.java | 5 ----- .../backend/services/PasswordEncryptionService.java | 8 ++------ .../java/com/commafeed/frontend/CommaFeedApplication.java | 7 +++---- .../commafeed/frontend/pages/PasswordRecoveryPage.java | 7 +++---- .../commafeed/frontend/rest/resources/CategoryREST.java | 7 +++---- .../com/commafeed/frontend/rest/resources/FeedREST.java | 7 +++---- .../frontend/rest/resources/PubSubHubbubCallbackREST.java | 7 +++---- .../utils/InternationalizationDevelopmentFilter.java | 7 +++---- 26 files changed, 62 insertions(+), 106 deletions(-) diff --git a/src/main/java/com/commafeed/backend/DatabaseCleaner.java b/src/main/java/com/commafeed/backend/DatabaseCleaner.java index a3a02b8c..1591a4fa 100644 --- a/src/main/java/com/commafeed/backend/DatabaseCleaner.java +++ b/src/main/java/com/commafeed/backend/DatabaseCleaner.java @@ -7,8 +7,7 @@ import java.util.concurrent.TimeUnit; import javax.inject.Inject; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import lombok.extern.slf4j.Slf4j; import com.commafeed.backend.dao.FeedDAO; import com.commafeed.backend.dao.FeedEntryContentDAO; @@ -23,10 +22,9 @@ import com.commafeed.backend.services.ApplicationSettingsService; * Contains utility methods for cleaning the database * */ +@Slf4j public class DatabaseCleaner { - private static Logger log = LoggerFactory.getLogger(DatabaseCleaner.class); - @Inject FeedDAO feedDAO; diff --git a/src/main/java/com/commafeed/backend/HttpGetter.java b/src/main/java/com/commafeed/backend/HttpGetter.java index 8cdb0132..e97ab72c 100644 --- a/src/main/java/com/commafeed/backend/HttpGetter.java +++ b/src/main/java/com/commafeed/backend/HttpGetter.java @@ -13,6 +13,8 @@ import javax.net.ssl.SSLSocket; import javax.net.ssl.TrustManager; import javax.net.ssl.X509TrustManager; +import lombok.extern.slf4j.Slf4j; + import org.apache.commons.lang.StringUtils; import org.apache.http.Header; import org.apache.http.HttpEntity; @@ -38,17 +40,14 @@ import org.apache.http.params.HttpConnectionParams; import org.apache.http.params.HttpParams; import org.apache.http.params.HttpProtocolParams; import org.apache.http.util.EntityUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Smart HTTP getter * */ +@Slf4j public class HttpGetter { - private static Logger log = LoggerFactory.getLogger(HttpGetter.class); - private static final String USER_AGENT = "CommaFeed/1.0 (http://www.commafeed.com)"; private static final String ACCEPT_LANGUAGE = "en"; private static final String PRAGMA_NO_CACHE = "No-cache"; diff --git a/src/main/java/com/commafeed/backend/ScheduledTasks.java b/src/main/java/com/commafeed/backend/ScheduledTasks.java index c39ff00f..b88700b2 100644 --- a/src/main/java/com/commafeed/backend/ScheduledTasks.java +++ b/src/main/java/com/commafeed/backend/ScheduledTasks.java @@ -8,9 +8,6 @@ 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; /** @@ -19,7 +16,6 @@ import com.commafeed.backend.services.ApplicationSettingsService; */ @Stateless public class ScheduledTasks { - protected final static Logger log = LoggerFactory.getLogger(ScheduledTasks.class); @Inject ApplicationSettingsService applicationSettingsService; diff --git a/src/main/java/com/commafeed/backend/StartupBean.java b/src/main/java/com/commafeed/backend/StartupBean.java index 72c43028..e895ceef 100644 --- a/src/main/java/com/commafeed/backend/StartupBean.java +++ b/src/main/java/com/commafeed/backend/StartupBean.java @@ -13,9 +13,9 @@ import javax.ejb.Singleton; import javax.ejb.Startup; import javax.inject.Inject; +import lombok.extern.slf4j.Slf4j; + import org.apache.commons.io.IOUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import com.commafeed.backend.dao.ApplicationSettingsDAO; import com.commafeed.backend.feeds.FeedRefreshTaskGiver; @@ -32,9 +32,9 @@ import com.google.common.collect.Maps; @Startup @Singleton @ConcurrencyManagement(ConcurrencyManagementType.BEAN) +@Slf4j public class StartupBean { - private static Logger log = LoggerFactory.getLogger(StartupBean.class); public static final String USERNAME_ADMIN = "admin"; public static final String USERNAME_DEMO = "demo"; diff --git a/src/main/java/com/commafeed/backend/cache/RedisCacheService.java b/src/main/java/com/commafeed/backend/cache/RedisCacheService.java index 51287db2..4c6c0aca 100644 --- a/src/main/java/com/commafeed/backend/cache/RedisCacheService.java +++ b/src/main/java/com/commafeed/backend/cache/RedisCacheService.java @@ -7,9 +7,7 @@ import java.util.concurrent.TimeUnit; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Alternative; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - +import lombok.extern.slf4j.Slf4j; import redis.clients.jedis.Jedis; import redis.clients.jedis.JedisPool; import redis.clients.jedis.JedisPoolConfig; @@ -27,9 +25,9 @@ import com.google.common.collect.Lists; @Alternative @ApplicationScoped +@Slf4j public class RedisCacheService extends CacheService { - private static final Logger log = LoggerFactory.getLogger(RedisCacheService.class); private static ObjectMapper mapper = new ObjectMapper(); private JedisPool pool = new JedisPool(new JedisPoolConfig(), "localhost"); diff --git a/src/main/java/com/commafeed/backend/dao/FeedEntryDAO.java b/src/main/java/com/commafeed/backend/dao/FeedEntryDAO.java index 5fd25bbe..c87c7c8c 100644 --- a/src/main/java/com/commafeed/backend/dao/FeedEntryDAO.java +++ b/src/main/java/com/commafeed/backend/dao/FeedEntryDAO.java @@ -10,8 +10,6 @@ import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Root; import org.apache.commons.codec.digest.DigestUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import com.commafeed.backend.model.FeedEntry; import com.commafeed.backend.model.FeedEntry_; @@ -21,8 +19,6 @@ import com.google.common.collect.Iterables; @Stateless public class FeedEntryDAO extends GenericDAO { - protected static final Logger log = LoggerFactory.getLogger(FeedEntryDAO.class); - public Long findExisting(String guid, Long feedId) { CriteriaQuery query = builder.createQuery(Long.class); diff --git a/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java b/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java index 7a5cd801..34a2be21 100644 --- a/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java +++ b/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java @@ -25,8 +25,6 @@ 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; @@ -46,8 +44,6 @@ import com.google.common.collect.Lists; @Stateless public class FeedEntryStatusDAO extends GenericDAO { - protected static Logger log = LoggerFactory.getLogger(FeedEntryStatusDAO.class); - private static final String ALIAS_STATUS = "status"; private static final String ALIAS_ENTRY = "entry"; diff --git a/src/main/java/com/commafeed/backend/feeds/FaviconFetcher.java b/src/main/java/com/commafeed/backend/feeds/FaviconFetcher.java index 2d9c9125..cc243ddd 100644 --- a/src/main/java/com/commafeed/backend/feeds/FaviconFetcher.java +++ b/src/main/java/com/commafeed/backend/feeds/FaviconFetcher.java @@ -5,12 +5,12 @@ import java.util.List; import javax.inject.Inject; +import lombok.extern.slf4j.Slf4j; + import org.apache.commons.lang3.StringUtils; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.select.Elements; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import com.commafeed.backend.HttpGetter; import com.commafeed.backend.HttpGetter.HttpResult; @@ -19,10 +19,9 @@ import com.commafeed.backend.HttpGetter.HttpResult; * Inspired/Ported from https://github.com/potatolondon/getfavicon * */ +@Slf4j public class FaviconFetcher { - private static Logger log = LoggerFactory.getLogger(FeedFetcher.class); - private static long MIN_ICON_LENGTH = 100; private static long MAX_ICON_LENGTH = 100000; private static int TIMEOUT = 4000; diff --git a/src/main/java/com/commafeed/backend/feeds/FeedFetcher.java b/src/main/java/com/commafeed/backend/feeds/FeedFetcher.java index 04f18eef..56d1d943 100644 --- a/src/main/java/com/commafeed/backend/feeds/FeedFetcher.java +++ b/src/main/java/com/commafeed/backend/feeds/FeedFetcher.java @@ -5,14 +5,14 @@ import java.util.Date; import javax.inject.Inject; +import lombok.extern.slf4j.Slf4j; + import org.apache.commons.codec.binary.StringUtils; import org.apache.commons.codec.digest.DigestUtils; import org.apache.http.client.ClientProtocolException; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.select.Elements; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import com.commafeed.backend.HttpGetter; import com.commafeed.backend.HttpGetter.HttpResult; @@ -20,10 +20,9 @@ import com.commafeed.backend.HttpGetter.NotModifiedException; import com.commafeed.backend.model.Feed; import com.sun.syndication.io.FeedException; +@Slf4j public class FeedFetcher { - private static Logger log = LoggerFactory.getLogger(FeedFetcher.class); - @Inject FeedParser parser; diff --git a/src/main/java/com/commafeed/backend/feeds/FeedParser.java b/src/main/java/com/commafeed/backend/feeds/FeedParser.java index 77b759bb..b04dbec4 100644 --- a/src/main/java/com/commafeed/backend/feeds/FeedParser.java +++ b/src/main/java/com/commafeed/backend/feeds/FeedParser.java @@ -5,12 +5,12 @@ import java.text.DateFormat; import java.util.Date; import java.util.List; +import lombok.extern.slf4j.Slf4j; + import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.SystemUtils; import org.jdom.Element; import org.jdom.Namespace; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.xml.sax.InputSource; import com.commafeed.backend.model.Feed; @@ -28,10 +28,9 @@ import com.sun.syndication.feed.synd.SyndLinkImpl; import com.sun.syndication.io.FeedException; import com.sun.syndication.io.SyndFeedInput; +@Slf4j 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); diff --git a/src/main/java/com/commafeed/backend/feeds/FeedRefreshExecutor.java b/src/main/java/com/commafeed/backend/feeds/FeedRefreshExecutor.java index 4fdd1b12..4f989bb8 100644 --- a/src/main/java/com/commafeed/backend/feeds/FeedRefreshExecutor.java +++ b/src/main/java/com/commafeed/backend/feeds/FeedRefreshExecutor.java @@ -5,18 +5,16 @@ import java.util.concurrent.RejectedExecutionHandler; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import lombok.extern.slf4j.Slf4j; /** * Wraps a {@link ThreadPoolExecutor} instance. Blocks when queue is full instead of rejecting the task. Allow priority queueing by using * {@link Task} instead of {@link Runnable} * */ +@Slf4j public class FeedRefreshExecutor { - private static Logger log = LoggerFactory.getLogger(FeedRefreshExecutor.class); - private String poolName; private ThreadPoolExecutor pool; private LinkedBlockingDeque queue; diff --git a/src/main/java/com/commafeed/backend/feeds/FeedRefreshTaskGiver.java b/src/main/java/com/commafeed/backend/feeds/FeedRefreshTaskGiver.java index f7ef1222..ba6d3cc6 100644 --- a/src/main/java/com/commafeed/backend/feeds/FeedRefreshTaskGiver.java +++ b/src/main/java/com/commafeed/backend/feeds/FeedRefreshTaskGiver.java @@ -12,10 +12,10 @@ import javax.annotation.PreDestroy; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; +import lombok.extern.slf4j.Slf4j; + import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.lang.time.DateUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import com.commafeed.backend.MetricsBean; import com.commafeed.backend.dao.FeedDAO; @@ -31,10 +31,9 @@ import com.google.common.collect.Queues; * */ @ApplicationScoped +@Slf4j public class FeedRefreshTaskGiver { - protected static final Logger log = LoggerFactory.getLogger(FeedRefreshTaskGiver.class); - @Inject FeedDAO feedDAO; diff --git a/src/main/java/com/commafeed/backend/feeds/FeedRefreshUpdater.java b/src/main/java/com/commafeed/backend/feeds/FeedRefreshUpdater.java index d571150e..fc64d27e 100644 --- a/src/main/java/com/commafeed/backend/feeds/FeedRefreshUpdater.java +++ b/src/main/java/com/commafeed/backend/feeds/FeedRefreshUpdater.java @@ -12,12 +12,12 @@ import javax.annotation.PreDestroy; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; +import lombok.extern.slf4j.Slf4j; + import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang3.time.DateUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import com.commafeed.backend.MetricsBean; import com.commafeed.backend.cache.CacheService; @@ -38,10 +38,9 @@ import com.google.common.collect.Lists; import com.google.common.util.concurrent.Striped; @ApplicationScoped +@Slf4j public class FeedRefreshUpdater { - protected static Logger log = LoggerFactory.getLogger(FeedRefreshUpdater.class); - @Inject FeedUpdateService feedUpdateService; diff --git a/src/main/java/com/commafeed/backend/feeds/FeedRefreshWorker.java b/src/main/java/com/commafeed/backend/feeds/FeedRefreshWorker.java index 53219fdf..e2052b72 100644 --- a/src/main/java/com/commafeed/backend/feeds/FeedRefreshWorker.java +++ b/src/main/java/com/commafeed/backend/feeds/FeedRefreshWorker.java @@ -8,10 +8,10 @@ import javax.annotation.PreDestroy; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; +import lombok.extern.slf4j.Slf4j; + import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.lang.time.DateUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import com.commafeed.backend.HttpGetter.NotModifiedException; import com.commafeed.backend.feeds.FeedRefreshExecutor.Task; @@ -25,10 +25,9 @@ import com.commafeed.backend.services.ApplicationSettingsService; * */ @ApplicationScoped +@Slf4j public class FeedRefreshWorker { - private static Logger log = LoggerFactory.getLogger(FeedRefreshWorker.class); - @Inject FeedRefreshUpdater feedRefreshUpdater; diff --git a/src/main/java/com/commafeed/backend/feeds/FeedUtils.java b/src/main/java/com/commafeed/backend/feeds/FeedUtils.java index e24ca314..58f24090 100644 --- a/src/main/java/com/commafeed/backend/feeds/FeedUtils.java +++ b/src/main/java/com/commafeed/backend/feeds/FeedUtils.java @@ -9,6 +9,8 @@ import java.util.Iterator; import java.util.List; import java.util.regex.Pattern; +import lombok.extern.slf4j.Slf4j; + import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.StringUtils; @@ -23,8 +25,6 @@ import org.jsoup.safety.Cleaner; import org.jsoup.safety.Whitelist; import org.jsoup.select.Elements; import org.mozilla.universalchardet.UniversalDetector; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.w3c.css.sac.InputSource; import org.w3c.dom.css.CSSStyleDeclaration; @@ -42,10 +42,9 @@ import edu.uci.ics.crawler4j.url.URLCanonicalizer; * Utility methods related to feed handling * */ +@Slf4j 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"); diff --git a/src/main/java/com/commafeed/backend/feeds/OPMLImporter.java b/src/main/java/com/commafeed/backend/feeds/OPMLImporter.java index b41e17bc..8998fd3f 100644 --- a/src/main/java/com/commafeed/backend/feeds/OPMLImporter.java +++ b/src/main/java/com/commafeed/backend/feeds/OPMLImporter.java @@ -9,9 +9,9 @@ import javax.ejb.TransactionAttribute; import javax.ejb.TransactionAttributeType; import javax.inject.Inject; +import lombok.extern.slf4j.Slf4j; + import org.apache.commons.lang.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import com.commafeed.backend.cache.CacheService; import com.commafeed.backend.dao.FeedCategoryDAO; @@ -25,10 +25,9 @@ import com.sun.syndication.io.WireFeedInput; @Stateless @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED) +@Slf4j public class OPMLImporter { - private static Logger log = LoggerFactory.getLogger(OPMLImporter.class); - @Inject FeedSubscriptionService feedSubscriptionService; diff --git a/src/main/java/com/commafeed/backend/pubsubhubbub/SubscriptionHandler.java b/src/main/java/com/commafeed/backend/pubsubhubbub/SubscriptionHandler.java index 3a0f2dfe..d540203c 100644 --- a/src/main/java/com/commafeed/backend/pubsubhubbub/SubscriptionHandler.java +++ b/src/main/java/com/commafeed/backend/pubsubhubbub/SubscriptionHandler.java @@ -5,6 +5,8 @@ import java.util.List; import javax.inject.Inject; import javax.ws.rs.core.MediaType; +import lombok.extern.slf4j.Slf4j; + import org.apache.commons.lang.StringUtils; import org.apache.http.HttpHeaders; import org.apache.http.HttpResponse; @@ -14,8 +16,6 @@ import org.apache.http.client.entity.UrlEncodedFormEntity; import org.apache.http.client.methods.HttpPost; import org.apache.http.message.BasicNameValuePair; import org.apache.http.util.EntityUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import com.commafeed.backend.HttpGetter; import com.commafeed.backend.feeds.FeedRefreshTaskGiver; @@ -29,10 +29,9 @@ import com.google.common.collect.Lists; * Sends push subscription requests. Callback is handled by {@link PubSubHubbubCallbackREST} * */ +@Slf4j public class SubscriptionHandler { - private static Logger log = LoggerFactory.getLogger(SubscriptionHandler.class); - @Inject ApplicationSettingsService applicationSettingsService; diff --git a/src/main/java/com/commafeed/backend/services/FeedSubscriptionService.java b/src/main/java/com/commafeed/backend/services/FeedSubscriptionService.java index aa8ffbf0..a7e27e43 100644 --- a/src/main/java/com/commafeed/backend/services/FeedSubscriptionService.java +++ b/src/main/java/com/commafeed/backend/services/FeedSubscriptionService.java @@ -6,9 +6,9 @@ import java.util.Map; import javax.ejb.ApplicationException; import javax.inject.Inject; +import lombok.extern.slf4j.Slf4j; + import org.apache.commons.lang.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import com.commafeed.backend.cache.CacheService; import com.commafeed.backend.dao.FeedEntryDAO; @@ -24,10 +24,9 @@ import com.commafeed.backend.model.User; import com.commafeed.frontend.model.UnreadCount; import com.google.common.collect.Maps; +@Slf4j public class FeedSubscriptionService { - private static Logger log = LoggerFactory.getLogger(FeedSubscriptionService.class); - @SuppressWarnings("serial") @ApplicationException public static class FeedSubscriptionException extends RuntimeException { diff --git a/src/main/java/com/commafeed/backend/services/MailService.java b/src/main/java/com/commafeed/backend/services/MailService.java index 88d73015..e48a7a5c 100644 --- a/src/main/java/com/commafeed/backend/services/MailService.java +++ b/src/main/java/com/commafeed/backend/services/MailService.java @@ -12,9 +12,6 @@ import javax.mail.Transport; import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeMessage; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.commafeed.backend.model.ApplicationSettings; import com.commafeed.backend.model.User; @@ -25,8 +22,6 @@ import com.commafeed.backend.model.User; @SuppressWarnings("serial") public class MailService implements Serializable { - protected static Logger log = LoggerFactory.getLogger(MailService.class); - @Inject ApplicationSettingsService applicationSettingsService; diff --git a/src/main/java/com/commafeed/backend/services/PasswordEncryptionService.java b/src/main/java/com/commafeed/backend/services/PasswordEncryptionService.java index 5eb9fb61..ff81bff3 100644 --- a/src/main/java/com/commafeed/backend/services/PasswordEncryptionService.java +++ b/src/main/java/com/commafeed/backend/services/PasswordEncryptionService.java @@ -10,17 +10,13 @@ import javax.crypto.SecretKey; import javax.crypto.SecretKeyFactory; import javax.crypto.spec.PBEKeySpec; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.commafeed.backend.dao.UserDAO; +import lombok.extern.slf4j.Slf4j; // taken from http://www.javacodegeeks.com/2012/05/secure-password-storage-donts-dos-and.html @SuppressWarnings("serial") +@Slf4j public class PasswordEncryptionService implements Serializable { - private static final Logger log = LoggerFactory.getLogger(UserDAO.class); - public boolean authenticate(String attemptedPassword, byte[] encryptedPassword, byte[] salt) { // Encrypt the clear-text password using the same salt that was used to // encrypt the original password diff --git a/src/main/java/com/commafeed/frontend/CommaFeedApplication.java b/src/main/java/com/commafeed/frontend/CommaFeedApplication.java index 4a8386f5..ad4fb5e3 100644 --- a/src/main/java/com/commafeed/frontend/CommaFeedApplication.java +++ b/src/main/java/com/commafeed/frontend/CommaFeedApplication.java @@ -5,6 +5,8 @@ import javax.naming.InitialContext; import javax.naming.NamingException; import javax.servlet.http.Cookie; +import lombok.extern.slf4j.Slf4j; + import org.apache.wicket.Application; import org.apache.wicket.Component; import org.apache.wicket.Page; @@ -33,8 +35,6 @@ import org.apache.wicket.request.component.IRequestableComponent; import org.apache.wicket.request.cycle.AbstractRequestCycleListener; import org.apache.wicket.request.cycle.RequestCycle; import org.apache.wicket.util.cookies.CookieUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import com.commafeed.backend.services.ApplicationPropertiesService; import com.commafeed.frontend.pages.DemoLoginPage; @@ -46,10 +46,9 @@ import com.commafeed.frontend.pages.PasswordRecoveryPage; import com.commafeed.frontend.pages.WelcomePage; import com.commafeed.frontend.utils.exception.DisplayExceptionPage; +@Slf4j public class CommaFeedApplication extends AuthenticatedWebApplication { - private static Logger log = LoggerFactory.getLogger(CommaFeedApplication.class); - public CommaFeedApplication() { super(); boolean prod = ApplicationPropertiesService.get().isProduction(); diff --git a/src/main/java/com/commafeed/frontend/pages/PasswordRecoveryPage.java b/src/main/java/com/commafeed/frontend/pages/PasswordRecoveryPage.java index 99b47bbc..1eb01229 100644 --- a/src/main/java/com/commafeed/frontend/pages/PasswordRecoveryPage.java +++ b/src/main/java/com/commafeed/frontend/pages/PasswordRecoveryPage.java @@ -3,6 +3,8 @@ package com.commafeed.frontend.pages; import java.util.Date; import java.util.UUID; +import lombok.extern.slf4j.Slf4j; + import org.apache.commons.codec.digest.DigestUtils; import org.apache.http.client.utils.URIBuilder; import org.apache.wicket.extensions.validation.validator.RfcCompliantEmailAddressValidator; @@ -11,18 +13,15 @@ import org.apache.wicket.markup.html.form.RequiredTextField; import org.apache.wicket.markup.html.link.BookmarkablePageLink; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import com.commafeed.backend.feeds.FeedUtils; import com.commafeed.backend.model.User; import com.commafeed.frontend.pages.components.BootstrapFeedbackPanel; @SuppressWarnings("serial") +@Slf4j public class PasswordRecoveryPage extends BasePage { - private static Logger log = LoggerFactory.getLogger(PasswordRecoveryPage.class); - public PasswordRecoveryPage() { IModel email = new Model(); 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 940e2f95..3664413e 100644 --- a/src/main/java/com/commafeed/frontend/rest/resources/CategoryREST.java +++ b/src/main/java/com/commafeed/frontend/rest/resources/CategoryREST.java @@ -18,10 +18,10 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; +import lombok.extern.slf4j.Slf4j; + import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import com.commafeed.backend.cache.CacheService; import com.commafeed.backend.dao.FeedCategoryDAO; @@ -61,10 +61,9 @@ import com.wordnik.swagger.annotations.ApiParam; @Path("/category") @Api(value = "/category", description = "Operations about user categories") +@Slf4j public class CategoryREST extends AbstractREST { - private static Logger log = LoggerFactory.getLogger(CategoryREST.class); - public static final String ALL = "all"; public static final String STARRED = "starred"; 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 2c89306e..49610479 100644 --- a/src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java +++ b/src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java @@ -27,6 +27,8 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.ResponseBuilder; import javax.ws.rs.core.Response.Status; +import lombok.extern.slf4j.Slf4j; + import org.apache.commons.fileupload.FileItem; import org.apache.commons.fileupload.FileItemFactory; import org.apache.commons.fileupload.disk.DiskFileItemFactory; @@ -34,8 +36,6 @@ import org.apache.commons.fileupload.servlet.ServletFileUpload; import org.apache.commons.io.IOUtils; import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import com.commafeed.backend.StartupBean; import com.commafeed.backend.cache.CacheService; @@ -84,10 +84,9 @@ import com.wordnik.swagger.annotations.ApiParam; @Path("/feed") @Api(value = "/feed", description = "Operations about feeds") +@Slf4j public class FeedREST extends AbstractREST { - private static Logger log = LoggerFactory.getLogger(FeedREST.class); - @Inject StartupBean startupBean; 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 a5f61861..2feddbdf 100644 --- a/src/main/java/com/commafeed/frontend/rest/resources/PubSubHubbubCallbackREST.java +++ b/src/main/java/com/commafeed/frontend/rest/resources/PubSubHubbubCallbackREST.java @@ -16,11 +16,11 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; +import lombok.extern.slf4j.Slf4j; + import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import com.commafeed.backend.MetricsBean; import com.commafeed.backend.dao.FeedDAO; @@ -34,10 +34,9 @@ import com.commafeed.frontend.SecurityCheck; import com.google.common.base.Preconditions; @Path("/push") +@Slf4j public class PubSubHubbubCallbackREST extends AbstractREST { - private static Logger log = LoggerFactory.getLogger(PubSubHubbubCallbackREST.class); - @Context private HttpServletRequest request; diff --git a/src/main/java/com/commafeed/frontend/utils/InternationalizationDevelopmentFilter.java b/src/main/java/com/commafeed/frontend/utils/InternationalizationDevelopmentFilter.java index bdf9c0f5..96747f5a 100644 --- a/src/main/java/com/commafeed/frontend/utils/InternationalizationDevelopmentFilter.java +++ b/src/main/java/com/commafeed/frontend/utils/InternationalizationDevelopmentFilter.java @@ -19,9 +19,9 @@ import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponseWrapper; +import lombok.extern.slf4j.Slf4j; + import org.apache.commons.io.IOUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import com.commafeed.backend.dao.UserSettingsDAO; import com.commafeed.backend.model.UserSettings; @@ -32,10 +32,9 @@ 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. * */ +@Slf4j public class InternationalizationDevelopmentFilter implements Filter { - private static Logger log = LoggerFactory.getLogger(InternationalizationDevelopmentFilter.class); - @Inject UserSettingsDAO userSettingsDAO;