From d081f77287b4715b69d3387a8048f615e2148f64 Mon Sep 17 00:00:00 2001 From: yewei <17855368071@163.com> Date: Mon, 19 Sep 2022 17:56:39 +0800 Subject: [PATCH] finish webConfig modification verify --- .../java/cn/hippo4j/common/model/ThreadPoolParameter.java | 3 --- .../main/java/cn/hippo4j/config/config/CommonConfig.java | 6 +++++- .../cn/hippo4j/console/controller/ThreadPoolController.java | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/model/ThreadPoolParameter.java b/hippo4j-common/src/main/java/cn/hippo4j/common/model/ThreadPoolParameter.java index 125ea912..be74b478 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/model/ThreadPoolParameter.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/model/ThreadPoolParameter.java @@ -57,9 +57,6 @@ public interface ThreadPoolParameter { */ Integer getMaxSize(); - Integer getCorePoolSize(); - - Integer getMaximumPoolSize(); /** * Get queue type * diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/config/CommonConfig.java b/hippo4j-config/src/main/java/cn/hippo4j/config/config/CommonConfig.java index e191c465..7d5cf77d 100644 --- a/hippo4j-config/src/main/java/cn/hippo4j/config/config/CommonConfig.java +++ b/hippo4j-config/src/main/java/cn/hippo4j/config/config/CommonConfig.java @@ -32,7 +32,6 @@ import static cn.hippo4j.common.constant.Constants.AVAILABLE_PROCESSORS; * Common config. */ @Configuration -@Import(WebThreadPoolHandlerChoose.class) public class CommonConfig { @Bean @@ -54,4 +53,9 @@ public class CommonConfig { return monitorThreadPool; } + @Bean + public WebThreadPoolHandlerChoose webThreadPoolHandlerChoose() { + return new WebThreadPoolHandlerChoose(); + } + } diff --git a/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ThreadPoolController.java b/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ThreadPoolController.java index 6012bdf1..d7115a1e 100644 --- a/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ThreadPoolController.java +++ b/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ThreadPoolController.java @@ -49,6 +49,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; import java.util.Map; +import java.util.function.Supplier; import java.util.stream.Collectors; import static cn.hippo4j.common.constant.Constants.HTTP_EXECUTE_TIMEOUT; @@ -179,7 +180,7 @@ public class ThreadPoolController { String urlString = StrBuilder.create("http://", each, "/web/update/pool").toString(); HttpUtil.post(urlString, JSONUtil.toJSONString(requestParam), HTTP_EXECUTE_TIMEOUT); } - }else { + } else { ConfigModifySaveReqDTO modifySaveReqDTO = BeanUtil.convert(requestParam, ConfigModifySaveReqDTO.class); modifySaveReqDTO.setModifyUser(UserContext.getUserName()); modifySaveReqDTO.setType(ConfigModifyTypeConstants.WEB_THREAD_POOL);