This is an automated email from the ASF dual-hosted git repository.
min pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-ops.git
The following commit(s) were added to refs/heads/develop by this push:
new 79c5d5e avoid dup in services and apps
79c5d5e is described below
commit 79c5d5e1744bbc2992ad84464c2bfc352e6a5adb
Author: nzomkxia <[email protected]>
AuthorDate: Thu Jan 17 11:46:31 2019 +0800
avoid dup in services and apps
---
.../java/org/apache/dubbo/admin/service/ProviderService.java | 6 +++---
.../apache/dubbo/admin/service/impl/ProviderServiceImpl.java | 10 +++++-----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git
a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/ProviderService.java
b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/ProviderService.java
index 01a79e4..b035b13 100644
---
a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/ProviderService.java
+++
b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/ProviderService.java
@@ -52,7 +52,7 @@ public interface ProviderService {
*
* @return list of all provider's service name
*/
- List<String> findServices();
+ Set<String> findServices();
String findServiceVersion(String serviceName, String application);
@@ -88,7 +88,7 @@ public interface ProviderService {
List<String> findServicesByAddress(String providerAddress);
- List<String> findApplications();
+ Set<String> findApplications();
/**
* Get provider list with specific application name.
@@ -117,4 +117,4 @@ public interface ProviderService {
*/
Set<ServiceDTO> getServiceDTOS(String pattern, String filter, String env);
-}
\ No newline at end of file
+}
diff --git
a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/impl/ProviderServiceImpl.java
b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/impl/ProviderServiceImpl.java
index 0786b8c..98e3e63 100644
---
a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/impl/ProviderServiceImpl.java
+++
b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/impl/ProviderServiceImpl.java
@@ -253,8 +253,8 @@ public class ProviderServiceImpl extends AbstractService
implements ProviderServ
}
@Override
- public List<String> findServices() {
- List<String> ret = new ArrayList<String>();
+ public Set<String> findServices() {
+ Set<String> ret = new HashSet<>();
ConcurrentMap<String, Map<String, URL>> providerUrls =
getRegistryCache().get(Constants.PROVIDERS_CATEGORY);
if (providerUrls != null){
ret.addAll(providerUrls.keySet());
@@ -413,8 +413,8 @@ public class ProviderServiceImpl extends AbstractService
implements ProviderServ
}
@Override
- public List<String> findApplications() {
- List<String> ret = new ArrayList<String>();
+ public Set<String> findApplications() {
+ Set<String> ret = new HashSet<>();
ConcurrentMap<String, Map<String, URL>> providerUrls =
getRegistryCache().get(Constants.PROVIDERS_CATEGORY);
if (providerUrls == null){
return ret;
@@ -568,7 +568,7 @@ public class ProviderServiceImpl extends AbstractService
implements ProviderServ
}
} else {
// filter with fuzzy search
- List<String> candidates = Collections.emptyList();
+ Set<String> candidates = Collections.emptySet();
if (Constants.SERVICE.equals(pattern)) {
candidates = findServices();
} else if (Constants.APPLICATION.equals(pattern)) {