This is an automated email from the ASF dual-hosted git repository.
lizhimins pushed a commit to branch rocketmq-studio
in repository https://gitbox.apache.org/repos/asf/rocketmq-dashboard.git
The following commit(s) were added to refs/heads/rocketmq-studio by this push:
new 94609993 fix(alerts): normalize query levels with root locale (#1495)
94609993 is described below
commit 94609993f5252da9e91345b73566319ed2f17791
Author: yyqdbngt <[email protected]>
AuthorDate: Tue Aug 11 17:51:12 2026 +0800
fix(alerts): normalize query levels with root locale (#1495)
Co-authored-by: yyqdbngt <[email protected]>
---
.../ops/alert/MybatisPlusAlertRepository.java | 3 +-
.../ops/alert/MybatisPlusAlertRepositoryTest.java | 72 ++++++++++++++++++++++
2 files changed, 74 insertions(+), 1 deletion(-)
diff --git
a/server/src/main/java/org/apache/rocketmq/studio/ops/alert/MybatisPlusAlertRepository.java
b/server/src/main/java/org/apache/rocketmq/studio/ops/alert/MybatisPlusAlertRepository.java
index 3571dd13..b67c370e 100644
---
a/server/src/main/java/org/apache/rocketmq/studio/ops/alert/MybatisPlusAlertRepository.java
+++
b/server/src/main/java/org/apache/rocketmq/studio/ops/alert/MybatisPlusAlertRepository.java
@@ -30,6 +30,7 @@ import lombok.RequiredArgsConstructor;
import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.List;
+import java.util.Locale;
import java.util.stream.Collectors;
/**
@@ -78,7 +79,7 @@ public class MybatisPlusAlertRepository implements
AlertRepository {
@Override
public List<SystemAlertVO> findAlerts(String level) {
QueryWrapper<RmqSystemAlert> query = new QueryWrapper<RmqSystemAlert>()
- .eq(StringUtils.hasText(level), "level", level == null ? null
: level.toLowerCase())
+ .eq(StringUtils.hasText(level), "level", level == null ? null
: level.toLowerCase(Locale.ROOT))
.orderByDesc("time");
return alertMapper.selectList(query).stream()
.map(MybatisPlusAlertRepository::toAlertVO)
diff --git
a/server/src/test/java/org/apache/rocketmq/studio/ops/alert/MybatisPlusAlertRepositoryTest.java
b/server/src/test/java/org/apache/rocketmq/studio/ops/alert/MybatisPlusAlertRepositoryTest.java
new file mode 100644
index 00000000..050b42f5
--- /dev/null
+++
b/server/src/test/java/org/apache/rocketmq/studio/ops/alert/MybatisPlusAlertRepositoryTest.java
@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.rocketmq.studio.ops.alert;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.apache.rocketmq.studio.persistence.entity.RmqSystemAlert;
+import org.apache.rocketmq.studio.persistence.mapper.RmqAlertRuleMapper;
+import org.apache.rocketmq.studio.persistence.mapper.RmqSystemAlertMapper;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.List;
+import java.util.Locale;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+class MybatisPlusAlertRepositoryTest {
+
+ @Mock
+ private RmqAlertRuleMapper ruleMapper;
+
+ @Mock
+ private RmqSystemAlertMapper alertMapper;
+
+ @InjectMocks
+ private MybatisPlusAlertRepository repository;
+
+ @Test
+ void findAlertsShouldNormalizeLevelIndependentlyOfDefaultLocale() {
+ when(alertMapper.selectList(any())).thenReturn(List.of());
+ Locale originalLocale = Locale.getDefault();
+
+ try {
+ Locale.setDefault(Locale.forLanguageTag("tr-TR"));
+ repository.findAlerts("INFO");
+ } finally {
+ Locale.setDefault(originalLocale);
+ }
+
+
verify(alertMapper).selectList(argThat(MybatisPlusAlertRepositoryTest::hasInfoLevelParameter));
+ }
+
+ private static boolean hasInfoLevelParameter(Wrapper<RmqSystemAlert>
query) {
+ if (!(query instanceof QueryWrapper<?> queryWrapper)) {
+ return false;
+ }
+ queryWrapper.getCustomSqlSegment();
+ return queryWrapper.getParamNameValuePairs().containsValue("info");
+ }
+}
