🔨 https://github.com/b3log/latke/issues/64

pom.xml

@@ -107,7 +107,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <org.b3log.latke.version>2.3.10</org.b3log.latke.version>
+        <org.b3log.latke.version>2.3.11-SNAPSHOT</org.b3log.latke.version>
 
         <servlet.version>3.1.0</servlet.version>
         <slf4j.version>1.7.5</slf4j.version>

src/main/java/org/b3log/solo/SoloServletListener.java

@@ -15,14 +15,6 @@
  */
 package org.b3log.solo;
 
-import java.util.ResourceBundle;
-import java.util.Set;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletRequestEvent;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionEvent;
 import org.b3log.latke.Keys;
 import org.b3log.latke.Latkes;
 import org.b3log.latke.event.EventManager;
@@ -56,6 +48,15 @@ import org.b3log.solo.service.UpgradeService;
 import org.b3log.solo.util.Skins;
 import org.json.JSONObject;
 
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletRequestEvent;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import javax.servlet.http.HttpSessionEvent;
+import java.util.ResourceBundle;
+import java.util.Set;
+
 /**
  * Solo Servlet listener.
  *

src/main/java/org/b3log/solo/Starter.java

@@ -15,16 +15,7 @@
  */
 package org.b3log.solo;
 
-import java.awt.Desktop;
-import java.io.File;
-import java.net.URI;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.DefaultParser;
-import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.Options;
-import org.apache.commons.cli.ParseException;
+import org.apache.commons.cli.*;
 import org.b3log.latke.Latkes;
 import org.b3log.latke.RuntimeMode;
 import org.b3log.latke.logging.Level;
@@ -35,6 +26,10 @@ import org.eclipse.jetty.util.log.Log;
 import org.eclipse.jetty.util.log.Slf4jLog;
 import org.eclipse.jetty.webapp.WebAppContext;
 
+import java.awt.*;
+import java.io.File;
+import java.net.URI;
+
 /**
  * Solo with embedded Jetty, <a href="https://github.com/b3log/solo/issues/12037">standalone mode</a>.
  *

src/main/java/org/b3log/solo/api/metaweblog/MetaWeblogAPI.java

@@ -15,19 +15,13 @@
  */
 package org.b3log.solo.api.metaweblog;
 
-import java.text.ParseException;
-import java.util.Date;
-import java.util.List;
-import javax.inject.Inject;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.time.DateFormatUtils;
 import org.apache.commons.lang.time.DateUtils;
 import org.b3log.latke.Keys;
 import org.b3log.latke.Latkes;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.User;
@@ -43,17 +37,20 @@ import org.b3log.solo.model.Article;
 import org.b3log.solo.model.Option;
 import org.b3log.solo.model.Tag;
 import org.b3log.solo.repository.ArticleRepository;
-import org.b3log.solo.service.ArticleMgmtService;
-import org.b3log.solo.service.ArticleQueryService;
-import org.b3log.solo.service.PreferenceQueryService;
-import org.b3log.solo.service.TagQueryService;
-import org.b3log.solo.service.UserQueryService;
+import org.b3log.solo.service.*;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.json.XML;
 import org.jsoup.Jsoup;
 
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.text.ParseException;
+import java.util.Date;
+import java.util.List;
+
 /**
  * <a href="http://www.xmlrpc.com/metaWeblogApi">MetaWeblog API</a> requests processing.
  *
@@ -423,7 +420,7 @@ public class MetaWeblogAPI {
             }
         }
 
-        final boolean publish = 1 == params.getJSONObject(INDEX_PUBLISH).getJSONObject("value").getInt("boolean") ? true : false;
+        final boolean publish = 1 == params.getJSONObject(INDEX_PUBLISH).getJSONObject("value").getInt("boolean");
 
         ret.put(Article.ARTICLE_IS_PUBLISHED, publish);
 

src/main/java/org/b3log/solo/api/symphony/ArticleReceiver.java

@@ -16,6 +16,7 @@
 package org.b3log.solo.api.symphony;
 
 import org.b3log.latke.Keys;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.User;
@@ -39,7 +40,6 @@ import org.json.JSONObject;
 import org.jsoup.Jsoup;
 import org.jsoup.safety.Whitelist;
 
-import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 

src/main/java/org/b3log/solo/api/symphony/CommentReceiver.java

@@ -15,16 +15,11 @@
  */
 package org.b3log.solo.api.symphony;
 
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Date;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.lang.time.DateFormatUtils;
 import org.b3log.latke.Keys;
 import org.b3log.latke.event.Event;
 import org.b3log.latke.event.EventManager;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.repository.Transaction;
@@ -52,6 +47,12 @@ import org.b3log.solo.util.Comments;
 import org.b3log.solo.util.QueryResults;
 import org.json.JSONObject;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Date;
+
 /**
  * Comment receiver (from B3log Symphony).
  *

src/main/java/org/b3log/solo/dev/ArticleGenerator.java

@@ -16,14 +16,10 @@
 package org.b3log.solo.dev;
 
 
-import java.io.IOException;
-import java.util.Date;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.lang.time.DateUtils;
 import org.b3log.latke.Latkes;
 import org.b3log.latke.RuntimeMode;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.User;
@@ -37,6 +33,11 @@ import org.b3log.solo.service.ArticleMgmtService;
 import org.b3log.solo.service.UserQueryService;
 import org.json.JSONObject;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Date;
+
 
 /**
  * Generates some dummy articles for development testing.

src/main/java/org/b3log/solo/event/comment/ArticleCommentReplyNotifier.java

@@ -65,7 +65,7 @@ public final class ArticleCommentReplyNotifier extends AbstractEventListener<JSO
 
         LOGGER.log(Level.DEBUG,
                 "Processing an event[type={0}, data={1}] in listener[className={2}]",
-                new Object[]{event.getType(), eventData, ArticleCommentReplyNotifier.class.getName()});
+                event.getType(), eventData, ArticleCommentReplyNotifier.class.getName());
         final String originalCommentId = comment.optString(Comment.COMMENT_ORIGINAL_COMMENT_ID);
 
         if (Strings.isEmptyOrNull(originalCommentId)) {
@@ -144,7 +144,7 @@ public final class ArticleCommentReplyNotifier extends AbstractEventListener<JSO
 
             message.setHtmlBody(mailBody);
             LOGGER.log(Level.DEBUG, "Sending a mail[mailSubject={0}, mailBody=[{1}] to [{2}]",
-                    new Object[]{mailSubject, mailBody, originalCommentEmail});
+                    mailSubject, mailBody, originalCommentEmail);
             mailService.send(message);
 
         } catch (final Exception e) {

src/main/java/org/b3log/solo/event/comment/PageCommentReplyNotifier.java

@@ -65,7 +65,7 @@ public final class PageCommentReplyNotifier extends AbstractEventListener<JSONOb
         final JSONObject page = eventData.optJSONObject(Page.PAGE);
 
         LOGGER.log(Level.DEBUG, "Processing an event[type={0}, data={1}] in listener[className={2}]",
-            new Object[] {event.getType(), eventData, PageCommentReplyNotifier.class.getName()});
+                event.getType(), eventData, PageCommentReplyNotifier.class.getName());
         final String originalCommentId = comment.optString(Comment.COMMENT_ORIGINAL_COMMENT_ID);
 
         if (Strings.isEmptyOrNull(originalCommentId)) {
@@ -123,7 +123,7 @@ public final class PageCommentReplyNotifier extends AbstractEventListener<JSONOb
 
             message.setHtmlBody(mailBody);
             LOGGER.log(Level.DEBUG, "Sending a mail[mailSubject={0}, mailBody=[{1}] to [{2}]",
-                new Object[] {mailSubject, mailBody, originalCommentEmail});
+                    mailSubject, mailBody, originalCommentEmail);
             mailService.send(message);
         } catch (final Exception e) {
             LOGGER.log(Level.ERROR, e.getMessage(), e);

src/main/java/org/b3log/solo/event/ping/AddArticleGoogleBlogSearchPinger.java

@@ -16,8 +16,6 @@
 package org.b3log.solo.event.ping;
 
 
-import java.net.URL;
-import java.net.URLEncoder;
 import org.b3log.latke.Latkes;
 import org.b3log.latke.event.AbstractEventListener;
 import org.b3log.latke.event.Event;
@@ -35,6 +33,9 @@ import org.b3log.solo.model.Option;
 import org.b3log.solo.service.PreferenceQueryService;
 import org.json.JSONObject;
 
+import java.net.URL;
+import java.net.URLEncoder;
+
 
 /**
  * This listener is responsible for pinging <a href="http://blogsearch.google.com">
@@ -93,7 +94,7 @@ public final class AddArticleGoogleBlogSearchPinger extends AbstractEventListene
             if (Latkes.getServePath().contains("localhost")) {
                 LOGGER.log(Level.TRACE,
                     "Solo runs on local server, so should not ping " + "Google Blog Search Service for the article[title={0}]",
-                    new Object[] {article.getString(Article.ARTICLE_TITLE)});
+                        article.getString(Article.ARTICLE_TITLE));
                 return;
             }
 

src/main/java/org/b3log/solo/event/ping/UpdateArticleGoogleBlogSearchPinger.java

@@ -16,8 +16,6 @@
 package org.b3log.solo.event.ping;
 
 
-import java.net.URL;
-import java.net.URLEncoder;
 import org.b3log.latke.Latkes;
 import org.b3log.latke.event.AbstractEventListener;
 import org.b3log.latke.event.Event;
@@ -35,6 +33,9 @@ import org.b3log.solo.model.Option;
 import org.b3log.solo.service.PreferenceQueryService;
 import org.json.JSONObject;
 
+import java.net.URL;
+import java.net.URLEncoder;
+
 
 /**
  * This listener is responsible for pinging <a href="http://blogsearch.google.com">
@@ -93,7 +94,7 @@ public final class UpdateArticleGoogleBlogSearchPinger extends AbstractEventList
             if (Latkes.getServePath().contains("localhost")) {
                 LOGGER.log(Level.TRACE,
                     "Solo runs on local server, so should not ping " + "Google Blog Search Service for the article[title={0}]",
-                    new Object[] {article.getString(Article.ARTICLE_TITLE)});
+                        article.getString(Article.ARTICLE_TITLE));
                 return;
             }
 

src/main/java/org/b3log/solo/event/plugin/PluginRefresher.java

@@ -16,7 +16,6 @@
 package org.b3log.solo.event.plugin;
 
 
-import java.util.List;
 import org.b3log.latke.event.AbstractEventListener;
 import org.b3log.latke.event.Event;
 import org.b3log.latke.event.EventException;
@@ -31,6 +30,8 @@ import org.b3log.solo.repository.PluginRepository;
 import org.b3log.solo.repository.impl.PluginRepositoryImpl;
 import org.b3log.solo.service.PluginMgmtService;
 
+import java.util.List;
+
 
 /**
  * This listener is responsible for refreshing plugin after every loaded.
@@ -51,7 +52,7 @@ public final class PluginRefresher extends AbstractEventListener<List<AbstractPl
         final List<AbstractPlugin> plugins = event.getData();
 
         LOGGER.log(Level.DEBUG, "Processing an event[type={0}, data={1}] in listener[className={2}]",
-            new Object[] {event.getType(), plugins, PluginRefresher.class.getName()});
+                event.getType(), plugins, PluginRefresher.class.getName());
 
         final LatkeBeanManager beanManager = Lifecycle.getBeanManager();
         final PluginRepository pluginRepository = beanManager.getReference(PluginRepositoryImpl.class);

src/main/java/org/b3log/solo/event/rhythm/ArticleSender.java

@@ -15,9 +15,6 @@
  */
 package org.b3log.solo.event.rhythm;
 
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Date;
 import org.b3log.latke.Keys;
 import org.b3log.latke.Latkes;
 import org.b3log.latke.event.AbstractEventListener;
@@ -40,6 +37,10 @@ import org.b3log.solo.model.Option;
 import org.b3log.solo.service.PreferenceQueryService;
 import org.json.JSONObject;
 
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Date;
+
 /**
  * This listener is responsible for sending article to B3log Rhythm.
  *
@@ -83,7 +84,7 @@ public final class ArticleSender extends AbstractEventListener<JSONObject> {
         final JSONObject data = event.getData();
 
         LOGGER.log(Level.DEBUG, "Processing an event[type={0}, data={1}] in listener[className={2}]",
-                new Object[]{event.getType(), data, ArticleSender.class.getName()});
+                event.getType(), data, ArticleSender.class.getName());
         try {
             final JSONObject originalArticle = data.getJSONObject(Article.ARTICLE);
 
@@ -108,7 +109,7 @@ public final class ArticleSender extends AbstractEventListener<JSONObject> {
 
             if (Latkes.getServePath().contains("localhost")) {
                 LOGGER.log(Level.INFO, "Solo runs on local server, so should not send this article[id={0}, title={1}] to Rhythm",
-                        new Object[]{originalArticle.getString(Keys.OBJECT_ID), originalArticle.getString(Article.ARTICLE_TITLE)});
+                        originalArticle.getString(Keys.OBJECT_ID), originalArticle.getString(Article.ARTICLE_TITLE));
                 return;
             }
 

src/main/java/org/b3log/solo/event/rhythm/ArticleUpdater.java

@@ -15,9 +15,6 @@
  */
 package org.b3log.solo.event.rhythm;
 
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Date;
 import org.b3log.latke.Keys;
 import org.b3log.latke.Latkes;
 import org.b3log.latke.event.AbstractEventListener;
@@ -40,6 +37,10 @@ import org.b3log.solo.model.Option;
 import org.b3log.solo.service.PreferenceQueryService;
 import org.json.JSONObject;
 
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Date;
+
 /**
  * This listener is responsible for updating article to B3log Rhythm.
  *
@@ -82,7 +83,7 @@ public final class ArticleUpdater extends AbstractEventListener<JSONObject> {
         final JSONObject data = event.getData();
 
         LOGGER.log(Level.DEBUG, "Processing an event[type={0}, data={1}] in listener[className={2}]",
-                new Object[]{event.getType(), data, ArticleUpdater.class.getName()});
+                event.getType(), data, ArticleUpdater.class.getName());
         try {
             final JSONObject originalArticle = data.getJSONObject(Article.ARTICLE);
 
@@ -107,7 +108,7 @@ public final class ArticleUpdater extends AbstractEventListener<JSONObject> {
 
             if (Latkes.getServePath().contains("localhost")) {
                 LOGGER.log(Level.INFO, "Solo runs on local server, so should not send this article[id={0}, title={1}] to Rhythm",
-                        new Object[]{originalArticle.getString(Keys.OBJECT_ID), originalArticle.getString(Article.ARTICLE_TITLE)});
+                        originalArticle.getString(Keys.OBJECT_ID), originalArticle.getString(Article.ARTICLE_TITLE));
                 return;
             }
 

src/main/java/org/b3log/solo/event/symphony/CommentSender.java

@@ -16,8 +16,6 @@
 package org.b3log.solo.event.symphony;
 
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import org.b3log.latke.Keys;
 import org.b3log.latke.Latkes;
 import org.b3log.latke.event.AbstractEventListener;
@@ -39,6 +37,9 @@ import org.b3log.solo.model.Option;
 import org.b3log.solo.service.PreferenceQueryService;
 import org.json.JSONObject;
 
+import java.net.MalformedURLException;
+import java.net.URL;
+
 
 /**
  * This listener is responsible for sending comment to B3log Symphony.
@@ -78,7 +79,7 @@ public final class CommentSender extends AbstractEventListener<JSONObject> {
         final JSONObject data = event.getData();
 
         LOGGER.log(Level.DEBUG, "Processing an event[type={0}, data={1}] in listener[className={2}]",
-            new Object[] {event.getType(), data, ArticleSender.class.getName()});
+                event.getType(), data, ArticleSender.class.getName());
         try {
             final JSONObject originalComment = data.getJSONObject(Comment.COMMENT);
 
@@ -93,7 +94,7 @@ public final class CommentSender extends AbstractEventListener<JSONObject> {
 
             if (Latkes.getServePath().contains("localhost")) {
                 LOGGER.log(Level.TRACE, "Solo runs on local server, so should not send this comment[id={0}] to Symphony",
-                    new Object[] {originalComment.getString(Keys.OBJECT_ID)});
+                        originalComment.getString(Keys.OBJECT_ID));
                 return;
             }
 

src/main/java/org/b3log/solo/filter/AuthFilter.java

@@ -16,15 +16,6 @@
 package org.b3log.solo.filter;
 
 
-import java.io.IOException;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.b3log.latke.ioc.LatkeBeanManager;
 import org.b3log.latke.ioc.Lifecycle;
 import org.b3log.latke.logging.Level;
@@ -35,6 +26,11 @@ import org.b3log.solo.service.UserMgmtService;
 import org.b3log.solo.service.UserQueryService;
 import org.json.JSONObject;
 
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
 
 /**
  * Authentication filter.

src/main/java/org/b3log/solo/filter/InitCheckFilter.java

@@ -15,15 +15,6 @@
  */
 package org.b3log.solo.filter;
 
-import java.io.IOException;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.b3log.latke.Keys;
 import org.b3log.latke.Latkes;
 import org.b3log.latke.ioc.LatkeBeanManager;
@@ -37,6 +28,11 @@ import org.b3log.latke.servlet.HttpControl;
 import org.b3log.latke.servlet.renderer.HTTP500Renderer;
 import org.b3log.solo.service.InitService;
 
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
 /**
  * Checks initialization filter.
  *

src/main/java/org/b3log/solo/filter/PermalinkFilter.java

@@ -16,15 +16,6 @@
 package org.b3log.solo.filter;
 
 
-import java.io.IOException;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.lang.StringUtils;
 import org.b3log.latke.Keys;
 import org.b3log.latke.Latkes;
@@ -48,6 +39,11 @@ import org.b3log.solo.service.ArticleQueryService;
 import org.b3log.solo.service.PermalinkQueryService;
 import org.json.JSONObject;
 
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
 
 /**
  * Article/Page permalink filter.

src/main/java/org/b3log/solo/model/PageTypes.java

@@ -93,7 +93,7 @@ public enum PageTypes {
      * @param langLabel the specified language label
      * @param typeName the specified type name
      */
-    private PageTypes(final String langLabel, final String typeName) {
+    PageTypes(final String langLabel, final String typeName) {
         this.langLabel = langLabel;
         this.typeName = typeName;
     }

src/main/java/org/b3log/solo/model/feed/atom/Entry.java

@@ -16,13 +16,10 @@
 package org.b3log.solo.model.feed.atom;
 
 
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.TimeZone;
 import org.apache.commons.lang.time.DateFormatUtils;
 
+import java.util.*;
+
 
 /**
  * Entry.

src/main/java/org/b3log/solo/model/feed/atom/Feed.java

@@ -15,11 +15,12 @@
  */
 package org.b3log.solo.model.feed.atom;
 
+import org.apache.commons.lang.time.DateFormatUtils;
+
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.TimeZone;
-import org.apache.commons.lang.time.DateFormatUtils;
 
 /**
  * Feed.

src/main/java/org/b3log/solo/model/feed/rss/Channel.java

@@ -15,10 +15,11 @@
  */
 package org.b3log.solo.model.feed.rss;
 
+import org.apache.commons.lang.time.DateFormatUtils;
+
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import org.apache.commons.lang.time.DateFormatUtils;
 
 /**
  * RSS 2.0 channel.

src/main/java/org/b3log/solo/model/feed/rss/Item.java

@@ -15,11 +15,12 @@
  */
 package org.b3log.solo.model.feed.rss;
 
+import org.apache.commons.lang.time.DateFormatUtils;
+
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Locale;
 import java.util.Set;
-import org.apache.commons.lang.time.DateFormatUtils;
 
 /**
  * Item.

src/main/java/org/b3log/solo/plugin/broadcast/ChanceProcessor.java

@@ -16,14 +16,9 @@
 package org.b3log.solo.plugin.broadcast;
 
 
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.concurrent.Future;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.b3log.latke.Keys;
 import org.b3log.latke.Latkes;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.servlet.HTTPRequestContext;
@@ -46,6 +41,12 @@ import org.b3log.solo.service.UserQueryService;
 import org.b3log.solo.util.QueryResults;
 import org.json.JSONObject;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.concurrent.Future;
+
 
 /**
  * Broadcast chance processor.

src/main/java/org/b3log/solo/processor/ArticleProcessor.java

@@ -15,14 +15,6 @@
  */
 package org.b3log.solo.processor;
 
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.*;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.time.DateFormatUtils;
 import org.b3log.latke.Keys;
@@ -30,6 +22,7 @@ import org.b3log.latke.Latkes;
 import org.b3log.latke.event.Event;
 import org.b3log.latke.event.EventException;
 import org.b3log.latke.event.EventManager;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.Pagination;
@@ -45,12 +38,7 @@ import org.b3log.latke.servlet.renderer.JSONRenderer;
 import org.b3log.latke.servlet.renderer.TextHTMLRenderer;
 import org.b3log.latke.servlet.renderer.freemarker.AbstractFreeMarkerRenderer;
 import org.b3log.latke.servlet.renderer.freemarker.FreeMarkerRenderer;
-import org.b3log.latke.util.Dates;
-import org.b3log.latke.util.Locales;
-import org.b3log.latke.util.Paginator;
-import org.b3log.latke.util.Requests;
-import org.b3log.latke.util.Stopwatchs;
-import org.b3log.latke.util.Strings;
+import org.b3log.latke.util.*;
 import org.b3log.solo.SoloServletListener;
 import org.b3log.solo.event.EventTypes;
 import org.b3log.solo.model.*;
@@ -64,6 +52,14 @@ import org.json.JSONException;
 import org.json.JSONObject;
 import org.jsoup.Jsoup;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.*;
+
 /**
  * Article processor.
  *
@@ -670,7 +666,7 @@ public class ArticleProcessor {
 
             final String authorId = getAuthorId(requestURI);
 
-            LOGGER.log(Level.DEBUG, "Request author articles[requestURI={0}, authorId={1}]", new Object[]{requestURI, authorId});
+            LOGGER.log(Level.DEBUG, "Request author articles[requestURI={0}, authorId={1}]", requestURI, authorId);
 
             final int currentPageNum = getAuthorCurrentPageNum(requestURI, authorId);
 
@@ -679,7 +675,7 @@ public class ArticleProcessor {
                 return;
             }
 
-            LOGGER.log(Level.DEBUG, "Request author articles[authorId={0}, currentPageNum={1}]", new Object[]{authorId, currentPageNum});
+            LOGGER.log(Level.DEBUG, "Request author articles[authorId={0}, currentPageNum={1}]", authorId, currentPageNum);
 
             final JSONObject preference = preferenceQueryService.getPreference();
 
@@ -777,7 +773,7 @@ public class ArticleProcessor {
                 return;
             }
 
-            LOGGER.log(Level.DEBUG, "Request archive date[string={0}, currentPageNum={1}]", new Object[]{archiveDateString, currentPageNum});
+            LOGGER.log(Level.DEBUG, "Request archive date[string={0}, currentPageNum={1}]", archiveDateString, currentPageNum);
             final JSONObject result = archiveDateQueryService.getByArchiveDateString(archiveDateString);
 
             if (null == result) {

src/main/java/org/b3log/solo/processor/BlogProcessor.java

@@ -15,16 +15,10 @@
  */
 package org.b3log.solo.processor;
 
-import java.net.URL;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.b3log.latke.Keys;
 import org.b3log.latke.Latkes;
 import org.b3log.latke.RuntimeEnv;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.Pagination;
 import org.b3log.latke.model.User;
@@ -43,14 +37,17 @@ import org.b3log.solo.model.Article;
 import org.b3log.solo.model.Option;
 import org.b3log.solo.model.Statistic;
 import org.b3log.solo.model.Tag;
-import org.b3log.solo.service.ArticleQueryService;
-import org.b3log.solo.service.PreferenceQueryService;
-import org.b3log.solo.service.StatisticQueryService;
-import org.b3log.solo.service.TagQueryService;
-import org.b3log.solo.service.UserQueryService;
+import org.b3log.solo.service.*;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.net.URL;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
 /**
  * Blog processor.
  *

src/main/java/org/b3log/solo/processor/CaptchaProcessor.java

@@ -16,19 +16,6 @@
 package org.b3log.solo.processor;
 
 
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URL;
-import java.util.Enumeration;
-import java.util.Random;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
 import org.apache.commons.io.IOUtils;
 import org.b3log.latke.Latkes;
 import org.b3log.latke.RuntimeEnv;
@@ -44,6 +31,16 @@ import org.b3log.latke.servlet.annotation.RequestProcessor;
 import org.b3log.latke.servlet.renderer.PNGRenderer;
 import org.b3log.solo.SoloServletListener;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.*;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.Random;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
 
 /**
  * Captcha processor.
@@ -112,7 +109,7 @@ public class CaptchaProcessor {
             final HttpSession httpSession = request.getSession(false);
 
             if (null != httpSession) {
-                LOGGER.log(Level.DEBUG, "Captcha[{0}] for session[id={1}]", new Object[] {captcha, httpSession.getId()});
+                LOGGER.log(Level.DEBUG, "Captcha[{0}] for session[id={1}]", captcha, httpSession.getId());
                 httpSession.setAttribute(CAPTCHA, captcha);
             }
 

src/main/java/org/b3log/solo/processor/CategoryProcessor.java

@@ -17,6 +17,7 @@ package org.b3log.solo.processor;
 
 import org.b3log.latke.Keys;
 import org.b3log.latke.Latkes;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.Pagination;
@@ -40,7 +41,6 @@ import org.b3log.solo.util.Skins;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;

src/main/java/org/b3log/solo/processor/CommentProcessor.java

@@ -18,6 +18,7 @@ package org.b3log.solo.processor;
 
 import freemarker.template.Template;
 import org.b3log.latke.Keys;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.User;
@@ -37,7 +38,6 @@ import org.b3log.solo.service.UserQueryService;
 import org.b3log.solo.util.Skins;
 import org.json.JSONObject;
 
-import javax.inject.Inject;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

src/main/java/org/b3log/solo/processor/ErrorProcessor.java

@@ -15,12 +15,8 @@
  */
 package org.b3log.solo.processor;
 
-import java.io.IOException;
-import java.util.Map;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.lang.StringUtils;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.service.LangPropsService;
@@ -37,6 +33,11 @@ import org.b3log.solo.processor.util.Filler;
 import org.b3log.solo.service.PreferenceQueryService;
 import org.json.JSONObject;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Map;
+
 /**
  * Error processor.
  *
@@ -90,7 +91,7 @@ public class ErrorProcessor {
         String templateName = StringUtils.substringAfterLast(requestURI, "/");
 
         templateName = StringUtils.substringBefore(templateName, ".") + ".ftl";
-        LOGGER.log(Level.DEBUG, "Shows error page[requestURI={0}, templateName={1}]", new Object[]{requestURI, templateName});
+        LOGGER.log(Level.DEBUG, "Shows error page[requestURI={0}, templateName={1}]", requestURI, templateName);
 
         final ConsoleRenderer renderer = new ConsoleRenderer();
 

src/main/java/org/b3log/solo/processor/FeedProcessor.java

@@ -15,26 +15,14 @@
  */
 package org.b3log.solo.processor;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.lang.StringEscapeUtils;
 import org.b3log.latke.Keys;
 import org.b3log.latke.Latkes;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.User;
-import org.b3log.latke.repository.CompositeFilter;
-import org.b3log.latke.repository.CompositeFilterOperator;
-import org.b3log.latke.repository.Filter;
-import org.b3log.latke.repository.FilterOperator;
-import org.b3log.latke.repository.PropertyFilter;
-import org.b3log.latke.repository.Query;
-import org.b3log.latke.repository.SortDirection;
+import org.b3log.latke.repository.*;
 import org.b3log.latke.servlet.HTTPRequestContext;
 import org.b3log.latke.servlet.HTTPRequestMethod;
 import org.b3log.latke.servlet.annotation.RequestProcessing;
@@ -61,6 +49,13 @@ import org.b3log.solo.service.UserQueryService;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
 /**
  * Feed (Atom/RSS) processor.
  *

src/main/java/org/b3log/solo/processor/IndexProcessor.java

@@ -16,16 +16,9 @@
 package org.b3log.solo.processor;
 
 import freemarker.template.Template;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Map;
-import javax.inject.Inject;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.lang.StringUtils;
 import org.b3log.latke.Keys;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.Pagination;
@@ -52,6 +45,14 @@ import org.b3log.solo.service.StatisticMgmtService;
 import org.b3log.solo.util.Skins;
 import org.json.JSONObject;
 
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.Map;
+
 /**
  * Index processor.
  *

src/main/java/org/b3log/solo/processor/InitProcessor.java

@@ -15,14 +15,9 @@
  */
 package org.b3log.solo.processor;
 
-import java.util.Calendar;
-import java.util.Locale;
-import java.util.Map;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.b3log.latke.Keys;
 import org.b3log.latke.Latkes;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.Role;
@@ -48,6 +43,12 @@ import org.b3log.solo.util.QueryResults;
 import org.b3log.solo.util.Thumbnails;
 import org.json.JSONObject;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Calendar;
+import java.util.Locale;
+import java.util.Map;
+
 /**
  * Solo initialization service.
  *

src/main/java/org/b3log/solo/processor/LoginProcessor.java

@@ -18,6 +18,7 @@ package org.b3log.solo.processor;
 
 import org.b3log.latke.Keys;
 import org.b3log.latke.Latkes;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.mail.MailService;
@@ -51,7 +52,6 @@ import org.b3log.solo.util.Randoms;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -367,7 +367,7 @@ public class LoginProcessor {
 
             user.put(User.USER_PASSWORD, newPwd);
             userMgmtService.updateUser(user);
-            LOGGER.log(Level.DEBUG, "[{0}]'s password updated successfully.", new Object[] {userEmail});
+            LOGGER.log(Level.DEBUG, "[{0}]'s password updated successfully.", userEmail);
 
             jsonObject.put("succeed", true);
             jsonObject.put("to", Latkes.getServePath() + "/login?from=reset");
@@ -428,7 +428,7 @@ public class LoginProcessor {
         jsonObject.put("to", Latkes.getServePath() + "/login?from=forgot");
         jsonObject.put(Keys.MSG, langPropsService.get("resetPwdSuccessSend"));
 
-        LOGGER.log(Level.DEBUG, "Sent a mail[mailSubject={0}, mailBody=[{1}] to [{2}]", new Object[] {mailSubject, mailBody, userEmail});
+        LOGGER.log(Level.DEBUG, "Sent a mail[mailSubject={0}, mailBody=[{1}] to [{2}]", mailSubject, mailBody, userEmail);
     }
 
     /**

src/main/java/org/b3log/solo/processor/PageProcessor.java

@@ -15,14 +15,8 @@
  */
 package org.b3log.solo.processor;
 
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.b3log.latke.Keys;
-import org.b3log.latke.Latkes;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.service.LangPropsService;
@@ -45,6 +39,12 @@ import org.b3log.solo.util.Markdowns;
 import org.b3log.solo.util.Skins;
 import org.json.JSONObject;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
 /**
  * Page processor.
  *

src/main/java/org/b3log/solo/processor/RepairProcessor.java

@@ -15,22 +15,19 @@
  */
 package org.b3log.solo.processor;
 
-import java.io.IOException;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.ExecutionException;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.b3log.latke.Keys;
 import org.b3log.latke.Latkes;
 import org.b3log.latke.ioc.LatkeBeanManager;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.mail.MailService;
 import org.b3log.latke.mail.MailService.Message;
 import org.b3log.latke.mail.MailServiceFactory;
-import org.b3log.latke.repository.*;
+import org.b3log.latke.repository.Query;
+import org.b3log.latke.repository.Repositories;
+import org.b3log.latke.repository.Repository;
+import org.b3log.latke.repository.Transaction;
 import org.b3log.latke.repository.annotation.Transactional;
 import org.b3log.latke.servlet.HTTPRequestContext;
 import org.b3log.latke.servlet.HTTPRequestMethod;
@@ -38,22 +35,14 @@ import org.b3log.latke.servlet.annotation.RequestProcessing;
 import org.b3log.latke.servlet.annotation.RequestProcessor;
 import org.b3log.latke.servlet.renderer.TextHTMLRenderer;
 import org.b3log.latke.util.CollectionUtils;
-import org.b3log.solo.model.*;
+import org.b3log.solo.model.Article;
+import org.b3log.solo.model.Option;
+import org.b3log.solo.model.Statistic;
+import org.b3log.solo.model.Tag;
 import org.b3log.solo.repository.ArticleRepository;
 import org.b3log.solo.repository.TagArticleRepository;
 import org.b3log.solo.repository.TagRepository;
-import org.b3log.solo.repository.impl.ArchiveDateArticleRepositoryImpl;
-import org.b3log.solo.repository.impl.ArchiveDateRepositoryImpl;
-import org.b3log.solo.repository.impl.ArticleRepositoryImpl;
-import org.b3log.solo.repository.impl.CommentRepositoryImpl;
-import org.b3log.solo.repository.impl.LinkRepositoryImpl;
-import org.b3log.solo.repository.impl.OptionRepositoryImpl;
-import org.b3log.solo.repository.impl.PageRepositoryImpl;
-import org.b3log.solo.repository.impl.PluginRepositoryImpl;
-import org.b3log.solo.repository.impl.StatisticRepositoryImpl;
-import org.b3log.solo.repository.impl.TagArticleRepositoryImpl;
-import org.b3log.solo.repository.impl.TagRepositoryImpl;
-import org.b3log.solo.repository.impl.UserRepositoryImpl;
+import org.b3log.solo.repository.impl.*;
 import org.b3log.solo.service.PreferenceMgmtService;
 import org.b3log.solo.service.PreferenceQueryService;
 import org.b3log.solo.service.StatisticMgmtService;
@@ -61,6 +50,13 @@ import org.b3log.solo.service.StatisticQueryService;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.ExecutionException;
+
 /**
  * Provides patches on some special issues.
  *
@@ -163,7 +159,7 @@ public class RepairProcessor {
                 final JSONObject article = articles.getJSONObject(i);
 
                 final JSONArray names = article.names();
-                final Set<String> nameSet = CollectionUtils.<String>jsonArrayToSet(names);
+                final Set<String> nameSet = CollectionUtils.jsonArrayToSet(names);
 
                 if (nameSet.removeAll(keyNames)) {
                     for (final String unusedName : nameSet) {
@@ -172,7 +168,7 @@ public class RepairProcessor {
 
                     articleRepository.update(article.getString(Keys.OBJECT_ID), article);
                     LOGGER.log(Level.INFO, "Found an article[id={0}] exists unused properties[{1}]",
-                            new Object[]{article.getString(Keys.OBJECT_ID), nameSet});
+                            article.getString(Keys.OBJECT_ID), nameSet);
                 }
             }
 
@@ -315,7 +311,7 @@ public class RepairProcessor {
                 tagRepository.update(tagId, tag);
 
                 LOGGER.log(Level.INFO, "Repaired tag[title={0}, refCnt={1}, publishedTagRefCnt={2}]",
-                        new Object[]{tag.getString(Tag.TAG_TITLE), tagRefCnt, publishedTagRefCnt});
+                        tag.getString(Tag.TAG_TITLE), tagRefCnt, publishedTagRefCnt);
             }
 
             renderer.setContent("Repair sucessfully!");

src/main/java/org/b3log/solo/processor/SitemapProcessor.java

@@ -16,14 +16,10 @@
 package org.b3log.solo.processor;
 
 
-import java.io.IOException;
-import java.net.URLEncoder;
-import java.util.Date;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.lang.time.DateFormatUtils;
 import org.b3log.latke.Keys;
 import org.b3log.latke.Latkes;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.repository.FilterOperator;
@@ -49,6 +45,11 @@ import org.b3log.solo.service.PreferenceQueryService;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.util.Date;
+
 
 /**
  * Site map (sitemap) processor.

src/main/java/org/b3log/solo/processor/StatProcessor.java

@@ -16,7 +16,7 @@
 package org.b3log.solo.processor;
 
 
-import javax.inject.Inject;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.servlet.HTTPRequestContext;
 import org.b3log.latke.servlet.HTTPRequestMethod;
@@ -64,6 +64,6 @@ public class StatProcessor {
     public void onlineVisitorCountRefresher(final HTTPRequestContext context) {
         context.setRenderer(new DoNothingRenderer());
 
-        statisticMgmtService.removeExpiredOnlineVisitor();
+        StatisticMgmtService.removeExpiredOnlineVisitor();
     }
 }

src/main/java/org/b3log/solo/processor/TagProcessor.java

@@ -15,17 +15,9 @@
  */
 package org.b3log.solo.processor;
 
-import java.io.IOException;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.b3log.latke.Keys;
 import org.b3log.latke.Latkes;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.Pagination;
@@ -45,16 +37,21 @@ import org.b3log.solo.model.Common;
 import org.b3log.solo.model.Option;
 import org.b3log.solo.model.Tag;
 import org.b3log.solo.processor.util.Filler;
-import org.b3log.solo.service.ArticleQueryService;
-import org.b3log.solo.service.PreferenceQueryService;
-import org.b3log.solo.service.StatisticMgmtService;
-import org.b3log.solo.service.TagQueryService;
-import org.b3log.solo.service.UserQueryService;
+import org.b3log.solo.service.*;
 import org.b3log.solo.util.Skins;
 import org.b3log.solo.util.comparator.Comparators;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
 /**
  * Tag processor.
  *
@@ -145,7 +142,7 @@ public class TagProcessor {
                 return;
             }
 
-            LOGGER.log(Level.DEBUG, "Tag[title={0}, currentPageNum={1}]", new Object[]{tagTitle, currentPageNum});
+            LOGGER.log(Level.DEBUG, "Tag[title={0}, currentPageNum={1}]", tagTitle, currentPageNum);
 
             tagTitle = URLDecoder.decode(tagTitle, "UTF-8");
             final JSONObject result = tagQueryService.getTagByTitle(tagTitle);
@@ -191,7 +188,7 @@ public class TagProcessor {
             final int pageCount = (int) Math.ceil((double) tagArticleCount / (double) pageSize);
 
             LOGGER.log(Level.TRACE, "Paginate tag-articles[currentPageNum={0}, pageSize={1}, pageCount={2}, windowSize={3}]",
-                    new Object[]{currentPageNum, pageSize, pageCount, windowSize});
+                    currentPageNum, pageSize, pageCount, windowSize);
             final List<Integer> pageNums = Paginator.paginate(currentPageNum, pageSize, pageCount, windowSize);
 
             LOGGER.log(Level.TRACE, "tag-articles[pageNums={0}]", pageNums);

src/main/java/org/b3log/solo/processor/UserTemplateProcessor.java

@@ -17,13 +17,9 @@ package org.b3log.solo.processor;
 
 
 import freemarker.template.Template;
-import java.io.IOException;
-import java.util.Map;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.lang.StringUtils;
 import org.b3log.latke.Keys;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.service.LangPropsService;
@@ -42,6 +38,11 @@ import org.b3log.solo.service.StatisticMgmtService;
 import org.b3log.solo.util.Skins;
 import org.json.JSONObject;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Map;
+
 
 /**
  * User template processor.
@@ -105,7 +106,7 @@ public class UserTemplateProcessor {
         String templateName = StringUtils.substringAfterLast(requestURI, "/");
 
         templateName = StringUtils.substringBefore(templateName, ".") + ".ftl";
-        LOGGER.log(Level.DEBUG, "Shows page[requestURI={0}, templateName={1}]", new Object[] {requestURI, templateName});
+        LOGGER.log(Level.DEBUG, "Shows page[requestURI={0}, templateName={1}]", requestURI, templateName);
 
         final AbstractFreeMarkerRenderer renderer = new FreeMarkerRenderer();
 

src/main/java/org/b3log/solo/processor/console/AdminConsole.java

@@ -25,6 +25,7 @@ import org.b3log.latke.RuntimeDatabase;
 import org.b3log.latke.event.Event;
 import org.b3log.latke.event.EventException;
 import org.b3log.latke.event.EventManager;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.Plugin;
@@ -52,7 +53,6 @@ import org.b3log.solo.service.UserQueryService;
 import org.b3log.solo.util.Thumbnails;
 import org.json.JSONObject;
 
-import javax.inject.Inject;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

src/main/java/org/b3log/solo/processor/console/ArticleConsole.java

@@ -15,12 +15,10 @@
  */
 package org.b3log.solo.processor.console;
 
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.lang.StringUtils;
 import org.b3log.latke.Keys;
 import org.b3log.latke.Latkes;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.User;
@@ -43,6 +41,9 @@ import org.b3log.solo.util.QueryResults;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * Article console request processing.
  *
@@ -261,7 +262,7 @@ public class ArticleConsole {
 
             path = path.substring((status + "/").length());
 
-            final boolean published = "published".equals(status) ? true : false;
+            final boolean published = "published".equals(status);
 
             final JSONObject requestJSONObject = Requests.buildPaginationRequest(path);
 

src/main/java/org/b3log/solo/processor/console/CategoryConsole.java

@@ -18,6 +18,7 @@ package org.b3log.solo.processor.console;
 import org.apache.commons.lang.StringUtils;
 import org.b3log.latke.Keys;
 import org.b3log.latke.Latkes;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.service.LangPropsService;
@@ -38,7 +39,6 @@ import org.b3log.solo.service.UserQueryService;
 import org.b3log.solo.util.QueryResults;
 import org.json.JSONObject;
 
-import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;

src/main/java/org/b3log/solo/processor/console/CommentConsole.java

@@ -16,12 +16,9 @@
 package org.b3log.solo.processor.console;
 
 
-import java.util.List;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.b3log.latke.Keys;
 import org.b3log.latke.Latkes;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.service.LangPropsService;
@@ -38,6 +35,10 @@ import org.b3log.solo.service.UserQueryService;
 import org.b3log.solo.util.QueryResults;
 import org.json.JSONObject;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
 
 /**
  * Comment console request processing.

src/main/java/org/b3log/solo/processor/console/LinkConsole.java

@@ -16,11 +16,9 @@
 package org.b3log.solo.processor.console;
 
 
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.b3log.latke.Keys;
 import org.b3log.latke.Latkes;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.service.LangPropsService;
@@ -29,14 +27,17 @@ import org.b3log.latke.servlet.HTTPRequestMethod;
 import org.b3log.latke.servlet.annotation.RequestProcessing;
 import org.b3log.latke.servlet.annotation.RequestProcessor;
 import org.b3log.latke.servlet.renderer.JSONRenderer;
+import org.b3log.latke.util.Requests;
 import org.b3log.solo.model.Common;
 import org.b3log.solo.service.LinkMgmtService;
 import org.b3log.solo.service.LinkQueryService;
-import org.b3log.solo.util.QueryResults;
-import org.b3log.latke.util.Requests;
 import org.b3log.solo.service.UserQueryService;
+import org.b3log.solo.util.QueryResults;
 import org.json.JSONObject;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 
 /**
  * Link console request processing.

src/main/java/org/b3log/solo/processor/console/PageConsole.java

@@ -16,11 +16,9 @@
 package org.b3log.solo.processor.console;
 
 
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.b3log.latke.Keys;
 import org.b3log.latke.Latkes;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.service.LangPropsService;
@@ -40,6 +38,9 @@ import org.b3log.solo.util.QueryResults;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 
 /**
  * Plugin console request processing.

src/main/java/org/b3log/solo/processor/console/PluginConsole.java

@@ -16,12 +16,9 @@
 package org.b3log.solo.processor.console;
 
 
-import java.util.Map;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.b3log.latke.Keys;
 import org.b3log.latke.Latkes;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.Plugin;
@@ -40,6 +37,10 @@ import org.b3log.solo.service.PluginQueryService;
 import org.b3log.solo.util.QueryResults;
 import org.json.JSONObject;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
+
 
 /**
  * Plugin console request processing.

src/main/java/org/b3log/solo/processor/console/PreferenceConsole.java

@@ -15,12 +15,9 @@
  */
 package org.b3log.solo.processor.console;
 
-import javax.inject.Inject;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.lang.StringUtils;
 import org.b3log.latke.Keys;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.service.LangPropsService;
@@ -34,15 +31,15 @@ import org.b3log.latke.util.Requests;
 import org.b3log.solo.model.Option;
 import org.b3log.solo.model.Sign;
 import org.b3log.solo.model.Skin;
-import org.b3log.solo.service.OptionMgmtService;
-import org.b3log.solo.service.OptionQueryService;
-import org.b3log.solo.service.PreferenceMgmtService;
-import org.b3log.solo.service.PreferenceQueryService;
-import org.b3log.solo.service.UserQueryService;
+import org.b3log.solo.service.*;
 import org.b3log.solo.util.QueryResults;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * Preference console request processing.
  *

src/main/java/org/b3log/solo/processor/console/TagConsole.java

@@ -16,13 +16,8 @@
 package org.b3log.solo.processor.console;
 
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.b3log.latke.Keys;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.service.LangPropsService;
@@ -38,6 +33,12 @@ import org.b3log.solo.service.TagQueryService;
 import org.b3log.solo.service.UserQueryService;
 import org.json.JSONObject;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
 
 /**
  * Tag console request processing.

src/main/java/org/b3log/solo/processor/console/UserConsole.java

@@ -17,6 +17,7 @@ package org.b3log.solo.processor.console;
 
 import org.b3log.latke.Keys;
 import org.b3log.latke.Latkes;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.Role;
@@ -36,7 +37,6 @@ import org.b3log.solo.service.UserQueryService;
 import org.b3log.solo.util.QueryResults;
 import org.json.JSONObject;
 
-import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 

src/main/java/org/b3log/solo/processor/console/common/ProcessAuthAdvice.java

@@ -15,22 +15,20 @@
  */
 package org.b3log.solo.processor.console.common;
 
-
-import java.io.IOException;
-import java.util.Map;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-import javax.servlet.http.HttpServletResponse;
 import org.b3log.latke.ioc.LatkeBeanManager;
 import org.b3log.latke.ioc.Lifecycle;
-
+import org.b3log.latke.ioc.inject.Named;
+import org.b3log.latke.ioc.inject.Singleton;
 import org.b3log.latke.servlet.HTTPRequestContext;
 import org.b3log.latke.servlet.advice.BeforeRequestProcessAdvice;
 import org.b3log.latke.servlet.advice.RequestProcessAdviceException;
 import org.b3log.latke.servlet.advice.RequestReturnAdviceException;
 import org.b3log.solo.service.UserQueryService;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Map;
+
 
 /**
  *  The common auth check before advice for admin console.

src/main/java/org/b3log/solo/processor/renderer/ConsoleRenderer.java

@@ -18,13 +18,14 @@ package org.b3log.solo.processor.renderer;
 import freemarker.template.Configuration;
 import freemarker.template.Template;
 import freemarker.template.TemplateExceptionHandler;
-import java.io.IOException;
-import javax.servlet.ServletContext;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.servlet.HTTPRequestContext;
 import org.b3log.latke.servlet.renderer.freemarker.AbstractFreeMarkerRenderer;
 import org.b3log.solo.SoloServletListener;
 
+import javax.servlet.ServletContext;
+import java.io.IOException;
+
 /**
  * <a href="http://freemarker.org">FreeMarker</a> HTTP response renderer for administrator console and initialization
  * rendering.

src/main/java/org/b3log/solo/processor/util/FillTagArticles.java

@@ -19,6 +19,7 @@ package org.b3log.solo.processor.util;
 import freemarker.template.TemplateMethodModel;
 import freemarker.template.TemplateModelException;
 import org.b3log.latke.Keys;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.service.ServiceException;
 import org.b3log.latke.service.annotation.Service;
@@ -28,7 +29,6 @@ import org.b3log.solo.service.TagQueryService;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import javax.inject.Inject;
 import java.util.ArrayList;
 import java.util.List;
 

src/main/java/org/b3log/solo/processor/util/Filler.java

@@ -22,6 +22,7 @@ import org.b3log.latke.Latkes;
 import org.b3log.latke.event.Event;
 import org.b3log.latke.event.EventException;
 import org.b3log.latke.event.EventManager;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.Pagination;
@@ -46,7 +47,6 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.*;

src/main/java/org/b3log/solo/processor/util/TopBars.java

@@ -18,14 +18,8 @@ package org.b3log.solo.processor.util;
 
 import freemarker.template.Template;
 import freemarker.template.TemplateException;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.util.HashMap;
-import java.util.Map;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.b3log.latke.Keys;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.Role;
@@ -45,6 +39,13 @@ import org.b3log.solo.service.UserQueryService;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.HashMap;
+import java.util.Map;
+
 
 /**
  * Top bar utilities.
@@ -119,7 +120,7 @@ public class TopBars {
             topBarModel.put("mobileLabel", langPropsService.get("mobileLabel"));
 
             topBarModel.put("onlineVisitor1Label", langPropsService.get("onlineVisitor1Label"));
-            topBarModel.put(Common.ONLINE_VISITOR_CNT, statisticQueryService.getOnlineVisitorCount());
+            topBarModel.put(Common.ONLINE_VISITOR_CNT, StatisticQueryService.getOnlineVisitorCount());
 
             if (null == currentUser) {
                 topBarModel.put(Common.LOGIN_URL, userService.createLoginURL(Common.ADMIN_INDEX_URI));

src/main/java/org/b3log/solo/repository/ArchiveDateRepository.java

@@ -16,11 +16,12 @@
 package org.b3log.solo.repository;
 
 
-import java.util.List;
 import org.b3log.latke.repository.Repository;
 import org.b3log.latke.repository.RepositoryException;
 import org.json.JSONObject;
 
+import java.util.List;
+
 
 /**
  * Archive date repository.

src/main/java/org/b3log/solo/repository/ArticleRepository.java

@@ -16,11 +16,12 @@
 package org.b3log.solo.repository;
 
 
-import java.util.List;
 import org.b3log.latke.repository.Repository;
 import org.b3log.latke.repository.RepositoryException;
 import org.json.JSONObject;
 
+import java.util.List;
+
 
 /**
  * Article repository.

src/main/java/org/b3log/solo/repository/CommentRepository.java

@@ -16,12 +16,12 @@
 package org.b3log.solo.repository;
 
 
-import java.util.List;
-
 import org.b3log.latke.repository.Repository;
 import org.b3log.latke.repository.RepositoryException;
 import org.json.JSONObject;
 
+import java.util.List;
+
 
 /**
  * Comment repository.

src/main/java/org/b3log/solo/repository/PageRepository.java

@@ -16,11 +16,12 @@
 package org.b3log.solo.repository;
 
 
-import java.util.List;
 import org.b3log.latke.repository.Repository;
 import org.b3log.latke.repository.RepositoryException;
 import org.json.JSONObject;
 
+import java.util.List;
+
 
 /**
  * Page repository.

src/main/java/org/b3log/solo/repository/TagArticleRepository.java

@@ -16,11 +16,12 @@
 package org.b3log.solo.repository;
 
 
-import java.util.List;
 import org.b3log.latke.repository.Repository;
 import org.b3log.latke.repository.RepositoryException;
 import org.json.JSONObject;
 
+import java.util.List;
+
 
 /**
  * Tag-Article repository.

src/main/java/org/b3log/solo/repository/TagRepository.java

@@ -16,11 +16,12 @@
 package org.b3log.solo.repository;
 
 
-import java.util.List;
 import org.b3log.latke.repository.Repository;
 import org.b3log.latke.repository.RepositoryException;
 import org.json.JSONObject;
 
+import java.util.List;
+
 
 /**
  * Tag repository.

src/main/java/org/b3log/solo/repository/impl/ArchiveDateArticleRepositoryImpl.java

@@ -17,15 +17,10 @@ package org.b3log.solo.repository.impl;
 
 
 import org.b3log.latke.Keys;
-import org.b3log.latke.repository.AbstractRepository;
-import org.b3log.latke.repository.FilterOperator;
-import org.b3log.latke.repository.PropertyFilter;
-import org.b3log.latke.repository.Query;
-import org.b3log.latke.repository.RepositoryException;
-import org.b3log.latke.repository.SortDirection;
+import org.b3log.latke.repository.*;
 import org.b3log.latke.repository.annotation.Repository;
-import org.b3log.solo.model.Article;
 import org.b3log.solo.model.ArchiveDate;
+import org.b3log.solo.model.Article;
 import org.b3log.solo.repository.ArchiveDateArticleRepository;
 import org.json.JSONArray;
 import org.json.JSONObject;

src/main/java/org/b3log/solo/repository/impl/ArchiveDateRepositoryImpl.java

@@ -16,19 +16,11 @@
 package org.b3log.solo.repository.impl;
 
 
-import java.text.ParseException;
-import java.util.Iterator;
-import java.util.List;
 import org.apache.commons.lang.time.DateUtils;
 import org.b3log.latke.Keys;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
-import org.b3log.latke.repository.AbstractRepository;
-import org.b3log.latke.repository.FilterOperator;
-import org.b3log.latke.repository.PropertyFilter;
-import org.b3log.latke.repository.Query;
-import org.b3log.latke.repository.RepositoryException;
-import org.b3log.latke.repository.SortDirection;
+import org.b3log.latke.repository.*;
 import org.b3log.latke.repository.annotation.Repository;
 import org.b3log.latke.util.CollectionUtils;
 import org.b3log.solo.model.ArchiveDate;
@@ -36,6 +28,10 @@ import org.b3log.solo.repository.ArchiveDateRepository;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
+import java.text.ParseException;
+import java.util.Iterator;
+import java.util.List;
+
 
 /**
  * Archive date repository.
@@ -70,7 +66,7 @@ public class ArchiveDateRepositoryImpl extends AbstractRepository implements Arc
             throw new RepositoryException("Can not parse archive date [" + archiveDate + "]");
         }
 
-        LOGGER.log(Level.TRACE, "Archive date [{0}] parsed to time [{1}]", new Object[] {archiveDate, time});
+        LOGGER.log(Level.TRACE, "Archive date [{0}] parsed to time [{1}]", archiveDate, time);
 
         final Query query = new Query();
 

src/main/java/org/b3log/solo/repository/impl/ArticleRepositoryImpl.java

@@ -15,19 +15,10 @@
  */
 package org.b3log.solo.repository.impl;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
 import org.b3log.latke.Keys;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
-import org.b3log.latke.repository.AbstractRepository;
-import org.b3log.latke.repository.CompositeFilterOperator;
-import org.b3log.latke.repository.FilterOperator;
-import org.b3log.latke.repository.PropertyFilter;
-import org.b3log.latke.repository.Query;
-import org.b3log.latke.repository.RepositoryException;
-import org.b3log.latke.repository.SortDirection;
+import org.b3log.latke.repository.*;
 import org.b3log.latke.repository.annotation.Repository;
 import org.b3log.latke.util.CollectionUtils;
 import org.b3log.solo.model.Article;
@@ -36,6 +27,10 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
 /**
  * Article repository.
  *
@@ -233,7 +228,7 @@ public class ArticleRepositoryImpl extends AbstractRepository implements Article
         final JSONObject result1 = get(query);
         final JSONArray array1 = result1.optJSONArray(Keys.RESULTS);
 
-        final List<JSONObject> list1 = CollectionUtils.<JSONObject>jsonArrayToList(array1);
+        final List<JSONObject> list1 = CollectionUtils.jsonArrayToList(array1);
 
         ret.addAll(list1);
 
@@ -252,7 +247,7 @@ public class ArticleRepositoryImpl extends AbstractRepository implements Article
             final JSONObject result2 = get(query);
             final JSONArray array2 = result2.optJSONArray(Keys.RESULTS);
 
-            final List<JSONObject> list2 = CollectionUtils.<JSONObject>jsonArrayToList(array2);
+            final List<JSONObject> list2 = CollectionUtils.jsonArrayToList(array2);
 
             ret.addAll(list2);
         }

src/main/java/org/b3log/solo/repository/impl/CommentRepositoryImpl.java

@@ -16,27 +16,23 @@
 package org.b3log.solo.repository.impl;
 
 
-import java.util.Iterator;
-import java.util.List;
-import javax.inject.Inject;
 import org.b3log.latke.Keys;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
-import org.b3log.latke.repository.AbstractRepository;
-import org.b3log.latke.repository.FilterOperator;
-import org.b3log.latke.repository.PropertyFilter;
-import org.b3log.latke.repository.Query;
-import org.b3log.latke.repository.RepositoryException;
-import org.b3log.latke.repository.SortDirection;
+import org.b3log.latke.repository.*;
 import org.b3log.latke.repository.annotation.Repository;
-import org.b3log.solo.model.Comment;
-import org.b3log.solo.repository.CommentRepository;
 import org.b3log.latke.util.CollectionUtils;
 import org.b3log.solo.model.Article;
+import org.b3log.solo.model.Comment;
 import org.b3log.solo.repository.ArticleRepository;
+import org.b3log.solo.repository.CommentRepository;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
+import java.util.Iterator;
+import java.util.List;
+
 
 /**
  * Comment repository.
@@ -76,7 +72,7 @@ public class CommentRepositoryImpl extends AbstractRepository implements Comment
             remove(commentId);
         }
 
-        LOGGER.log(Level.DEBUG, "Removed comments[onId={0}, removedCnt={1}]", new Object[] {onId, comments.size()});
+        LOGGER.log(Level.DEBUG, "Removed comments[onId={0}, removedCnt={1}]", onId, comments.size());
 
         return comments.size();
     }

src/main/java/org/b3log/solo/repository/impl/LinkRepositoryImpl.java

@@ -17,12 +17,7 @@ package org.b3log.solo.repository.impl;
 
 
 import org.b3log.latke.Keys;
-import org.b3log.latke.repository.AbstractRepository;
-import org.b3log.latke.repository.FilterOperator;
-import org.b3log.latke.repository.PropertyFilter;
-import org.b3log.latke.repository.Query;
-import org.b3log.latke.repository.RepositoryException;
-import org.b3log.latke.repository.SortDirection;
+import org.b3log.latke.repository.*;
 import org.b3log.latke.repository.annotation.Repository;
 import org.b3log.solo.model.Link;
 import org.b3log.solo.repository.LinkRepository;

src/main/java/org/b3log/solo/repository/impl/PageRepositoryImpl.java

@@ -16,14 +16,8 @@
 package org.b3log.solo.repository.impl;
 
 
-import java.util.List;
 import org.b3log.latke.Keys;
-import org.b3log.latke.repository.AbstractRepository;
-import org.b3log.latke.repository.FilterOperator;
-import org.b3log.latke.repository.PropertyFilter;
-import org.b3log.latke.repository.Query;
-import org.b3log.latke.repository.RepositoryException;
-import org.b3log.latke.repository.SortDirection;
+import org.b3log.latke.repository.*;
 import org.b3log.latke.repository.annotation.Repository;
 import org.b3log.latke.util.CollectionUtils;
 import org.b3log.solo.model.Page;
@@ -31,6 +25,8 @@ import org.b3log.solo.repository.PageRepository;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
+import java.util.List;
+
 
 /**
  * Page repository.

src/main/java/org/b3log/solo/repository/impl/TagArticleRepositoryImpl.java

@@ -16,22 +16,18 @@
 package org.b3log.solo.repository.impl;
 
 
-import java.util.List;
-import org.b3log.solo.model.Article;
-import org.b3log.solo.model.Tag;
-import org.b3log.solo.repository.TagArticleRepository;
 import org.b3log.latke.Keys;
-import org.b3log.latke.repository.AbstractRepository;
-import org.b3log.latke.repository.FilterOperator;
-import org.b3log.latke.repository.PropertyFilter;
-import org.b3log.latke.repository.Query;
-import org.b3log.latke.repository.RepositoryException;
-import org.b3log.latke.repository.SortDirection;
+import org.b3log.latke.repository.*;
 import org.b3log.latke.repository.annotation.Repository;
 import org.b3log.latke.util.CollectionUtils;
+import org.b3log.solo.model.Article;
+import org.b3log.solo.model.Tag;
+import org.b3log.solo.repository.TagArticleRepository;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
+import java.util.List;
+
 
 /**
  * Tag-Article relation repository.

src/main/java/org/b3log/solo/repository/impl/TagRepositoryImpl.java

@@ -15,28 +15,24 @@
  */
 package org.b3log.solo.repository.impl;
 
-import java.text.Collator;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import javax.inject.Inject;
-import org.b3log.solo.model.Tag;
-import org.b3log.solo.repository.TagRepository;
 import org.b3log.latke.Keys;
-import org.b3log.latke.repository.AbstractRepository;
-import org.b3log.latke.repository.FilterOperator;
-import org.b3log.latke.repository.PropertyFilter;
-import org.b3log.latke.repository.Query;
-import org.b3log.latke.repository.RepositoryException;
-import org.b3log.latke.repository.SortDirection;
+import org.b3log.latke.ioc.inject.Inject;
+import org.b3log.latke.repository.*;
 import org.b3log.latke.repository.annotation.Repository;
 import org.b3log.latke.util.CollectionUtils;
+import org.b3log.solo.model.Tag;
 import org.b3log.solo.repository.TagArticleRepository;
+import org.b3log.solo.repository.TagRepository;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.text.Collator;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
 /**
  * Tag repository.
  *

src/main/java/org/b3log/solo/repository/impl/UserRepositoryImpl.java

@@ -19,11 +19,7 @@ package org.b3log.solo.repository.impl;
 import org.b3log.latke.Keys;
 import org.b3log.latke.model.Role;
 import org.b3log.latke.model.User;
-import org.b3log.latke.repository.AbstractRepository;
-import org.b3log.latke.repository.FilterOperator;
-import org.b3log.latke.repository.PropertyFilter;
-import org.b3log.latke.repository.Query;
-import org.b3log.latke.repository.RepositoryException;
+import org.b3log.latke.repository.*;
 import org.b3log.latke.repository.annotation.Repository;
 import org.b3log.solo.repository.UserRepository;
 import org.json.JSONArray;

src/main/java/org/b3log/solo/service/ArchiveDateQueryService.java

@@ -16,8 +16,7 @@
 package org.b3log.solo.service;
 
 
-import java.util.List;
-import javax.inject.Inject;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.repository.RepositoryException;
@@ -27,6 +26,8 @@ import org.b3log.solo.model.ArchiveDate;
 import org.b3log.solo.repository.ArchiveDateRepository;
 import org.json.JSONObject;
 
+import java.util.List;
+
 
 /**
  * Archive date query service.

src/main/java/org/b3log/solo/service/ArticleMgmtService.java

@@ -16,18 +16,13 @@
 package org.b3log.solo.service;
 
 
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import javax.inject.Inject;
 import org.apache.commons.lang.time.DateFormatUtils;
 import org.apache.commons.lang.time.DateUtils;
 import org.b3log.latke.Keys;
 import org.b3log.latke.event.Event;
 import org.b3log.latke.event.EventException;
 import org.b3log.latke.event.EventManager;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.repository.RepositoryException;
@@ -39,26 +34,21 @@ import org.b3log.latke.util.CollectionUtils;
 import org.b3log.latke.util.Ids;
 import org.b3log.latke.util.Strings;
 import org.b3log.solo.event.EventTypes;
-import org.b3log.solo.model.ArchiveDate;
-import org.b3log.solo.model.Article;
-import static org.b3log.solo.model.Article.*;
-import org.b3log.solo.model.Comment;
-import org.b3log.solo.model.Common;
-import org.b3log.solo.model.Option;
-import org.b3log.solo.model.Tag;
-import org.b3log.solo.model.UserExt;
-import org.b3log.solo.repository.ArchiveDateArticleRepository;
-import org.b3log.solo.repository.ArchiveDateRepository;
-import org.b3log.solo.repository.ArticleRepository;
-import org.b3log.solo.repository.CommentRepository;
-import org.b3log.solo.repository.TagArticleRepository;
-import org.b3log.solo.repository.TagRepository;
-import org.b3log.solo.repository.UserRepository;
+import org.b3log.solo.model.*;
+import org.b3log.solo.repository.*;
 import org.b3log.solo.util.Comments;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
+import static org.b3log.solo.model.Article.*;
+
 
 /**
  * Article management service.
@@ -702,9 +692,8 @@ public class ArticleMgmtService {
                 }
                 tagRepository.update(tagId, tag);
                 LOGGER.log(Level.TRACE, "Deced tag[title={0}, refCnt={1}, publishedRefCnt={2}] of article[id={3}]",
-                    new Object[] {
-                    tag.getString(Tag.TAG_TITLE), tag.getInt(Tag.TAG_REFERENCE_COUNT), tag.getInt(Tag.TAG_PUBLISHED_REFERENCE_COUNT),
-                    articleId});
+                        tag.getString(Tag.TAG_TITLE), tag.getInt(Tag.TAG_REFERENCE_COUNT), tag.getInt(Tag.TAG_PUBLISHED_REFERENCE_COUNT),
+                        articleId);
             }
         } catch (final Exception e) {
             LOGGER.log(Level.ERROR, "Decs tag references count of article[id" + articleId + "] failed", e);
@@ -967,7 +956,7 @@ public class ArticleMgmtService {
 
             if (null == tag) {
                 LOGGER.log(Level.TRACE, "Found a new tag[title={0}] in article[title={1}]",
-                    new Object[] {tagTitle, article.optString(Article.ARTICLE_TITLE)});
+                        tagTitle, article.optString(Article.ARTICLE_TITLE));
                 tag = new JSONObject();
                 tag.put(Tag.TAG_TITLE, tagTitle);
                 tag.put(Tag.TAG_REFERENCE_COUNT, 1);
@@ -982,7 +971,7 @@ public class ArticleMgmtService {
             } else {
                 tagId = tag.optString(Keys.OBJECT_ID);
                 LOGGER.log(Level.TRACE, "Found a existing tag[title={0}, id={1}] in article[title={2}]",
-                    new Object[] {tag.optString(Tag.TAG_TITLE), tag.optString(Keys.OBJECT_ID), article.optString(Article.ARTICLE_TITLE)});
+                        tag.optString(Tag.TAG_TITLE), tag.optString(Keys.OBJECT_ID), article.optString(Article.ARTICLE_TITLE));
                 final JSONObject tagTmp = new JSONObject();
 
                 tagTmp.put(Keys.OBJECT_ID, tagId);

src/main/java/org/b3log/solo/service/ArticleQueryService.java

@@ -16,6 +16,7 @@
 package org.b3log.solo.service;
 
 import org.b3log.latke.Keys;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.Pagination;
@@ -38,7 +39,6 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 import java.util.*;
@@ -270,11 +270,7 @@ public class ArticleQueryService {
 
         final JSONObject currentUser = userQueryService.getCurrentUser(request);
 
-        if (null != currentUser && !Role.VISITOR_ROLE.equals(currentUser.optString(User.USER_ROLE))) {
-            return false;
-        }
-
-        return true; // Visitor or NOT logged in
+        return !(null != currentUser && !Role.VISITOR_ROLE.equals(currentUser.optString(User.USER_ROLE)));
     }
 
     /**

src/main/java/org/b3log/solo/service/CategoryMgmtService.java

@@ -16,6 +16,7 @@
 package org.b3log.solo.service;
 
 import org.b3log.latke.Keys;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.repository.*;
@@ -29,8 +30,6 @@ import org.b3log.solo.repository.CategoryTagRepository;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
-import javax.inject.Inject;
-
 /**
  * Category management service.
  *

src/main/java/org/b3log/solo/service/CategoryQueryService.java

@@ -16,6 +16,7 @@
 package org.b3log.solo.service;
 
 import org.b3log.latke.Keys;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.Pagination;
@@ -32,7 +33,6 @@ import org.b3log.solo.repository.TagRepository;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
-import javax.inject.Inject;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -227,7 +227,7 @@ public class CategoryQueryService {
         pagination.put(Pagination.PAGINATION_PAGE_NUMS, pageNums);
 
         final JSONArray data = result.optJSONArray(Keys.RESULTS);
-        final List<JSONObject> categories = CollectionUtils.<JSONObject>jsonArrayToList(data);
+        final List<JSONObject> categories = CollectionUtils.jsonArrayToList(data);
 
         ret.put(Category.CATEGORIES, categories);
 

src/main/java/org/b3log/solo/service/CommentMgmtService.java

@@ -15,17 +15,13 @@
  */
 package org.b3log.solo.service;
 
-import java.io.IOException;
-import java.net.URL;
-import java.util.Date;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.time.DateFormatUtils;
 import org.b3log.latke.Keys;
 import org.b3log.latke.Latkes;
 import org.b3log.latke.event.Event;
 import org.b3log.latke.event.EventManager;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.mail.MailService;
@@ -35,7 +31,10 @@ import org.b3log.latke.repository.Transaction;
 import org.b3log.latke.service.LangPropsService;
 import org.b3log.latke.service.ServiceException;
 import org.b3log.latke.service.annotation.Service;
-import org.b3log.latke.urlfetch.*;
+import org.b3log.latke.urlfetch.HTTPRequest;
+import org.b3log.latke.urlfetch.HTTPResponse;
+import org.b3log.latke.urlfetch.URLFetchService;
+import org.b3log.latke.urlfetch.URLFetchServiceFactory;
 import org.b3log.latke.util.Ids;
 import org.b3log.latke.util.Strings;
 import org.b3log.solo.event.EventTypes;
@@ -53,6 +52,11 @@ import org.json.JSONObject;
 import org.jsoup.Jsoup;
 import org.jsoup.safety.Whitelist;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.net.URL;
+import java.util.Date;
+
 /**
  * Comment management service.
  *
@@ -251,7 +255,7 @@ public class CommentMgmtService {
         message.setHtmlBody(mailBody);
 
         LOGGER.log(Level.DEBUG, "Sending a mail[mailSubject={0}, mailBody=[{1}] to admin[email={2}]",
-                new Object[]{mailSubject, mailBody, adminEmail});
+                mailSubject, mailBody, adminEmail);
 
         mailService.send(message);
     }

src/main/java/org/b3log/solo/service/CommentQueryService.java

@@ -15,13 +15,9 @@
  */
 package org.b3log.solo.service;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
 import org.apache.commons.lang.StringUtils;
 import org.b3log.latke.Keys;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.Pagination;
@@ -45,6 +41,11 @@ import org.b3log.solo.util.Thumbnails;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
 /**
  * Comment query service.
  *

src/main/java/org/b3log/solo/service/InitService.java

@@ -15,19 +15,13 @@
  */
 package org.b3log.solo.service;
 
-import java.net.URL;
-import java.text.ParseException;
-import java.util.Date;
-import java.util.List;
-import java.util.Set;
-import javax.inject.Inject;
-import javax.servlet.ServletContext;
 import org.apache.commons.lang.time.DateFormatUtils;
 import org.apache.commons.lang.time.DateUtils;
 import org.b3log.latke.Keys;
 import org.b3log.latke.Latkes;
 import org.b3log.latke.RuntimeDatabase;
 import org.b3log.latke.RuntimeEnv;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.Role;
@@ -49,16 +43,7 @@ import org.b3log.latke.util.freemarker.Templates;
 import org.b3log.solo.SoloServletListener;
 import org.b3log.solo.model.*;
 import org.b3log.solo.model.Option.DefaultPreference;
-import org.b3log.solo.repository.ArchiveDateArticleRepository;
-import org.b3log.solo.repository.ArchiveDateRepository;
-import org.b3log.solo.repository.ArticleRepository;
-import org.b3log.solo.repository.CommentRepository;
-import org.b3log.solo.repository.LinkRepository;
-import org.b3log.solo.repository.OptionRepository;
-import org.b3log.solo.repository.StatisticRepository;
-import org.b3log.solo.repository.TagArticleRepository;
-import org.b3log.solo.repository.TagRepository;
-import org.b3log.solo.repository.UserRepository;
+import org.b3log.solo.repository.*;
 import org.b3log.solo.util.Comments;
 import org.b3log.solo.util.Skins;
 import org.b3log.solo.util.Thumbnails;
@@ -67,6 +52,13 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import javax.servlet.ServletContext;
+import java.net.URL;
+import java.text.ParseException;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+
 /**
  * Solo initialization service.
  *
@@ -232,7 +224,7 @@ public class InitService {
             final List<CreateTableResult> createTableResults = JdbcRepositories.initAllTables();
             for (final CreateTableResult createTableResult : createTableResults) {
                 LOGGER.log(Level.DEBUG, "Create table result[tableName={0}, isSuccess={1}]",
-                        new Object[]{createTableResult.getName(), createTableResult.isSuccess()});
+                        createTableResult.getName(), createTableResult.isSuccess());
             }
         }
 
@@ -478,7 +470,7 @@ public class InitService {
             final JSONObject tag = new JSONObject();
 
             LOGGER.log(Level.TRACE, "Found a new tag[title={0}] in article[title={1}]",
-                    new Object[]{tagTitle, article.optString(Article.ARTICLE_TITLE)});
+                    tagTitle, article.optString(Article.ARTICLE_TITLE));
             tag.put(Tag.TAG_TITLE, tagTitle);
             tag.put(Tag.TAG_REFERENCE_COUNT, 1);
             tag.put(Tag.TAG_PUBLISHED_REFERENCE_COUNT, 1);

src/main/java/org/b3log/solo/service/LinkMgmtService.java

@@ -16,8 +16,8 @@
 package org.b3log.solo.service;
 
 
-import javax.inject.Inject;
 import org.b3log.latke.Keys;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.repository.Transaction;

src/main/java/org/b3log/solo/service/LinkQueryService.java

@@ -16,9 +16,8 @@
 package org.b3log.solo.service;
 
 
-import java.util.List;
-import javax.inject.Inject;
 import org.b3log.latke.Keys;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.Pagination;
@@ -32,6 +31,8 @@ import org.b3log.solo.repository.LinkRepository;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
+import java.util.List;
+
 
 /**
  * Link query service.

src/main/java/org/b3log/solo/service/OptionMgmtService.java

@@ -16,8 +16,8 @@
 package org.b3log.solo.service;
 
 
-import javax.inject.Inject;
 import org.b3log.latke.Keys;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.repository.Transaction;
 import org.b3log.latke.service.ServiceException;
 import org.b3log.latke.service.annotation.Service;

src/main/java/org/b3log/solo/service/OptionQueryService.java

@@ -16,8 +16,8 @@
 package org.b3log.solo.service;
 
 
-import javax.inject.Inject;
 import org.b3log.latke.Keys;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.repository.FilterOperator;
 import org.b3log.latke.repository.PropertyFilter;
 import org.b3log.latke.repository.Query;

src/main/java/org/b3log/solo/service/PageMgmtService.java

@@ -15,9 +15,8 @@
  */
 package org.b3log.solo.service;
 
-import java.util.List;
-import javax.inject.Inject;
 import org.b3log.latke.Keys;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.repository.RepositoryException;
@@ -36,6 +35,8 @@ import org.b3log.solo.util.Comments;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.util.List;
+
 /**
  * Page management service.
  *

src/main/java/org/b3log/solo/service/PageQueryService.java

@@ -16,9 +16,8 @@
 package org.b3log.solo.service;
 
 
-import java.util.List;
-import javax.inject.Inject;
 import org.b3log.latke.Keys;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.Pagination;
@@ -32,6 +31,8 @@ import org.b3log.solo.repository.PageRepository;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
+import java.util.List;
+
 
 /**
  * Page query service.

src/main/java/org/b3log/solo/service/PermalinkQueryService.java

@@ -16,10 +16,8 @@
 package org.b3log.solo.service;
 
 
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import javax.inject.Inject;
 import org.b3log.latke.Latkes;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.repository.RepositoryException;
@@ -28,6 +26,9 @@ import org.b3log.latke.util.Strings;
 import org.b3log.solo.repository.ArticleRepository;
 import org.b3log.solo.repository.PageRepository;
 
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 
 /**
  * Permalink query service.

src/main/java/org/b3log/solo/service/PluginMgmtService.java

@@ -16,12 +16,10 @@
 package org.b3log.solo.service;
 
 
-import java.util.List;
-import java.util.Map;
-import javax.inject.Inject;
 import org.apache.commons.lang.StringUtils;
 import org.b3log.latke.Keys;
 import org.b3log.latke.Latkes;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.Plugin;
@@ -38,6 +36,9 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.util.List;
+import java.util.Map;
+
 
 /**
  * Plugin management service.

src/main/java/org/b3log/solo/service/PluginQueryService.java

@@ -16,9 +16,7 @@
 package org.b3log.solo.service;
 
 
-import java.util.ArrayList;
-import java.util.List;
-import javax.inject.Inject;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.Pagination;
@@ -33,6 +31,9 @@ import org.b3log.solo.repository.PluginRepository;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.util.ArrayList;
+import java.util.List;
+
 
 /**
  * Plugin query service.

src/main/java/org/b3log/solo/service/PreferenceMgmtService.java

@@ -15,18 +15,12 @@
  */
 package org.b3log.solo.service;
 
-import org.b3log.latke.service.LangPropsService;
-import org.b3log.solo.util.TimeZones;
-import org.b3log.solo.util.Skins;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.Set;
-import javax.inject.Inject;
-import javax.servlet.ServletContext;
 import org.b3log.latke.Latkes;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.repository.Transaction;
+import org.b3log.latke.service.LangPropsService;
 import org.b3log.latke.service.ServiceException;
 import org.b3log.latke.service.annotation.Service;
 import org.b3log.latke.util.Locales;
@@ -35,12 +29,18 @@ import org.b3log.latke.util.freemarker.Templates;
 import org.b3log.solo.SoloServletListener;
 import org.b3log.solo.model.Option;
 import org.b3log.solo.model.Skin;
+import org.b3log.solo.repository.OptionRepository;
+import org.b3log.solo.util.Skins;
+import org.b3log.solo.util.TimeZones;
 import org.json.JSONArray;
 import org.json.JSONObject;
-import static org.b3log.solo.model.Skin.SKINS;
-import static org.b3log.solo.model.Skin.SKIN_DIR_NAME;
-import static org.b3log.solo.model.Skin.SKIN_NAME;
-import org.b3log.solo.repository.OptionRepository;
+
+import javax.servlet.ServletContext;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.Set;
+
+import static org.b3log.solo.model.Skin.*;
 import static org.b3log.solo.util.Skins.getSkinDirNames;
 import static org.b3log.solo.util.Skins.setDirectoryForTemplateLoading;
 

src/main/java/org/b3log/solo/service/PreferenceQueryService.java

@@ -15,8 +15,8 @@
  */
 package org.b3log.solo.service;
 
-import javax.inject.Inject;
 import org.b3log.latke.Keys;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.repository.FilterOperator;

src/main/java/org/b3log/solo/service/StatisticMgmtService.java

@@ -16,12 +16,7 @@
 package org.b3log.solo.service;
 
 
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.repository.RepositoryException;
@@ -30,11 +25,17 @@ import org.b3log.latke.service.LangPropsService;
 import org.b3log.latke.service.ServiceException;
 import org.b3log.latke.service.annotation.Service;
 import org.b3log.latke.util.Requests;
-import org.json.JSONObject;
 import org.b3log.solo.model.Statistic;
 import org.b3log.solo.repository.ArticleRepository;
 import org.b3log.solo.repository.StatisticRepository;
 import org.json.JSONException;
+import org.json.JSONObject;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
 
 
 /**

src/main/java/org/b3log/solo/service/StatisticQueryService.java

@@ -16,7 +16,7 @@
 package org.b3log.solo.service;
 
 
-import javax.inject.Inject;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.repository.RepositoryException;

src/main/java/org/b3log/solo/service/TagMgmtService.java

@@ -17,6 +17,7 @@ package org.b3log.solo.service;
 
 
 import org.b3log.latke.Keys;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.repository.RepositoryException;
@@ -29,7 +30,6 @@ import org.b3log.solo.repository.TagRepository;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import javax.inject.Inject;
 import java.util.List;
 
 

src/main/java/org/b3log/solo/service/TagQueryService.java

@@ -15,10 +15,8 @@
  */
 package org.b3log.solo.service;
 
-import java.util.Iterator;
-import java.util.List;
-import javax.inject.Inject;
 import org.b3log.latke.Keys;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.repository.Query;
@@ -33,6 +31,9 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.util.Iterator;
+import java.util.List;
+
 /**
  * Tag query service.
  *

src/main/java/org/b3log/solo/service/UpgradeService.java

@@ -15,10 +15,8 @@
  */
 package org.b3log.solo.service;
 
-import java.io.IOException;
-import javax.inject.Inject;
-
 import org.b3log.latke.Keys;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.mail.MailService;
@@ -42,6 +40,8 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.io.IOException;
+
 /**
  * Upgrade service.
  *

src/main/java/org/b3log/solo/service/UserMgmtService.java

@@ -15,15 +15,12 @@
  */
 package org.b3log.solo.service;
 
-import javax.inject.Inject;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.lang.StringUtils;
 import org.b3log.latke.Keys;
 import org.b3log.latke.Latkes;
 import org.b3log.latke.ioc.LatkeBeanManager;
 import org.b3log.latke.ioc.Lifecycle;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.Role;
@@ -41,6 +38,10 @@ import org.b3log.solo.repository.UserRepository;
 import org.b3log.solo.util.Thumbnails;
 import org.json.JSONObject;
 
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * User management service.
  *
@@ -175,12 +176,12 @@ public class UserMgmtService {
             oldUser.put(User.USER_EMAIL, userNewEmail);
             oldUser.put(User.USER_NAME, userName);
 
-            final boolean mybeHashed = HASHED_PASSWORD_LENGTH == userPassword.length();
+            final boolean maybeHashed = HASHED_PASSWORD_LENGTH == userPassword.length();
             final String newHashedPassword = MD5.hash(userPassword);
             final String oldHashedPassword = oldUser.optString(User.USER_PASSWORD);
 
             if (!"demo.b3log.org".equals(Latkes.getServerHost())) { // Skips the Solo Online Demo (http://demo.b3log.org)
-                if (!mybeHashed || (!oldHashedPassword.equals(userPassword) && !oldHashedPassword.equals(newHashedPassword))) {
+                if (!maybeHashed || (!oldHashedPassword.equals(userPassword) && !oldHashedPassword.equals(newHashedPassword))) {
                     oldUser.put(User.USER_PASSWORD, newHashedPassword);
                 }
             }
@@ -213,7 +214,7 @@ public class UserMgmtService {
     }
 
     /**
-     * Swithches the user role between "defaultRole" and "visitorRole" by the specified user id.
+     * Switches the user role between "defaultRole" and "visitorRole" by the specified user id.
      *
      * @param userId the specified user id
      * @throws ServiceException exception

src/main/java/org/b3log/solo/service/UserQueryService.java

@@ -16,11 +16,8 @@
 package org.b3log.solo.service;
 
 
-import java.util.List;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.b3log.latke.Keys;
+import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.Pagination;
@@ -38,6 +35,10 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
 
 /**
  * User query service.

src/main/java/org/b3log/solo/util/Comments.java

@@ -16,7 +16,8 @@
 package org.b3log.solo.util;
 
 
-import org.b3log.solo.model.*;
+import org.b3log.solo.model.Article;
+import org.b3log.solo.model.Page;
 import org.json.JSONException;
 import org.json.JSONObject;
 

src/main/java/org/b3log/solo/util/Emotions.java

@@ -16,9 +16,10 @@
 package org.b3log.solo.util;
 
 import com.vdurmont.emoji.EmojiParser;
-import java.util.regex.Pattern;
 import org.b3log.latke.Latkes;
 
+import java.util.regex.Pattern;
+
 /**
  * Emotions utilities.
  *

src/main/java/org/b3log/solo/util/Skins.java

@@ -16,16 +16,6 @@
 package org.b3log.solo.util;
 
 import freemarker.template.TemplateExceptionHandler;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import javax.servlet.ServletContext;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
 import org.b3log.latke.Latkes;
 import org.b3log.latke.ioc.LatkeBeanManager;
 import org.b3log.latke.ioc.Lifecycle;
@@ -41,6 +31,13 @@ import org.b3log.latke.util.freemarker.Templates;
 import org.b3log.solo.SoloServletListener;
 import org.b3log.solo.model.Skin;
 
+import javax.servlet.ServletContext;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.*;
+
 /**
  * Skin utilities.
  *
@@ -86,7 +83,7 @@ public final class Skins {
             if (null == langs) {
                 LANG_MAP.clear(); // Collect unused skin languages
 
-                LOGGER.log(Level.DEBUG, "Loading skin [dirName={0}, locale={1}]", new Object[]{currentSkinDirName, localeString});
+                LOGGER.log(Level.DEBUG, "Loading skin [dirName={0}, locale={1}]", currentSkinDirName, localeString);
                 langs = new HashMap<String, String>();
 
                 final String language = Locales.getLanguage(localeString);
@@ -107,7 +104,7 @@ public final class Skins {
 
                 LANG_MAP.put(langName, langs);
                 LOGGER.log(Level.DEBUG, "Loaded skin[dirName={0}, locale={1}, keyCount={2}]",
-                        new Object[]{currentSkinDirName, localeString, langs.size()});
+                        currentSkinDirName, localeString, langs.size());
             }
 
             dataModel.putAll(langs); // Fills the current skin's language configurations

src/main/java/org/b3log/solo/util/Thumbnails.java

@@ -16,9 +16,10 @@
 package org.b3log.solo.util;
 
 
-import java.util.ResourceBundle;
 import org.b3log.latke.util.MD5;
 
+import java.util.ResourceBundle;
+
 
 /**
  * Thumbnail utilities.
@@ -36,8 +37,8 @@ public final class Thumbnails {
     /**
      * Gravatar address.
      */
-    public static final String GRAVATAR;;
-    
+    public static final String GRAVATAR;
+
     static {
         final ResourceBundle b3log = ResourceBundle.getBundle("b3log");