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/09/20 05:41:14 UTC
[incubator-dubbo-ops] branch develop updated: update util
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 5662921 update util
5662921 is described below
commit 56629216690885fb43efd4a1540d3787affae803
Author: nzomkxia <z8...@gmail.com>
AuthorDate: Thu Sep 20 13:41:01 2018 +0800
update util
---
.../admin/registry/common/util/OverrideUtils.java | 6 +++++-
.../java/org/apache/dubbo/admin/util/YamlUtil.java | 22 ++++++++++++++++++++++
2 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/registry/common/util/OverrideUtils.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/registry/common/util/OverrideUtils.java
index 2fb9c0b..96360bf 100644
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/registry/common/util/OverrideUtils.java
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/registry/common/util/OverrideUtils.java
@@ -104,7 +104,11 @@ public class OverrideUtils {
}
public static LoadBalance overrideToLoadBalance(Override override) {
- return OverrideUtils.overridesToLoadBalances(Arrays.asList(override)).get(0);
+ List<LoadBalance> loadBalances = OverrideUtils.overridesToLoadBalances(Arrays.asList(override));
+ if (loadBalances != null && loadBalances.size() > 0) {
+ return loadBalances.get(0);
+ }
+ return null;
}
public static Override loadBalanceToOverride(LoadBalance loadBalance) {
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/util/YamlUtil.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/util/YamlUtil.java
new file mode 100644
index 0000000..c3f9d08
--- /dev/null
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/util/YamlUtil.java
@@ -0,0 +1,22 @@
+package org.apache.dubbo.admin.util;
+
+import org.yaml.snakeyaml.Yaml;
+
+import java.util.Map;
+
+public class YamlUtil {
+
+ private static Yaml yaml;
+
+ static {
+ yaml = new Yaml();
+ }
+
+ public static Map<String, Object> loadString(String text) {
+ if (text != null) {
+ return yaml.load(text);
+ }
+ return null;
+ }
+
+}