study/Spring-Cloud-Alibaba
1
0
Fork 0
mirror of https://gitee.com/mirrors/Spring-Cloud-Alibaba.git synced 2021-06-26 13:25:11 +08:00
Code Issues Releases Wiki Activity

upgrade sentinel to 1.6.3 & sync code in edgware

Browse Source
This commit is contained in:
fangjian0423 2019-07-30 01:34:09 +08:00
parent 5ea274cfad
commit 1bf1c95247
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-alibaba-dependencies/pom.xml
View File

@ -17,7 +17,7 @@
<description>Spring Cloud Alibaba Dependencies</description> <description>Spring Cloud Alibaba Dependencies</description>
<properties> <properties>
<sentinel.version>1.6.2</sentinel.version> <sentinel.version>1.6.3</sentinel.version>
<oss.version>3.1.0</oss.version> <oss.version>3.1.0</oss.version>
<seata.version>0.7.1</seata.version> <seata.version>0.7.1</seata.version>
<nacos.version>1.1.1</nacos.version> <nacos.version>1.1.1</nacos.version>

1
spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelAutoConfiguration.java
View File

@ -175,6 +175,7 @@ public class SentinelAutoConfiguration {
} }
@Bean @Bean
@ConditionalOnMissingBean
public SentinelDataSourceHandler sentinelDataSourceHandler( public SentinelDataSourceHandler sentinelDataSourceHandler(
DefaultListableBeanFactory beanFactory, SentinelProperties sentinelProperties, DefaultListableBeanFactory beanFactory, SentinelProperties sentinelProperties,
Environment env) { Environment env) {

6
spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/feign/SentinelContractHolder.java
View File

@ -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 * {@link MethodMetadata} data
* *
* @author <a href="mailto:fangjian0423@gmail.com">Jim</a> * @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 * map key is constructed by ClassFullName + configKey. configKey is constructed by
* {@link feign.Feign#configKey} * {@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) { public SentinelContractHolder(Contract delegate) {
this.delegate = delegate; this.delegate = delegate;
@ -48,7 +48,7 @@ public class SentinelContractHolder implements Contract {
public List<MethodMetadata> parseAndValidatateMetadata(Class<?> targetType) { public List<MethodMetadata> parseAndValidatateMetadata(Class<?> targetType) {
List<MethodMetadata> metadatas = delegate.parseAndValidatateMetadata(targetType); List<MethodMetadata> metadatas = delegate.parseAndValidatateMetadata(targetType);
for (MethodMetadata metadata : metadatas) { for (MethodMetadata metadata : metadatas) {
metadataMap.put(targetType.getName() + metadata.configKey(), metadata); METADATA_MAP.put(targetType.getName() + metadata.configKey(), metadata);
} }
return metadatas; return metadatas;
} }

2
spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/feign/SentinelInvocationHandler.java
View File

@ -90,7 +90,7 @@ public class SentinelInvocationHandler implements InvocationHandler {
// only handle by HardCodedTarget // only handle by HardCodedTarget
if (target instanceof Target.HardCodedTarget) { if (target instanceof Target.HardCodedTarget) {
Target.HardCodedTarget hardCodedTarget = (Target.HardCodedTarget) target; Target.HardCodedTarget hardCodedTarget = (Target.HardCodedTarget) target;
MethodMetadata methodMetadata = SentinelContractHolder.metadataMap MethodMetadata methodMetadata = SentinelContractHolder.METADATA_MAP
.get(hardCodedTarget.type().getName() .get(hardCodedTarget.type().getName()
+ Feign.configKey(hardCodedTarget.type(), method)); + Feign.configKey(hardCodedTarget.type(), method));
if (methodMetadata == null) { if (methodMetadata == null) {