This is an automated email from the ASF dual-hosted git repository.
mjk 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 1370eff Use constructor based dependency injection
1370eff is described below
commit 1370effd779583b3115c8b3f190a5f022d5f8063
Author: Jinkai Ma <m...@vip.qq.com>
AuthorDate: Fri Nov 2 16:57:49 2018 +0800
Use constructor based dependency injection
Spring Team recommends "Always use constructor based dependency injection
in your beans. Always use assertions for mandatory dependencies".
---
.../apache/dubbo/admin/controller/AccessesController.java | 10 +++++++---
.../dubbo/admin/controller/LoadBalanceController.java | 8 ++++++--
.../dubbo/admin/controller/OverridesController.java | 10 +++++++---
.../apache/dubbo/admin/controller/RoutesController.java | 15 ++++++++-------
.../apache/dubbo/admin/controller/ServiceController.java | 9 ++++++---
.../apache/dubbo/admin/controller/WeightController.java | 6 +++++-
6 files changed, 39 insertions(+), 19 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 3b6a955..5cce05e 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
@@ -25,10 +25,10 @@ import org.apache.dubbo.admin.dto.AccessDTO;
import org.apache.dubbo.admin.governance.service.RouteService;
import org.apache.dubbo.admin.registry.common.domain.Route;
import org.apache.dubbo.admin.registry.common.route.RouteRule;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
import java.text.ParseException;
import java.util.*;
@@ -37,8 +37,12 @@ import java.util.*;
public class AccessesController {
private static final Logger logger =
LoggerFactory.getLogger(AccessesController.class);
- @Resource
- private RouteService routeService;
+ private final RouteService routeService;
+
+ @Autowired
+ public AccessesController(RouteService routeService) {
+ this.routeService = routeService;
+ }
@RequestMapping(method = RequestMethod.GET)
public List<AccessDTO> searchAccess(@RequestParam(required = false) String
service, @PathVariable String env) throws ParseException {
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 e142ddc..004bc15 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
@@ -38,8 +38,12 @@ import static
org.apache.dubbo.admin.registry.common.util.OverrideUtils.override
@RequestMapping("/api/{env}/rules/balancing")
public class LoadBalanceController {
+ private final OverrideService overrideService;
+
@Autowired
- private OverrideService overrideService;
+ public LoadBalanceController(OverrideService overrideService) {
+ this.overrideService = overrideService;
+ }
@RequestMapping(method = RequestMethod.POST)
@ResponseStatus(HttpStatus.CREATED)
@@ -99,7 +103,7 @@ public class LoadBalanceController {
@RequestMapping(value = "/{id}", method = RequestMethod.GET)
public BalancingDTO detailLoadBalance(@PathVariable String id,
@PathVariable String env) throws ParamValidationException {
- Override override = overrideService.findById(id);
+ Override override = overrideService.findById(id);
if (override == null) {
throw new ResourceNotFoundException("Unknown ID!");
}
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 9eb1de1..f4a6e7d 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
@@ -37,8 +37,12 @@ import java.util.Map;
@RequestMapping("/api/{env}/rules/override")
public class OverridesController {
+ private final OverrideService overrideService;
+
@Autowired
- private OverrideService overrideService;
+ public OverridesController(OverrideService overrideService) {
+ this.overrideService = overrideService;
+ }
@RequestMapping(method = RequestMethod.POST)
@ResponseStatus(HttpStatus.CREATED)
@@ -78,7 +82,7 @@ public class OverridesController {
public List<OverrideDTO> searchOverride(@RequestParam(required = false)
String service, @PathVariable String env) {
List<Override> overrides;
if (StringUtils.isEmpty(service)) {
- overrides = overrideService.findAll();
+ overrides = overrideService.findAll();
} else {
overrides = overrideService.findByService(service);
}
@@ -111,7 +115,7 @@ public class OverridesController {
return overrideDTO;
}
- @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
+ @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
public boolean deleteOverride(@PathVariable String id, @PathVariable
String env) {
overrideService.deleteOverride(id);
return true;
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 223a244..1ec2edb 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
@@ -21,7 +21,6 @@ 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.RouteDTO;
-import org.apache.dubbo.admin.governance.service.ProviderService;
import org.apache.dubbo.admin.governance.service.RouteService;
import org.apache.dubbo.admin.registry.common.domain.Route;
import org.springframework.beans.factory.annotation.Autowired;
@@ -35,10 +34,12 @@ import java.util.List;
@RequestMapping("/api/{env}/rules/route")
public class RoutesController {
+ private final RouteService routeService;
+
@Autowired
- private RouteService routeService;
- @Autowired
- private ProviderService providerService;
+ public RoutesController(RouteService routeService) {
+ this.routeService = routeService;
+ }
@RequestMapping(method = RequestMethod.POST)
@ResponseStatus(HttpStatus.CREATED)
@@ -75,10 +76,10 @@ public class RoutesController {
@RequestMapping(method = RequestMethod.GET)
public List<RouteDTO> searchRoutes(@RequestParam(required = false) String
app,
- @RequestParam(required = false) String
service, @PathVariable String env) {
+ @RequestParam(required = false) String
service, @PathVariable String env) {
List<Route> routes;
if (StringUtils.isNotEmpty(app)) {
- // app scope in 2.7
+ // app scope in 2.7
}
if (StringUtils.isNotEmpty(service)) {
routes = routeService.findByService(service);
@@ -162,7 +163,7 @@ public class RoutesController {
route.setRuntime(routeDTO.isRuntime());
route.setPriority(routeDTO.getPriority());
route.setRule(rule);
- if(id != null) {
+ if (id != null) {
route.setHash(id);
}
return route;
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 ece57d9..361c962 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
@@ -35,11 +35,14 @@ import java.util.*;
@RequestMapping("/api/{env}/service")
public class ServiceController {
- @Autowired
- private ProviderService providerService;
+ private final ProviderService providerService;
+ private final ConsumerService consumerService;
@Autowired
- private ConsumerService consumerService;
+ public ServiceController(ProviderService providerService, ConsumerService
consumerService) {
+ this.providerService = providerService;
+ this.consumerService = consumerService;
+ }
@RequestMapping(method = RequestMethod.GET)
public List<ServiceDTO> searchService(@RequestParam String pattern,
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 ff77e5e..cc679f9 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
@@ -36,8 +36,12 @@ import java.util.List;
@RequestMapping("/api/{env}/rules/weight")
public class WeightController {
+ private final OverrideService overrideService;
+
@Autowired
- private OverrideService overrideService;
+ public WeightController(OverrideService overrideService) {
+ this.overrideService = overrideService;
+ }
@RequestMapping(method = RequestMethod.POST)
@ResponseStatus(HttpStatus.CREATED)
