From d53c23c724d1224fa705402671a9819d23d4ea33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B9=E5=9C=86?= <374072213@qq.com> Date: Thu, 17 Jul 2025 20:20:25 +0800 Subject: [PATCH] [issue #13468] fix dataIdPattern default value (#13611) * [issue #13468] fix dataIdPattern default value * [issue #13468] fix unit test --- .../alibaba/nacos/client/config/NacosConfigService.java | 8 ++++---- .../nacos/client/config/NacosConfigServiceTest.java | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/client/src/main/java/com/alibaba/nacos/client/config/NacosConfigService.java b/client/src/main/java/com/alibaba/nacos/client/config/NacosConfigService.java index 5b4d49de93..99ef8f158e 100644 --- a/client/src/main/java/com/alibaba/nacos/client/config/NacosConfigService.java +++ b/client/src/main/java/com/alibaba/nacos/client/config/NacosConfigService.java @@ -46,7 +46,7 @@ import java.util.Properties; import java.util.Set; import java.util.concurrent.Future; -import static com.alibaba.nacos.api.common.Constants.ANY_PATTERN; +import static com.alibaba.nacos.api.common.Constants.ALL_PATTERN; /** * Config Impl. @@ -124,7 +124,7 @@ public class NacosConfigService implements ConfigService { @Override public void fuzzyWatch(String groupNamePattern, FuzzyWatchEventWatcher watcher) throws NacosException { - doAddFuzzyWatch(ANY_PATTERN, groupNamePattern, watcher); + doAddFuzzyWatch(ALL_PATTERN, groupNamePattern, watcher); } @Override @@ -136,7 +136,7 @@ public class NacosConfigService implements ConfigService { @Override public Future> fuzzyWatchWithGroupKeys(String groupNamePattern, FuzzyWatchEventWatcher watcher) throws NacosException { - return doAddFuzzyWatch(ANY_PATTERN, groupNamePattern, watcher); + return doAddFuzzyWatch(ALL_PATTERN, groupNamePattern, watcher); } @Override @@ -154,7 +154,7 @@ public class NacosConfigService implements ConfigService { @Override public void cancelFuzzyWatch(String groupNamePattern, FuzzyWatchEventWatcher watcher) throws NacosException { - cancelFuzzyWatch(ANY_PATTERN, groupNamePattern, watcher); + cancelFuzzyWatch(ALL_PATTERN, groupNamePattern, watcher); } @Override diff --git a/client/src/test/java/com/alibaba/nacos/client/config/NacosConfigServiceTest.java b/client/src/test/java/com/alibaba/nacos/client/config/NacosConfigServiceTest.java index 7a228fb16a..7038f0ab9c 100644 --- a/client/src/test/java/com/alibaba/nacos/client/config/NacosConfigServiceTest.java +++ b/client/src/test/java/com/alibaba/nacos/client/config/NacosConfigServiceTest.java @@ -49,7 +49,7 @@ import java.util.Set; import java.util.concurrent.Executor; import java.util.concurrent.Future; -import static com.alibaba.nacos.api.common.Constants.ANY_PATTERN; +import static com.alibaba.nacos.api.common.Constants.ALL_PATTERN; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; @@ -426,7 +426,7 @@ class NacosConfigServiceTest { Mockito.when(mockWoker.addTenantFuzzyWatcher(anyString(), anyString(), any())).thenReturn(context); nacosConfigService.fuzzyWatch(groupNamePattern, fuzzyWatchEventWatcher); Mockito.verify(mockWoker, Mockito.times(1)) - .addTenantFuzzyWatcher(ANY_PATTERN, groupNamePattern, fuzzyWatchEventWatcher); + .addTenantFuzzyWatcher(ALL_PATTERN, groupNamePattern, fuzzyWatchEventWatcher); Mockito.verify(context, Mockito.times(1)).createNewFuture(); } @@ -475,7 +475,7 @@ class NacosConfigServiceTest { Future> setFuture = nacosConfigService.fuzzyWatchWithGroupKeys(groupNamePattern, fuzzyWatchEventWatcher); Mockito.verify(mockWoker, Mockito.times(1)) - .addTenantFuzzyWatcher(ANY_PATTERN, groupNamePattern, fuzzyWatchEventWatcher); + .addTenantFuzzyWatcher(ALL_PATTERN, groupNamePattern, fuzzyWatchEventWatcher); Assertions.assertNotNull(setFuture); }