root
/
nacos
mirror of https://github.com/alibaba/nacos.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

[issue #13468] fix dataIdPattern default value (#13611)
Code Coverage / ci (17, ubuntu-latest) (push) Has been cancelled Details
PUSH-CI / Build dist tar (push) Has been cancelled Details
PUSH-CI / Docker images (centos, 17) (push) Has been cancelled Details
PUSH-CI / Deploy nacos (push) Has been cancelled Details
PUSH-CI / Java e2e Test (push) Has been cancelled Details
PUSH-CI / GO E2E Test (push) Has been cancelled Details
PUSH-CI / Cpp E2E Test (push) Has been cancelled Details
PUSH-CI / Csharp E2E Test (push) Has been cancelled Details
PUSH-CI / Nodejs E2E Test (push) Has been cancelled Details
PUSH-CI / Python E2E Test (push) Has been cancelled Details
PUSH-CI / Clean (push) Has been cancelled Details 

* [issue #13468] fix dataIdPattern default value

* [issue #13468] fix unit test
This commit is contained in:
方圆 2025-07-17 20:20:25 +08:00 committed by GitHub
parent 3191d1764a
commit d53c23c724
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/src/main/java/com/alibaba/nacos/client/config/NacosConfigService.java
View File

@ -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<Set<String>> 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

6
client/src/test/java/com/alibaba/nacos/client/config/NacosConfigServiceTest.java
View File

@ -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<Set<String>> setFuture = nacosConfigService.fuzzyWatchWithGroupKeys(groupNamePattern,
fuzzyWatchEventWatcher);
Mockito.verify(mockWoker, Mockito.times(1))
.addTenantFuzzyWatcher(ANY_PATTERN, groupNamePattern, fuzzyWatchEventWatcher);
.addTenantFuzzyWatcher(ALL_PATTERN, groupNamePattern, fuzzyWatchEventWatcher);
Assertions.assertNotNull(setFuture);
}