From 7c1a783ca33349492219bc93ebbd66dd0c9e52e5 Mon Sep 17 00:00:00 2001 From: "chen.ma" Date: Tue, 25 Jan 2022 23:02:30 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=90=8E=E7=BC=80=E5=91=BD=E5=90=8D.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/hippo4j/starter/alarm/ThreadPoolAlarmManage.java | 4 ++-- .../{DiscoveryConfig.java => DiscoveryConfiguration.java} | 2 +- .../starter/config/DynamicThreadPoolAutoConfiguration.java | 2 +- .../{HttpClientConfig.java => HttpClientConfiguration.java} | 2 +- ...MessageAlarmConfig.java => MessageAlarmConfiguration.java} | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) rename hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/{DiscoveryConfig.java => DiscoveryConfiguration.java} (98%) rename hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/{HttpClientConfig.java => HttpClientConfiguration.java} (98%) rename hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/{MessageAlarmConfig.java => MessageAlarmConfiguration.java} (95%) diff --git a/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/alarm/ThreadPoolAlarmManage.java b/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/alarm/ThreadPoolAlarmManage.java index 89bbfd82..54956e81 100644 --- a/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/alarm/ThreadPoolAlarmManage.java +++ b/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/alarm/ThreadPoolAlarmManage.java @@ -2,7 +2,7 @@ package cn.hippo4j.starter.alarm; import cn.hippo4j.common.config.ApplicationContextHolder; import cn.hippo4j.common.model.PoolParameterInfo; -import cn.hippo4j.starter.config.MessageAlarmConfig; +import cn.hippo4j.starter.config.MessageAlarmConfiguration; import cn.hippo4j.starter.core.DynamicThreadPoolExecutor; import cn.hippo4j.starter.toolkit.CalculateUtil; import lombok.extern.slf4j.Slf4j; @@ -26,7 +26,7 @@ public class ThreadPoolAlarmManage { static { SEND_MESSAGE_SERVICE = Optional.ofNullable(ApplicationContextHolder.getInstance()) - .map(each -> each.getBean(MessageAlarmConfig.SEND_MESSAGE_BEAN_NAME, SendMessageService.class)) + .map(each -> each.getBean(MessageAlarmConfiguration.SEND_MESSAGE_BEAN_NAME, SendMessageService.class)) .orElse(null); } diff --git a/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/DiscoveryConfig.java b/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/DiscoveryConfiguration.java similarity index 98% rename from hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/DiscoveryConfig.java rename to hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/DiscoveryConfiguration.java index 2342248c..d492fc53 100644 --- a/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/DiscoveryConfig.java +++ b/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/DiscoveryConfiguration.java @@ -26,7 +26,7 @@ import static cn.hippo4j.starter.toolkit.CloudCommonIdUtil.getIpApplicationName; * @date 2021/8/6 21:35 */ @AllArgsConstructor -public class DiscoveryConfig { +public class DiscoveryConfiguration { private final ConfigurableEnvironment environment; diff --git a/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/DynamicThreadPoolAutoConfiguration.java b/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/DynamicThreadPoolAutoConfiguration.java index 90f51405..044c089f 100644 --- a/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/DynamicThreadPoolAutoConfiguration.java +++ b/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/DynamicThreadPoolAutoConfiguration.java @@ -51,7 +51,7 @@ import org.springframework.core.env.ConfigurableEnvironment; @ConditionalOnBean(MarkerConfiguration.Marker.class) @EnableConfigurationProperties(BootstrapProperties.class) @ConditionalOnProperty(prefix = BootstrapProperties.PREFIX, value = "enable", matchIfMissing = true, havingValue = "true") -@ImportAutoConfiguration({HttpClientConfig.class, DiscoveryConfig.class, MessageAlarmConfig.class, UtilAutoConfiguration.class}) +@ImportAutoConfiguration({HttpClientConfiguration.class, DiscoveryConfiguration.class, MessageAlarmConfiguration.class, UtilAutoConfiguration.class}) public class DynamicThreadPoolAutoConfiguration { private final BootstrapProperties properties; diff --git a/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/HttpClientConfig.java b/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/HttpClientConfiguration.java similarity index 98% rename from hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/HttpClientConfig.java rename to hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/HttpClientConfiguration.java index 55390cb0..f48635b8 100644 --- a/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/HttpClientConfig.java +++ b/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/HttpClientConfiguration.java @@ -19,7 +19,7 @@ import java.util.concurrent.TimeUnit; * @author chen.ma * @date 2021/6/10 13:28 */ -public class HttpClientConfig { +public class HttpClientConfiguration { @Bean public OkHttpClient hippo4JOkHttpClient() { diff --git a/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/MessageAlarmConfig.java b/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/MessageAlarmConfiguration.java similarity index 95% rename from hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/MessageAlarmConfig.java rename to hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/MessageAlarmConfiguration.java index afd4828b..f10d2efd 100644 --- a/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/MessageAlarmConfig.java +++ b/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/MessageAlarmConfiguration.java @@ -21,7 +21,7 @@ import org.springframework.core.env.ConfigurableEnvironment; * @date 2021/8/15 15:39 */ @AllArgsConstructor -public class MessageAlarmConfig { +public class MessageAlarmConfiguration { private final BootstrapProperties properties; @@ -34,7 +34,7 @@ public class MessageAlarmConfig { public static final String SEND_MESSAGE_BEAN_NAME = "hippo4JSendMessageService"; @DependsOn("hippo4JApplicationContextHolder") - @Bean(MessageAlarmConfig.SEND_MESSAGE_BEAN_NAME) + @Bean(MessageAlarmConfiguration.SEND_MESSAGE_BEAN_NAME) public SendMessageService hippo4JSendMessageService(HttpAgent httpAgent, AlarmControlHandler alarmControlHandler) { return new BaseSendMessageService(httpAgent, properties, alarmControlHandler); }