You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by mi...@apache.org on 2018/12/11 09:51:18 UTC
[incubator-dubbo-ops] branch metadata updated: reject application
scope config in dubbo 2.6
This is an automated email from the ASF dual-hosted git repository.
min pushed a commit to branch metadata
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-ops.git
The following commit(s) were added to refs/heads/metadata by this push:
new c13aac8 reject application scope config in dubbo 2.6
c13aac8 is described below
commit c13aac82af223af7eb205acc4034fa0e7b564ce6
Author: nzomkxia <z8...@gmail.com>
AuthorDate: Tue Dec 11 17:51:32 2018 +0800
reject application scope config in dubbo 2.6
---
.../dubbo/admin/controller/ConditionRoutesController.java | 11 +++++++++--
.../apache/dubbo/admin/controller/OverridesController.java | 9 ++++++++-
2 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/ConditionRoutesController.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/ConditionRoutesController.java
index 1dd9650..c5ca576 100644
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/ConditionRoutesController.java
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/ConditionRoutesController.java
@@ -20,7 +20,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.common.exception.VersionValidationException;
import org.apache.dubbo.admin.model.dto.ConditionRouteDTO;
+import org.apache.dubbo.admin.service.ProviderService;
import org.apache.dubbo.admin.service.RouteService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
@@ -34,10 +36,12 @@ import java.util.List;
public class ConditionRoutesController {
private final RouteService routeService;
+ private final ProviderService providerService;
@Autowired
- public ConditionRoutesController(RouteService routeService) {
+ public ConditionRoutesController(RouteService routeService, ProviderService providerService) {
this.routeService = routeService;
+ this.providerService = providerService;
}
@RequestMapping(method = RequestMethod.POST)
@@ -48,6 +52,9 @@ public class ConditionRoutesController {
if (StringUtils.isEmpty(serviceName) && StringUtils.isEmpty(app)) {
throw new ParamValidationException("serviceName and app is Empty!");
}
+ if (StringUtils.isNotEmpty(app) && providerService.findVersionInApplication(app).equals("2.6")) {
+ throw new VersionValidationException("dubbo 2.6 does not support application scope routing rule");
+ }
routeService.createConditionRoute(routeDTO);
return true;
}
@@ -118,4 +125,4 @@ public class ConditionRoutesController {
conditionRouteDTO.setKey(null);
return conditionRouteDTO;
}
-}
\ No newline at end of file
+}
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 fa57224..ac0eb6e 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
@@ -20,8 +20,10 @@ 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.common.exception.VersionValidationException;
import org.apache.dubbo.admin.model.dto.OverrideDTO;
import org.apache.dubbo.admin.service.OverrideService;
+import org.apache.dubbo.admin.service.ProviderService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.*;
@@ -34,10 +36,12 @@ import java.util.List;
public class OverridesController {
private final OverrideService overrideService;
+ private final ProviderService providerService;
@Autowired
- public OverridesController(OverrideService overrideService) {
+ public OverridesController(OverrideService overrideService, ProviderService providerService) {
this.overrideService = overrideService;
+ this.providerService = providerService;
}
@RequestMapping(method = RequestMethod.POST)
@@ -48,6 +52,9 @@ public class OverridesController {
if (StringUtils.isEmpty(serviceName) && StringUtils.isEmpty(application)) {
throw new ParamValidationException("serviceName and application are Empty!");
}
+ if (StringUtils.isNotEmpty(application) && providerService.findVersionInApplication(application).equals("2.6")) {
+ throw new VersionValidationException("dubbo 2.6 does not support application scope dynamic config");
+ }
overrideService.saveOverride(overrideDTO);
return true;
}