From 8e64b9acd6bbae137b6cff2ba24b2fa3f86f7987 Mon Sep 17 00:00:00 2001 From: johnniang Date: Mon, 22 Apr 2019 10:56:33 +0800 Subject: [PATCH] Deprecate event queue publisher and listener manager --- .../app/event/ApplicationEventQueuePublisher.java | 3 +-- .../halo/app/event/ApplicationListenerManager.java | 3 +-- .../java/run/halo/app/event/LogEventListener.java | 8 +++++--- .../run/halo/app/service/impl/PostServiceImpl.java | 12 ++++++------ 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/java/run/halo/app/event/ApplicationEventQueuePublisher.java b/src/main/java/run/halo/app/event/ApplicationEventQueuePublisher.java index a42c5982b..1cca0faad 100644 --- a/src/main/java/run/halo/app/event/ApplicationEventQueuePublisher.java +++ b/src/main/java/run/halo/app/event/ApplicationEventQueuePublisher.java @@ -3,7 +3,6 @@ package run.halo.app.event; import lombok.extern.slf4j.Slf4j; import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationListener; -import org.springframework.stereotype.Component; import javax.annotation.PreDestroy; import java.util.EventListener; @@ -20,7 +19,7 @@ import java.util.concurrent.LinkedBlockingQueue; * @date 19-4-20 */ @Slf4j -@Component +@Deprecated public class ApplicationEventQueuePublisher { private final BlockingQueue events = new LinkedBlockingQueue<>(); diff --git a/src/main/java/run/halo/app/event/ApplicationListenerManager.java b/src/main/java/run/halo/app/event/ApplicationListenerManager.java index 6bb63923c..f10858a3a 100644 --- a/src/main/java/run/halo/app/event/ApplicationListenerManager.java +++ b/src/main/java/run/halo/app/event/ApplicationListenerManager.java @@ -6,7 +6,6 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationListener; import org.springframework.lang.NonNull; import org.springframework.lang.Nullable; -import org.springframework.stereotype.Component; import run.halo.app.utils.ReflectionUtils; import java.lang.reflect.ParameterizedType; @@ -21,7 +20,7 @@ import java.util.concurrent.ConcurrentHashMap; * @date 19-4-21 */ @Slf4j -@Component +@Deprecated public class ApplicationListenerManager { /** diff --git a/src/main/java/run/halo/app/event/LogEventListener.java b/src/main/java/run/halo/app/event/LogEventListener.java index a037b2857..208d0e08f 100644 --- a/src/main/java/run/halo/app/event/LogEventListener.java +++ b/src/main/java/run/halo/app/event/LogEventListener.java @@ -1,6 +1,7 @@ package run.halo.app.event; -import org.springframework.context.ApplicationListener; +import org.springframework.context.event.EventListener; +import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; import run.halo.app.model.entity.Log; import run.halo.app.service.LogService; @@ -12,7 +13,7 @@ import run.halo.app.service.LogService; * @date 19-4-21 */ @Component -public class LogEventListener implements ApplicationListener { +public class LogEventListener { private final LogService logService; @@ -20,7 +21,8 @@ public class LogEventListener implements ApplicationListener { this.logService = logService; } - @Override + @EventListener + @Async public void onApplicationEvent(LogEvent event) { // Convert to log Log logToCreate = event.getLogParam().convertTo(); diff --git a/src/main/java/run/halo/app/service/impl/PostServiceImpl.java b/src/main/java/run/halo/app/service/impl/PostServiceImpl.java index 578b3001f..7c242dda3 100644 --- a/src/main/java/run/halo/app/service/impl/PostServiceImpl.java +++ b/src/main/java/run/halo/app/service/impl/PostServiceImpl.java @@ -2,6 +2,7 @@ package run.halo.app.service.impl; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.springframework.context.ApplicationEventPublisher; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; @@ -13,7 +14,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; -import run.halo.app.event.ApplicationEventQueuePublisher; import run.halo.app.event.LogEvent; import run.halo.app.exception.AlreadyExistsException; import run.halo.app.exception.NotFoundException; @@ -69,7 +69,7 @@ public class PostServiceImpl extends AbstractCrudService implemen private final CommentService commentService; - private final ApplicationEventQueuePublisher eventQueuePublisher; + private final ApplicationEventPublisher eventPublisher; public PostServiceImpl(PostRepository postRepository, TagService tagService, @@ -77,7 +77,7 @@ public class PostServiceImpl extends AbstractCrudService implemen PostTagService postTagService, PostCategoryService postCategoryService, CommentService commentService, - ApplicationEventQueuePublisher eventQueuePublisher) { + ApplicationEventPublisher eventPublisher) { super(postRepository); this.postRepository = postRepository; this.tagService = tagService; @@ -85,7 +85,7 @@ public class PostServiceImpl extends AbstractCrudService implemen this.postTagService = postTagService; this.postCategoryService = postCategoryService; this.commentService = commentService; - this.eventQueuePublisher = eventQueuePublisher; + this.eventPublisher = eventPublisher; } @Override @@ -227,7 +227,7 @@ public class PostServiceImpl extends AbstractCrudService implemen // Log the creation LogEvent logEvent = new LogEvent(this, createdPost.getId().toString(), LogType.POST_PUBLISHED, createdPost.getTitle()); - eventQueuePublisher.publishEvent(logEvent); + eventPublisher.publishEvent(logEvent); return createdPost; } @@ -238,7 +238,7 @@ public class PostServiceImpl extends AbstractCrudService implemen // Log the creation LogEvent logEvent = new LogEvent(this, updatedPost.getId().toString(), LogType.POST_EDITED, updatedPost.getTitle()); - eventQueuePublisher.publishEvent(logEvent); + eventPublisher.publishEvent(logEvent); return updatedPost; }