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 ab6ffb9 use StringUtils & optimize imports
ab6ffb9 is described below
commit ab6ffb9947e5aae58c8b4f1fbb7e30f5724c03ea
Author: nzomkxia <[email protected]>
AuthorDate: Fri Oct 19 17:20:14 2018 +0800
use StringUtils & optimize imports
---
.../apache/dubbo/admin/controller/AccessesController.java | 1 -
.../dubbo/admin/controller/LoadBalanceController.java | 14 +++-----------
.../apache/dubbo/admin/controller/OverridesController.java | 8 ++++----
.../apache/dubbo/admin/controller/RoutesController.java | 10 +++++-----
.../apache/dubbo/admin/controller/ServiceController.java | 2 +-
.../apache/dubbo/admin/controller/WeightController.java | 3 ++-
.../apache/dubbo/admin/handler/CustomExceptionHandler.java | 5 ++---
.../src/components/governance/RoutingRule.vue | 3 +++
8 files changed, 20 insertions(+), 26 deletions(-)
diff --git
a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/AccessesController.java
b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/AccessesController.java
index 6c3ff1b..3b6a955 100644
---
a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/AccessesController.java
+++
b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/AccessesController.java
@@ -19,7 +19,6 @@ package org.apache.dubbo.admin.controller;
import com.alibaba.dubbo.common.logger.Logger;
import com.alibaba.dubbo.common.logger.LoggerFactory;
import org.apache.commons.lang3.StringUtils;
-
import org.apache.dubbo.admin.common.exception.ParamValidationException;
import org.apache.dubbo.admin.common.exception.ResourceNotFoundException;
import org.apache.dubbo.admin.dto.AccessDTO;
diff --git
a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/LoadBalanceController.java
b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/LoadBalanceController.java
index e5812f5..e142ddc 100644
---
a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/LoadBalanceController.java
+++
b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/LoadBalanceController.java
@@ -17,6 +17,7 @@
package org.apache.dubbo.admin.controller;
+import org.apache.commons.lang3.StringUtils;
import org.apache.dubbo.admin.common.exception.ParamValidationException;
import org.apache.dubbo.admin.common.exception.ResourceNotFoundException;
import org.apache.dubbo.admin.dto.BalancingDTO;
@@ -24,17 +25,9 @@ import
org.apache.dubbo.admin.governance.service.OverrideService;
import org.apache.dubbo.admin.registry.common.domain.LoadBalance;
import org.apache.dubbo.admin.registry.common.domain.Override;
import org.apache.dubbo.admin.registry.common.util.OverrideUtils;
-
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-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.ResponseStatus;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
@@ -82,9 +75,8 @@ public class LoadBalanceController {
@RequestMapping(method = RequestMethod.GET)
public List<BalancingDTO> searchLoadbalances(@RequestParam(required =
false) String service, @PathVariable String env) {
List<Override> overrides;
- if (service == null || service.length() == 0) {
+ if (StringUtils.isEmpty(service)) {
overrides = overrideService.findAll();
- //TODO throw Exception
} else {
overrides = overrideService.findByService(service);
}
diff --git
a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/OverridesController.java
b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/OverridesController.java
index b69cfd9..6c13264 100644
---
a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/OverridesController.java
+++
b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/OverridesController.java
@@ -18,15 +18,14 @@
package org.apache.dubbo.admin.controller;
import com.alibaba.dubbo.common.URL;
+import org.apache.commons.lang3.StringUtils;
import org.apache.dubbo.admin.common.exception.ParamValidationException;
import org.apache.dubbo.admin.common.exception.ResourceNotFoundException;
-import org.apache.dubbo.admin.dto.BaseDTO;
import org.apache.dubbo.admin.dto.OverrideDTO;
import org.apache.dubbo.admin.governance.service.OverrideService;
import org.apache.dubbo.admin.registry.common.domain.Override;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
-import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
@@ -78,10 +77,11 @@ public class OverridesController {
@RequestMapping(method = RequestMethod.GET)
public List<OverrideDTO> searchOverride(@RequestParam(required = false)
String service, @PathVariable String env) {
List<Override> overrides;
- if (service == null || service.length() == 0) {
+ if (StringUtils.isEmpty(service)) {
overrides = overrideService.findAll();
+ } else {
+ overrides = overrideService.findByService(service);
}
- overrides = overrideService.findByService(service);
List<OverrideDTO> result = new ArrayList<>();
for (Override override : overrides) {
OverrideDTO overrideDTO = new OverrideDTO();
diff --git
a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/RoutesController.java
b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/RoutesController.java
index 3c4de21..148fc58 100644
---
a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/RoutesController.java
+++
b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/RoutesController.java
@@ -17,9 +17,9 @@
package org.apache.dubbo.admin.controller;
+import org.apache.commons.lang3.StringUtils;
import org.apache.dubbo.admin.common.exception.ParamValidationException;
import org.apache.dubbo.admin.common.exception.ResourceNotFoundException;
-import org.apache.dubbo.admin.dto.BaseDTO;
import org.apache.dubbo.admin.dto.RouteDTO;
import org.apache.dubbo.admin.governance.service.ProviderService;
import org.apache.dubbo.admin.governance.service.RouteService;
@@ -45,10 +45,10 @@ public class RoutesController {
public boolean createRule(@RequestBody RouteDTO routeDTO, @PathVariable
String env) {
String serviceName = routeDTO.getService();
String app = routeDTO.getApp();
- if (serviceName == null && app == null) {
+ if (StringUtils.isEmpty(serviceName) && StringUtils.isEmpty(app)) {
throw new ParamValidationException("serviceName and app is
Empty!");
}
- if (serviceName != null) {
+ if (StringUtils.isNotEmpty(serviceName)) {
//2.6
String version = null;
String service = serviceName;
@@ -85,10 +85,10 @@ public class RoutesController {
public List<RouteDTO> searchRoutes(@RequestParam(required = false) String
app,
@RequestParam(required = false) String
service, @PathVariable String env) {
List<Route> routes;
- if (app != null) {
+ if (StringUtils.isNotEmpty(app)) {
// app scope in 2.7
}
- if (service != null) {
+ if (StringUtils.isNotEmpty(service)) {
routes = routeService.findByService(service);
} else {
routes = routeService.findAll();
diff --git
a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/ServiceController.java
b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/ServiceController.java
index 189b017..68c1ad0 100644
---
a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/ServiceController.java
+++
b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/ServiceController.java
@@ -53,7 +53,7 @@ public class ServiceController {
for (Provider provider : allProviders) {
Map<String, String> map =
StringUtils.parseQueryString(provider.getParameters());
ServiceDTO s = new ServiceDTO();
- if (filter == null || filter.length() == 0) {
+ if (org.apache.commons.lang3.StringUtils.isEmpty(filter)) {
s.setAppName(provider.getApplication());
s.setService(provider.getService());
s.setGroup(map.get(Constants.GROUP_KEY));
diff --git
a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/WeightController.java
b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/WeightController.java
index 4f11626..ff77e5e 100644
---
a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/WeightController.java
+++
b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/WeightController.java
@@ -17,6 +17,7 @@
package org.apache.dubbo.admin.controller;
+import org.apache.commons.lang3.StringUtils;
import org.apache.dubbo.admin.common.exception.ParamValidationException;
import org.apache.dubbo.admin.common.exception.ResourceNotFoundException;
import org.apache.dubbo.admin.dto.WeightDTO;
@@ -73,7 +74,7 @@ public class WeightController {
@RequestMapping(method = RequestMethod.GET)
public List<WeightDTO> searchWeight(@RequestParam(required = false) String
service, @PathVariable String env) {
List<Override> overrides;
- if (service == null || service.length() == 0) {
+ if (StringUtils.isEmpty(service)) {
overrides = overrideService.findAll();
} else {
overrides = overrideService.findByService(service);
diff --git
a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/handler/CustomExceptionHandler.java
b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/handler/CustomExceptionHandler.java
index fd9ec0b..94c4a22 100644
---
a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/handler/CustomExceptionHandler.java
+++
b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/handler/CustomExceptionHandler.java
@@ -16,14 +16,13 @@
*/
package org.apache.dubbo.admin.handler;
+import com.alibaba.dubbo.common.logger.Logger;
+import com.alibaba.dubbo.common.logger.LoggerFactory;
import org.apache.dubbo.admin.common.CommonResponse;
import org.apache.dubbo.admin.common.exception.ParamValidationException;
import org.apache.dubbo.admin.common.exception.PermissionDeniedException;
import org.apache.dubbo.admin.common.exception.ResourceNotFoundException;
import org.apache.dubbo.admin.common.exception.ServiceException;
-
-import com.alibaba.dubbo.common.logger.Logger;
-import com.alibaba.dubbo.common.logger.LoggerFactory;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ControllerAdvice;
import org.springframework.web.bind.annotation.ExceptionHandler;
diff --git a/dubbo-admin-frontend/src/components/governance/RoutingRule.vue
b/dubbo-admin-frontend/src/components/governance/RoutingRule.vue
index 00c8990..418a96d 100644
--- a/dubbo-admin-frontend/src/components/governance/RoutingRule.vue
+++ b/dubbo-admin-frontend/src/components/governance/RoutingRule.vue
@@ -241,6 +241,9 @@
}
this.closeDialog()
})
+ .catch(error => {
+ console.log(error)
+ })
}
},
itemOperation: function (icon, item) {
