From ecdf65da3e8e0544d13adf1ca35fbb251fc72203 Mon Sep 17 00:00:00 2001
From: jerryjzhang <jerryjzhang@tencent.com>
Date: Mon, 14 Apr 2025 21:09:37 +0800
Subject: [PATCH] (fix)(headless)Fix bizName and name NPE issue.

---
 .../headless/server/utils/ModelClusterBuilder.java           | 4 ++--
 .../supersonic/headless/server/utils/ModelConverter.java     | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelClusterBuilder.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelClusterBuilder.java
index 872a167ef..33cbaf6be 100644
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelClusterBuilder.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelClusterBuilder.java
@@ -38,7 +38,7 @@ public class ModelClusterBuilder {
     }
 
     private static ModelCluster getModelCluster(Map<Long, ModelSchemaResp> modelIdToModelSchema,
-                                                Set<Long> modelIds) {
+            Set<Long> modelIds) {
         boolean containsPartitionDimensions = modelIds.stream().map(modelIdToModelSchema::get)
                 .filter(Objects::nonNull).anyMatch(modelSchemaResp -> CollectionUtils
                         .isNotEmpty(modelSchemaResp.getTimeDimension()));
@@ -47,7 +47,7 @@ public class ModelClusterBuilder {
     }
 
     private static void dfs(ModelSchemaResp model, Map<Long, ModelSchemaResp> modelMap,
-                            Set<Long> visited, Set<Long> modelCluster) {
+            Set<Long> visited, Set<Long> modelCluster) {
         if (Objects.isNull(model)) {
             return;
         }
diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelConverter.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelConverter.java
index f99e7223d..1c1c86171 100644
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelConverter.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelConverter.java
@@ -145,8 +145,9 @@ public class ModelConverter {
     public static ModelReq convert(ModelSchema modelSchema, ModelBuildReq modelBuildReq,
             String tableName) {
         ModelReq modelReq = new ModelReq();
-        modelReq.setName(modelBuildReq.getName());
-        modelReq.setBizName(modelBuildReq.getBizName());
+        modelReq.setName(modelBuildReq.getName() != null ? modelBuildReq.getName() : tableName);
+        modelReq.setBizName(
+                modelBuildReq.getBizName() != null ? modelBuildReq.getBizName() : tableName);
         modelReq.setDatabaseId(modelBuildReq.getDatabaseId());
         modelReq.setDomainId(modelBuildReq.getDomainId());
         ModelDetail modelDetail = new ModelDetail();