From c410204fd06fd88e0252830e4280fecc3e96cf1b Mon Sep 17 00:00:00 2001
From: fangjian0423 <fangjian0423@gmail.com>
Date: Mon, 17 Dec 2018 12:27:59 +0800
Subject: [PATCH] upgrade sentinel version to 1.4.0 for 1.x branch

---
 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 f438ccf0..0ecec8be 100644
--- a/spring-cloud-alibaba-dependencies/pom.xml
+++ b/spring-cloud-alibaba-dependencies/pom.xml
@@ -16,7 +16,7 @@
     <description>Spring Cloud Alibaba Dependencies</description>
 
     <properties>
-        <sentinel.version>1.3.0-GA</sentinel.version>
+        <sentinel.version>1.4.0</sentinel.version>
         <oss.version>3.1.0</oss.version>
         <nacos.version>0.5.0</nacos.version>
         <acm.version>1.0.8</acm.version>
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 ebe58acc..e0275b15 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
@@ -16,7 +16,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;
 
@@ -113,7 +113,7 @@ public class JsonConverter implements Converter<String, List<AbstractRule>> {
 	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 af62df74..20961058 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
@@ -16,7 +16,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;
 
@@ -112,7 +112,7 @@ public class XmlConverter implements Converter<String, List<AbstractRule>> {
 	private FlowRule convertFlowRule(String xml) {
 		try {
 			FlowRule rule = xmlMapper.readValue(xml, FlowRule.class);
-			if (FlowRuleManager.isValidRule(rule)) {
+			if (FlowRuleUtil.isValidRule(rule)) {
 				return rule;
 			}
 		}