From d0552f2d05fccec02aa6404d0917a1b89c34ddce Mon Sep 17 00:00:00 2001 From: "chen.ma" Date: Tue, 9 Aug 2022 21:19:53 +0800 Subject: [PATCH] Improve the dynamic registration thread pool logic --- .../java/cn/hippo4j/common/model/ThreadPoolParameterInfo.java | 3 +++ .../model/register/DynamicThreadPoolRegisterParameter.java | 4 ++++ .../cn/hippo4j/config/service/biz/impl/ConfigServiceImpl.java | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/model/ThreadPoolParameterInfo.java b/hippo4j-common/src/main/java/cn/hippo4j/common/model/ThreadPoolParameterInfo.java index 8a6a5ef8..f113d602 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/model/ThreadPoolParameterInfo.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/model/ThreadPoolParameterInfo.java @@ -17,6 +17,7 @@ package cn.hippo4j.common.model; +import com.fasterxml.jackson.annotation.JsonAlias; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -50,6 +51,7 @@ public class ThreadPoolParameterInfo implements ThreadPoolParameter, Serializabl /** * Thread-pool id */ + @JsonAlias("threadPoolId") private String tpId; /** @@ -112,6 +114,7 @@ public class ThreadPoolParameterInfo implements ThreadPoolParameter, Serializabl /** * Liveness alarm */ + @JsonAlias("activeAlarm") private Integer livenessAlarm; /** diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/model/register/DynamicThreadPoolRegisterParameter.java b/hippo4j-common/src/main/java/cn/hippo4j/common/model/register/DynamicThreadPoolRegisterParameter.java index 4d10c963..5cbfb3cf 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/model/register/DynamicThreadPoolRegisterParameter.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/model/register/DynamicThreadPoolRegisterParameter.java @@ -103,4 +103,8 @@ public class DynamicThreadPoolRegisterParameter { * Execute timeout */ private Long executeTimeOut; + + public Integer getAllowCoreThreadTimeOut() { + return this.allowCoreThreadTimeOut ? 1 : 0; + } } diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ConfigServiceImpl.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ConfigServiceImpl.java index 71476a55..02e521d8 100644 --- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ConfigServiceImpl.java +++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ConfigServiceImpl.java @@ -159,7 +159,7 @@ public class ConfigServiceImpl implements ConfigService { configAllInfo.setTenantId(registerWrapper.getTenantId()); configAllInfo.setItemId(registerWrapper.getItemId()); configAllInfo.setTpId(registerParameter.getThreadPoolId()); - configAllInfo.setAllowCoreThreadTimeOut(registerParameter.getAllowCoreThreadTimeOut() ? 1 : 0); + configAllInfo.setAllowCoreThreadTimeOut(registerParameter.getAllowCoreThreadTimeOut()); return configAllInfo; }