⬆ 升级 Latke

pom.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!--
     Description: Solo POM.
-    Version: 3.18.3.24, Sep 27, 2018
+    Version: 3.18.3.25, Sep 30, 2018
     Author: <a href="http://88250.b3log.org">Liang Ding</a>
     Author: <a href="http://www.annpeter.cn">Ann Peter</a>
     Author: <a href="http://vanessa.b3log.org">Vanessa</a>
@@ -75,7 +75,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <org.b3log.latke.version>2.4.17</org.b3log.latke.version>
+        <org.b3log.latke.version>2.4.18</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

@@ -20,8 +20,7 @@ package org.b3log.solo;
 import org.b3log.latke.Keys;
 import org.b3log.latke.Latkes;
 import org.b3log.latke.event.EventManager;
-import org.b3log.latke.ioc.LatkeBeanManager;
-import org.b3log.latke.ioc.Lifecycle;
+import org.b3log.latke.ioc.BeanManager;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.plugin.PluginManager;
@@ -72,7 +71,7 @@ public final class SoloServletListener extends AbstractServletListener {
     /**
      * Bean manager.
      */
-    private LatkeBeanManager beanManager;
+    private BeanManager beanManager;
 
     @Override
     public void contextInitialized(final ServletContextEvent servletContextEvent) {
@@ -81,7 +80,7 @@ public final class SoloServletListener extends AbstractServletListener {
         super.contextInitialized(servletContextEvent);
         Stopwatchs.start("Context Initialized");
 
-        beanManager = Lifecycle.getBeanManager();
+        beanManager = BeanManager.getInstance();
 
         // Upgrade check https://github.com/b3log/solo/issues/12040
         final UpgradeService upgradeService = beanManager.getReference(UpgradeService.class);

src/main/java/org/b3log/solo/api/B3ArticleReceiver.java

@@ -18,7 +18,7 @@
 package org.b3log.solo.api;
 
 import org.b3log.latke.Keys;
-import org.b3log.latke.ioc.inject.Inject;
+import org.b3log.latke.ioc.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.service.ServiceException;

src/main/java/org/b3log/solo/api/B3CommentReceiver.java

@@ -22,7 +22,7 @@ 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.ioc.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/api/MetaWeblogAPI.java

@@ -24,7 +24,7 @@ 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.ioc.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.User;

src/main/java/org/b3log/solo/cache/ArticleCache.java

@@ -18,8 +18,7 @@
 package org.b3log.solo.cache;
 
 import org.b3log.latke.Keys;
-import org.b3log.latke.ioc.inject.Named;
-import org.b3log.latke.ioc.inject.Singleton;
+import org.b3log.latke.ioc.Singleton;
 import org.b3log.solo.model.Article;
 import org.b3log.solo.util.Solos;
 import org.json.JSONObject;
@@ -34,7 +33,6 @@ import java.util.concurrent.ConcurrentHashMap;
  * @version 1.2.0.1, Sep 25, 2018
  * @since 2.3.0
  */
-@Named
 @Singleton
 public class ArticleCache {
 

src/main/java/org/b3log/solo/cache/CommentCache.java

@@ -18,8 +18,7 @@
 package org.b3log.solo.cache;
 
 import org.b3log.latke.Keys;
-import org.b3log.latke.ioc.inject.Named;
-import org.b3log.latke.ioc.inject.Singleton;
+import org.b3log.latke.ioc.Singleton;
 import org.b3log.solo.util.Solos;
 import org.json.JSONObject;
 
@@ -33,7 +32,6 @@ import java.util.concurrent.ConcurrentHashMap;
  * @version 1.1.0.1, Sep 25, 2018
  * @since 2.3.0
  */
-@Named
 @Singleton
 public class CommentCache {
 

src/main/java/org/b3log/solo/cache/OptionCache.java

@@ -18,8 +18,7 @@
 package org.b3log.solo.cache;
 
 import org.b3log.latke.Keys;
-import org.b3log.latke.ioc.inject.Named;
-import org.b3log.latke.ioc.inject.Singleton;
+import org.b3log.latke.ioc.Singleton;
 import org.b3log.solo.model.Option;
 import org.b3log.solo.util.Solos;
 import org.json.JSONObject;
@@ -34,7 +33,6 @@ import java.util.concurrent.ConcurrentHashMap;
  * @version 1.1.0.1, Sep 25, 2018
  * @since 2.3.0
  */
-@Named
 @Singleton
 public class OptionCache {
 

src/main/java/org/b3log/solo/cache/PageCache.java

@@ -18,8 +18,7 @@
 package org.b3log.solo.cache;
 
 import org.b3log.latke.Keys;
-import org.b3log.latke.ioc.inject.Named;
-import org.b3log.latke.ioc.inject.Singleton;
+import org.b3log.latke.ioc.Singleton;
 import org.b3log.solo.util.Solos;
 import org.json.JSONObject;
 
@@ -33,7 +32,6 @@ import java.util.concurrent.ConcurrentHashMap;
  * @version 1.0.0.1, Sep 25, 2018
  * @since 2.3.0
  */
-@Named
 @Singleton
 public class PageCache {
 

src/main/java/org/b3log/solo/cache/StatisticCache.java

@@ -17,8 +17,7 @@
  */
 package org.b3log.solo.cache;
 
-import org.b3log.latke.ioc.inject.Named;
-import org.b3log.latke.ioc.inject.Singleton;
+import org.b3log.latke.ioc.Singleton;
 import org.b3log.solo.model.Option;
 import org.json.JSONObject;
 
@@ -32,7 +31,6 @@ import java.util.concurrent.ConcurrentHashMap;
  * @version 1.0.0.1, Sep 25, 2018
  * @since 2.4.0
  */
-@Named
 @Singleton
 public class StatisticCache {
 

src/main/java/org/b3log/solo/cache/UserCache.java

@@ -18,8 +18,7 @@
 package org.b3log.solo.cache;
 
 import org.b3log.latke.Keys;
-import org.b3log.latke.ioc.inject.Named;
-import org.b3log.latke.ioc.inject.Singleton;
+import org.b3log.latke.ioc.Singleton;
 import org.b3log.latke.model.Role;
 import org.b3log.latke.model.User;
 import org.b3log.solo.util.Solos;
@@ -35,7 +34,6 @@ import java.util.concurrent.ConcurrentHashMap;
  * @version 1.1.0.1, Sep 25, 2018
  * @since 2.3.0
  */
-@Named
 @Singleton
 public class UserCache {
 

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

@@ -22,10 +22,8 @@ import org.b3log.latke.Keys;
 import org.b3log.latke.Latkes;
 import org.b3log.latke.event.AbstractEventListener;
 import org.b3log.latke.event.Event;
-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.ioc.BeanManager;
+import org.b3log.latke.ioc.Singleton;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.mail.MailService;
@@ -49,7 +47,6 @@ import org.json.JSONObject;
  * @version 1.2.2.11, Sep 25, 2018
  * @since 0.3.1
  */
-@Named
 @Singleton
 public class ArticleCommentReplyNotifier extends AbstractEventListener<JSONObject> {
 
@@ -88,7 +85,7 @@ public class ArticleCommentReplyNotifier extends AbstractEventListener<JSONObjec
             return;
         }
 
-        final LatkeBeanManager beanManager = Lifecycle.getBeanManager();
+        final BeanManager beanManager = BeanManager.getInstance();
         final PreferenceQueryService preferenceQueryService = beanManager.getReference(PreferenceQueryService.class);
         final CommentRepository commentRepository = beanManager.getReference(CommentRepositoryImpl.class);
 

src/main/java/org/b3log/solo/event/B3ArticleSender.java

@@ -24,10 +24,8 @@ import org.b3log.latke.Latkes;
 import org.b3log.latke.event.AbstractEventListener;
 import org.b3log.latke.event.Event;
 import org.b3log.latke.event.EventException;
-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.ioc.BeanManager;
+import org.b3log.latke.ioc.Singleton;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.User;
@@ -52,7 +50,6 @@ import org.json.JSONObject;
  * @version 1.0.2.15, Sep 25, 2018
  * @since 0.3.1
  */
-@Named
 @Singleton
 public class B3ArticleSender extends AbstractEventListener<JSONObject> {
 
@@ -80,7 +77,7 @@ public class B3ArticleSender extends AbstractEventListener<JSONObject> {
                 return;
             }
 
-            final LatkeBeanManager beanManager = Lifecycle.getBeanManager();
+            final BeanManager beanManager = BeanManager.getInstance();
             final PreferenceQueryService preferenceQueryService = beanManager.getReference(PreferenceQueryService.class);
             final ArticleQueryService articleQueryService = beanManager.getReference(ArticleQueryService.class);
 

src/main/java/org/b3log/solo/event/B3ArticleUpdater.java

@@ -24,10 +24,8 @@ import org.b3log.latke.Latkes;
 import org.b3log.latke.event.AbstractEventListener;
 import org.b3log.latke.event.Event;
 import org.b3log.latke.event.EventException;
-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.ioc.BeanManager;
+import org.b3log.latke.ioc.Singleton;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.User;
@@ -51,7 +49,6 @@ import org.json.JSONObject;
  * @version 1.0.1.5, Sep 25, 2018
  * @since 0.6.0
  */
-@Named
 @Singleton
 public class B3ArticleUpdater extends AbstractEventListener<JSONObject> {
 
@@ -78,7 +75,7 @@ public class B3ArticleUpdater extends AbstractEventListener<JSONObject> {
                 return;
             }
 
-            final LatkeBeanManager beanManager = Lifecycle.getBeanManager();
+            final BeanManager beanManager = BeanManager.getInstance();
             final PreferenceQueryService preferenceQueryService = beanManager.getReference(PreferenceQueryService.class);
             final ArticleQueryService articleQueryService = beanManager.getReference(ArticleQueryService.class);
 

src/main/java/org/b3log/solo/event/B3CommentSender.java

@@ -23,10 +23,8 @@ import org.b3log.latke.Latkes;
 import org.b3log.latke.event.AbstractEventListener;
 import org.b3log.latke.event.Event;
 import org.b3log.latke.event.EventException;
-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.ioc.BeanManager;
+import org.b3log.latke.ioc.Singleton;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.util.Strings;
@@ -44,7 +42,6 @@ import org.json.JSONObject;
  * @version 1.0.1.3, Sep 25, 2018
  * @since 0.5.5
  */
-@Named
 @Singleton
 public class B3CommentSender extends AbstractEventListener<JSONObject> {
 
@@ -67,7 +64,7 @@ public class B3CommentSender extends AbstractEventListener<JSONObject> {
         try {
             final JSONObject originalComment = data.getJSONObject(Comment.COMMENT);
 
-            final LatkeBeanManager beanManager = Lifecycle.getBeanManager();
+            final BeanManager beanManager = BeanManager.getInstance();
             final PreferenceQueryService preferenceQueryService = beanManager.getReference(PreferenceQueryService.class);
 
             final JSONObject preference = preferenceQueryService.getPreference();

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

@@ -23,10 +23,8 @@ import org.b3log.latke.Latkes;
 import org.b3log.latke.event.AbstractEventListener;
 import org.b3log.latke.event.Event;
 import org.b3log.latke.event.EventException;
-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.ioc.BeanManager;
+import org.b3log.latke.ioc.Singleton;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.mail.MailService;
@@ -49,7 +47,6 @@ import org.json.JSONObject;
  * @version 1.0.2.6, Sep 25, 2018
  * @since 0.3.1
  */
-@Named
 @Singleton
 public class PageCommentReplyNotifier extends AbstractEventListener<JSONObject> {
 
@@ -82,7 +79,7 @@ public class PageCommentReplyNotifier extends AbstractEventListener<JSONObject>
             return;
         }
 
-        final LatkeBeanManager beanManager = Lifecycle.getBeanManager();
+        final BeanManager beanManager = BeanManager.getInstance();
         final PreferenceQueryService preferenceQueryService = beanManager.getReference(PreferenceQueryService.class);
         final CommentRepository commentRepository = beanManager.getReference(CommentRepositoryImpl.class);
 

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

@@ -19,10 +19,8 @@ package org.b3log.solo.event;
 
 import org.b3log.latke.event.AbstractEventListener;
 import org.b3log.latke.event.Event;
-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.ioc.BeanManager;
+import org.b3log.latke.ioc.Singleton;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.plugin.AbstractPlugin;
@@ -41,7 +39,6 @@ import java.util.List;
  * @version 1.0.0.2, Sep 25, 2018
  * @since 0.3.1
  */
-@Named
 @Singleton
 public class PluginRefresher extends AbstractEventListener<List<AbstractPlugin>> {
 
@@ -57,7 +54,7 @@ public class PluginRefresher extends AbstractEventListener<List<AbstractPlugin>>
         LOGGER.log(Level.DEBUG, "Processing an event[type={0}, data={1}] in listener[className={2}]",
                 event.getType(), plugins, PluginRefresher.class.getName());
 
-        final LatkeBeanManager beanManager = Lifecycle.getBeanManager();
+        final BeanManager beanManager = BeanManager.getInstance();
         final PluginRepository pluginRepository = beanManager.getReference(PluginRepositoryImpl.class);
 
         final Transaction transaction = pluginRepository.beginTransaction();

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

@@ -20,8 +20,7 @@ package org.b3log.solo.filter;
 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.BeanManager;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.servlet.DispatcherServlet;
@@ -82,7 +81,7 @@ public final class InitCheckFilter implements Filter {
             return;
         }
 
-        final LatkeBeanManager beanManager = Lifecycle.getBeanManager();
+        final BeanManager beanManager = BeanManager.getInstance();
         final InitService initService = beanManager.getReference(InitService.class);
         if (initService.isInited()) {
             chain.doFilter(request, response);

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

@@ -20,8 +20,7 @@ package org.b3log.solo.filter;
 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.BeanManager;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.repository.RepositoryException;
@@ -96,7 +95,7 @@ public final class PermalinkFilter implements Filter {
         JSONObject article;
         JSONObject page = null;
 
-        final LatkeBeanManager beanManager = Lifecycle.getBeanManager();
+        final BeanManager beanManager = BeanManager.getInstance();
 
         try {
             final ArticleRepository articleRepository = beanManager.getReference(ArticleRepositoryImpl.class);

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

@@ -24,7 +24,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.ioc.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.Pagination;

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

@@ -22,7 +22,7 @@ import org.apache.commons.codec.digest.DigestUtils;
 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.ioc.Inject;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.Pagination;
 import org.b3log.latke.model.User;

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

@@ -20,7 +20,7 @@ package org.b3log.solo.processor;
 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.ioc.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.Pagination;

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

@@ -19,7 +19,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.ioc.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.User;

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

@@ -18,7 +18,7 @@
 package org.b3log.solo.processor;
 
 import org.apache.commons.lang.StringUtils;
-import org.b3log.latke.ioc.inject.Inject;
+import org.b3log.latke.ioc.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.service.LangPropsService;

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

@@ -19,7 +19,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.ioc.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.User;

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

@@ -31,8 +31,7 @@ import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.time.DateFormatUtils;
 import org.b3log.latke.Latkes;
-import org.b3log.latke.ioc.LatkeBeanManager;
-import org.b3log.latke.ioc.Lifecycle;
+import org.b3log.latke.ioc.BeanManager;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.servlet.HTTPRequestContext;
@@ -165,7 +164,7 @@ public class FileUploadProcessor {
         final String date = DateFormatUtils.format(System.currentTimeMillis(), "yyyy/MM");
         if (QN_ENABLED) {
             try {
-                final LatkeBeanManager beanManager = Lifecycle.getBeanManager();
+                final BeanManager beanManager = BeanManager.getInstance();
                 final OptionQueryService optionQueryService = beanManager.getReference(OptionQueryService.class);
                 qiniu = optionQueryService.getOptions(Option.CATEGORY_C_QINIU);
                 if (null == qiniu) {

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

@@ -20,7 +20,7 @@ package org.b3log.solo.processor;
 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.ioc.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.Pagination;

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

@@ -20,7 +20,7 @@ package org.b3log.solo.processor;
 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.ioc.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.Role;

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

@@ -22,7 +22,7 @@ import org.apache.commons.lang.RandomStringUtils;
 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.ioc.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.mail.MailService;
@@ -45,7 +45,6 @@ import org.b3log.solo.SoloServletListener;
 import org.b3log.solo.model.Common;
 import org.b3log.solo.model.Option;
 import org.b3log.solo.processor.console.ConsoleRenderer;
-import org.b3log.solo.service.DataModelService;
 import org.b3log.solo.repository.OptionRepository;
 import org.b3log.solo.service.*;
 import org.b3log.solo.util.Solos;

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

@@ -23,7 +23,7 @@ import org.apache.commons.lang.RandomStringUtils;
 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.ioc.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.Role;

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

@@ -18,7 +18,7 @@
 package org.b3log.solo.processor;
 
 import org.b3log.latke.Keys;
-import org.b3log.latke.ioc.inject.Inject;
+import org.b3log.latke.ioc.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.service.LangPropsService;

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

@@ -18,8 +18,8 @@
 package org.b3log.solo.processor;
 
 import org.b3log.latke.Keys;
-import org.b3log.latke.ioc.LatkeBeanManager;
-import org.b3log.latke.ioc.inject.Inject;
+import org.b3log.latke.ioc.BeanManager;
+import org.b3log.latke.ioc.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.mail.MailService;
@@ -75,7 +75,7 @@ public class RepairProcessor {
      * Bean manager.
      */
     @Inject
-    private LatkeBeanManager beanManager;
+    private BeanManager beanManager;
 
     /**
      * Preference query service.

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

@@ -20,7 +20,7 @@ package org.b3log.solo.processor;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
 import org.b3log.latke.Latkes;
-import org.b3log.latke.ioc.inject.Inject;
+import org.b3log.latke.ioc.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.Pagination;

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

@@ -21,7 +21,7 @@ import org.apache.commons.lang.StringEscapeUtils;
 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.ioc.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/processor/TagProcessor.java

@@ -20,7 +20,7 @@ package org.b3log.solo.processor;
 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.ioc.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.Pagination;

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

@@ -20,7 +20,7 @@ package org.b3log.solo.processor;
 import freemarker.template.Template;
 import org.apache.commons.lang.StringUtils;
 import org.b3log.latke.Keys;
-import org.b3log.latke.ioc.inject.Inject;
+import org.b3log.latke.ioc.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.service.LangPropsService;

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

@@ -27,7 +27,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.ioc.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.Plugin;

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

@@ -21,7 +21,7 @@ import org.apache.commons.lang.StringEscapeUtils;
 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.ioc.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.service.LangPropsService;

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

@@ -21,7 +21,7 @@ import org.apache.commons.lang.StringEscapeUtils;
 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.ioc.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.service.LangPropsService;

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

@@ -19,7 +19,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.ioc.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.service.LangPropsService;

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

@@ -18,10 +18,8 @@
 package org.b3log.solo.processor.console;
 
 import org.b3log.latke.Keys;
-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.ioc.BeanManager;
+import org.b3log.latke.ioc.Singleton;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.servlet.HTTPRequestContext;
 import org.b3log.latke.servlet.advice.BeforeRequestProcessAdvice;
@@ -40,7 +38,6 @@ import java.util.Map;
  * @version 1.0.1.1, Sep 25, 2018
  * @since 2.9.5
  */
-@Named
 @Singleton
 public class ConsoleAdminAuthAdvice extends BeforeRequestProcessAdvice {
 
@@ -51,7 +48,7 @@ public class ConsoleAdminAuthAdvice extends BeforeRequestProcessAdvice {
 
     @Override
     public void doAdvice(final HTTPRequestContext context, final Map<String, Object> args) throws RequestProcessAdviceException {
-        final LatkeBeanManager beanManager = Lifecycle.getBeanManager();
+        final BeanManager beanManager = BeanManager.getInstance();
         final UserQueryService userQueryService = beanManager.getReference(UserQueryService.class);
 
         final HttpServletRequest request = context.getRequest();

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

@@ -18,9 +18,8 @@
 package org.b3log.solo.processor.console;
 
 import org.b3log.latke.Keys;
-import org.b3log.latke.ioc.inject.Inject;
-import org.b3log.latke.ioc.inject.Named;
-import org.b3log.latke.ioc.inject.Singleton;
+import org.b3log.latke.ioc.Inject;
+import org.b3log.latke.ioc.Singleton;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.Role;
 import org.b3log.latke.model.User;
@@ -41,7 +40,6 @@ import java.util.Map;
  * @version 1.0.1.1, Sep 25, 2018
  * @since 2.9.5
  */
-@Named
 @Singleton
 public class ConsoleAuthAdvice extends BeforeRequestProcessAdvice {
 

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

@@ -20,7 +20,7 @@ package org.b3log.solo.processor.console;
 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.ioc.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.service.LangPropsService;

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

@@ -20,7 +20,8 @@ package org.b3log.solo.processor.console;
 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.ioc.Inject;
+import org.b3log.latke.ioc.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.service.LangPropsService;

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

@@ -19,7 +19,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.ioc.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.Plugin;

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

@@ -19,7 +19,7 @@ package org.b3log.solo.processor.console;
 
 import org.apache.commons.lang.StringUtils;
 import org.b3log.latke.Keys;
-import org.b3log.latke.ioc.inject.Inject;
+import org.b3log.latke.ioc.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.service.LangPropsService;

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

@@ -18,7 +18,7 @@
 package org.b3log.solo.processor.console;
 
 import org.b3log.latke.Keys;
-import org.b3log.latke.ioc.inject.Inject;
+import org.b3log.latke.ioc.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.service.LangPropsService;

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

@@ -20,7 +20,7 @@ package org.b3log.solo.processor.console;
 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.ioc.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.Role;

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

@@ -18,7 +18,7 @@
 package org.b3log.solo.repository.impl;
 
 import org.b3log.latke.Keys;
-import org.b3log.latke.ioc.inject.Inject;
+import org.b3log.latke.ioc.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.repository.*;

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

@@ -18,7 +18,7 @@
 package org.b3log.solo.repository.impl;
 
 import org.b3log.latke.Keys;
-import org.b3log.latke.ioc.inject.Inject;
+import org.b3log.latke.ioc.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.repository.*;

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

@@ -18,7 +18,7 @@
 package org.b3log.solo.repository.impl;
 
 import org.b3log.latke.Keys;
-import org.b3log.latke.ioc.inject.Inject;
+import org.b3log.latke.ioc.Inject;
 import org.b3log.latke.repository.*;
 import org.b3log.latke.repository.annotation.Repository;
 import org.b3log.solo.cache.OptionCache;

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

@@ -18,7 +18,7 @@
 package org.b3log.solo.repository.impl;
 
 import org.b3log.latke.Keys;
-import org.b3log.latke.ioc.inject.Inject;
+import org.b3log.latke.ioc.Inject;
 import org.b3log.latke.repository.*;
 import org.b3log.latke.repository.annotation.Repository;
 import org.b3log.solo.cache.PageCache;

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

@@ -18,7 +18,7 @@
 package org.b3log.solo.repository.impl;
 
 import org.b3log.latke.Keys;
-import org.b3log.latke.ioc.inject.Inject;
+import org.b3log.latke.ioc.Inject;
 import org.b3log.latke.repository.*;
 import org.b3log.latke.repository.annotation.Repository;
 import org.b3log.solo.model.Tag;

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

@@ -18,7 +18,7 @@
 package org.b3log.solo.repository.impl;
 
 import org.b3log.latke.Keys;
-import org.b3log.latke.ioc.inject.Inject;
+import org.b3log.latke.ioc.Inject;
 import org.b3log.latke.model.Role;
 import org.b3log.latke.model.User;
 import org.b3log.latke.repository.*;

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

@@ -17,7 +17,7 @@
  */
 package org.b3log.solo.service;
 
-import org.b3log.latke.ioc.inject.Inject;
+import org.b3log.latke.ioc.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/ArticleMgmtService.java

@@ -24,7 +24,7 @@ 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.ioc.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/ArticleQueryService.java

@@ -19,7 +19,7 @@ package org.b3log.solo.service;
 
 import org.apache.commons.lang.StringUtils;
 import org.b3log.latke.Keys;
-import org.b3log.latke.ioc.inject.Inject;
+import org.b3log.latke.ioc.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.Pagination;

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

@@ -18,7 +18,7 @@
 package org.b3log.solo.service;
 
 import org.b3log.latke.Keys;
-import org.b3log.latke.ioc.inject.Inject;
+import org.b3log.latke.ioc.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.repository.*;

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

@@ -18,7 +18,7 @@
 package org.b3log.solo.service;
 
 import org.b3log.latke.Keys;
-import org.b3log.latke.ioc.inject.Inject;
+import org.b3log.latke.ioc.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.Pagination;

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

@@ -24,7 +24,7 @@ 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.ioc.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.mail.MailService;

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

@@ -19,7 +19,7 @@ package org.b3log.solo.service;
 
 import org.apache.commons.lang.StringUtils;
 import org.b3log.latke.Keys;
-import org.b3log.latke.ioc.inject.Inject;
+import org.b3log.latke.ioc.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.Pagination;

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

@@ -25,7 +25,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.ioc.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.Pagination;

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

@@ -20,7 +20,7 @@ package org.b3log.solo.service;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.time.DateFormatUtils;
 import org.b3log.latke.Keys;
-import org.b3log.latke.ioc.inject.Inject;
+import org.b3log.latke.ioc.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.Plugin;

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

@@ -21,7 +21,7 @@ import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.time.DateUtils;
 import org.b3log.latke.Keys;
-import org.b3log.latke.ioc.inject.Inject;
+import org.b3log.latke.ioc.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.User;

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

@@ -24,7 +24,7 @@ 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.ioc.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.Role;

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

@@ -18,7 +18,7 @@
 package org.b3log.solo.service;
 
 import org.b3log.latke.Keys;
-import org.b3log.latke.ioc.inject.Inject;
+import org.b3log.latke.ioc.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

@@ -18,7 +18,7 @@
 package org.b3log.solo.service;
 
 import org.b3log.latke.Keys;
-import org.b3log.latke.ioc.inject.Inject;
+import org.b3log.latke.ioc.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.Pagination;

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

@@ -19,7 +19,7 @@ package org.b3log.solo.service;
 
 import org.apache.commons.lang.StringUtils;
 import org.b3log.latke.Keys;
-import org.b3log.latke.ioc.inject.Inject;
+import org.b3log.latke.ioc.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

@@ -17,7 +17,7 @@
  */
 package org.b3log.solo.service;
 
-import org.b3log.latke.ioc.inject.Inject;
+import org.b3log.latke.ioc.Inject;
 import org.b3log.latke.repository.RepositoryException;
 import org.b3log.latke.service.ServiceException;
 import org.b3log.latke.service.annotation.Service;

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

@@ -19,7 +19,7 @@ package org.b3log.solo.service;
 
 import org.apache.commons.lang.StringUtils;
 import org.b3log.latke.Keys;
-import org.b3log.latke.ioc.inject.Inject;
+import org.b3log.latke.ioc.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/PageQueryService.java

@@ -18,7 +18,7 @@
 package org.b3log.solo.service;
 
 import org.b3log.latke.Keys;
-import org.b3log.latke.ioc.inject.Inject;
+import org.b3log.latke.ioc.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.Pagination;

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

@@ -19,7 +19,7 @@ package org.b3log.solo.service;
 
 import org.apache.commons.lang.StringUtils;
 import org.b3log.latke.Latkes;
-import org.b3log.latke.ioc.inject.Inject;
+import org.b3log.latke.ioc.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/PluginMgmtService.java

@@ -20,7 +20,7 @@ package org.b3log.solo.service;
 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.ioc.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.Plugin;

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

@@ -17,7 +17,7 @@
  */
 package org.b3log.solo.service;
 
-import org.b3log.latke.ioc.inject.Inject;
+import org.b3log.latke.ioc.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.Pagination;

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

@@ -18,7 +18,7 @@
 package org.b3log.solo.service;
 
 import org.b3log.latke.Latkes;
-import org.b3log.latke.ioc.inject.Inject;
+import org.b3log.latke.ioc.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/PreferenceQueryService.java

@@ -17,7 +17,7 @@
  */
 package org.b3log.solo.service;
 
-import org.b3log.latke.ioc.inject.Inject;
+import org.b3log.latke.ioc.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/StatisticMgmtService.java

@@ -17,7 +17,7 @@
  */
 package org.b3log.solo.service;
 
-import org.b3log.latke.ioc.inject.Inject;
+import org.b3log.latke.ioc.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/StatisticQueryService.java

@@ -17,7 +17,7 @@
  */
 package org.b3log.solo.service;
 
-import org.b3log.latke.ioc.inject.Inject;
+import org.b3log.latke.ioc.Inject;
 import org.b3log.latke.service.ServiceException;
 import org.b3log.latke.service.annotation.Service;
 import org.b3log.solo.model.Option;

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

@@ -18,7 +18,7 @@
 package org.b3log.solo.service;
 
 import org.b3log.latke.Keys;
-import org.b3log.latke.ioc.inject.Inject;
+import org.b3log.latke.ioc.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/TagQueryService.java

@@ -17,7 +17,7 @@
  */
 package org.b3log.solo.service;
 
-import org.b3log.latke.ioc.inject.Inject;
+import org.b3log.latke.ioc.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.repository.Query;

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

@@ -20,7 +20,7 @@ package org.b3log.solo.service;
 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.ioc.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.mail.MailService;

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

@@ -21,9 +21,7 @@ import org.apache.commons.codec.digest.DigestUtils;
 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.ioc.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.Role;
@@ -95,6 +93,12 @@ public class UserMgmtService {
     @Inject
     private OptionMgmtService optionMgmtService;
 
+    /**
+     * User query service.
+     */
+    @Inject
+    private UserQueryService userQueryService;
+
     /**
      * Tries to login with cookie.
      *
@@ -122,9 +126,6 @@ public class UserMgmtService {
                     break;
                 }
 
-                final LatkeBeanManager beanManager = Lifecycle.getBeanManager();
-                final UserQueryService userQueryService = beanManager.getReference(UserQueryService.class);
-
                 final JSONObject userResult = userQueryService.getUser(userId);
                 if (null == userResult) {
                     break;

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

@@ -19,7 +19,7 @@ package org.b3log.solo.service;
 
 import org.b3log.latke.Keys;
 import org.b3log.latke.Latkes;
-import org.b3log.latke.ioc.inject.Inject;
+import org.b3log.latke.ioc.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.Pagination;

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

@@ -25,11 +25,10 @@ import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
 import org.b3log.latke.Latkes;
-import org.b3log.latke.ioc.LatkeBeanManagerImpl;
+import org.b3log.latke.ioc.BeanManager;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.service.LangPropsService;
-import org.b3log.latke.service.LangPropsServiceImpl;
 import org.b3log.latke.util.Callstacks;
 import org.b3log.latke.util.Stopwatchs;
 import org.json.JSONObject;
@@ -62,11 +61,6 @@ public final class Markdowns {
      */
     private static final Logger LOGGER = Logger.getLogger(Markdowns.class);
 
-    /**
-     * Language service.
-     */
-    private static final LangPropsService LANG_PROPS_SERVICE = LatkeBeanManagerImpl.getInstance().getReference(LangPropsServiceImpl.class);
-
     /**
      * Markdown cache.
      */
@@ -159,13 +153,15 @@ public final class Markdowns {
             return cachedHTML;
         }
 
+        final LangPropsService langPropsService = BeanManager.getInstance().getReference(LangPropsService.class);
+
         final ExecutorService pool = Executors.newSingleThreadExecutor();
         final long[] threadId = new long[1];
 
         final Callable<String> call = () -> {
             threadId[0] = Thread.currentThread().getId();
 
-            String html = LANG_PROPS_SERVICE.get("contentRenderFailedLabel");
+            String html = langPropsService.get("contentRenderFailedLabel");
 
             if (MARKED_AVAILABLE) {
                 html = toHtmlByMarked(markdownText);
@@ -223,7 +219,7 @@ public final class Markdowns {
             Stopwatchs.end();
         }
 
-        return LANG_PROPS_SERVICE.get("contentRenderFailedLabel");
+        return langPropsService.get("contentRenderFailedLabel");
     }
 
     private static String toHtmlByMarked(final String markdownText) throws Exception {

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

@@ -23,12 +23,10 @@ import freemarker.template.TemplateExceptionHandler;
 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.BeanManager;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.service.LangPropsService;
-import org.b3log.latke.service.LangPropsServiceImpl;
 import org.b3log.latke.service.ServiceException;
 import org.b3log.latke.util.Locales;
 import org.b3log.latke.util.Requests;
@@ -164,8 +162,8 @@ public final class Skins {
             dataModel.putAll(langs); // Fills the current skin's language configurations
 
             // Fills the core language configurations
-            final LatkeBeanManager beanManager = Lifecycle.getBeanManager();
-            final LangPropsService langPropsService = beanManager.getReference(LangPropsServiceImpl.class);
+            final BeanManager beanManager = BeanManager.getInstance();
+            final LangPropsService langPropsService = beanManager.getReference(LangPropsService.class);
 
             dataModel.putAll(langPropsService.getAll(Latkes.getLocale()));
         } catch (final Exception e) {

src/test/java/org/b3log/solo/AbstractTestCase.java

@@ -18,9 +18,8 @@
 package org.b3log.solo;
 
 import org.b3log.latke.Latkes;
-import org.b3log.latke.ioc.LatkeBeanManager;
-import org.b3log.latke.ioc.Lifecycle;
-import org.b3log.latke.ioc.config.Discoverer;
+import org.b3log.latke.ioc.BeanManager;
+import org.b3log.latke.ioc.Discoverer;
 import org.b3log.latke.repository.jdbc.util.Connections;
 import org.b3log.latke.repository.jdbc.util.JdbcRepositories;
 import org.b3log.solo.api.MetaWeblogAPI;
@@ -46,7 +45,7 @@ public abstract class AbstractTestCase {
     /**
      * Bean manager.
      */
-    private LatkeBeanManager beanManager;
+    private BeanManager beanManager;
 
     /**
      * Before class.
@@ -63,8 +62,8 @@ public abstract class AbstractTestCase {
         Latkes.setLocale(Locale.SIMPLIFIED_CHINESE);
 
         final Collection<Class<?>> classes = Discoverer.discover("org.b3log.solo");
-        Lifecycle.startApplication(classes);
-        beanManager = Lifecycle.getBeanManager();
+        BeanManager.start(classes);
+        beanManager = BeanManager.getInstance();
 
         final Connection connection = Connections.getConnection();
         connection.createStatement().execute("DROP ALL OBJECTS");

src/test/java/org/b3log/solo/processor/ArticleProcessorTestCase.java

@@ -20,7 +20,7 @@ package org.b3log.solo.processor;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.time.DateFormatUtils;
 import org.b3log.latke.Keys;
-import org.b3log.latke.ioc.Lifecycle;
+import org.b3log.latke.ioc.BeanManager;
 import org.b3log.latke.model.User;
 import org.b3log.latke.repository.Query;
 import org.b3log.latke.servlet.HTTPRequestContext;
@@ -344,7 +344,7 @@ public class ArticleProcessorTestCase extends AbstractTestCase {
         httpRequestContext.setRequest(request);
         httpRequestContext.setResponse(response);
 
-        final ArticleProcessor articleProcessor = Lifecycle.getBeanManager().getReference(ArticleProcessor.class);
+        final ArticleProcessor articleProcessor = BeanManager.getInstance().getReference(ArticleProcessor.class);
         articleProcessor.showArticle(httpRequestContext, request, response);
 
         final Map<String, Object> dataModel = httpRequestContext.getRenderer().getRenderDataModel();

src/test/java/org/b3log/solo/processor/PageProcessorTestCase.java

@@ -17,15 +17,9 @@
  */
 package org.b3log.solo.processor;
 
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Map;
-import javax.servlet.ServletContext;
-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.Lifecycle;
+import org.b3log.latke.ioc.BeanManager;
 import org.b3log.latke.model.User;
 import org.b3log.latke.servlet.HTTPRequestContext;
 import org.b3log.solo.AbstractTestCase;
@@ -36,10 +30,19 @@ import org.b3log.solo.service.InitService;
 import org.b3log.solo.service.PageMgmtService;
 import org.b3log.solo.service.UserQueryService;
 import org.json.JSONObject;
-import static org.mockito.Mockito.*;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.Map;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 /**
  * {@link PageProcessor} test case.
  *
@@ -97,7 +100,7 @@ public class PageProcessorTestCase extends AbstractTestCase {
         httpRequestContext.setRequest(request);
         httpRequestContext.setResponse(response);
 
-        final PageProcessor pageProcessor = Lifecycle.getBeanManager().getReference(PageProcessor.class);
+        final PageProcessor pageProcessor = BeanManager.getInstance().getReference(PageProcessor.class);
         pageProcessor.showPage(httpRequestContext);
 
         final Map<String, Object> dataModel = httpRequestContext.getRenderer().getRenderDataModel();