refactor: replace ObjectMapper instantiation with JsonUtils.getObjectMapper()

Author: zxuexingzhijie

spring-ai-alibaba-data-agent-chat/src/main/java/com/alibaba/cloud/ai/dto/schema/ColumnDTO.java

@@ -15,6 +15,7 @@
  */
 package com.alibaba.cloud.ai.dto.schema;
 
+import com.alibaba.cloud.ai.util.JsonUtils;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -105,7 +106,7 @@ public void setMapping(Map<String, String> mapping) {
 
 	@Override
 	public String toString() {
-		ObjectMapper objectMapper = new ObjectMapper();
+		ObjectMapper objectMapper = JsonUtils.getObjectMapper();
 		try {
 			return objectMapper.writeValueAsString(this);
 		}

spring-ai-alibaba-data-agent-chat/src/main/java/com/alibaba/cloud/ai/dto/schema/TableDTO.java

@@ -15,6 +15,7 @@
  */
 package com.alibaba.cloud.ai.dto.schema;
 
+import com.alibaba.cloud.ai.util.JsonUtils;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -65,7 +66,7 @@ public void setPrimaryKeys(List<String> primaryKeys) {
 
 	@Override
 	public String toString() {
-		ObjectMapper objectMapper = new ObjectMapper();
+		ObjectMapper objectMapper = JsonUtils.getObjectMapper();
 		try {
 			return objectMapper.writeValueAsString(this);
 		}

spring-ai-alibaba-data-agent-chat/src/main/java/com/alibaba/cloud/ai/pojo/ExecutionStep.java

@@ -16,6 +16,7 @@
 
 package com.alibaba.cloud.ai.pojo;
 
+import com.alibaba.cloud.ai.util.JsonUtils;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -89,7 +90,7 @@ public void setInputDataDescription(String inputDataDescription) {
 		}
 
 		public String toJsonStr() {
-			ObjectMapper objectMapper = new ObjectMapper();
+			ObjectMapper objectMapper = JsonUtils.getObjectMapper();
 			try {
 				return objectMapper.writeValueAsString(this);
 			}

spring-ai-alibaba-data-agent-chat/src/main/java/com/alibaba/cloud/ai/pojo/Plan.java

@@ -16,6 +16,7 @@
 
 package com.alibaba.cloud.ai.pojo;
 
+import com.alibaba.cloud.ai.util.JsonUtils;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -60,7 +61,7 @@ public String toString() {
 	}
 
 	public String toJsonStr() {
-		ObjectMapper objectMapper = new ObjectMapper();
+		ObjectMapper objectMapper = JsonUtils.getObjectMapper();
 		try {
 			return objectMapper.writeValueAsString(this);
 		}

spring-ai-alibaba-data-agent-chat/src/main/java/com/alibaba/cloud/ai/service/base/BaseNl2SqlService.java

@@ -29,7 +29,7 @@
 import com.alibaba.cloud.ai.util.MarkdownParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import com.alibaba.cloud.ai.util.JsonUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.ai.chat.model.ChatResponse;
@@ -228,8 +228,9 @@ public List<String> expandQuestion(String query) {
 			String content = aiService.call(prompt);
 
 			// Parse JSON response
-			List<String> expandedQuestions = new ObjectMapper().readValue(content, new TypeReference<List<String>>() {
-			});
+			List<String> expandedQuestions = JsonUtils.getObjectMapper()
+				.readValue(content, new TypeReference<List<String>>() {
+				});
 
 			if (expandedQuestions == null || expandedQuestions.isEmpty()) {
 				logger.warn("No expanded questions generated, returning original query");
@@ -282,7 +283,7 @@ public List<String> extractKeywords(String query, List<String> evidenceList) thr
 		logger.debug("Calling LLM for keyword extraction");
 		String content = aiService.call(prompt);
 
-		List<String> keywords = new ObjectMapper().readValue(content, new TypeReference<List<String>>() {
+		List<String> keywords = JsonUtils.getObjectMapper().readValue(content, new TypeReference<List<String>>() {
 		});
 		logger.debug("Extracted {} keywords: {}", keywords != null ? keywords.size() : 0, keywords);
 		return keywords;
@@ -364,7 +365,7 @@ public Set<String> fineSelect(SchemaDTO schemaDTO, String sqlGenerateSchemaMissi
 			String jsonContent = MarkdownParser.extractText(content);
 			List<String> tableList;
 			try {
-				tableList = new ObjectMapper().readValue(jsonContent, new TypeReference<List<String>>() {
+				tableList = JsonUtils.getObjectMapper().readValue(jsonContent, new TypeReference<List<String>>() {
 				});
 			}
 			catch (Exception e) {
@@ -414,7 +415,7 @@ public SchemaDTO fineSelect(SchemaDTO schemaDTO, String query, List<String> evid
 			String jsonContent = MarkdownParser.extractText(content);
 			List<String> tableList;
 			try {
-				tableList = new ObjectMapper().readValue(jsonContent, new TypeReference<List<String>>() {
+				tableList = JsonUtils.getObjectMapper().readValue(jsonContent, new TypeReference<List<String>>() {
 				});
 			}
 			catch (Exception e) {

spring-ai-alibaba-data-agent-common/src/main/java/com/alibaba/cloud/ai/connector/bo/ResultSetBO.java

@@ -15,6 +15,7 @@
  */
 package com.alibaba.cloud.ai.connector.bo;
 
+import com.alibaba.cloud.ai.util.JsonUtils;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -115,7 +116,7 @@ public ResultSetBO build() {
 	 * @return JSON string
 	 */
 	public String toJsonStr() {
-		ObjectMapper objectMapper = new ObjectMapper();
+		ObjectMapper objectMapper = JsonUtils.getObjectMapper();
 		try {
 			return objectMapper.writeValueAsString(this);
 		}

spring-ai-alibaba-data-agent-common/src/main/java/com/alibaba/cloud/ai/util/JsonUtils.java

@@ -26,6 +26,10 @@ public class JsonUtils {
 
 	private static final ObjectMapper objectMapper = new ObjectMapper();
 
+	public static ObjectMapper getObjectMapper() {
+		return objectMapper;
+	}
+
 	public static String toJson(StreamResponseType type, String data) {
 		try {
 			return objectMapper.writeValueAsString(Map.of("type", type.getValue(), "data", data));

spring-ai-alibaba-data-agent-management/src/main/java/com/alibaba/cloud/ai/controller/ChatController.java

@@ -18,6 +18,7 @@
 import com.alibaba.cloud.ai.dto.ChatRequest;
 import com.alibaba.cloud.ai.entity.*;
 import com.alibaba.cloud.ai.service.*;
+import com.alibaba.cloud.ai.util.JsonUtils;
 import com.alibaba.cloud.ai.vo.ApiResponse;
 import com.alibaba.cloud.ai.vo.ChatResponse;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -53,7 +54,7 @@ public class ChatController {
 	@Autowired(required = false)
 	private Nl2SqlService nl2SqlService;
 
-	private final ObjectMapper objectMapper = new ObjectMapper();
+	private final ObjectMapper objectMapper = JsonUtils.getObjectMapper();
 
 	/**
 	 * Get session list for an agent

spring-ai-alibaba-data-agent-management/src/main/java/com/alibaba/cloud/ai/controller/Nl2sqlForGraphController.java

@@ -28,6 +28,7 @@
 import com.alibaba.cloud.ai.service.DatasourceService;
 import com.alibaba.cloud.ai.entity.Datasource;
 import com.alibaba.cloud.ai.service.AgentService;
+import com.alibaba.cloud.ai.util.JsonUtils;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.servlet.http.HttpServletResponse;
 import org.slf4j.Logger;
@@ -70,7 +71,7 @@ public class Nl2sqlForGraphController {
 
 	private final AgentService agentService;
 
-	private final ObjectMapper objectMapper = new ObjectMapper();
+	private final ObjectMapper objectMapper = JsonUtils.getObjectMapper();
 
 	public Nl2sqlForGraphController(@Qualifier("nl2sqlGraph") StateGraph stateGraph,
 			SimpleVectorStoreService simpleVectorStoreService, DatasourceService datasourceService,

spring-ai-alibaba-data-agent-management/src/main/java/com/alibaba/cloud/ai/service/AnalyticDbVectorStoreManagementService.java

@@ -26,6 +26,7 @@
 import com.alibaba.cloud.ai.request.EvidenceRequest;
 import com.alibaba.cloud.ai.request.SchemaInitRequest;
 import com.alibaba.cloud.ai.request.SearchRequest;
+import com.alibaba.cloud.ai.util.JsonUtils;
 import com.alibaba.cloud.ai.vectorstore.analyticdb.AnalyticDbVectorStoreProperties;
 import com.aliyun.gpdb20160503.Client;
 import com.aliyun.gpdb20160503.models.DeleteCollectionDataRequest;
@@ -83,7 +84,7 @@ public class AnalyticDbVectorStoreManagementService implements VectorStoreManage
 	@Autowired
 	private Client client;
 
-	private final ObjectMapper objectMapper = new ObjectMapper();
+	private final ObjectMapper objectMapper = JsonUtils.getObjectMapper();
 
 	/**
 	 * Add evidence content to vector store
@@ -150,9 +151,9 @@ public List<Document> search(SearchRequest searchRequest) throws Exception {
 					if (match.getScore() != null && match.getScore() > 0.2) {
 						Map<String, String> metadata = match.getMetadata();
 						String pageContent = metadata.get(CONTENT_FIELD_NAME);
-						Map<String, Object> metadataJson = new ObjectMapper()
-							.readValue(metadata.get(METADATA_FIELD_NAME), new TypeReference<HashMap<String, Object>>() {
-							});
+						Map<String, Object> metadataJson = objectMapper.readValue(metadata.get(METADATA_FIELD_NAME),
+								new TypeReference<HashMap<String, Object>>() {
+								});
 
 						Document doc = new Document(match.getId(), pageContent, metadataJson);
 						documents.add(doc);