Merge branch 'tencentmusic:master' into master

2025-12-11 03:58:14 +00:00 · 2024-12-11 22:48:14 +08:00
parent 8c44c9f42f 07f6be51c7
commit a8868ba9ab
91 changed files with 246 additions and 253 deletions
--- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/Param.java
+++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/Param.java
@@ -1,8 +1,7 @@
 package com.tencent.supersonic.headless.api.pojo;

-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;

@Data
--- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DictItemReq.java
+++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DictItemReq.java
@@ -1,10 +1,10 @@
 package com.tencent.supersonic.headless.api.pojo.request;

-import javax.validation.constraints.NotNull;

 import com.tencent.supersonic.common.pojo.enums.StatusEnum;
 import com.tencent.supersonic.common.pojo.enums.TypeEnums;
 import com.tencent.supersonic.headless.api.pojo.ItemValueConfig;
+import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
--- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DictSingleTaskReq.java
+++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DictSingleTaskReq.java
@@ -1,8 +1,7 @@
 package com.tencent.supersonic.headless.api.pojo.request;

-import javax.validation.constraints.NotNull;
-
 import com.tencent.supersonic.common.pojo.enums.TypeEnums;
+import jakarta.validation.constraints.NotNull;
 import lombok.Builder;
 import lombok.Data;

--- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DimValueAliasReq.java
+++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DimValueAliasReq.java
@@ -1,8 +1,7 @@
 package com.tencent.supersonic.headless.api.pojo.request;

-import javax.validation.constraints.NotNull;
-
 import com.tencent.supersonic.headless.api.pojo.DimValueMap;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;

 /**
--- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DimensionReq.java
+++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DimensionReq.java
@@ -1,11 +1,10 @@
 package com.tencent.supersonic.headless.api.pojo.request;

-import javax.validation.constraints.NotNull;
-
 import com.tencent.supersonic.common.pojo.enums.DataTypeEnums;
 import com.tencent.supersonic.headless.api.pojo.DimValueMap;
 import com.tencent.supersonic.headless.api.pojo.DimensionTimeTypeParams;
 import com.tencent.supersonic.headless.api.pojo.SchemaItem;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;

 import java.util.List;
--- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DimensionValueReq.java
+++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DimensionValueReq.java
@@ -1,8 +1,7 @@
 package com.tencent.supersonic.headless.api.pojo.request;

-import javax.validation.constraints.NotNull;
-
 import com.tencent.supersonic.common.pojo.DateConf;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;

--- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/ItemValueReq.java
+++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/ItemValueReq.java
@@ -1,8 +1,7 @@
 package com.tencent.supersonic.headless.api.pojo.request;

-import javax.validation.constraints.NotNull;
-
 import com.tencent.supersonic.common.pojo.DateConf;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.ToString;

--- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QueryItemReq.java
+++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QueryItemReq.java
@@ -1,8 +1,8 @@
 package com.tencent.supersonic.headless.api.pojo.request;

-import javax.validation.constraints.Size;

 import com.tencent.supersonic.common.pojo.DateConf;
+import jakarta.validation.constraints.Size;
 import lombok.Data;

 import java.util.List;
--- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QueryRuleReq.java
+++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QueryRuleReq.java
@@ -1,11 +1,10 @@
 package com.tencent.supersonic.headless.api.pojo.request;

-import javax.validation.constraints.NotNull;
-
 import com.tencent.supersonic.headless.api.pojo.ActionInfo;
 import com.tencent.supersonic.headless.api.pojo.RuleInfo;
 import com.tencent.supersonic.headless.api.pojo.SchemaItem;
 import com.tencent.supersonic.headless.api.pojo.enums.QueryRuleType;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.ToString;

--- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/SchemaItemQueryReq.java
+++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/SchemaItemQueryReq.java
@@ -1,9 +1,8 @@
 package com.tencent.supersonic.headless.api.pojo.request;

-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-
 import com.tencent.supersonic.common.pojo.enums.TypeEnums;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;

 import java.util.List;
--- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/SqlExecuteReq.java
+++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/SqlExecuteReq.java
@@ -1,9 +1,8 @@
 package com.tencent.supersonic.headless.api.pojo.request;

-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-
 import com.tencent.supersonic.headless.api.pojo.SqlVariable;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;

--- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/TagBatchCreateReq.java
+++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/TagBatchCreateReq.java
@@ -1,8 +1,7 @@
 package com.tencent.supersonic.headless.api.pojo.request;

-import javax.validation.constraints.NotNull;
-
 import com.tencent.supersonic.headless.api.pojo.SchemaElementType;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.ToString;

--- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/TagObjectReq.java
+++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/TagObjectReq.java
@@ -1,9 +1,8 @@
 package com.tencent.supersonic.headless.api.pojo.request;

-import javax.validation.constraints.NotNull;
-
 import com.alibaba.fastjson.JSONObject;
 import com.tencent.supersonic.headless.api.pojo.SchemaItem;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;

 import java.util.HashMap;
--- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/TagReq.java
+++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/TagReq.java
@@ -1,9 +1,8 @@
 package com.tencent.supersonic.headless.api.pojo.request;

-import javax.validation.constraints.NotNull;
-
 import com.tencent.supersonic.common.pojo.RecordInfo;
 import com.tencent.supersonic.headless.api.pojo.enums.TagDefineType;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;

@Data
--- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/TermReq.java
+++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/TermReq.java
@@ -1,9 +1,8 @@
 package com.tencent.supersonic.headless.api.pojo.request;

-import javax.validation.constraints.NotNull;
-
 import com.google.common.collect.Lists;
 import com.tencent.supersonic.common.pojo.RecordInfo;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;

 import java.util.List;
--- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/ValueTaskQueryReq.java
+++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/ValueTaskQueryReq.java
@@ -1,8 +1,9 @@
 package com.tencent.supersonic.headless.api.pojo.request;

-import javax.validation.constraints.NotNull;
+

 import com.tencent.supersonic.common.pojo.PageBaseReq;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;

 import java.util.List;
--- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/DictItemResp.java
+++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/DictItemResp.java
@@ -1,10 +1,9 @@
 package com.tencent.supersonic.headless.api.pojo.response;

-import javax.validation.constraints.NotNull;
-
 import com.tencent.supersonic.common.pojo.enums.StatusEnum;
 import com.tencent.supersonic.common.pojo.enums.TypeEnums;
 import com.tencent.supersonic.headless.api.pojo.ItemValueConfig;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;

 import static com.tencent.supersonic.common.pojo.Constants.UNDERLINE;
--- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/QueryRuleResp.java
+++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/QueryRuleResp.java
@@ -1,11 +1,10 @@
 package com.tencent.supersonic.headless.api.pojo.response;

-import javax.validation.constraints.NotNull;
-
 import com.tencent.supersonic.headless.api.pojo.ActionInfo;
 import com.tencent.supersonic.headless.api.pojo.RuleInfo;
 import com.tencent.supersonic.headless.api.pojo.SchemaItem;
 import com.tencent.supersonic.headless.api.pojo.enums.QueryRuleType;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;

 import java.util.Map;