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/11/30 08:14:39 UTC
[incubator-dubbo-ops] branch metadata updated: yaml dump without tag
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 e26cb70 yaml dump without tag
e26cb70 is described below
commit e26cb70091635a9394acceec3679d7abc89a5122
Author: nzomkxia <z8...@gmail.com>
AuthorDate: Fri Nov 30 16:14:24 2018 +0800
yaml dump without tag
---
.../dubbo/admin/service/impl/OverrideServiceImpl.java | 9 +++++----
.../dubbo/admin/service/impl/RouteServiceImpl.java | 16 ++++++++--------
2 files changed, 13 insertions(+), 12 deletions(-)
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 7818dd0..0aae9f8 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
@@ -22,6 +22,7 @@ import org.apache.dubbo.admin.service.OverrideService;
import org.apache.dubbo.admin.model.domain.Override;
import org.springframework.stereotype.Component;
import org.yaml.snakeyaml.Yaml;
+import org.yaml.snakeyaml.nodes.Tag;
import java.util.List;
@@ -38,7 +39,7 @@ public class OverrideServiceImpl extends AbstractService implements OverrideServ
@java.lang.Override
public void saveOverride(Override override) {
String path = getPath(override.getKey());
- dynamicConfiguration.setConfig(path, yaml.dump(override));
+ dynamicConfiguration.setConfig(path, yaml.dumpAsMap(override));
}
@java.lang.Override
@@ -47,7 +48,7 @@ public class OverrideServiceImpl extends AbstractService implements OverrideServ
if (dynamicConfiguration.getConfig(path) == null) {
//throw exception
}
- dynamicConfiguration.setConfig(path, yaml.dump(override));
+ dynamicConfiguration.setConfig(path, yaml.dumpAsMap(override));
}
@java.lang.Override
@@ -74,7 +75,7 @@ public class OverrideServiceImpl extends AbstractService implements OverrideServ
String config = dynamicConfiguration.getConfig(path);
Override override = yaml.loadAs(config, Override.class);
override.setEnabled(true);
- dynamicConfiguration.setConfig(path, yaml.dump(override));
+ dynamicConfiguration.setConfig(path, yaml.dumpAsMap(override));
}
@java.lang.Override
@@ -89,7 +90,7 @@ public class OverrideServiceImpl extends AbstractService implements OverrideServ
String config = dynamicConfiguration.getConfig(path);
Override override = yaml.loadAs(config, Override.class);
override.setEnabled(false);
- dynamicConfiguration.setConfig(path, yaml.dump(override));
+ dynamicConfiguration.setConfig(path, yaml.dumpAsMap(override));
}
@java.lang.Override
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 588d66b..6d4a31a 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
@@ -36,7 +36,7 @@ public class RouteServiceImpl extends AbstractService implements RouteService {
@Override
public void createConditionRoute(ConditionRoute conditionRoute) {
String path = getPath(conditionRoute.getKey(),Constants.CONDITION_ROUTE);
- dynamicConfiguration.setConfig(path, yaml.dump(conditionRoute));
+ dynamicConfiguration.setConfig(path, yaml.dumpAsMap(conditionRoute));
}
@Override
@@ -45,7 +45,7 @@ public class RouteServiceImpl extends AbstractService implements RouteService {
if (dynamicConfiguration.getConfig(path) == null) {
//throw exception
}
- dynamicConfiguration.setConfig(path, yaml.dump(conditionRoute));
+ dynamicConfiguration.setConfig(path, yaml.dumpAsMap(conditionRoute));
}
@@ -64,7 +64,7 @@ public class RouteServiceImpl extends AbstractService implements RouteService {
if (config != null) {
ConditionRoute conditionRoute = yaml.loadAs(config, ConditionRoute.class);
conditionRoute.setEnabled(true);
- dynamicConfiguration.setConfig(path, yaml.dump(conditionRoute));
+ dynamicConfiguration.setConfig(path, yaml.dumpAsMap(conditionRoute));
}
}
@@ -75,7 +75,7 @@ public class RouteServiceImpl extends AbstractService implements RouteService {
if (config != null) {
ConditionRoute conditionRoute = yaml.loadAs(config, ConditionRoute.class);
conditionRoute.setEnabled(false);
- dynamicConfiguration.setConfig(path, yaml.dump(conditionRoute));
+ dynamicConfiguration.setConfig(path, yaml.dumpAsMap(conditionRoute));
}
}
@@ -93,7 +93,7 @@ public class RouteServiceImpl extends AbstractService implements RouteService {
@Override
public void createTagRoute(TagRoute tagRoute) {
String path = getPath(tagRoute.getKey(),Constants.TAG_ROUTE);
- dynamicConfiguration.setConfig(path, yaml.dump(tagRoute));
+ dynamicConfiguration.setConfig(path, yaml.dumpAsMap(tagRoute));
}
@Override
@@ -102,7 +102,7 @@ public class RouteServiceImpl extends AbstractService implements RouteService {
if (dynamicConfiguration.getConfig(path) == null) {
//throw exception
}
- dynamicConfiguration.setConfig(path, yaml.dump(tagRoute));
+ dynamicConfiguration.setConfig(path, yaml.dumpAsMap(tagRoute));
}
@@ -119,7 +119,7 @@ public class RouteServiceImpl extends AbstractService implements RouteService {
if (config != null) {
TagRoute tagRoute = yaml.loadAs(config, TagRoute.class);
tagRoute.setEnabled(true);
- dynamicConfiguration.setConfig(path, yaml.dump(tagRoute));
+ dynamicConfiguration.setConfig(path, yaml.dumpAsMap(tagRoute));
}
}
@@ -131,7 +131,7 @@ public class RouteServiceImpl extends AbstractService implements RouteService {
if (config != null) {
TagRoute tagRoute = yaml.loadAs(config, TagRoute.class);
tagRoute.setEnabled(false);
- dynamicConfiguration.setConfig(path, yaml.dump(tagRoute));
+ dynamicConfiguration.setConfig(path, yaml.dumpAsMap(tagRoute));
}
}