🚚 重构包移动

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

@@ -33,12 +33,7 @@ import org.b3log.latke.util.Requests;
 import org.b3log.latke.util.Stopwatchs;
 import org.b3log.latke.util.Strings;
 import org.b3log.latke.util.freemarker.Templates;
-import org.b3log.solo.event.b3log.ArticleSender;
-import org.b3log.solo.event.b3log.ArticleUpdater;
-import org.b3log.solo.event.b3log.CommentSender;
-import org.b3log.solo.event.comment.ArticleCommentReplyNotifier;
-import org.b3log.solo.event.comment.PageCommentReplyNotifier;
-import org.b3log.solo.event.plugin.PluginRefresher;
+import org.b3log.solo.event.*;
 import org.b3log.solo.model.Option;
 import org.b3log.solo.model.Skin;
 import org.b3log.solo.repository.OptionRepository;
@@ -236,21 +231,18 @@ public final class SoloServletListener extends AbstractServletListener {
 
         try {
             final EventManager eventManager = beanManager.getReference(EventManager.class);
-            // Comment
             final ArticleCommentReplyNotifier articleCommentReplyNotifier = beanManager.getReference(ArticleCommentReplyNotifier.class);
             eventManager.registerListener(articleCommentReplyNotifier);
             final PageCommentReplyNotifier pageCommentReplyNotifier = beanManager.getReference(PageCommentReplyNotifier.class);
             eventManager.registerListener(pageCommentReplyNotifier);
-            // Plugin
             final PluginRefresher pluginRefresher = beanManager.getReference(PluginRefresher.class);
             eventManager.registerListener(pluginRefresher);
             eventManager.registerListener(new ViewLoadEventHandler());
-            // B3log Sync
-            final ArticleSender articleSender = beanManager.getReference(ArticleSender.class);
+            final B3ArticleSender articleSender = beanManager.getReference(B3ArticleSender.class);
             eventManager.registerListener(articleSender);
-            final ArticleUpdater articleUpdater = beanManager.getReference(ArticleUpdater.class);
+            final B3ArticleUpdater articleUpdater = beanManager.getReference(B3ArticleUpdater.class);
             eventManager.registerListener(articleUpdater);
-            final CommentSender commentSender = beanManager.getReference(CommentSender.class);
+            final B3CommentSender commentSender = beanManager.getReference(B3CommentSender.class);
             eventManager.registerListener(commentSender);
         } catch (final Exception e) {
             LOGGER.log(Level.ERROR, "Register event handlers error", e);

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

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.b3log.solo.event.comment;
+package org.b3log.solo.event;
 
 import org.apache.commons.lang.StringUtils;
 import org.b3log.latke.Keys;
@@ -32,7 +32,6 @@ import org.b3log.latke.mail.MailService;
 import org.b3log.latke.mail.MailService.Message;
 import org.b3log.latke.mail.MailServiceFactory;
 import org.b3log.latke.util.Strings;
-import org.b3log.solo.event.EventTypes;
 import org.b3log.solo.model.Article;
 import org.b3log.solo.model.Comment;
 import org.b3log.solo.model.Option;

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

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.b3log.solo.event.b3log;
+package org.b3log.solo.event;
 
 import jodd.http.HttpRequest;
 import org.apache.commons.lang.StringUtils;
@@ -33,7 +33,6 @@ import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.User;
 import org.b3log.latke.util.Strings;
 import org.b3log.solo.SoloServletListener;
-import org.b3log.solo.event.EventTypes;
 import org.b3log.solo.model.Article;
 import org.b3log.solo.model.Common;
 import org.b3log.solo.model.Option;
@@ -43,7 +42,7 @@ import org.b3log.solo.util.Solos;
 import org.json.JSONObject;
 
 /**
- * This listener is responsible for sending article to B3log Rhythm.
+ * This listener is responsible for sending article to B3log Rhythm. Sees <a href="https://hacpai.com/b3log">B3log 构思</a> for more details.
  * <p>
  * The B3log Rhythm article update interface: http://rhythm.b3log.org/article (POST).
  * </p>
@@ -55,12 +54,12 @@ import org.json.JSONObject;
  */
 @Named
 @Singleton
-public class ArticleSender extends AbstractEventListener<JSONObject> {
+public class B3ArticleSender extends AbstractEventListener<JSONObject> {
 
     /**
      * Logger.
      */
-    private static final Logger LOGGER = Logger.getLogger(ArticleSender.class);
+    private static final Logger LOGGER = Logger.getLogger(B3ArticleSender.class);
 
     /**
      * URL of adding article to Rhythm.
@@ -72,7 +71,7 @@ public 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}]",
-                event.getType(), data, ArticleSender.class.getName());
+                event.getType(), data, B3ArticleSender.class.getName());
         try {
             final JSONObject originalArticle = data.getJSONObject(Article.ARTICLE);
             if (!originalArticle.getBoolean(Article.ARTICLE_IS_PUBLISHED)) {

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

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.b3log.solo.event.b3log;
+package org.b3log.solo.event;
 
 import jodd.http.HttpRequest;
 import org.apache.commons.lang.StringUtils;
@@ -33,7 +33,6 @@ import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.User;
 import org.b3log.latke.util.Strings;
 import org.b3log.solo.SoloServletListener;
-import org.b3log.solo.event.EventTypes;
 import org.b3log.solo.model.Article;
 import org.b3log.solo.model.Common;
 import org.b3log.solo.model.Option;
@@ -43,7 +42,7 @@ import org.b3log.solo.util.Solos;
 import org.json.JSONObject;
 
 /**
- * This listener is responsible for updating article to B3log Rhythm.
+ * This listener is responsible for updating article to B3log Rhythm. Sees <a href="https://hacpai.com/b3log">B3log 构思</a> for more details.
  * <p>
  * The B3log Rhythm article update interface: http://rhythm.b3log.org/article (PUT).
  * </p>
@@ -54,12 +53,12 @@ import org.json.JSONObject;
  */
 @Named
 @Singleton
-public class ArticleUpdater extends AbstractEventListener<JSONObject> {
+public class B3ArticleUpdater extends AbstractEventListener<JSONObject> {
 
     /**
      * Logger.
      */
-    private static final Logger LOGGER = Logger.getLogger(ArticleUpdater.class);
+    private static final Logger LOGGER = Logger.getLogger(B3ArticleUpdater.class);
 
     /**
      * URL of updating article to Rhythm.
@@ -70,7 +69,7 @@ public 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}]",
-                event.getType(), data, ArticleUpdater.class.getName());
+                event.getType(), data, B3ArticleUpdater.class.getName());
         try {
             final JSONObject originalArticle = data.getJSONObject(Article.ARTICLE);
             if (!originalArticle.getBoolean(Article.ARTICLE_IS_PUBLISHED)) {

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

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.b3log.solo.event.b3log;
+package org.b3log.solo.event;
 
 import jodd.http.HttpRequest;
 import org.b3log.latke.Keys;
@@ -31,7 +31,6 @@ import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.util.Strings;
 import org.b3log.solo.SoloServletListener;
-import org.b3log.solo.event.EventTypes;
 import org.b3log.solo.model.Comment;
 import org.b3log.solo.model.Option;
 import org.b3log.solo.service.PreferenceQueryService;
@@ -39,7 +38,7 @@ import org.b3log.solo.util.Solos;
 import org.json.JSONObject;
 
 /**
- * This listener is responsible for sending comment to B3log Symphony.
+ * This listener is responsible for sending comment to B3log Symphony. Sees <a href="https://hacpai.com/b3log">B3log 构思</a> for more details.
  *
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
  * @version 1.0.1.3, Sep 25, 2018
@@ -47,12 +46,12 @@ import org.json.JSONObject;
  */
 @Named
 @Singleton
-public class CommentSender extends AbstractEventListener<JSONObject> {
+public class B3CommentSender extends AbstractEventListener<JSONObject> {
 
     /**
      * Logger.
      */
-    private static final Logger LOGGER = Logger.getLogger(CommentSender.class);
+    private static final Logger LOGGER = Logger.getLogger(B3CommentSender.class);
 
     /**
      * URL of adding comment to Symphony.
@@ -64,7 +63,7 @@ public 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}]",
-                event.getType(), data, ArticleSender.class.getName());
+                event.getType(), data, B3ArticleSender.class.getName());
         try {
             final JSONObject originalComment = data.getJSONObject(Comment.COMMENT);
 

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

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.b3log.solo.event.comment;
+package org.b3log.solo.event;
 
 import org.apache.commons.lang.StringUtils;
 import org.b3log.latke.Keys;
@@ -33,7 +33,6 @@ import org.b3log.latke.mail.MailService;
 import org.b3log.latke.mail.MailService.Message;
 import org.b3log.latke.mail.MailServiceFactory;
 import org.b3log.latke.util.Strings;
-import org.b3log.solo.event.EventTypes;
 import org.b3log.solo.model.Comment;
 import org.b3log.solo.model.Option;
 import org.b3log.solo.model.Page;

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

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.b3log.solo.event.plugin;
+package org.b3log.solo.event;
 
 import org.b3log.latke.event.AbstractEventListener;
 import org.b3log.latke.event.Event;

src/main/java/org/b3log/solo/event/b3log/package-info.java

-/**
- * <a href="https://hacpai.com/b3log">B3log 构思</a> data push.
- */
-package org.b3log.solo.event.b3log;

src/main/java/org/b3log/solo/event/package-info.java

 /**
- * Event processors.
+ * Event handlers.
  */
 package org.b3log.solo.event;