From 75f02aa2c5875609f36ea13d76842ff4cf8c1efb Mon Sep 17 00:00:00 2001 From: fangjian0423 Date: Wed, 11 Sep 2019 14:39:17 +0800 Subject: [PATCH] some compatibility modifications about Hoxton --- .../com/alibaba/cloud/examples/FooServiceConsumer.java | 2 +- .../cloud/sentinel/custom/SentinelBeanPostProcessor.java | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-consumer-example/src/main/java/com/alibaba/cloud/examples/FooServiceConsumer.java b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-consumer-example/src/main/java/com/alibaba/cloud/examples/FooServiceConsumer.java index e4a6022c..48c03b86 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-consumer-example/src/main/java/com/alibaba/cloud/examples/FooServiceConsumer.java +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-consumer-example/src/main/java/com/alibaba/cloud/examples/FooServiceConsumer.java @@ -7,7 +7,7 @@ import org.apache.dubbo.config.annotation.Reference; */ public class FooServiceConsumer { - @Reference(version = "${foo.service.version}", application = "${dubbo.application.id}", url = "dubbo://localhost:12345", timeout = 30000) + @Reference(version = "${foo.service.version}", application = "${dubbo.application.id}", url = "dubbo://localhost:12345?version=1.0.0", timeout = 30000) private FooService fooService; public String hello(String name) { diff --git a/spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelBeanPostProcessor.java b/spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelBeanPostProcessor.java index 565ceb6a..474c8bcd 100644 --- a/spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelBeanPostProcessor.java +++ b/spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelBeanPostProcessor.java @@ -31,7 +31,6 @@ import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.context.ApplicationContext; import org.springframework.core.type.MethodMetadata; import org.springframework.core.type.StandardMethodMetadata; -import org.springframework.core.type.classreading.MethodMetadataReadingVisitor; import org.springframework.http.HttpRequest; import org.springframework.http.client.ClientHttpRequestExecution; import org.springframework.http.client.ClientHttpResponse; @@ -171,12 +170,6 @@ public class SentinelBeanPostProcessor implements MergedBeanDefinitionPostProces && checkMethodMetadataReadingVisitor(beanDefinition); } - // private boolean checkStandardMethodMetadata(RootBeanDefinition beanDefinition) { - // return beanDefinition.getSource() instanceof StandardMethodMetadata - // && ((StandardMethodMetadata) beanDefinition.getSource()) - // .isAnnotated(SentinelRestTemplate.class.getName()); - // } - private boolean checkMethodMetadataReadingVisitor(RootBeanDefinition beanDefinition) { return beanDefinition.getSource() instanceof MethodMetadata && ((MethodMetadata) beanDefinition.getSource())