refactor(nl2sql): clean up whitespace in TableRelationNode and BaseNl2SqlService

Author: james-huangzhen

spring-ai-alibaba-nl2sql/spring-ai-alibaba-nl2sql-chat/src/main/java/com/alibaba/cloud/ai/node/TableRelationNode.java

@@ -77,7 +77,7 @@ public class TableRelationNode implements NodeAction {
 	private final BusinessKnowledgeRecallService businessKnowledgeRecallService;
 
 	private final SemanticModelRecallService semanticModelRecallService;
-	
+
 	private final DatasourceService datasourceService;
 
 	public TableRelationNode(BaseSchemaService baseSchemaService, BaseNl2SqlService baseNl2SqlService,
@@ -237,7 +237,7 @@ else if ("postgresql".equalsIgnoreCase(datasource.getType())) {
 	private SchemaDTO processSchemaSelection(SchemaDTO schemaDTO, String input, List<String> evidenceList,
 			OverAllState state) {
 		String schemaAdvice = StateUtils.getStringValue(state, SQL_GENERATE_SCHEMA_MISSING_ADVICE, null);
-		
+
 		// 动态获取Agent对应的数据库配置
 		DbConfig agentDbConfig = getAgentDbConfig(state);
 		logger.debug("Using agent-specific dbConfig: {}", agentDbConfig != null ? agentDbConfig.getUrl() : "default");

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

@@ -391,14 +391,14 @@ public SchemaDTO fineSelect(SchemaDTO schemaDTO, String query, List<String> evid
 
 	public SchemaDTO fineSelect(SchemaDTO schemaDTO, String query, List<String> evidenceList,
 			String sqlGenerateSchemaMissingAdvice, DbConfig specificDbConfig) {
-		logger.debug("Fine selecting schema for query: {} with {} evidences and specificDbConfig: {}", 
-				query, evidenceList.size(), specificDbConfig != null ? specificDbConfig.getUrl() : "default");
-		
+		logger.debug("Fine selecting schema for query: {} with {} evidences and specificDbConfig: {}", query,
+				evidenceList.size(), specificDbConfig != null ? specificDbConfig.getUrl() : "default");
+
 		// 增加具体的样例数据，让模型根据样例数据进行选择
 		SchemaDTO enrichedSchema = enrichSchemaWithSampleData(schemaDTO, specificDbConfig);
-		logger.debug("Schema enriched with sample data for {} tables", 
+		logger.debug("Schema enriched with sample data for {} tables",
 				enrichedSchema.getTable() != null ? enrichedSchema.getTable().size() : 0);
-		
+
 		String prompt = buildMixSelectorPrompt(evidenceList, query, enrichedSchema);
 		logger.debug("Calling LLM for schema fine selection");
 		String content = aiService.call(prompt);
@@ -451,8 +451,7 @@ private SchemaDTO enrichSchemaWithSampleData(SchemaDTO schemaDTO, DbConfig speci
 
 		// 使用传入的特定数据库配置，如果为null则使用默认配置
 		DbConfig targetDbConfig = specificDbConfig != null ? specificDbConfig : dbConfig;
-		logger.debug("Using database config: {}", 
-				targetDbConfig != null ? targetDbConfig.getUrl() : "null");
+		logger.debug("Using database config: {}", targetDbConfig != null ? targetDbConfig.getUrl() : "null");
 
 		// 检查数据库配置是否有效
 		if (!isDatabaseConfigValid(targetDbConfig)) {
@@ -463,17 +462,18 @@ private SchemaDTO enrichSchemaWithSampleData(SchemaDTO schemaDTO, DbConfig speci
 		try {
 			// 创建SchemaDTO的深拷贝以避免修改原始对象
 			SchemaDTO enrichedSchema = copySchemaDTO(schemaDTO);
-			
+
 			// 为每个表获取样例数据
 			for (TableDTO tableDTO : enrichedSchema.getTable()) {
 				enrichTableWithSampleData(tableDTO, targetDbConfig);
 			}
-			
-			logger.info("Successfully enriched schema with sample data for {} tables", 
+
+			logger.info("Successfully enriched schema with sample data for {} tables",
 					enrichedSchema.getTable().size());
 			return enrichedSchema;
-			
-		} catch (Exception e) {
+
+		}
+		catch (Exception e) {
 			logger.warn("Failed to enrich schema with sample data, using original schema: {}", e.getMessage());
 			return schemaDTO;
 		}
@@ -489,24 +489,25 @@ private void enrichTableWithSampleData(TableDTO tableDTO, DbConfig dbConfig) {
 			return;
 		}
 
-		logger.debug("Enriching table '{}' with sample table data for {} columns", 
-				tableDTO.getName(), tableDTO.getColumn().size());
+		logger.debug("Enriching table '{}' with sample table data for {} columns", tableDTO.getName(),
+				tableDTO.getColumn().size());
 
 		try {
 			// 获取表的样例数据
 			ResultSetBO tableData = getSampleDataForTable(tableDTO.getName(), dbConfig);
 			if (tableData != null && tableData.getData() != null && !tableData.getData().isEmpty()) {
 				// 将整行数据分配给对应的列
 				distributeTableDataToColumns(tableDTO, tableData);
-				logger.info("Successfully enriched table '{}' with {} sample rows", 
-						tableDTO.getName(), tableData.getData().size());
-			} else {
+				logger.info("Successfully enriched table '{}' with {} sample rows", tableDTO.getName(),
+						tableData.getData().size());
+			}
+			else {
 				logger.debug("No sample data found for table '{}'", tableDTO.getName());
 			}
-			
-		} catch (Exception e) {
-			logger.warn("Failed to get sample data for table '{}': {}", 
-					tableDTO.getName(), e.getMessage());
+
+		}
+		catch (Exception e) {
+			logger.warn("Failed to get sample data for table '{}': {}", tableDTO.getName(), e.getMessage());
 		}
 	}
 
@@ -529,39 +530,38 @@ private ResultSetBO getSampleDataForTable(String tableName, DbConfig dbConfig) t
 	private void distributeTableDataToColumns(TableDTO tableDTO, ResultSetBO tableData) {
 		List<String> columnHeaders = tableData.getColumn();
 		List<Map<String, String>> rows = tableData.getData();
-		
+
 		// 为每个列创建样例数据映射
 		Map<String, List<String>> columnSamples = new HashMap<>();
-		
+
 		// 遍历每一行数据
 		for (Map<String, String> row : rows) {
 			for (String columnName : columnHeaders) {
 				String value = row.get(columnName);
-				
+
 				if (value != null && !value.trim().isEmpty()) {
-					columnSamples.computeIfAbsent(columnName, k -> new ArrayList<>())
-						.add(value);
+					columnSamples.computeIfAbsent(columnName, k -> new ArrayList<>()).add(value);
 				}
 			}
 		}
-		
+
 		// 将样例数据分配给对应的列
 		for (ColumnDTO columnDTO : tableDTO.getColumn()) {
 			String columnName = columnDTO.getName();
 			List<String> samples = columnSamples.get(columnName);
-			
+
 			if (samples != null && !samples.isEmpty()) {
 				// 去重并限制样例数量
 				List<String> filteredSamples = samples.stream()
 					.filter(sample -> sample != null && !sample.trim().isEmpty())
 					.distinct()
 					.limit(5) // 最多保留5个样例值
 					.collect(Collectors.toList());
-				
+
 				if (!filteredSamples.isEmpty()) {
 					columnDTO.setSamples(filteredSamples);
-					logger.debug("Added {} sample values for column '{}.{}': {}", 
-							filteredSamples.size(), tableDTO.getName(), columnName, filteredSamples);
+					logger.debug("Added {} sample values for column '{}.{}': {}", filteredSamples.size(),
+							tableDTO.getName(), columnName, filteredSamples);
 				}
 			}
 		}
@@ -577,23 +577,23 @@ private boolean isDatabaseConfigValid(DbConfig dbConfig) {
 			logger.debug("dbConfig is null");
 			return false;
 		}
-		
+
 		if (dbAccessor == null) {
 			logger.debug("dbAccessor is null");
 			return false;
 		}
-		
+
 		// 检查基本的连接信息
 		boolean hasBasicInfo = dbConfig.getUrl() != null && !dbConfig.getUrl().trim().isEmpty()
 				&& dbConfig.getUsername() != null && !dbConfig.getUsername().trim().isEmpty();
-		
+
 		if (!hasBasicInfo) {
-			logger.debug("dbConfig missing basic connection info - url: {}, username: {}", 
+			logger.debug("dbConfig missing basic connection info - url: {}, username: {}",
 					dbConfig.getUrl() != null ? "present" : "null",
 					dbConfig.getUsername() != null ? "present" : "null");
 			return false;
 		}
-		
+
 		return true;
 	}
 
@@ -608,14 +608,15 @@ private SchemaDTO copySchemaDTO(SchemaDTO originalSchema) {
 		copy.setDescription(originalSchema.getDescription());
 		copy.setTableCount(originalSchema.getTableCount());
 		copy.setForeignKeys(originalSchema.getForeignKeys());
-		
+
 		if (originalSchema.getTable() != null) {
-			List<TableDTO> copiedTables = originalSchema.getTable().stream()
-					.map(this::copyTableDTO)
-					.collect(Collectors.toList());
+			List<TableDTO> copiedTables = originalSchema.getTable()
+				.stream()
+				.map(this::copyTableDTO)
+				.collect(Collectors.toList());
 			copy.setTable(copiedTables);
 		}
-		
+
 		return copy;
 	}
 
@@ -629,14 +630,15 @@ private TableDTO copyTableDTO(TableDTO originalTable) {
 		copy.setName(originalTable.getName());
 		copy.setDescription(originalTable.getDescription());
 		copy.setPrimaryKeys(originalTable.getPrimaryKeys());
-		
+
 		if (originalTable.getColumn() != null) {
-			List<ColumnDTO> copiedColumns = originalTable.getColumn().stream()
-					.map(this::copyColumnDTO)
-					.collect(Collectors.toList());
+			List<ColumnDTO> copiedColumns = originalTable.getColumn()
+				.stream()
+				.map(this::copyColumnDTO)
+				.collect(Collectors.toList());
 			copy.setColumn(copiedColumns);
 		}
-		
+
 		return copy;
 	}
 
@@ -653,15 +655,15 @@ private ColumnDTO copyColumnDTO(ColumnDTO originalColumn) {
 		copy.setRange(originalColumn.getRange());
 		copy.setType(originalColumn.getType());
 		copy.setMapping(originalColumn.getMapping());
-		
+
 		// 复制现有的样例数据
 		if (originalColumn.getSamples() != null) {
 			copy.setSamples(new ArrayList<>(originalColumn.getSamples()));
 		}
 		if (originalColumn.getData() != null) {
 			copy.setData(new ArrayList<>(originalColumn.getData()));
 		}
-		
+
 		return copy;
 	}