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 ffd0513 add compatible parameter registering 2.6
ffd0513 is described below
commit ffd051360036ee587928ac93b7da24cd872c273a
Author: nzomkxia <z82507...@gmail.com>
AuthorDate: Tue Dec 11 17:52:21 2018 +0800
add compatible parameter registering 2.6
---
.../org/apache/dubbo/admin/common/util/Constants.java | 3 +++
.../dubbo/admin/service/impl/OverrideServiceImpl.java | 16 ++++++++--------
.../dubbo/admin/service/impl/RouteServiceImpl.java | 12 ++++++------
3 files changed, 17 insertions(+), 14 deletions(-)
diff --git
a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/common/util/Constants.java
b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/common/util/Constants.java
index d334b18..427affa 100644
---
a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/common/util/Constants.java
+++
b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/common/util/Constants.java
@@ -31,4 +31,7 @@ public class Constants {
public static final String CONDITION_ROUTE = "condition_route";
public static final String TAG_ROUTE = "tag_route";
+
+ public static final String COMPATIBLE_CONFIG = "compatible_config";
+
}
diff --git
a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/impl/OverrideServiceImpl.java
b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/impl/OverrideServiceImpl.java
index fb3b420..2f1d7da 100644
---
a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/impl/OverrideServiceImpl.java
+++
b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/impl/OverrideServiceImpl.java
@@ -48,7 +48,7 @@ public class OverrideServiceImpl extends AbstractService
implements OverrideServ
if (override.getScope().equals("service")) {
List<Override> result = convertDTOtoOldOverride(override);
for (Override o : result) {
- registry.register(o.toUrl());
+
registry.register(o.toUrl().addParameter(Constants.COMPATIBLE_CONFIG, true));
}
}
}
@@ -68,10 +68,10 @@ public class OverrideServiceImpl extends AbstractService
implements OverrideServ
List<Override> oldOverrides = convertDTOtoOldOverride(old);
List<Override> updatedOverrides = convertDTOtoOldOverride(update);
for (Override o : oldOverrides) {
- registry.unregister(o.toUrl());
+
registry.unregister(o.toUrl().addParameter(Constants.COMPATIBLE_CONFIG, true));
}
for (Override o : updatedOverrides) {
- registry.register(o.toUrl());
+
registry.register(o.toUrl().addParameter(Constants.COMPATIBLE_CONFIG, true));
}
}
}
@@ -93,7 +93,7 @@ public class OverrideServiceImpl extends AbstractService
implements OverrideServ
if (overrideDTO.getScope().equals("service")) {
List<Override> overrides = convertDTOtoOldOverride(overrideDTO);
for (Override o : overrides) {
- registry.unregister(o.toUrl());
+
registry.unregister(o.toUrl().addParameter(Constants.COMPATIBLE_CONFIG, true));
}
}
}
@@ -117,9 +117,9 @@ public class OverrideServiceImpl extends AbstractService
implements OverrideServ
List<Override> overrides = convertDTOtoOldOverride(override);
for (Override o : overrides) {
o.setEnabled(false);
- registry.unregister(o.toUrl());
+
registry.unregister(o.toUrl().addParameter(Constants.COMPATIBLE_CONFIG, true));
o.setEnabled(true);
- registry.register(o.toUrl());
+
registry.register(o.toUrl().addParameter(Constants.COMPATIBLE_CONFIG, true));
}
}
}
@@ -143,9 +143,9 @@ public class OverrideServiceImpl extends AbstractService
implements OverrideServ
List<Override> overrides = convertDTOtoOldOverride(override);
for (Override o : overrides) {
o.setEnabled(true);
- registry.unregister(o.toUrl());
+
registry.unregister(o.toUrl().addParameter(Constants.COMPATIBLE_CONFIG, true));
o.setEnabled(false);
- registry.register(o.toUrl());
+
registry.register(o.toUrl().addParameter(Constants.COMPATIBLE_CONFIG, true));
}
}
}
diff --git
a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/impl/RouteServiceImpl.java
b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/impl/RouteServiceImpl.java
index e012d81..a420dfc 100644
---
a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/impl/RouteServiceImpl.java
+++
b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/impl/RouteServiceImpl.java
@@ -46,7 +46,7 @@ public class RouteServiceImpl extends AbstractService
implements RouteService {
//register2.6
if (conditionRoute.getScope().equals("service")) {
Route old = convertRouteToOldRoute(conditionRoute);
- registry.register(old.toUrl());
+
registry.register(old.toUrl().addParameter(Constants.COMPATIBLE_CONFIG, true));
}
}
@@ -64,8 +64,8 @@ public class RouteServiceImpl extends AbstractService
implements RouteService {
if (newConditionRoute.getScope().equals("service")) {
Route old = convertRouteToOldRoute(oldConditionRoute);
Route updated = convertRouteToOldRoute(newConditionRoute);
- registry.unregister(old.toUrl());
- registry.register(updated.toUrl());
+
registry.unregister(old.toUrl().addParameter(Constants.COMPATIBLE_CONFIG,
true));
+
registry.register(updated.toUrl().addParameter(Constants.COMPATIBLE_CONFIG,
true));
}
}
@@ -80,7 +80,7 @@ public class RouteServiceImpl extends AbstractService
implements RouteService {
ConditionRouteDTO route = YamlParser.loadObject(config,
ConditionRouteDTO.class);
if (route.getScope().equals("service")) {
Route old = convertRouteToOldRoute(route);
- registry.unregister(old.toUrl());
+
registry.unregister(old.toUrl().addParameter(Constants.COMPATIBLE_CONFIG,
true));
}
}
}
@@ -95,7 +95,7 @@ public class RouteServiceImpl extends AbstractService
implements RouteService {
if (conditionRoute.getScope().equals("service")) {
//for2.6
- URL oldURL = convertRouteToOldRoute(conditionRoute).toUrl();
+ URL oldURL =
convertRouteToOldRoute(conditionRoute).toUrl().addParameter(Constants.COMPATIBLE_CONFIG,
true);
registry.unregister(oldURL);
oldURL = oldURL.addParameter("enabled", true);
registry.register(oldURL);
@@ -117,7 +117,7 @@ public class RouteServiceImpl extends AbstractService
implements RouteService {
if (conditionRoute.getScope().equals("service")) {
//for 2.6
- URL oldURL = convertRouteToOldRoute(conditionRoute).toUrl();
+ URL oldURL =
convertRouteToOldRoute(conditionRoute).toUrl().addParameter(Constants.COMPATIBLE_CONFIG,true);
registry.unregister(oldURL);
oldURL = oldURL.addParameter("enabled", false);
registry.register(oldURL);
