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-admin.git
The following commit(s) were added to refs/heads/develop by this push:
new 0414bf6 code clean
0414bf6 is described below
commit 0414bf6a186b758087dec9529233e350b8e8f9b0
Author: nzomkxia <[email protected]>
AuthorDate: Thu May 16 14:43:44 2019 +0800
code clean
---
.../apache/dubbo/admin/common/util/Constants.java | 16 ++
.../dubbo/admin/common/util/ConvertUtil.java | 1 -
.../apache/dubbo/admin/common/util/SyncUtils.java | 1 -
.../apache/dubbo/admin/config/ConfigCenter.java | 2 +-
.../admin/controller/MetricsCollectController.java | 6 +-
.../admin/controller/ServiceTestController.java | 2 +-
.../BalancingDTO2OverrideConfigAdapter.java | 5 +-
.../apache/dubbo/admin/model/domain/Consumer.java | 2 +-
.../apache/dubbo/admin/model/domain/Override.java | 2 +-
.../apache/dubbo/admin/model/domain/Provider.java | 2 +-
.../org/apache/dubbo/admin/model/domain/Route.java | 2 +-
.../dubbo/admin/service/ConsumerService.java | 22 ---
.../dubbo/admin/service/RegistryServerSync.java | 2 +-
.../admin/service/impl/ConsumerServiceImpl.java | 168 +--------------------
.../admin/controller/AccessesControllerTest.java | 3 +-
.../controller/LoadBalanceControllerTest.java | 1 -
.../admin/controller/ManagementControllerTest.java | 1 -
.../admin/service/RegistryServerSyncTest.java | 14 +-
18 files changed, 41 insertions(+), 211 deletions(-)
diff --git
a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/common/util/Constants.java
b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/common/util/Constants.java
index b10f566..141caa8 100644
---
a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/common/util/Constants.java
+++
b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/common/util/Constants.java
@@ -49,6 +49,22 @@ public class Constants {
public static final String PLUS_SIGNS = "+";
public static final String IP = "ip";
public static final String INTERFACE_KEY = "interface";
+ public static final String DYNAMIC_KEY = "dynamic";
+ public static final String CONSUMER_PROTOCOL = "consumer";
+ public static final String PROVIDER_PROTOCOL = "provider";
+ public static final String ROUTE_PROTOCOL = "route";
+ public static final String APPLICATION_KEY = "application";
+ public static final String ENABLED_KEY = "enabled";
+ public static final String RULE_KEY = "rule";
+ public static final String ANYHOST_VALUE = "0.0.0.0";
+ public static final String OVERRIDE_PROTOCOL = "override";
+ public static final String CONFIGURATORS_CATEGORY = "configurators";
+ public static final String EMPTY_PROTOCOL = "empty";
+ public static final String WEIGHT_KEY = "weight";
+ public static final int DEFAULT_WEIGHT = 100;
+ public static final String ADMIN_PROTOCOL = "admin";
+ public static final String CLASSIFIER_KEY = "classifier";
+ public static final String CHECK_KEY = "check";
public static final String VERSION_KEY = "version";
public static final String PROVIDERS_CATEGORY = "providers";
public static final String CONSUMERS_CATEGORY = "consumers";
diff --git
a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/common/util/ConvertUtil.java
b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/common/util/ConvertUtil.java
index c360e09..a60a80f 100644
---
a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/common/util/ConvertUtil.java
+++
b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/common/util/ConvertUtil.java
@@ -17,7 +17,6 @@
package org.apache.dubbo.admin.common.util;
import org.apache.dubbo.admin.model.dto.BaseDTO;
-import org.apache.dubbo.common.Constants;
import org.apache.dubbo.common.utils.StringUtils;
import org.apache.dubbo.metadata.definition.model.MethodDefinition;
diff --git
a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/common/util/SyncUtils.java
b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/common/util/SyncUtils.java
index 840d046..293de8f 100644
---
a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/common/util/SyncUtils.java
+++
b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/common/util/SyncUtils.java
@@ -18,7 +18,6 @@ package org.apache.dubbo.admin.common.util;
import org.apache.dubbo.admin.model.domain.Consumer;
import org.apache.dubbo.admin.model.domain.Provider;
-import org.apache.dubbo.common.Constants;
import org.apache.dubbo.common.URL;
import java.util.ArrayList;
diff --git
a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/config/ConfigCenter.java
b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/config/ConfigCenter.java
index e0bbe0d..3513cd8 100644
---
a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/config/ConfigCenter.java
+++
b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/config/ConfigCenter.java
@@ -151,7 +151,7 @@ public class ConfigCenter {
private URL formUrl(String config, String group, String username, String
password) {
URL url = URL.valueOf(config);
if (StringUtils.isNotEmpty(group)) {
- url =
url.addParameter(org.apache.dubbo.common.Constants.GROUP_KEY, group);
+ url = url.addParameter(Constants.GROUP_KEY, group);
}
if (StringUtils.isNotEmpty(username)) {
url = url.setUsername(username);
diff --git
a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/controller/MetricsCollectController.java
b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/controller/MetricsCollectController.java
index c5952cc..9dfc43c 100644
---
a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/controller/MetricsCollectController.java
+++
b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/controller/MetricsCollectController.java
@@ -30,16 +30,16 @@ import
org.apache.dubbo.admin.service.impl.MetrcisCollectServiceImpl;
import org.apache.dubbo.metadata.definition.model.FullServiceDefinition;
import org.apache.dubbo.metadata.identifier.MetadataIdentifier;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.PathVariable;
-import java.util.Map;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
-import java.util.ArrayList;
+import java.util.Map;
diff --git
a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/controller/ServiceTestController.java
b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/controller/ServiceTestController.java
index f5f0da1..9fc946b 100644
---
a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/controller/ServiceTestController.java
+++
b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/controller/ServiceTestController.java
@@ -18,13 +18,13 @@
package org.apache.dubbo.admin.controller;
import com.google.gson.Gson;
+import org.apache.dubbo.admin.common.util.Constants;
import org.apache.dubbo.admin.common.util.ConvertUtil;
import org.apache.dubbo.admin.common.util.ServiceTestUtil;
import org.apache.dubbo.admin.model.domain.MethodMetadata;
import org.apache.dubbo.admin.model.dto.ServiceTestDTO;
import org.apache.dubbo.admin.service.ProviderService;
import org.apache.dubbo.admin.service.impl.GenericServiceImpl;
-import org.apache.dubbo.common.Constants;
import org.apache.dubbo.metadata.definition.model.FullServiceDefinition;
import org.apache.dubbo.metadata.definition.model.MethodDefinition;
import org.apache.dubbo.metadata.identifier.MetadataIdentifier;
diff --git
a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/model/adapter/BalancingDTO2OverrideConfigAdapter.java
b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/model/adapter/BalancingDTO2OverrideConfigAdapter.java
index 97032af..0beabdd 100644
---
a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/model/adapter/BalancingDTO2OverrideConfigAdapter.java
+++
b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/model/adapter/BalancingDTO2OverrideConfigAdapter.java
@@ -16,12 +16,13 @@
*/
package org.apache.dubbo.admin.model.adapter;
-import java.util.HashMap;
-import java.util.Map;
import org.apache.dubbo.admin.common.util.Constants;
import org.apache.dubbo.admin.model.dto.BalancingDTO;
import org.apache.dubbo.admin.model.store.OverrideConfig;
+import java.util.HashMap;
+import java.util.Map;
+
public class BalancingDTO2OverrideConfigAdapter extends OverrideConfig {
public BalancingDTO2OverrideConfigAdapter(BalancingDTO balancingDTO) {
setType(Constants.BALANCING);
diff --git
a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/model/domain/Consumer.java
b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/model/domain/Consumer.java
index c08c7e0..a3824f1 100644
---
a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/model/domain/Consumer.java
+++
b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/model/domain/Consumer.java
@@ -16,8 +16,8 @@
*/
package org.apache.dubbo.admin.model.domain;
+import org.apache.dubbo.admin.common.util.Constants;
import org.apache.dubbo.admin.common.util.Tool;
-import org.apache.dubbo.common.Constants;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.utils.StringUtils;
diff --git
a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/model/domain/Override.java
b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/model/domain/Override.java
index fe96aff..39bae2e 100644
---
a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/model/domain/Override.java
+++
b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/model/domain/Override.java
@@ -16,8 +16,8 @@
*/
package org.apache.dubbo.admin.model.domain;
+import org.apache.dubbo.admin.common.util.Constants;
import org.apache.dubbo.admin.common.util.Tool;
-import org.apache.dubbo.common.Constants;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.utils.StringUtils;
diff --git
a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/model/domain/Provider.java
b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/model/domain/Provider.java
index 6d4763a..363872b 100644
---
a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/model/domain/Provider.java
+++
b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/model/domain/Provider.java
@@ -16,8 +16,8 @@
*/
package org.apache.dubbo.admin.model.domain;
+import org.apache.dubbo.admin.common.util.Constants;
import org.apache.dubbo.admin.common.util.ConvertUtil;
-import org.apache.dubbo.common.Constants;
import org.apache.dubbo.common.URL;
import java.util.Date;
diff --git
a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/model/domain/Route.java
b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/model/domain/Route.java
index 1bb7fa1..c03980a 100644
---
a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/model/domain/Route.java
+++
b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/model/domain/Route.java
@@ -18,8 +18,8 @@
package org.apache.dubbo.admin.model.domain;
+import org.apache.dubbo.admin.common.util.Constants;
import org.apache.dubbo.admin.common.util.Tool;
-import org.apache.dubbo.common.Constants;
import org.apache.dubbo.common.URL;
import java.util.List;
diff --git
a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/service/ConsumerService.java
b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/service/ConsumerService.java
index 0cd5238..506809d 100644
---
a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/service/ConsumerService.java
+++
b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/service/ConsumerService.java
@@ -29,7 +29,6 @@ public interface ConsumerService {
List<Consumer> findByService(String serviceName);
- Consumer findConsumer(String id);
String getConsumerMetadata(MetadataIdentifier consumerIdentifier);
@@ -38,26 +37,5 @@ public interface ConsumerService {
/**
* query for all consumer addresses
*/
- List<String> findAddresses();
-
- List<String> findAddressesByApplication(String application);
-
- List<String> findAddressesByService(String serviceName);
-
List<Consumer> findByAddress(String consumerAddress);
-
- List<String> findServicesByAddress(String consumerAddress);
-
- List<String> findApplications();
-
- List<String> findApplicationsByServiceName(String serviceName);
-
- List<Consumer> findByApplication(String application);
-
- List<Consumer> findByAppandService(String app, String serviceName);
-
- List<String> findServicesByApplication(String application);
-
- List<String> findServices();
-
}
diff --git
a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/service/RegistryServerSync.java
b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/service/RegistryServerSync.java
index 6b28f02..6a91f5c 100644
---
a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/service/RegistryServerSync.java
+++
b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/service/RegistryServerSync.java
@@ -17,8 +17,8 @@
package org.apache.dubbo.admin.service;
import org.apache.dubbo.admin.common.util.CoderUtil;
+import org.apache.dubbo.admin.common.util.Constants;
import org.apache.dubbo.admin.common.util.Tool;
-import org.apache.dubbo.common.Constants;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
diff --git
a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/service/impl/ConsumerServiceImpl.java
b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/service/impl/ConsumerServiceImpl.java
index c719389..8942b08 100644
---
a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/service/impl/ConsumerServiceImpl.java
+++
b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/service/impl/ConsumerServiceImpl.java
@@ -16,36 +16,28 @@
*/
package org.apache.dubbo.admin.service.impl;
-import org.apache.dubbo.admin.common.util.Pair;
+import org.apache.dubbo.admin.common.util.Constants;
import org.apache.dubbo.admin.common.util.SyncUtils;
import org.apache.dubbo.admin.model.domain.Consumer;
import org.apache.dubbo.admin.service.ConsumerService;
-import org.apache.dubbo.common.Constants;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.metadata.identifier.MetadataIdentifier;
import org.springframework.stereotype.Component;
-import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.ConcurrentMap;
@Component
public class ConsumerServiceImpl extends AbstractService implements
ConsumerService {
+ @Override
public List<Consumer> findByService(String service) {
return SyncUtils.url2ConsumerList(findConsumerUrlByService(service));
}
- public Consumer findConsumer(String id) {
- return SyncUtils.url2Consumer(findConsumerUrl(id));
- }
-
- private Pair<String, URL> findConsumerUrl(String id) {
- return SyncUtils.filterFromCategory(getRegistryCache(),
Constants.CONSUMERS_CATEGORY, id);
- }
+ @Override
public List<Consumer> findAll() {
return SyncUtils.url2ConsumerList(findAllConsumerUrl());
}
@@ -61,80 +53,14 @@ public class ConsumerServiceImpl extends AbstractService
implements ConsumerServ
return SyncUtils.filterFromCategory(getRegistryCache(), filter);
}
- public List<String> findAddresses() {
- List<String> ret = new ArrayList<String>();
- ConcurrentMap<String, Map<String, URL>> consumerUrls =
getRegistryCache().get(Constants.CONSUMERS_CATEGORY);
- if (null == consumerUrls) return ret;
-
- for (Map.Entry<String, Map<String, URL>> e1 : consumerUrls.entrySet())
{
- Map<String, URL> value = e1.getValue();
- for (Map.Entry<String, URL> e2 : value.entrySet()) {
- URL u = e2.getValue();
- String app = u.getAddress();
- if (app != null) ret.add(app);
- }
- }
-
- return ret;
- }
-
- public List<String> findAddressesByApplication(String application) {
- List<String> ret = new ArrayList<String>();
- ConcurrentMap<String, Map<String, URL>> consumerUrls =
getRegistryCache().get(Constants.CONSUMERS_CATEGORY);
-
- if(consumerUrls == null)
- return ret;
-
- for (Map.Entry<String, Map<String, URL>> e1 : consumerUrls.entrySet())
{
- Map<String, URL> value = e1.getValue();
- for (Map.Entry<String, URL> e2 : value.entrySet()) {
- URL u = e2.getValue();
- if
(application.equals(u.getParameter(Constants.APPLICATION_KEY))) {
- String addr = u.getAddress();
- if (addr != null) ret.add(addr);
- }
- }
- }
-
- return ret;
- }
-
- public List<String> findAddressesByService(String service) {
- List<String> ret = new ArrayList<String>();
- ConcurrentMap<String, Map<String, URL>> consumerUrls =
getRegistryCache().get(Constants.CONSUMERS_CATEGORY);
- if (null == consumerUrls) return ret;
- for (Map.Entry<String, URL> e2 : consumerUrls.get(service).entrySet())
{
- URL u = e2.getValue();
- String app = u.getAddress();
- if (app != null) ret.add(app);
- }
- return ret;
- }
+ @Override
public List<Consumer> findByAddress(String consumerAddress) {
return
SyncUtils.url2ConsumerList(findConsumerUrlByAddress(consumerAddress));
}
- public List<String> findServicesByAddress(String address) {
- List<String> ret = new ArrayList<String>();
- ConcurrentMap<String, Map<String, URL>> consumerUrls =
getRegistryCache().get(Constants.CONSUMERS_CATEGORY);
- if (consumerUrls == null || address == null || address.length() == 0)
return ret;
-
- for (Map.Entry<String, Map<String, URL>> e1 : consumerUrls.entrySet())
{
- Map<String, URL> value = e1.getValue();
- for (Map.Entry<String, URL> e2 : value.entrySet()) {
- URL u = e2.getValue();
- if (address.equals(u.getAddress())) {
- ret.add(e1.getKey());
- break;
- }
- }
- }
-
- return ret;
- }
private Map<String, URL> findConsumerUrlByAddress(String address) {
Map<String, String> filter = new HashMap<String, String>();
@@ -144,92 +70,6 @@ public class ConsumerServiceImpl extends AbstractService
implements ConsumerServ
return SyncUtils.filterFromCategory(getRegistryCache(), filter);
}
- public List<String> findApplications() {
- List<String> ret = new ArrayList<String>();
- ConcurrentMap<String, Map<String, URL>> consumerUrls =
getRegistryCache().get(Constants.CONSUMERS_CATEGORY);
- if (consumerUrls == null) return ret;
-
- for (Map.Entry<String, Map<String, URL>> e1 : consumerUrls.entrySet())
{
- Map<String, URL> value = e1.getValue();
- for (Map.Entry<String, URL> e2 : value.entrySet()) {
- URL u = e2.getValue();
- String app = u.getParameter(Constants.APPLICATION_KEY);
- if (app != null) ret.add(app);
- }
- }
-
- return ret;
- }
-
- public List<String> findApplicationsByServiceName(String service) {
- List<String> ret = new ArrayList<String>();
- ConcurrentMap<String, Map<String, URL>> consumerUrls =
getRegistryCache().get(Constants.CONSUMERS_CATEGORY);
- if (consumerUrls == null) return ret;
-
- Map<String, URL> value = consumerUrls.get(service);
- if (value == null) {
- return ret;
- }
- for (Map.Entry<String, URL> e2 : value.entrySet()) {
- URL u = e2.getValue();
- String app = u.getParameter(Constants.APPLICATION_KEY);
- if (app != null) ret.add(app);
- }
-
- return ret;
- }
-
- public List<Consumer> findByApplication(String application) {
- return
SyncUtils.url2ConsumerList(findConsumerUrlByApplication(application));
- }
-
- public List<Consumer> findByAppandService(String app, String serviceName) {
- return SyncUtils.url2ConsumerList(findConsumerUrlByAppandService(app,
serviceName));
- }
-
- private Map<String, URL> findConsumerUrlByAppandService(String
application, String service) {
- Map<String, String> filter = new HashMap<>();
- filter.put(Constants.CATEGORY_KEY, Constants.CONSUMERS_CATEGORY);
- filter.put(Constants.APPLICATION_KEY, application);
- filter.put(Constants.SERVICE_FILTER_KEY, service);
-
- return SyncUtils.filterFromCategory(getRegistryCache(), filter);
- }
-
- private Map<String, URL> findConsumerUrlByApplication(String application) {
- Map<String, String> filter = new HashMap<String, String>();
- filter.put(Constants.CATEGORY_KEY, Constants.CONSUMERS_CATEGORY);
- filter.put(Constants.APPLICATION_KEY, application);
-
- return SyncUtils.filterFromCategory(getRegistryCache(), filter);
- }
-
- public List<String> findServicesByApplication(String application) {
- List<String> ret = new ArrayList<String>();
- ConcurrentMap<String, Map<String, URL>> consumerUrls =
getRegistryCache().get(Constants.CONSUMERS_CATEGORY);
- if (consumerUrls == null || application == null ||
application.length() == 0) return ret;
-
- for (Map.Entry<String, Map<String, URL>> e1 : consumerUrls.entrySet())
{
- Map<String, URL> value = e1.getValue();
- for (Map.Entry<String, URL> e2 : value.entrySet()) {
- URL u = e2.getValue();
- if
(application.equals(u.getParameter(Constants.APPLICATION_KEY))) {
- ret.add(e1.getKey());
- break;
- }
- }
- }
-
- return ret;
- }
-
- public List<String> findServices() {
- List<String> ret = new ArrayList<String>();
- ConcurrentMap<String, Map<String, URL>> consumerUrls =
getRegistryCache().get(Constants.CONSUMERS_CATEGORY);
- if (consumerUrls != null) ret.addAll(consumerUrls.keySet());
- return ret;
- }
-
public Map<String, URL> findConsumerUrlByService(String service) {
Map<String, String> filter = new HashMap<String, String>();
filter.put(Constants.CATEGORY_KEY, Constants.CONSUMERS_CATEGORY);
diff --git
a/dubbo-admin-server/src/test/java/org/apache/dubbo/admin/controller/AccessesControllerTest.java
b/dubbo-admin-server/src/test/java/org/apache/dubbo/admin/controller/AccessesControllerTest.java
index c77bf34..e087898 100644
---
a/dubbo-admin-server/src/test/java/org/apache/dubbo/admin/controller/AccessesControllerTest.java
+++
b/dubbo-admin-server/src/test/java/org/apache/dubbo/admin/controller/AccessesControllerTest.java
@@ -24,7 +24,6 @@ import org.apache.dubbo.admin.model.dto.AccessDTO;
import org.apache.dubbo.admin.model.dto.ConditionRouteDTO;
import org.apache.dubbo.admin.service.ProviderService;
import org.apache.dubbo.admin.service.RouteService;
-
import org.junit.After;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
@@ -136,4 +135,4 @@ public class AccessesControllerTest extends
AbstractSpringIntegrationTest {
restTemplate.put(url("/api/{env}/rules/access/{id}"), accessDTO, env,
id);
verify(routeService).updateAccess(any(AccessDTO.class));
}
-}
\ No newline at end of file
+}
diff --git
a/dubbo-admin-server/src/test/java/org/apache/dubbo/admin/controller/LoadBalanceControllerTest.java
b/dubbo-admin-server/src/test/java/org/apache/dubbo/admin/controller/LoadBalanceControllerTest.java
index bdc77ea..acade40 100644
---
a/dubbo-admin-server/src/test/java/org/apache/dubbo/admin/controller/LoadBalanceControllerTest.java
+++
b/dubbo-admin-server/src/test/java/org/apache/dubbo/admin/controller/LoadBalanceControllerTest.java
@@ -22,7 +22,6 @@ import org.apache.dubbo.admin.AbstractSpringIntegrationTest;
import org.apache.dubbo.admin.model.dto.BalancingDTO;
import org.apache.dubbo.admin.service.OverrideService;
import org.apache.dubbo.admin.service.ProviderService;
-
import org.junit.After;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
diff --git
a/dubbo-admin-server/src/test/java/org/apache/dubbo/admin/controller/ManagementControllerTest.java
b/dubbo-admin-server/src/test/java/org/apache/dubbo/admin/controller/ManagementControllerTest.java
index fb89b86..b832b57 100644
---
a/dubbo-admin-server/src/test/java/org/apache/dubbo/admin/controller/ManagementControllerTest.java
+++
b/dubbo-admin-server/src/test/java/org/apache/dubbo/admin/controller/ManagementControllerTest.java
@@ -21,7 +21,6 @@ import org.apache.dubbo.admin.AbstractSpringIntegrationTest;
import org.apache.dubbo.admin.common.util.Constants;
import org.apache.dubbo.admin.model.dto.ConfigDTO;
import org.apache.dubbo.admin.service.ProviderService;
-
import org.junit.After;
import org.junit.Test;
import org.springframework.boot.test.mock.mockito.MockBean;
diff --git
a/dubbo-admin-server/src/test/java/org/apache/dubbo/admin/service/RegistryServerSyncTest.java
b/dubbo-admin-server/src/test/java/org/apache/dubbo/admin/service/RegistryServerSyncTest.java
index 45e2747..ad1d631 100644
---
a/dubbo-admin-server/src/test/java/org/apache/dubbo/admin/service/RegistryServerSyncTest.java
+++
b/dubbo-admin-server/src/test/java/org/apache/dubbo/admin/service/RegistryServerSyncTest.java
@@ -72,24 +72,24 @@ public class RegistryServerSyncTest {
URL consumerUrl = mock(URL.class);
URL providerUrl = mock(URL.class);
- when(consumerUrl.getParameter(Constants.CATEGORY_KEY,
Constants.PROVIDERS_CATEGORY)).thenReturn(org.apache.dubbo.common.Constants.CONSUMER_PROTOCOL);
+ when(consumerUrl.getParameter(Constants.CATEGORY_KEY,
Constants.PROVIDERS_CATEGORY)).thenReturn(Constants.CONSUMER_PROTOCOL);
when(consumerUrl.getServiceInterface()).thenReturn("org.apache.dubbo.consumer");
when(consumerUrl.getServiceKey()).thenReturn("org.apache.dubbo.consumer");
when(consumerUrl.toFullString()).thenReturn("consumer://192.168.1.10/sunbufu.dubbo.consumer?application=dubbo&category=consumer&check=false&dubbo=2.7.0&interface=sunbufu.dubbo.consumer&loadbalabce=roundrobin&mehods=sayHi,sayGoodBye&owner=sunbufu&pid=18&protocol=dubbo&side=consumer&timeout=3000×tamp=1548127407769");
- when(providerUrl.getParameter(Constants.CATEGORY_KEY,
Constants.PROVIDERS_CATEGORY)).thenReturn(org.apache.dubbo.common.Constants.PROVIDER_PROTOCOL);
+ when(providerUrl.getParameter(Constants.CATEGORY_KEY,
Constants.PROVIDERS_CATEGORY)).thenReturn(Constants.PROVIDER_PROTOCOL);
when(providerUrl.getServiceInterface()).thenReturn("org.apache.dubbo.provider");
when(providerUrl.getServiceKey()).thenReturn("org.apache.dubbo.provider");
when(providerUrl.toFullString()).thenReturn("consumer://192.168.1.10/sunbufu.dubbo.consumer?application=dubbo&category=consumer&check=false&dubbo=2.6.2&interface=sunbufu.dubbo.consumer&loadbalabce=roundrobin&mehods=sayHi,sayGoodBye&owner=sunbufu&pid=18&protocol=dubbo&side=consumer&timeout=3000×tamp=1548127407769");
registryServerSync.notify(Arrays.asList(consumerUrl, consumerUrl,
providerUrl));
- ConcurrentMap<String, Map<String, URL>> consumerMap =
registryServerSync.getRegistryCache().get(org.apache.dubbo.common.Constants.CONSUMER_PROTOCOL);
+ ConcurrentMap<String, Map<String, URL>> consumerMap =
registryServerSync.getRegistryCache().get(Constants.CONSUMER_PROTOCOL);
assertTrue(consumerMap.keySet().contains("org.apache.dubbo.consumer"));
- ConcurrentMap<String, Map<String, URL>> providerMap =
registryServerSync.getRegistryCache().get(org.apache.dubbo.common.Constants.PROVIDER_PROTOCOL);
+ ConcurrentMap<String, Map<String, URL>> providerMap =
registryServerSync.getRegistryCache().get(Constants.PROVIDER_PROTOCOL);
assertTrue(providerMap.keySet().contains("org.apache.dubbo.provider"));
// when url.getProtocol is empty protocol
-
when(consumerUrl.getProtocol()).thenReturn(org.apache.dubbo.common.Constants.EMPTY_PROTOCOL);
+ when(consumerUrl.getProtocol()).thenReturn(Constants.EMPTY_PROTOCOL);
when(consumerUrl.getParameter(Constants.GROUP_KEY)).thenReturn("dubbo");
when(consumerUrl.getParameter(Constants.VERSION_KEY)).thenReturn("2.7.0");
registryServerSync.notify(Collections.singletonList(consumerUrl));
@@ -97,10 +97,10 @@ public class RegistryServerSyncTest {
assertTrue(!consumerMap.keySet().contains("org.apache.dubbo.consumer"));
// when url's group or version is ANY_VALUE (*)
-
when(providerUrl.getProtocol()).thenReturn(org.apache.dubbo.common.Constants.EMPTY_PROTOCOL);
+ when(providerUrl.getProtocol()).thenReturn(Constants.EMPTY_PROTOCOL);
when(providerUrl.getParameter(Constants.GROUP_KEY)).thenReturn(Constants.ANY_VALUE);
registryServerSync.notify(Collections.singletonList(providerUrl));
assertTrue(!providerMap.keySet().contains("org.apache.dubbo.provider"));
}
-}
\ No newline at end of file
+}
