⬆️ 升级 Latke

fjaa · Sep 30, 2018 · 085dfa8 · 085dfa8
1 parent f6e6ff6
commit 085dfa8
Show file tree

Hide file tree

Showing 134 changed files with 210 additions and 324 deletions.
diff --git a/src/main/java/org/b3log/symphony/SymphonyServletListener.java b/src/main/java/org/b3log/symphony/SymphonyServletListener.java
@@ -23,8 +23,7 @@
 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.model.User;
@@ -80,7 +79,7 @@ public final class SymphonyServletListener extends AbstractServletListener {
     /**
      * Bean manager.
      */
-    private LatkeBeanManager beanManager;
+    private BeanManager beanManager;
 
     @Override
     public void contextInitialized(final ServletContextEvent servletContextEvent) {
@@ -89,7 +88,7 @@ public void contextInitialized(final ServletContextEvent servletContextEvent) {
         Latkes.setScanPath("org.b3log.symphony");
         super.contextInitialized(servletContextEvent);
 
-        beanManager = Lifecycle.getBeanManager();
+        beanManager = BeanManager.getInstance();
 
         final InitMgmtService initMgmtService = beanManager.getReference(InitMgmtService.class);
         initMgmtService.initSym();

diff --git a/src/main/java/org/b3log/symphony/cache/ArticleCache.java b/src/main/java/org/b3log/symphony/cache/ArticleCache.java
@@ -21,10 +21,8 @@
 import org.b3log.latke.Keys;
 import org.b3log.latke.cache.Cache;
 import org.b3log.latke.cache.CacheFactory;
-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.repository.*;
@@ -52,7 +50,6 @@
  * @version 1.3.1.0, Sep 6, 2018
  * @since 1.4.0
  */
-@Named
 @Singleton
 public class ArticleCache {
 
@@ -109,7 +106,7 @@ public List<JSONObject> getSideHotArticles() {
      * Loads side hot articles.
      */
     public void loadSideHotArticles() {
-        final LatkeBeanManager beanManager = Lifecycle.getBeanManager();
+        final BeanManager beanManager = BeanManager.getInstance();
         final ArticleRepository articleRepository = beanManager.getReference(ArticleRepository.class);
         final ArticleQueryService articleQueryService = beanManager.getReference(ArticleQueryService.class);
 
@@ -160,7 +157,7 @@ public List<JSONObject> getSideRandomArticles() {
      * Loads side random articles.
      */
     public void loadSideRandomArticles() {
-        final LatkeBeanManager beanManager = Lifecycle.getBeanManager();
+        final BeanManager beanManager = BeanManager.getInstance();
         final ArticleRepository articleRepository = beanManager.getReference(ArticleRepository.class);
         final ArticleQueryService articleQueryService = beanManager.getReference(ArticleQueryService.class);
 
@@ -210,7 +207,7 @@ public List<JSONObject> getPerfectArticles() {
      * Loads perfect articles.
      */
     public void loadPerfectArticles() {
-        final LatkeBeanManager beanManager = Lifecycle.getBeanManager();
+        final BeanManager beanManager = BeanManager.getInstance();
         final ArticleRepository articleRepository = beanManager.getReference(ArticleRepository.class);
         final ArticleQueryService articleQueryService = beanManager.getReference(ArticleQueryService.class);
 

diff --git a/src/main/java/org/b3log/symphony/cache/CommentCache.java b/src/main/java/org/b3log/symphony/cache/CommentCache.java
@@ -20,8 +20,7 @@
 import org.b3log.latke.Keys;
 import org.b3log.latke.cache.Cache;
 import org.b3log.latke.cache.CacheFactory;
-import org.b3log.latke.ioc.inject.Named;
-import org.b3log.latke.ioc.inject.Singleton;
+import org.b3log.latke.ioc.Singleton;
 import org.b3log.symphony.model.Comment;
 import org.b3log.symphony.util.JSONs;
 import org.b3log.symphony.util.Symphonys;
@@ -34,7 +33,6 @@
  * @version 1.0.0.0, Sep 1, 2016
  * @since 1.6.0
  */
-@Named
 @Singleton
 public class CommentCache {
 

diff --git a/src/main/java/org/b3log/symphony/cache/DomainCache.java b/src/main/java/org/b3log/symphony/cache/DomainCache.java
@@ -17,9 +17,8 @@
  */
 package org.b3log.symphony.cache;
 
-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.symphony.service.DomainQueryService;
 import org.b3log.symphony.util.JSONs;
@@ -38,7 +37,6 @@
  * @version 1.0.2.3, Aug 31, 2018
  * @since 1.4.0
  */
-@Named
 @Singleton
 public class DomainCache {
 

diff --git a/src/main/java/org/b3log/symphony/cache/OptionCache.java b/src/main/java/org/b3log/symphony/cache/OptionCache.java
@@ -20,8 +20,7 @@
 import org.b3log.latke.Keys;
 import org.b3log.latke.cache.Cache;
 import org.b3log.latke.cache.CacheFactory;
-import org.b3log.latke.ioc.inject.Named;
-import org.b3log.latke.ioc.inject.Singleton;
+import org.b3log.latke.ioc.Singleton;
 import org.b3log.symphony.model.Option;
 import org.b3log.symphony.util.JSONs;
 import org.json.JSONObject;
@@ -33,7 +32,6 @@
  * @version 1.0.0.1, Oct 25, 2016
  * @since 1.5.0
  */
-@Named
 @Singleton
 public class OptionCache {
 

diff --git a/src/main/java/org/b3log/symphony/cache/TagCache.java b/src/main/java/org/b3log/symphony/cache/TagCache.java
@@ -19,10 +19,8 @@
 
 import org.apache.commons.lang.StringUtils;
 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.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.repository.*;
@@ -43,7 +41,6 @@
  * @version 1.5.6.5, Aug 31, 2018
  * @since 1.4.0
  */
-@Named
 @Singleton
 public class TagCache {
 
@@ -188,7 +185,7 @@ public void loadTags() {
      * Loads new tags.
      */
     private void loadNewTags() {
-        final LatkeBeanManager beanManager = Lifecycle.getBeanManager();
+        final BeanManager beanManager = BeanManager.getInstance();
         final TagRepository tagRepository = beanManager.getReference(TagRepository.class);
 
         final Query query = new Query().addSort(Keys.OBJECT_ID, SortDirection.DESCENDING).
@@ -209,7 +206,7 @@ private void loadNewTags() {
      * Loads icon tags.
      */
     private void loadIconTags() {
-        final LatkeBeanManager beanManager = Lifecycle.getBeanManager();
+        final BeanManager beanManager = BeanManager.getInstance();
         final TagRepository tagRepository = beanManager.getReference(TagRepository.class);
 
         final Query query = new Query().setFilter(
@@ -251,7 +248,7 @@ private void loadIconTags() {
      * Loads all tags.
      */
     public void loadAllTags() {
-        final LatkeBeanManager beanManager = Lifecycle.getBeanManager();
+        final BeanManager beanManager = BeanManager.getInstance();
         final TagRepository tagRepository = beanManager.getReference(TagRepository.class);
 
         final Query query = new Query().setFilter(

diff --git a/src/main/java/org/b3log/symphony/cache/UserCache.java b/src/main/java/org/b3log/symphony/cache/UserCache.java
@@ -18,8 +18,7 @@
 package org.b3log.symphony.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.User;
 import org.b3log.symphony.util.JSONs;
 import org.b3log.symphony.util.Sessions;
@@ -37,7 +36,6 @@
  * @version 1.1.0.1, Jul 30, 2018
  * @since 1.4.0
  */
-@Named
 @Singleton
 public class UserCache {
 

diff --git a/src/main/java/org/b3log/symphony/event/ArticleAddAudioHandler.java b/src/main/java/org/b3log/symphony/event/ArticleAddAudioHandler.java
@@ -19,9 +19,8 @@
 
 import org.b3log.latke.event.AbstractEventListener;
 import org.b3log.latke.event.Event;
-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.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.symphony.model.Article;
@@ -35,7 +34,6 @@
  * @version 1.0.0.0, Mar 18, 2017
  * @since 2.1.0
  */
-@Named
 @Singleton
 public class ArticleAddAudioHandler extends AbstractEventListener<JSONObject> {
 

diff --git a/src/main/java/org/b3log/symphony/event/ArticleAddNotifier.java b/src/main/java/org/b3log/symphony/event/ArticleAddNotifier.java
@@ -22,9 +22,8 @@
 import org.b3log.latke.Keys;
 import org.b3log.latke.event.AbstractEventListener;
 import org.b3log.latke.event.Event;
-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.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.Pagination;
@@ -52,7 +51,6 @@
  * @version 1.3.4.16, Aug 6, 2018
  * @since 0.2.0
  */
-@Named
 @Singleton
 public class ArticleAddNotifier extends AbstractEventListener<JSONObject> {
 

diff --git a/src/main/java/org/b3log/symphony/event/ArticleBaiduSender.java b/src/main/java/org/b3log/symphony/event/ArticleBaiduSender.java
@@ -25,8 +25,7 @@
 import org.b3log.latke.Latkes;
 import org.b3log.latke.event.AbstractEventListener;
 import org.b3log.latke.event.Event;
-import org.b3log.latke.ioc.inject.Named;
-import org.b3log.latke.ioc.inject.Singleton;
+import org.b3log.latke.ioc.Singleton;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.symphony.model.Article;
@@ -42,7 +41,6 @@
  * @version 1.1.3.2, Aug 2, 2018
  * @since 1.3.0
  */
-@Named
 @Singleton
 public class ArticleBaiduSender extends AbstractEventListener<JSONObject> {
 

diff --git a/src/main/java/org/b3log/symphony/event/ArticleQQSender.java b/src/main/java/org/b3log/symphony/event/ArticleQQSender.java
@@ -22,8 +22,7 @@
 import org.b3log.latke.Latkes;
 import org.b3log.latke.event.AbstractEventListener;
 import org.b3log.latke.event.Event;
-import org.b3log.latke.ioc.inject.Named;
-import org.b3log.latke.ioc.inject.Singleton;
+import org.b3log.latke.ioc.Singleton;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.util.URLs;
@@ -40,7 +39,6 @@
  * @version 1.4.0.3, Aug 2, 2018
  * @since 1.4.0
  */
-@Named
 @Singleton
 public class ArticleQQSender extends AbstractEventListener<JSONObject> {
 

diff --git a/src/main/java/org/b3log/symphony/event/ArticleSearchAdder.java b/src/main/java/org/b3log/symphony/event/ArticleSearchAdder.java
@@ -20,9 +20,8 @@
 import org.apache.commons.lang.StringUtils;
 import org.b3log.latke.event.AbstractEventListener;
 import org.b3log.latke.event.Event;
-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.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.symphony.model.Article;
@@ -39,7 +38,6 @@
  * @version 1.1.3.3, Aug 31, 2018
  * @since 1.4.0
  */
-@Named
 @Singleton
 public class ArticleSearchAdder extends AbstractEventListener<JSONObject> {
 

diff --git a/src/main/java/org/b3log/symphony/event/ArticleSearchUpdater.java b/src/main/java/org/b3log/symphony/event/ArticleSearchUpdater.java
@@ -20,9 +20,8 @@
 import org.apache.commons.lang.StringUtils;
 import org.b3log.latke.event.AbstractEventListener;
 import org.b3log.latke.event.Event;
-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.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.symphony.model.Article;
@@ -39,7 +38,6 @@
  * @version 1.1.3.3, Aug 31, 2018
  * @since 1.4.0
  */
-@Named
 @Singleton
 public class ArticleSearchUpdater extends AbstractEventListener<JSONObject> {
 

diff --git a/src/main/java/org/b3log/symphony/event/ArticleUpdateAudioHandler.java b/src/main/java/org/b3log/symphony/event/ArticleUpdateAudioHandler.java
@@ -19,9 +19,8 @@
 
 import org.b3log.latke.event.AbstractEventListener;
 import org.b3log.latke.event.Event;
-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.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.symphony.model.Article;
@@ -35,7 +34,6 @@
  * @version 1.0.0.0, Mar 18, 2017
  * @since 2.1.0
  */
-@Named
 @Singleton
 public class ArticleUpdateAudioHandler extends AbstractEventListener<JSONObject> {
 

diff --git a/src/main/java/org/b3log/symphony/event/ArticleUpdateNotifier.java b/src/main/java/org/b3log/symphony/event/ArticleUpdateNotifier.java
@@ -20,9 +20,8 @@
 import org.b3log.latke.Keys;
 import org.b3log.latke.event.AbstractEventListener;
 import org.b3log.latke.event.Event;
-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.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.User;
@@ -45,7 +44,6 @@
  * @version 1.0.0.3, Jan 30, 2018
  * @since 2.0.0
  */
-@Named
 @Singleton
 public class ArticleUpdateNotifier extends AbstractEventListener<JSONObject> {
 

diff --git a/src/main/java/org/b3log/symphony/event/CommentNotifier.java b/src/main/java/org/b3log/symphony/event/CommentNotifier.java
@@ -22,9 +22,8 @@
 import org.b3log.latke.Keys;
 import org.b3log.latke.event.AbstractEventListener;
 import org.b3log.latke.event.Event;
-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.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.Pagination;
@@ -51,7 +50,6 @@
  * @version 1.7.12.4, Jul 31, 2018
  * @since 0.2.0
  */
-@Named
 @Singleton
 public class CommentNotifier extends AbstractEventListener<JSONObject> {
 

diff --git a/src/main/java/org/b3log/symphony/event/CommentUpdateNotifier.java b/src/main/java/org/b3log/symphony/event/CommentUpdateNotifier.java
@@ -19,9 +19,8 @@
 
 import org.b3log.latke.event.AbstractEventListener;
 import org.b3log.latke.event.Event;
-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.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.service.LangPropsService;
@@ -36,7 +35,6 @@
  * @version 1.0.0.1, Jan 30, 2018
  * @since 2.1.0
  */
-@Named
 @Singleton
 public class CommentUpdateNotifier extends AbstractEventListener<JSONObject> {