From 1bf1c9524767f57c5f68ad3094c764d5c2060c54 Mon Sep 17 00:00:00 2001
From: fangjian0423 <fangjian0423@gmail.com>
Date: Tue, 30 Jul 2019 01:34:09 +0800
Subject: [PATCH] upgrade sentinel to 1.6.3 & sync code in edgware

---
 spring-cloud-alibaba-dependencies/pom.xml                   | 2 +-
 .../cloud/sentinel/custom/SentinelAutoConfiguration.java    | 1 +
 .../cloud/sentinel/feign/SentinelContractHolder.java        | 6 +++---
 .../cloud/sentinel/feign/SentinelInvocationHandler.java     | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/spring-cloud-alibaba-dependencies/pom.xml b/spring-cloud-alibaba-dependencies/pom.xml
index f4bdb8ba..380b440a 100644
--- a/spring-cloud-alibaba-dependencies/pom.xml
+++ b/spring-cloud-alibaba-dependencies/pom.xml
@@ -17,7 +17,7 @@
     <description>Spring Cloud Alibaba Dependencies</description>
 
     <properties>
-        <sentinel.version>1.6.2</sentinel.version>
+        <sentinel.version>1.6.3</sentinel.version>
         <oss.version>3.1.0</oss.version>
         <seata.version>0.7.1</seata.version>
         <nacos.version>1.1.1</nacos.version>
diff --git a/spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelAutoConfiguration.java b/spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelAutoConfiguration.java
index 234da9d4..c6bde5ed 100644
--- a/spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelAutoConfiguration.java
+++ b/spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelAutoConfiguration.java
@@ -175,6 +175,7 @@ public class SentinelAutoConfiguration {
 	}
 
 	@Bean
+	@ConditionalOnMissingBean
 	public SentinelDataSourceHandler sentinelDataSourceHandler(
 			DefaultListableBeanFactory beanFactory, SentinelProperties sentinelProperties,
 			Environment env) {
diff --git a/spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/feign/SentinelContractHolder.java b/spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/feign/SentinelContractHolder.java
index e499393b..10771f87 100644
--- a/spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/feign/SentinelContractHolder.java
+++ b/spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/feign/SentinelContractHolder.java
@@ -25,7 +25,7 @@ import feign.MethodMetadata;
 
 /**
  *
- * Using static field {@link SentinelContractHolder#metadataMap} to hold
+ * Using static field {@link SentinelContractHolder#METADATA_MAP} to hold
  * {@link MethodMetadata} data
  *
  * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
@@ -38,7 +38,7 @@ public class SentinelContractHolder implements Contract {
 	 * map key is constructed by ClassFullName + configKey. configKey is constructed by
 	 * {@link feign.Feign#configKey}
 	 */
-	public final static Map<String, MethodMetadata> metadataMap = new HashMap();
+	public final static Map<String, MethodMetadata> METADATA_MAP = new HashMap();
 
 	public SentinelContractHolder(Contract delegate) {
 		this.delegate = delegate;
@@ -48,7 +48,7 @@ public class SentinelContractHolder implements Contract {
 	public List<MethodMetadata> parseAndValidatateMetadata(Class<?> targetType) {
 		List<MethodMetadata> metadatas = delegate.parseAndValidatateMetadata(targetType);
 		for (MethodMetadata metadata : metadatas) {
-			metadataMap.put(targetType.getName() + metadata.configKey(), metadata);
+			METADATA_MAP.put(targetType.getName() + metadata.configKey(), metadata);
 		}
 		return metadatas;
 	}
diff --git a/spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/feign/SentinelInvocationHandler.java b/spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/feign/SentinelInvocationHandler.java
index 53ad6944..ef8c6c33 100644
--- a/spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/feign/SentinelInvocationHandler.java
+++ b/spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/feign/SentinelInvocationHandler.java
@@ -90,7 +90,7 @@ public class SentinelInvocationHandler implements InvocationHandler {
 		// only handle by HardCodedTarget
 		if (target instanceof Target.HardCodedTarget) {
 			Target.HardCodedTarget hardCodedTarget = (Target.HardCodedTarget) target;
-			MethodMetadata methodMetadata = SentinelContractHolder.metadataMap
+			MethodMetadata methodMetadata = SentinelContractHolder.METADATA_MAP
 					.get(hardCodedTarget.type().getName()
 							+ Feign.configKey(hardCodedTarget.type(), method));
 			if (methodMetadata == null) {