petentially fixed flaky

hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ContentUtil.java

@@ -15,72 +15,63 @@
  * limitations under the License.
  */
 
-package cn.hippo4j.common.toolkit;
+ package cn.hippo4j.common.toolkit;
 
-import cn.hippo4j.common.constant.Constants;
+ import cn.hippo4j.common.constant.Constants;
-import cn.hippo4j.common.model.ThreadPoolParameter;
+ import cn.hippo4j.common.model.ThreadPoolParameter;
-import cn.hippo4j.common.model.ThreadPoolParameterInfo;
+ 
-
+ /**
-/**
+  * Content util.
- * Content util.
+  */
- */
+ public class ContentUtil {
-public class ContentUtil {
+ 
-
+     /**
-    /**
+      * Get pool content.
-     * Get pool content.
+      *
-     *
+      * @param parameter thread-pool parameter
-     * @param parameter thread-pool parameter
+      * @return dynamic thread-pool content str
-     * @return dynamic thread-pool content str
+      */
-     */
+     public static String getPoolContent(ThreadPoolParameter parameter) {
-    public static String getPoolContent(ThreadPoolParameter parameter) {
+         String getPoolContent = String.format("{\"tenantId\":\"%s\",\"itemId\":\"%s\",\"tpId\":" +
-        ThreadPoolParameterInfo threadPoolParameterInfo = new ThreadPoolParameterInfo();
+                 "\"%s\",\"queueType\":%d,\"capacity\":%d,\"keepAliveTime\":%d,\"rejectedType\":%d,\"isAlarm\"" +
-        threadPoolParameterInfo.setTenantId(parameter.getTenantId())
+                 ":%d,\"capacityAlarm\":%d,\"livenessAlarm\":%d,\"allowCoreThreadTimeOut\":%d}", parameter.getTenantId(),
-                .setItemId(parameter.getItemId())
+                 parameter.getItemId(), parameter.getTpId(), parameter.getQueueType(), parameter.getCapacity(),
-                .setTpId(parameter.getTpId())
+                 parameter.getKeepAliveTime(), parameter.getRejectedType(), parameter.getIsAlarm(),
-                .setCoreSize(parameter.getCoreSize())
+                 parameter.getCapacityAlarm(), parameter.getLivenessAlarm(), parameter.getAllowCoreThreadTimeOut());
-                .setMaxSize(parameter.getMaxSize())
+         return getPoolContent;
-                .setQueueType(parameter.getQueueType())
+     }
-                .setCapacity(parameter.getCapacity())
+ 
-                .setKeepAliveTime(parameter.getKeepAliveTime())
+     /**
-                .setExecuteTimeOut(parameter.getExecuteTimeOut())
+      * Get group key.
-                .setIsAlarm(parameter.getIsAlarm())
+      *
-                .setCapacityAlarm(parameter.getCapacityAlarm())
+      * @param parameter thread-pool parameter
-                .setLivenessAlarm(parameter.getLivenessAlarm())
+      * @return group key
-                .setAllowCoreThreadTimeOut(parameter.getAllowCoreThreadTimeOut())
+      */
-                .setRejectedType(parameter.getRejectedType());
+     public static String getGroupKey(ThreadPoolParameter parameter) {
-        return JSONUtil.toJSONString(threadPoolParameterInfo);
+         return StringUtil.createBuilder()
-    }
+                 .append(parameter.getTpId())
-
+                 .append(Constants.GROUP_KEY_DELIMITER)
-    /**
+                 .append(parameter.getItemId())
-     * Get group key.
+                 .append(Constants.GROUP_KEY_DELIMITER)
-     *
+                 .append(parameter.getTenantId())
-     * @param parameter thread-pool parameter
+                 .toString();
-     * @return group key
+     }
-     */
+ 
-    public static String getGroupKey(ThreadPoolParameter parameter) {
+     /**
-        return StringUtil.createBuilder()
+      * Get group key.
-                .append(parameter.getTpId())
+      *
-                .append(Constants.GROUP_KEY_DELIMITER)
+      * @param parameters thread-pool parameters
-                .append(parameter.getItemId())
+      * @return group key
-                .append(Constants.GROUP_KEY_DELIMITER)
+      */
-                .append(parameter.getTenantId())
+     public static String getGroupKey(String... parameters) {
-                .toString();
+         StringBuilder stringBuilder = new StringBuilder();
-    }
+         for (int i = 0; i < parameters.length; i++) {
-
+             stringBuilder.append(parameters[i]);
-    /**
+             if (i < parameters.length - 1) {
-     * Get group key.
+                 stringBuilder.append(Constants.GROUP_KEY_DELIMITER);
-     *
+             }
-     * @param parameters thread-pool parameters
+         }
-     * @return group key
+         return stringBuilder.toString();
-     */
+     }
-    public static String getGroupKey(String... parameters) {
+ }
-        StringBuilder stringBuilder = new StringBuilder();
+ 
-        for (int i = 0; i < parameters.length; i++) {
-            stringBuilder.append(parameters[i]);
-            if (i < parameters.length - 1) {
-                stringBuilder.append(Constants.GROUP_KEY_DELIMITER);
-            }
-        }
-        return stringBuilder.toString();
-    }
-}