From eb6c125ac7cf67512df9b9a5b3637e3eb18473d6 Mon Sep 17 00:00:00 2001
From: Kazi Akib Javed <akib.javed@apsissolutions.com>
Date: Sun, 16 Jul 2023 13:31:15 +0600
Subject: [PATCH] fixed contentutil.java's assertGetPoolContent test case

---
 .../hippo4j/common/toolkit/ContentUtil.java   | 24 +++++++++++++------
 .../common/toolkit/ContentUtilTest.java       |  2 +-
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/infra/common/src/main/java/cn/hippo4j/common/toolkit/ContentUtil.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/ContentUtil.java
index a4f5fcb4..ae5b6dfe 100644
--- a/infra/common/src/main/java/cn/hippo4j/common/toolkit/ContentUtil.java
+++ b/infra/common/src/main/java/cn/hippo4j/common/toolkit/ContentUtil.java
@@ -19,6 +19,7 @@ package cn.hippo4j.common.toolkit;
 
 import cn.hippo4j.common.constant.Constants;
 import cn.hippo4j.common.model.ThreadPoolParameter;
+import cn.hippo4j.common.model.ThreadPoolParameterInfo;
 
 /**
  * Content util.
@@ -32,13 +33,22 @@ public class ContentUtil {
      * @return dynamic thread-pool content str
      */
     public static String getPoolContent(ThreadPoolParameter parameter) {
-        String getPoolContent = String.format("{\"tenantId\":\"%s\",\"itemId\":\"%s\",\"tpId\":" +
-                "\"%s\",\"queueType\":%d,\"capacity\":%d,\"keepAliveTime\":%d,\"rejectedType\":%d,\"isAlarm\"" +
-                ":%d,\"capacityAlarm\":%d,\"livenessAlarm\":%d,\"allowCoreThreadTimeOut\":%d}", parameter.getTenantId(),
-                parameter.getItemId(), parameter.getTpId(), parameter.getQueueType(), parameter.getCapacity(),
-                parameter.getKeepAliveTime(), parameter.getRejectedType(), parameter.getIsAlarm(),parameter.getCapacityAlarm(), 
-                parameter.getLivenessAlarm(), parameter.getAllowCoreThreadTimeOut());
-        return getPoolContent;
+        ThreadPoolParameterInfo threadPoolParameterInfo = new ThreadPoolParameterInfo();
+        threadPoolParameterInfo.setTenantId(parameter.getTenantId())
+                .setItemId(parameter.getItemId())
+                .setTpId(parameter.getTpId())
+                .setCoreSize(parameter.getCoreSize())
+                .setMaxSize(parameter.getMaxSize())
+                .setQueueType(parameter.getQueueType())
+                .setCapacity(parameter.getCapacity())
+                .setKeepAliveTime(parameter.getKeepAliveTime())
+                .setExecuteTimeOut(parameter.getExecuteTimeOut())
+                .setIsAlarm(parameter.getIsAlarm())
+                .setCapacityAlarm(parameter.getCapacityAlarm())
+                .setLivenessAlarm(parameter.getLivenessAlarm())
+                .setAllowCoreThreadTimeOut(parameter.getAllowCoreThreadTimeOut())
+                .setRejectedType(parameter.getRejectedType());
+        return JSONUtil.toJSONString(threadPoolParameterInfo);
     }
 
     /**
diff --git a/infra/common/src/test/java/cn/hippo4j/common/toolkit/ContentUtilTest.java b/infra/common/src/test/java/cn/hippo4j/common/toolkit/ContentUtilTest.java
index 02baa272..fc2b614d 100644
--- a/infra/common/src/test/java/cn/hippo4j/common/toolkit/ContentUtilTest.java
+++ b/infra/common/src/test/java/cn/hippo4j/common/toolkit/ContentUtilTest.java
@@ -31,7 +31,7 @@ public class ContentUtilTest {
                 .itemId("dynamic-threadpool-example").tpId("message-consume").content("描述信息").corePoolSize(1)
                 .maximumPoolSize(2).queueType(1).capacity(4).keepAliveTime(513L).executeTimeOut(null).rejectedType(4)
                 .isAlarm(1).capacityAlarm(80).livenessAlarm(80).allowCoreThreadTimeOut(1).build();
-        Assert.isTrue(testText.equals(ContentUtil.getPoolContent(threadPoolParameterInfo)));
+                Assert.isTrue(ContentUtil.getPoolContent(JSONUtil.parseObject(testText, ThreadPoolParameterInfo.class)).equals(ContentUtil.getPoolContent(threadPoolParameterInfo)));
     }
 
     @Test