From 440bf7ebcb8c168ffab996f901ce1ac42b075814 Mon Sep 17 00:00:00 2001 From: "chen.ma" Date: Sat, 23 Jul 2022 19:08:26 +0800 Subject: [PATCH] Fix message reconstruction compilation errors --- .../hippo4j/core/executor/manage/GlobalNotifyAlarmManage.java | 1 - hippo4j-discovery/pom.xml | 1 - hippo4j-message/pom.xml | 2 +- .../cn/hippo4j/message/platform/DingSendMessageHandler.java | 1 - .../starter/refresher/BootstrapCorePropertiesBinderAdapt.java | 4 ++-- .../starter/refresher/ZookeeperRefresherHandler.java | 2 +- .../springboot/starter/refresher/event/PlatformsListener.java | 4 ++-- .../starter/support/DynamicThreadPoolPostProcessor.java | 2 +- pom.xml | 2 +- 9 files changed, 8 insertions(+), 11 deletions(-) diff --git a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/manage/GlobalNotifyAlarmManage.java b/hippo4j-core/src/main/java/cn/hippo4j/core/executor/manage/GlobalNotifyAlarmManage.java index a3044ca3..9ca8c33f 100644 --- a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/manage/GlobalNotifyAlarmManage.java +++ b/hippo4j-core/src/main/java/cn/hippo4j/core/executor/manage/GlobalNotifyAlarmManage.java @@ -17,7 +17,6 @@ package cn.hippo4j.core.executor.manage; - import cn.hippo4j.message.service.ThreadPoolNotifyAlarm; import java.util.Map; diff --git a/hippo4j-discovery/pom.xml b/hippo4j-discovery/pom.xml index b523d475..ca2b97a7 100644 --- a/hippo4j-discovery/pom.xml +++ b/hippo4j-discovery/pom.xml @@ -10,7 +10,6 @@ hippo4j-discovery - true diff --git a/hippo4j-message/pom.xml b/hippo4j-message/pom.xml index 579571d6..7d88e834 100644 --- a/hippo4j-message/pom.xml +++ b/hippo4j-message/pom.xml @@ -14,7 +14,7 @@ cn.hippo4j hippo4j-common - + org.projectlombok lombok diff --git a/hippo4j-message/src/main/java/cn/hippo4j/message/platform/DingSendMessageHandler.java b/hippo4j-message/src/main/java/cn/hippo4j/message/platform/DingSendMessageHandler.java index 014ccdd5..d7dd5691 100644 --- a/hippo4j-message/src/main/java/cn/hippo4j/message/platform/DingSendMessageHandler.java +++ b/hippo4j-message/src/main/java/cn/hippo4j/message/platform/DingSendMessageHandler.java @@ -44,7 +44,6 @@ import java.util.Objects; import static cn.hippo4j.message.platform.DingAlarmConstants.*; - /** * Send ding notification message. */ diff --git a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/refresher/BootstrapCorePropertiesBinderAdapt.java b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/refresher/BootstrapCorePropertiesBinderAdapt.java index 155c2c35..7df533e9 100644 --- a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/refresher/BootstrapCorePropertiesBinderAdapt.java +++ b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/refresher/BootstrapCorePropertiesBinderAdapt.java @@ -17,13 +17,13 @@ package cn.hippo4j.core.springboot.starter.refresher; -import cn.hippo4j.common.notify.NotifyPlatformEnum; -import cn.hippo4j.common.notify.ThreadPoolNotifyAlarm; import cn.hippo4j.common.toolkit.CollectionUtil; import cn.hippo4j.common.toolkit.StringUtil; import cn.hippo4j.core.springboot.starter.config.BootstrapCoreProperties; import cn.hippo4j.core.springboot.starter.config.ExecutorProperties; import cn.hippo4j.core.springboot.starter.config.NotifyPlatformProperties; +import cn.hippo4j.message.enums.NotifyPlatformEnum; +import cn.hippo4j.message.service.ThreadPoolNotifyAlarm; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import com.google.common.collect.Lists; diff --git a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/refresher/ZookeeperRefresherHandler.java b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/refresher/ZookeeperRefresherHandler.java index c9bb82a9..585e16b0 100644 --- a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/refresher/ZookeeperRefresherHandler.java +++ b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/refresher/ZookeeperRefresherHandler.java @@ -17,8 +17,8 @@ package cn.hippo4j.core.springboot.starter.refresher; -import cn.hippo4j.common.notify.ThreadPoolNotifyAlarm; import cn.hippo4j.core.executor.manage.GlobalNotifyAlarmManage; +import cn.hippo4j.message.service.ThreadPoolNotifyAlarm; import com.google.common.base.Charsets; import lombok.extern.slf4j.Slf4j; import org.apache.curator.framework.CuratorFramework; diff --git a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/refresher/event/PlatformsListener.java b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/refresher/event/PlatformsListener.java index 8eb310f8..f1235434 100644 --- a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/refresher/event/PlatformsListener.java +++ b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/refresher/event/PlatformsListener.java @@ -18,13 +18,13 @@ package cn.hippo4j.core.springboot.starter.refresher.event; import cn.hippo4j.common.config.ApplicationContextHolder; -import cn.hippo4j.common.notify.HippoBaseSendMessageService; -import cn.hippo4j.common.notify.NotifyConfigDTO; import cn.hippo4j.core.executor.DynamicThreadPoolWrapper; import cn.hippo4j.core.executor.manage.GlobalThreadPoolManage; import cn.hippo4j.core.springboot.starter.config.BootstrapCoreProperties; import cn.hippo4j.core.springboot.starter.config.ExecutorProperties; import cn.hippo4j.core.springboot.starter.notify.CoreNotifyConfigBuilder; +import cn.hippo4j.message.dto.NotifyConfigDTO; +import cn.hippo4j.message.service.HippoBaseSendMessageService; import org.springframework.context.ApplicationListener; import org.springframework.core.annotation.Order; diff --git a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/support/DynamicThreadPoolPostProcessor.java b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/support/DynamicThreadPoolPostProcessor.java index e0df1042..bff37040 100644 --- a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/support/DynamicThreadPoolPostProcessor.java +++ b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/support/DynamicThreadPoolPostProcessor.java @@ -18,7 +18,6 @@ package cn.hippo4j.core.springboot.starter.support; import cn.hippo4j.common.config.ApplicationContextHolder; -import cn.hippo4j.common.notify.ThreadPoolNotifyAlarm; import cn.hippo4j.common.toolkit.StringUtil; import cn.hippo4j.core.executor.DynamicThreadPool; import cn.hippo4j.core.executor.DynamicThreadPoolExecutor; @@ -29,6 +28,7 @@ import cn.hippo4j.core.executor.support.*; import cn.hippo4j.core.springboot.starter.config.BootstrapCoreProperties; import cn.hippo4j.core.springboot.starter.config.ExecutorProperties; import cn.hippo4j.core.toolkit.inet.DynamicThreadPoolAnnotationUtil; +import cn.hippo4j.message.service.ThreadPoolNotifyAlarm; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeansException; diff --git a/pom.xml b/pom.xml index 6be59883..261f7381 100644 --- a/pom.xml +++ b/pom.xml @@ -102,7 +102,7 @@ hippo4j-common ${revision} - + cn.hippo4j hippo4j-message