From 564acbb2a8191a8d054fb45531bb310a92aa5426 Mon Sep 17 00:00:00 2001 From: fangjian0423 Date: Mon, 17 Dec 2018 11:36:38 +0800 Subject: [PATCH] upgrade sentinel version to 1.4.0 --- spring-cloud-alibaba-dependencies/pom.xml | 2 +- .../alibaba/sentinel/datasource/converter/JsonConverter.java | 4 ++-- .../alibaba/sentinel/datasource/converter/XmlConverter.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-cloud-alibaba-dependencies/pom.xml b/spring-cloud-alibaba-dependencies/pom.xml index a05608f5..55acd9ea 100644 --- a/spring-cloud-alibaba-dependencies/pom.xml +++ b/spring-cloud-alibaba-dependencies/pom.xml @@ -17,7 +17,7 @@ Spring Cloud Alibaba Dependencies - 1.3.0-GA + 1.4.0 3.1.0 0.6.0 1.0.8 diff --git a/spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/converter/JsonConverter.java b/spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/converter/JsonConverter.java index 591d61bd..5f64825b 100644 --- a/spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/converter/JsonConverter.java +++ b/spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/converter/JsonConverter.java @@ -17,7 +17,7 @@ import com.alibaba.csp.sentinel.slots.block.authority.AuthorityRule; import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRule; import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRuleManager; import com.alibaba.csp.sentinel.slots.block.flow.FlowRule; -import com.alibaba.csp.sentinel.slots.block.flow.FlowRuleManager; +import com.alibaba.csp.sentinel.slots.block.flow.FlowRuleUtil; import com.alibaba.csp.sentinel.slots.block.flow.param.ParamFlowRule; import com.alibaba.csp.sentinel.slots.system.SystemRule; @@ -109,7 +109,7 @@ public class JsonConverter implements Converter> { private FlowRule convertFlowRule(String json) { try { FlowRule rule = objectMapper.readValue(json, FlowRule.class); - if (FlowRuleManager.isValidRule(rule)) { + if (FlowRuleUtil.isValidRule(rule)) { return rule; } } diff --git a/spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/converter/XmlConverter.java b/spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/converter/XmlConverter.java index 6ff3f8bb..77f3b593 100644 --- a/spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/converter/XmlConverter.java +++ b/spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/converter/XmlConverter.java @@ -17,7 +17,7 @@ import com.alibaba.csp.sentinel.slots.block.authority.AuthorityRule; import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRule; import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRuleManager; import com.alibaba.csp.sentinel.slots.block.flow.FlowRule; -import com.alibaba.csp.sentinel.slots.block.flow.FlowRuleManager; +import com.alibaba.csp.sentinel.slots.block.flow.FlowRuleUtil; import com.alibaba.csp.sentinel.slots.block.flow.param.ParamFlowRule; import com.alibaba.csp.sentinel.slots.system.SystemRule; @@ -108,7 +108,7 @@ public class XmlConverter implements Converter> { private FlowRule convertFlowRule(String xml) { try { FlowRule rule = xmlMapper.readValue(xml, FlowRule.class); - if (FlowRuleManager.isValidRule(rule)) { + if (FlowRuleUtil.isValidRule(rule)) { return rule; } }