From c100c61af823649ed1ab5a22989f1a83cf5601fa Mon Sep 17 00:00:00 2001 From: seanyu Date: Mon, 20 Mar 2023 22:10:01 +0800 Subject: [PATCH] fix feign name bug --- ...arisFeignCircuitBreakerInvocationHandler.java | 2 +- .../circuitbreaker/feign/example/ProviderB.java | 2 +- .../feign/example/ProviderBWithFallback.java | 2 +- .../feign/example/ServiceAController.java | 4 ++-- .../resttemplate/example/ServiceAController.java | 16 ++++++++-------- .../example/ServiceAResTemplate.java | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/feign/PolarisFeignCircuitBreakerInvocationHandler.java b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/feign/PolarisFeignCircuitBreakerInvocationHandler.java index 0541693b2..0bc8411e2 100644 --- a/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/feign/PolarisFeignCircuitBreakerInvocationHandler.java +++ b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/feign/PolarisFeignCircuitBreakerInvocationHandler.java @@ -74,7 +74,7 @@ public class PolarisFeignCircuitBreakerInvocationHandler implements InvocationHa return toString(); } - String circuitName = circuitBreakerNameResolver.resolveCircuitBreakerName(feignClientName, target, method); + String circuitName = circuitBreakerNameResolver.resolveCircuitBreakerName(target.name(), target, method); CircuitBreaker circuitBreaker = factory.create(circuitName); Supplier supplier = asSupplier(method, args); Function fallbackFunction; diff --git a/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-feign-example/src/main/java/com/tencent/cloud/polaris/circuitbreaker/feign/example/ProviderB.java b/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-feign-example/src/main/java/com/tencent/cloud/polaris/circuitbreaker/feign/example/ProviderB.java index 36730edce..11b750017 100644 --- a/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-feign-example/src/main/java/com/tencent/cloud/polaris/circuitbreaker/feign/example/ProviderB.java +++ b/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-feign-example/src/main/java/com/tencent/cloud/polaris/circuitbreaker/feign/example/ProviderB.java @@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.GetMapping; * * @author sean yu */ -@FeignClient(name = "polaris-circuitbreaker-callee-service", contextId = "use-polaris-fallback") +@FeignClient(name = "polaris-circuitbreaker-callee-service", contextId = "fallback-from-polaris") public interface ProviderB { /** diff --git a/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-feign-example/src/main/java/com/tencent/cloud/polaris/circuitbreaker/feign/example/ProviderBWithFallback.java b/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-feign-example/src/main/java/com/tencent/cloud/polaris/circuitbreaker/feign/example/ProviderBWithFallback.java index de83f3226..01c462e7b 100644 --- a/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-feign-example/src/main/java/com/tencent/cloud/polaris/circuitbreaker/feign/example/ProviderBWithFallback.java +++ b/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-feign-example/src/main/java/com/tencent/cloud/polaris/circuitbreaker/feign/example/ProviderBWithFallback.java @@ -3,7 +3,7 @@ package com.tencent.cloud.polaris.circuitbreaker.feign.example; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; -@FeignClient(name = "polaris-circuitbreaker-callee-service", contextId = "use-code-fallback", fallback = ProviderBFallback.class) +@FeignClient(name = "polaris-circuitbreaker-callee-service", contextId = "fallback-from-code", fallback = ProviderBFallback.class) public interface ProviderBWithFallback { /** diff --git a/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-feign-example/src/main/java/com/tencent/cloud/polaris/circuitbreaker/feign/example/ServiceAController.java b/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-feign-example/src/main/java/com/tencent/cloud/polaris/circuitbreaker/feign/example/ServiceAController.java index 45e49d26a..30aa94c49 100644 --- a/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-feign-example/src/main/java/com/tencent/cloud/polaris/circuitbreaker/feign/example/ServiceAController.java +++ b/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-feign-example/src/main/java/com/tencent/cloud/polaris/circuitbreaker/feign/example/ServiceAController.java @@ -42,8 +42,8 @@ public class ServiceAController { * Get info of Service B by Feign. * @return info of Service B */ - @GetMapping("/getBServiceInfo/fallbackFromLocalCode") - public String getBServiceInfoFallbackFromLocalCode() { + @GetMapping("/getBServiceInfo/fallbackFromCode") + public String getBServiceInfoFallbackFromCode() { return providerBWithFallback.info(); } diff --git a/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-resttemplate-example/src/main/java/com/tencent/cloud/polaris/circuitbreaker/resttemplate/example/ServiceAController.java b/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-resttemplate-example/src/main/java/com/tencent/cloud/polaris/circuitbreaker/resttemplate/example/ServiceAController.java index 63dd3dcb4..d17744ce3 100644 --- a/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-resttemplate-example/src/main/java/com/tencent/cloud/polaris/circuitbreaker/resttemplate/example/ServiceAController.java +++ b/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-resttemplate-example/src/main/java/com/tencent/cloud/polaris/circuitbreaker/resttemplate/example/ServiceAController.java @@ -41,12 +41,12 @@ public class ServiceAController { private RestTemplate defaultRestTemplate; @Autowired - @Qualifier("fallbackRestTemplate") - private RestTemplate fallbackRestTemplate; + @Qualifier("restTemplateFallbackFromPolaris") + private RestTemplate restTemplateFallbackFromPolaris; @Autowired - @Qualifier("fallbackClassRestTemplate") - private RestTemplate fallbackClassRestTemplate; + @Qualifier("restTemplateFallbackFromCode") + private RestTemplate restTemplateFallbackFromCode; @Autowired private CircuitBreakerFactory circuitBreakerFactory; @@ -61,14 +61,14 @@ public class ServiceAController { ); } - @GetMapping("/getBServiceInfo/fallback") + @GetMapping("/getBServiceInfo/fallbackFromPolaris") public ResponseEntity getBServiceInfoFallback() { - return fallbackRestTemplate.getForEntity("/example/service/b/info", String.class); + return restTemplateFallbackFromPolaris.getForEntity("/example/service/b/info", String.class); } - @GetMapping("/getBServiceInfo/fallbackClass") + @GetMapping("/getBServiceInfo/fallbackFromCode") public ResponseEntity getBServiceInfoFallbackClass() { - return fallbackClassRestTemplate.getForEntity("/example/service/b/info", String.class); + return restTemplateFallbackFromCode.getForEntity("/example/service/b/info", String.class); } } diff --git a/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-resttemplate-example/src/main/java/com/tencent/cloud/polaris/circuitbreaker/resttemplate/example/ServiceAResTemplate.java b/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-resttemplate-example/src/main/java/com/tencent/cloud/polaris/circuitbreaker/resttemplate/example/ServiceAResTemplate.java index c0340cc40..ca39e39fe 100644 --- a/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-resttemplate-example/src/main/java/com/tencent/cloud/polaris/circuitbreaker/resttemplate/example/ServiceAResTemplate.java +++ b/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-resttemplate-example/src/main/java/com/tencent/cloud/polaris/circuitbreaker/resttemplate/example/ServiceAResTemplate.java @@ -56,7 +56,7 @@ public class ServiceAResTemplate { @Bean @LoadBalanced @PolarisCircuitBreakerRestTemplate - public RestTemplate fallbackRestTemplate() { + public RestTemplate restTemplateFallbackFromPolaris() { DefaultUriBuilderFactory uriBuilderFactory = new DefaultUriBuilderFactory("http://polaris-circuitbreaker-callee-service"); RestTemplate restTemplate = new RestTemplate(); restTemplate.setUriTemplateHandler(uriBuilderFactory); @@ -66,7 +66,7 @@ public class ServiceAResTemplate { @Bean @LoadBalanced @PolarisCircuitBreakerRestTemplate(fallbackClass = CustomPolarisCircuitBreakerFallback.class) - public RestTemplate fallbackClassRestTemplate() { + public RestTemplate restTemplateFallbackFromCode() { DefaultUriBuilderFactory uriBuilderFactory = new DefaultUriBuilderFactory("http://polaris-circuitbreaker-callee-service"); RestTemplate restTemplate = new RestTemplate(); restTemplate.setUriTemplateHandler(uriBuilderFactory);