[incubator-dubbo-ops] branch develop updated: api to restful
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 86e7ec4 api to restful
86e7ec4 is described below
commit 86e7ec4d803accd794ccce6d8f0f242f23697529
Author: nzomkxia
AuthorDate: Mon Oct 15 11:09:47 2018 +0800
api to restful
---
.../admin/controller/LoadBalanceController.java| 37 +-
.../admin/controller/OverridesController.java | 30
.../dubbo/admin/controller/RoutesController.java | 50 ++---
.../dubbo/admin/controller/ServiceController.java | 82 ++
.../dubbo/admin/controller/WeightController.java | 39 +-
.../admin/registry/common/util/OverrideUtils.java | 4 ++
.../java/org/apache/dubbo/admin/util/MD5Util.java | 1 -
.../src/components/ServiceDetail.vue | 2 +-
.../src/components/ServiceSearch.vue | 18 +++--
.../src/components/governance/Overrides.vue| 74 +++
.../src/components/governance/RoutingRule.vue | 68 +-
.../src/components/governance/WeightAdjust.vue | 71 ---
12 files changed, 259 insertions(+), 217 deletions(-)
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 1b0d0c7..29665c2 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
@@ -18,7 +18,6 @@
package org.apache.dubbo.admin.controller;
import org.apache.dubbo.admin.dto.BalancingDTO;
-import org.apache.dubbo.admin.dto.BaseDTO;
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;
@@ -32,14 +31,14 @@ import java.util.List;
import static
org.apache.dubbo.admin.registry.common.util.OverrideUtils.overrideToLoadBalance;
@RestController
-@RequestMapping("/api/balancing")
+@RequestMapping("/api/{env}/rules/balancing")
public class LoadBalanceController {
@Autowired
private OverrideService overrideService;
-@RequestMapping(value = "/create", method = RequestMethod.POST)
-public boolean createLoadbalance(@RequestBody BalancingDTO balancingDTO) {
+@RequestMapping(method = RequestMethod.POST)
+public boolean createLoadbalance(@RequestBody BalancingDTO balancingDTO,
@PathVariable String env) {
String serviceName = balancingDTO.getService();
if (serviceName == null || serviceName.length() == 0) {
//TODO throw exception
@@ -52,9 +51,8 @@ public class LoadBalanceController {
return true;
}
-@RequestMapping(value = "/update", method = RequestMethod.POST)
-public boolean updateLoadbalance(@RequestBody BalancingDTO balancingDTO) {
-String id = balancingDTO.getId();
+@RequestMapping(value = "/{id}", method = RequestMethod.PUT)
+public boolean updateLoadbalance(@PathVariable String id, @RequestBody
BalancingDTO balancingDTO, @PathVariable String env) {
Override override = overrideService.findById(id);
if (override == null) {
//TODO throw exception
@@ -64,17 +62,20 @@ public class LoadBalanceController {
loadBalance.setStrategy(balancingDTO.getStrategy());
loadBalance.setMethod(formatMethodName(balancingDTO.getMethodName()));
loadBalance.setService(old.getService());
-loadBalance.setId(old.getId());
+loadBalance.setHash(id);
overrideService.updateOverride(OverrideUtils.loadBalanceToOverride(loadBalance));
return true;
}
-@RequestMapping(value = "/search", method = RequestMethod.GET)
-public List allLoadbalances(@RequestParam String
serviceName) {
-if (serviceName == null || serviceName.length() == 0) {
+@RequestMapping(method = RequestMethod.GET)
+public List searchLoadbalances(@RequestParam(required =
false) String service, @PathVariable String env) {
+List overrides;
+if (service == null || service.length() == 0) {
+overrides = overrideService.findAll();
//TODO throw Exception
+} else {
+overrides = overrideService.findByService(service);
}
-List overrides = overrideService.findByService(serviceName);
List loadBalances = new ArrayList<>();
if (overrides != null) {
for (Override override : overrides) {
@@ -92,8 +93,8 @@ public class LoadBalanceController {
return loadBalances;
}
-@RequestMapping("/detail")
-public BalancingDTO detail(@RequestParam String
[incubator-dubbo-ops] branch develop updated: access controller
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 f3267bf access controller
f3267bf is described below
commit f3267bf962eccc49f68ad86aed67ae6c9388e4a6
Author: nzomkxia
AuthorDate: Mon Oct 15 11:00:07 2018 +0800
access controller
---
.../main/java/org/apache/dubbo/admin/controller/AccessesController.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 3e03aeb..967296b 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
@@ -86,7 +86,7 @@ public class AccessesController {
}
}
-@RequestMapping(value = "{id}", method = RequestMethod.DELETE)
+@RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
public void deleteAccess(@PathVariable String id, @PathVariable String
env) {
if (id == null) {
throw new IllegalArgumentException("Argument of id is null!");
[incubator-dubbo] branch master updated: combine test coverage report (#2643)
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git The following commit(s) were added to refs/heads/master by this push: new 8cafcab combine test coverage report (#2643) 8cafcab is described below commit 8cafcab65dbb86a83e9ae3e09aba601af462c47d Author: Huang YunKun AuthorDate: Mon Oct 15 09:30:01 2018 +0800 combine test coverage report (#2643) --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 2d81475..5882557 100644 --- a/pom.xml +++ b/pom.xml @@ -474,10 +474,10 @@ -jacoco-site -package +report-aggregate +verify -report +report-aggregate
[incubator-dubbo] branch dev-metadata updated: Merge pull request #2626, simplify registry data and add a new service data store seperated from registry.
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch dev-metadata
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/dev-metadata by this push:
new 59dd98a Merge pull request #2626, simplify registry data and add a
new service data store seperated from registry.
59dd98a is described below
commit 59dd98a06b6faf3d4e4a856d6b43f59b65da3d8f
Author: cvictory
AuthorDate: Mon Oct 15 09:22:02 2018 +0800
Merge pull request #2626, simplify registry data and add a new service data
store seperated from registry.
---
.../java/org/apache/dubbo/common/Constants.java| 2 +
.../src/main/java/org/apache/dubbo/common/URL.java | 10 +-
.../dubbo/config/AbstractInterfaceConfig.java | 3 +-
dubbo-servicedata/dubbo-servicedata-api/pom.xml| 17 +-
.../integration/ServiceStoreService.java | 85 --
.../servicedata/metadata/MethodDescriptor.java | 54 ++
.../servicedata/metadata/ServiceDescriptor.java| 55 +++
.../dubbo/servicedata/metadata/TypeDescriptor.java | 65
.../metadata/builder/ArrayTypeBuilder.java | 36
.../metadata/builder/CollectionTypeBuilder.java| 59 +++
.../metadata/builder/DefaultTypeBuilder.java | 113 +
.../metadata/builder/EnumTypeBuilder.java | 45 +
.../metadata/builder/MapTypeBuilder.java | 60 +++
.../metadata/builder/ServiceDescriptorBuilder.java | 71
.../servicedata/metadata/builder/TypeBuilder.java | 23 +++
.../metadata/builder/TypeDescriptorBuilder.java| 63 +++
.../servicedata/{ => store}/ServiceStore.java | 2 +-
.../{ => store}/ServiceStoreFactory.java | 2 +-
.../servicedata/support/AbstractServiceStore.java | 4 +-
.../support/AbstractServiceStoreFactory.java | 4 +-
.../integration/InterfaceNameTestService.java | 9 +
.../integration/InterfaceNameTestService2.java | 9 +
.../integration/ServiceStoreServiceTest.java | 179 +++-
.../metadata/builder/ArrayTypeBuilderTest.java | 91 ++
.../builder/CollectionTypeBuilderTest.java | 91 ++
.../servicedata/metadata/builder/ComplexEnum.java | 16 ++
.../metadata/builder/ComplexObject.java| 37 +
.../metadata/builder/DefaultTypeBuilderTest.java | 64 +++
.../metadata/builder/EnumTypeBuilderTest.java | 85 ++
.../metadata/builder/MapTypeBuilderTest.java | 90 ++
.../builder/ServiceDescriptorBuilderTest.java | 25 +++
.../servicedata/metadata/builder/SingleEnum.java | 8 +
.../servicedata/metadata/builder/TestService.java | 45 +
.../builder/TypeDescriptorBuilderTest.java | 101
.../store/test/JTestServiceStore4Test.java}| 42 ++---
.../store/test/JTestServiceStoreFactory4Test.java} | 8 +-
.../support/AbstractServiceStoreFactoryTest.java | 4 +-
.../support/AbstractServiceStoreTest.java | 8 +-
...che.dubbo.servicedata.store.ServiceStoreFactory | 1 +
dubbo-servicedata/dubbo-servicedata-redis/pom.xml | 22 ++-
.../{ => store}/redis/RedisServiceStore.java | 20 ++-
.../redis/RedisServiceStoreFactory.java| 5 +-
...rg.apache.dubbo.servicedata.ServiceStoreFactory | 1 -
...che.dubbo.servicedata.store.ServiceStoreFactory | 1 +
.../store/redis/RedisServiceStoreTest.java | 101
.../dubbo-servicedata-zookeeper/pom.xml| 17 +-
.../zookeeper/ZookeeperServiceStore.java | 21 ++-
.../zookeeper/ZookeeperServiceStoreFactory.java| 4 +-
...rg.apache.dubbo.servicedata.ServiceStoreFactory | 1 -
...che.dubbo.servicedata.store.ServiceStoreFactory | 1 +
.../store/zookeeper/ZookeeperServiceStoreTest.java | 183 +
dubbo-servicedata/pom.xml | 17 +-
52 files changed, 1991 insertions(+), 89 deletions(-)
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/Constants.java
b/dubbo-common/src/main/java/org/apache/dubbo/common/Constants.java
index 49b0bd1..5f264fb 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/Constants.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/Constants.java
@@ -375,6 +375,8 @@ public class Constants {
public static final String DEFAULT_CHANNEL_HANDLER = "default";
+public static final String SERVICE_DESCIPTOR_KEY = "serviceDescriptor";
+
public static final String ANY_VALUE = "*";
public static final String COMMA_SEPARATOR = ",";
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/URL.java
b/dubbo-common/src/main/java/org/apache/dubbo/common/URL.java
index 312b691..5d24ed5 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/URL.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/URL.java
@@ -250,16 +250,16 @@ public /**final**/
