From 8117c83e61b14863729b0fc7bb99714805ee41c9 Mon Sep 17 00:00:00 2001 From: MarkPotato777 Date: Tue, 21 Jan 2025 15:29:55 +0800 Subject: [PATCH 1/3] server --- .../java/com/oceanbase/odc/config/HookConfiguration.java | 6 ++++-- .../service/regulation/risklevel/model/RiskDetectRule.java | 2 -- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/odc-service/src/main/java/com/oceanbase/odc/config/HookConfiguration.java b/server/odc-service/src/main/java/com/oceanbase/odc/config/HookConfiguration.java index 57a715a17a..7b32df1235 100644 --- a/server/odc-service/src/main/java/com/oceanbase/odc/config/HookConfiguration.java +++ b/server/odc-service/src/main/java/com/oceanbase/odc/config/HookConfiguration.java @@ -17,6 +17,7 @@ import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; @@ -190,8 +191,9 @@ private void checkRiskLevelReference(Long id, String name, Long organizationId, Set referencedRiskDetectRules = riskDetectService.listAllByOrganizationId(organizationId) .stream() - .filter(rule -> rule.getRootNode().find(ConditionExpression.ENVIRONMENT_ID.name(), id) - || rule.getRootNode().find(ConditionExpression.ENVIRONMENT_NAME.name(), name)) + .filter(rule -> Objects.nonNull(rule.getRootNode()) + && (rule.getRootNode().find(ConditionExpression.ENVIRONMENT_ID.name(), id) + || rule.getRootNode().find(ConditionExpression.ENVIRONMENT_NAME.name(), name))) .collect(Collectors.toSet()); if (!referencedRiskDetectRules.isEmpty()) { diff --git a/server/odc-service/src/main/java/com/oceanbase/odc/service/regulation/risklevel/model/RiskDetectRule.java b/server/odc-service/src/main/java/com/oceanbase/odc/service/regulation/risklevel/model/RiskDetectRule.java index 659aa9e632..b32455abdb 100644 --- a/server/odc-service/src/main/java/com/oceanbase/odc/service/regulation/risklevel/model/RiskDetectRule.java +++ b/server/odc-service/src/main/java/com/oceanbase/odc/service/regulation/risklevel/model/RiskDetectRule.java @@ -46,8 +46,6 @@ public class RiskDetectRule { /** * rule root node */ - @NotNull - @Valid private BaseTreeNode rootNode; @NotNull From c0552b638cc08d65c4b408292d5ea9f60e576fd3 Mon Sep 17 00:00:00 2001 From: MarkPotato777 Date: Tue, 21 Jan 2025 15:32:08 +0800 Subject: [PATCH 2/3] rollback --- .../odc/service/regulation/risklevel/model/RiskDetectRule.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/odc-service/src/main/java/com/oceanbase/odc/service/regulation/risklevel/model/RiskDetectRule.java b/server/odc-service/src/main/java/com/oceanbase/odc/service/regulation/risklevel/model/RiskDetectRule.java index b32455abdb..659aa9e632 100644 --- a/server/odc-service/src/main/java/com/oceanbase/odc/service/regulation/risklevel/model/RiskDetectRule.java +++ b/server/odc-service/src/main/java/com/oceanbase/odc/service/regulation/risklevel/model/RiskDetectRule.java @@ -46,6 +46,8 @@ public class RiskDetectRule { /** * rule root node */ + @NotNull + @Valid private BaseTreeNode rootNode; @NotNull From 7210824b795ec4d04a9313bebe941f10028d7912 Mon Sep 17 00:00:00 2001 From: MarkPotato777 Date: Tue, 21 Jan 2025 15:32:49 +0800 Subject: [PATCH 3/3] remove useless annotation --- .../odc/service/regulation/risklevel/model/RiskDetectRule.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/server/odc-service/src/main/java/com/oceanbase/odc/service/regulation/risklevel/model/RiskDetectRule.java b/server/odc-service/src/main/java/com/oceanbase/odc/service/regulation/risklevel/model/RiskDetectRule.java index 659aa9e632..b32455abdb 100644 --- a/server/odc-service/src/main/java/com/oceanbase/odc/service/regulation/risklevel/model/RiskDetectRule.java +++ b/server/odc-service/src/main/java/com/oceanbase/odc/service/regulation/risklevel/model/RiskDetectRule.java @@ -46,8 +46,6 @@ public class RiskDetectRule { /** * rule root node */ - @NotNull - @Valid private BaseTreeNode rootNode; @NotNull