From 22af663eb127ccdddcb4e17dff3adeb41245716d Mon Sep 17 00:00:00 2001
From: "chen.ma" <machencoding@163.com>
Date: Sun, 19 Dec 2021 22:07:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20JSONUtil=20=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=8C=96=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/hippo4j/common/toolkit/JSONUtil.java | 8 ++------
 .../main/java/cn/hippo4j/config/config/CommonConfig.java  | 7 -------
 .../cn/hippo4j/starter/config/BootstrapProperties.java    | 5 +++++
 .../config/DynamicThreadPoolAutoConfiguration.java        | 7 -------
 4 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/JSONUtil.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/JSONUtil.java
index 280dcc09..4cafbe6d 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/JSONUtil.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/JSONUtil.java
@@ -1,7 +1,7 @@
 package cn.hippo4j.common.toolkit;
 
 import cn.hippo4j.common.api.JsonFacade;
-import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.common.api.impl.JacksonHandler;
 import cn.hutool.core.util.StrUtil;
 
 import java.util.List;
@@ -14,11 +14,7 @@ import java.util.List;
  */
 public class JSONUtil {
 
-    private static JsonFacade JSON_FACADE;
-
-    static {
-        JSONUtil.JSON_FACADE = ApplicationContextHolder.getBean(JsonFacade.class);
-    }
+    private static final JsonFacade JSON_FACADE = new JacksonHandler();
 
     public static String toJSONString(Object object) {
         if (object == null) {
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 6c7e3b54..4084022c 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
@@ -1,7 +1,5 @@
 package cn.hippo4j.config.config;
 
-import cn.hippo4j.common.api.JsonFacade;
-import cn.hippo4j.common.api.impl.JacksonHandler;
 import cn.hippo4j.common.config.ApplicationContextHolder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -19,11 +17,6 @@ import static cn.hippo4j.common.constant.Constants.AVAILABLE_PROCESSORS;
 @Configuration
 public class CommonConfig {
 
-    @Bean
-    public JsonFacade jacksonHandler() {
-        return new JacksonHandler();
-    }
-
     @Bean
     public ApplicationContextHolder simpleApplicationContextHolder() {
         return new ApplicationContextHolder();
diff --git a/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/BootstrapProperties.java b/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/BootstrapProperties.java
index 9dcad3f8..f22941b3 100644
--- a/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/BootstrapProperties.java
+++ b/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/BootstrapProperties.java
@@ -59,4 +59,9 @@ public class BootstrapProperties {
      */
     private Long collectInterval = 5000L;
 
+    /**
+     * JSON serialization type.
+     */
+    private String jsonSerializeType = "JACKSON";
+
 }
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 d9b084c1..e6c793b1 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
@@ -1,7 +1,5 @@
 package cn.hippo4j.starter.config;
 
-import cn.hippo4j.common.api.JsonFacade;
-import cn.hippo4j.common.api.impl.JacksonHandler;
 import cn.hippo4j.common.config.ApplicationContextHolder;
 import cn.hippo4j.starter.controller.PoolRunStateController;
 import cn.hippo4j.starter.core.ConfigService;
@@ -108,11 +106,6 @@ public class DynamicThreadPoolAutoConfiguration {
         return new HttpScheduledHealthCheck(httpAgent);
     }
 
-    @Bean
-    public JsonFacade jacksonHandler() {
-        return new JacksonHandler();
-    }
-
     @Bean
     public RunTimeInfoCollector runTimeInfoCollector() {
         return new RunTimeInfoCollector(properties);