github-forks
/
spring-cloud-alibaba
mirror of https://github.com/alibaba/spring-cloud-alibaba.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Throw the origin RuntimeException when invoke a restTemplate fallback method, it's helpful for a global handler with @ExceptionHandler.

Browse Source 
Refined codes.
pull/1291/head
SoulSong 5 years ago
parent 3f534c8c33
commit 0a9f3eb6f9
2 changed files with 407 additions and 321 deletions
Show Stats Download Patch File Download Diff File

3
spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelProtectInterceptor.java
Unescape Escape View File

@ -139,6 +139,9 @@ public class SentinelProtectInterceptor implements ClientHttpRequestInterceptor
throw new RuntimeException(e); throw new RuntimeException(e);
} }
catch (InvocationTargetException e) { catch (InvocationTargetException e) {
if (e.getTargetException() instanceof RuntimeException) {
throw (RuntimeException) e.getTargetException();
}
throw new RuntimeException(e); throw new RuntimeException(e);
} }
} }

725
spring-cloud-alibaba-sentinel/src/test/java/com/alibaba/cloud/sentinel/SentinelRestTemplateTests.java
Unescape Escape View File

@ -20,6 +20,8 @@ import com.alibaba.cloud.sentinel.annotation.SentinelRestTemplate;
import com.alibaba.cloud.sentinel.custom.SentinelBeanPostProcessor; import com.alibaba.cloud.sentinel.custom.SentinelBeanPostProcessor;
import com.alibaba.cloud.sentinel.rest.SentinelClientHttpResponse; import com.alibaba.cloud.sentinel.rest.SentinelClientHttpResponse;
import com.alibaba.csp.sentinel.slots.block.BlockException; import com.alibaba.csp.sentinel.slots.block.BlockException;
import com.alibaba.csp.sentinel.slots.block.degrade.DegradeException;
import com.alibaba.csp.sentinel.slots.block.flow.FlowException;
import org.junit.Test; import org.junit.Test;
@ -29,7 +31,11 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.http.HttpRequest; import org.springframework.http.HttpRequest;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.http.client.ClientHttpRequestExecution; import org.springframework.http.client.ClientHttpRequestExecution;
import org.springframework.web.bind.annotation.ControllerAdvice;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
@ -39,326 +45,403 @@ import static org.junit.Assert.assertEquals;
*/ */
public class SentinelRestTemplateTests { public class SentinelRestTemplateTests {
@Test(expected = BeanCreationException.class) @Test(expected = BeanCreationException.class)
public void testFbkMethod() { public void testFbkMethod() {
new AnnotationConfigApplicationContext(TestConfig1.class); new AnnotationConfigApplicationContext(TestConfig1.class);
} }
@Test(expected = BeanCreationException.class) @Test(expected = BeanCreationException.class)
public void testFbkClass() { public void testFbkClass() {
new AnnotationConfigApplicationContext(TestConfig2.class); new AnnotationConfigApplicationContext(TestConfig2.class);
} }
@Test(expected = BeanCreationException.class) @Test(expected = BeanCreationException.class)
public void testblkMethod() { public void testblkMethod() {
new AnnotationConfigApplicationContext(TestConfig3.class); new AnnotationConfigApplicationContext(TestConfig3.class);
} }
@Test(expected = BeanCreationException.class) @Test(expected = BeanCreationException.class)
public void testblkClass() { public void testblkClass() {
new AnnotationConfigApplicationContext(TestConfig4.class); new AnnotationConfigApplicationContext(TestConfig4.class);
} }
@Test @Test
public void testNormal() { public void testNormal() {
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext( AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
TestConfig5.class); TestConfig5.class);
assertEquals("RestTemplate size was wrong", 1, assertEquals("RestTemplate size was wrong", 1,
context.getBeansOfType(RestTemplate.class).size()); context.getBeansOfType(RestTemplate.class).size());
} }
@Test(expected = BeanCreationException.class) @Test(expected = BeanCreationException.class)
public void testBlkMethodExists() { public void testBlkMethodExists() {
new AnnotationConfigApplicationContext(TestConfig6.class); new AnnotationConfigApplicationContext(TestConfig6.class);
} }
@Test(expected = BeanCreationException.class) @Test(expected = BeanCreationException.class)
public void testFbkMethodExists() { public void testFbkMethodExists() {
new AnnotationConfigApplicationContext(TestConfig7.class); new AnnotationConfigApplicationContext(TestConfig7.class);
} }
@Test(expected = BeanCreationException.class) @Test(expected = BeanCreationException.class)
public void testBlkReturnValue() { public void testBlkReturnValue() {
new AnnotationConfigApplicationContext(TestConfig8.class); new AnnotationConfigApplicationContext(TestConfig8.class);
} }
@Test(expected = BeanCreationException.class) @Test(expected = BeanCreationException.class)
public void testFbkReturnValue() { public void testFbkReturnValue() {
new AnnotationConfigApplicationContext(TestConfig9.class); new AnnotationConfigApplicationContext(TestConfig9.class);
} }
@Test @Test
public void testNormalWithoutParam() { public void testNormalWithoutParam() {
new AnnotationConfigApplicationContext(TestConfig10.class); new AnnotationConfigApplicationContext(TestConfig10.class);
} }
@Test(expected = BeanCreationException.class) @Test(expected = BeanCreationException.class)
public void testUrlClnMethod() { public void testUrlClnMethod() {
new AnnotationConfigApplicationContext(TestConfig11.class); new AnnotationConfigApplicationContext(TestConfig11.class);
} }
@Test(expected = BeanCreationException.class) @Test(expected = BeanCreationException.class)
public void testUrlClnClass() { public void testUrlClnClass() {
new AnnotationConfigApplicationContext(TestConfig12.class); new AnnotationConfigApplicationContext(TestConfig12.class);
} }
@Test(expected = BeanCreationException.class) @Test(expected = BeanCreationException.class)
public void testUrlClnMethodExists() { public void testUrlClnMethodExists() {
new AnnotationConfigApplicationContext(TestConfig13.class); new AnnotationConfigApplicationContext(TestConfig13.class);
} }
@Test(expected = BeanCreationException.class) @Test(expected = BeanCreationException.class)
public void testUrlClnReturnValue() { public void testUrlClnReturnValue() {
new AnnotationConfigApplicationContext(TestConfig14.class); new AnnotationConfigApplicationContext(TestConfig14.class);
} }
@Configuration @Test
public static class TestConfig1 { public void testExceptionHandler4Fallback() {
@Bean new AnnotationConfigApplicationContext(TestConfig15.class);
SentinelBeanPostProcessor sentinelBeanPostProcessor( }
ApplicationContext applicationContext) {
return new SentinelBeanPostProcessor(applicationContext);
} @Configuration
public static class TestConfig1 {
@Bean @Bean
@SentinelRestTemplate(fallback = "fbk") SentinelBeanPostProcessor sentinelBeanPostProcessor(
RestTemplate restTemplate() { ApplicationContext applicationContext) {
return new RestTemplate(); return new SentinelBeanPostProcessor(applicationContext);
} }
}
@Bean
@Configuration @SentinelRestTemplate(fallback = "fbk")
public static class TestConfig2 { RestTemplate restTemplate() {
@Bean return new RestTemplate();
SentinelBeanPostProcessor sentinelBeanPostProcessor( }
ApplicationContext applicationContext) { }
return new SentinelBeanPostProcessor(applicationContext);
} @Configuration
public static class TestConfig2 {
@Bean @Bean
@SentinelRestTemplate(fallbackClass = ExceptionUtil.class) SentinelBeanPostProcessor sentinelBeanPostProcessor(
RestTemplate restTemplate() { ApplicationContext applicationContext) {
return new RestTemplate(); return new SentinelBeanPostProcessor(applicationContext);
} }
}
@Bean
@Configuration @SentinelRestTemplate(fallbackClass = ExceptionUtil.class)
public static class TestConfig3 { RestTemplate restTemplate() {
@Bean return new RestTemplate();
SentinelBeanPostProcessor sentinelBeanPostProcessor( }
ApplicationContext applicationContext) { }
return new SentinelBeanPostProcessor(applicationContext);
} @Configuration
public static class TestConfig3 {
@Bean @Bean
@SentinelRestTemplate(blockHandler = "blk") SentinelBeanPostProcessor sentinelBeanPostProcessor(
RestTemplate restTemplate() { ApplicationContext applicationContext) {
return new RestTemplate(); return new SentinelBeanPostProcessor(applicationContext);
} }
}
@Bean
@Configuration @SentinelRestTemplate(blockHandler = "blk")
public static class TestConfig4 { RestTemplate restTemplate() {
@Bean return new RestTemplate();
SentinelBeanPostProcessor sentinelBeanPostProcessor( }
ApplicationContext applicationContext) { }
return new SentinelBeanPostProcessor(applicationContext);
} @Configuration
public static class TestConfig4 {
@Bean @Bean
@SentinelRestTemplate(blockHandlerClass = ExceptionUtil.class) SentinelBeanPostProcessor sentinelBeanPostProcessor(
RestTemplate restTemplate() { ApplicationContext applicationContext) {
return new RestTemplate(); return new SentinelBeanPostProcessor(applicationContext);
} }
}
@Bean
@Configuration @SentinelRestTemplate(blockHandlerClass = ExceptionUtil.class)
public static class TestConfig5 { RestTemplate restTemplate() {
@Bean return new RestTemplate();
SentinelBeanPostProcessor sentinelBeanPostProcessor( }
ApplicationContext applicationContext) { }
return new SentinelBeanPostProcessor(applicationContext);
} @Configuration
public static class TestConfig5 {
@Bean @Bean
@SentinelRestTemplate(blockHandlerClass = SentinelRestTemplateTests.ExceptionUtil.class, blockHandler = "handleException", fallbackClass = SentinelRestTemplateTests.ExceptionUtil.class, fallback = "fallbackException", urlCleanerClass = SentinelRestTemplateTests.UrlCleanUtil.class, urlCleaner = "clean") SentinelBeanPostProcessor sentinelBeanPostProcessor(
RestTemplate restTemplate() { ApplicationContext applicationContext) {
return new RestTemplate(); return new SentinelBeanPostProcessor(applicationContext);
} }
}
@Bean
@Configuration @SentinelRestTemplate(blockHandlerClass = SentinelRestTemplateTests.ExceptionUtil.class, blockHandler = "handleException", fallbackClass = SentinelRestTemplateTests.ExceptionUtil.class, fallback = "fallbackException", urlCleanerClass = SentinelRestTemplateTests.UrlCleanUtil.class, urlCleaner = "clean")
public static class TestConfig6 { RestTemplate restTemplate() {
@Bean return new RestTemplate();
SentinelBeanPostProcessor sentinelBeanPostProcessor( }
ApplicationContext applicationContext) { }
return new SentinelBeanPostProcessor(applicationContext);
} @Configuration
public static class TestConfig6 {
@Bean @Bean
@SentinelRestTemplate(blockHandlerClass = SentinelRestTemplateTests.ExceptionUtil.class, blockHandler = "handleException1") SentinelBeanPostProcessor sentinelBeanPostProcessor(
RestTemplate restTemplate() { ApplicationContext applicationContext) {
return new RestTemplate(); return new SentinelBeanPostProcessor(applicationContext);
} }
}
@Bean
@Configuration @SentinelRestTemplate(blockHandlerClass = SentinelRestTemplateTests.ExceptionUtil.class, blockHandler = "handleException1")
public static class TestConfig7 { RestTemplate restTemplate() {
@Bean return new RestTemplate();
SentinelBeanPostProcessor sentinelBeanPostProcessor( }
ApplicationContext applicationContext) { }
return new SentinelBeanPostProcessor(applicationContext);
} @Configuration
public static class TestConfig7 {
@Bean @Bean
@SentinelRestTemplate(fallbackClass = SentinelRestTemplateTests.ExceptionUtil.class, fallback = "fallbackException1") SentinelBeanPostProcessor sentinelBeanPostProcessor(
RestTemplate restTemplate() { ApplicationContext applicationContext) {
return new RestTemplate(); return new SentinelBeanPostProcessor(applicationContext);
} }
}
@Bean
@Configuration @SentinelRestTemplate(fallbackClass = SentinelRestTemplateTests.ExceptionUtil.class, fallback = "fallbackException1")
public static class TestConfig8 { RestTemplate restTemplate() {
@Bean return new RestTemplate();
SentinelBeanPostProcessor sentinelBeanPostProcessor( }
ApplicationContext applicationContext) { }
return new SentinelBeanPostProcessor(applicationContext);
} @Configuration
public static class TestConfig8 {
@Bean @Bean
@SentinelRestTemplate(blockHandlerClass = SentinelRestTemplateTests.ExceptionUtil.class, blockHandler = "handleException2") SentinelBeanPostProcessor sentinelBeanPostProcessor(
RestTemplate restTemplate() { ApplicationContext applicationContext) {
return new RestTemplate(); return new SentinelBeanPostProcessor(applicationContext);
} }
}
@Bean
@Configuration @SentinelRestTemplate(blockHandlerClass = SentinelRestTemplateTests.ExceptionUtil.class, blockHandler = "handleException2")
public static class TestConfig9 { RestTemplate restTemplate() {
@Bean return new RestTemplate();
SentinelBeanPostProcessor sentinelBeanPostProcessor( }
ApplicationContext applicationContext) { }
return new SentinelBeanPostProcessor(applicationContext);
} @Configuration
public static class TestConfig9 {
@Bean @Bean
@SentinelRestTemplate(fallbackClass = SentinelRestTemplateTests.ExceptionUtil.class, fallback = "fallbackException2") SentinelBeanPostProcessor sentinelBeanPostProcessor(
RestTemplate restTemplate() { ApplicationContext applicationContext) {
return new RestTemplate(); return new SentinelBeanPostProcessor(applicationContext);
} }
}
@Bean
@Configuration @SentinelRestTemplate(fallbackClass = SentinelRestTemplateTests.ExceptionUtil.class, fallback = "fallbackException2")
public static class TestConfig10 { RestTemplate restTemplate() {
@Bean return new RestTemplate();
SentinelBeanPostProcessor sentinelBeanPostProcessor( }
ApplicationContext applicationContext) { }
return new SentinelBeanPostProcessor(applicationContext);
} @Configuration
public static class TestConfig10 {
@Bean @Bean
@SentinelRestTemplate SentinelBeanPostProcessor sentinelBeanPostProcessor(
RestTemplate restTemplate() { ApplicationContext applicationContext) {
return new RestTemplate(); return new SentinelBeanPostProcessor(applicationContext);
} }
@Bean @Bean
@SentinelRestTemplate @SentinelRestTemplate
RestTemplate restTemplate2() { RestTemplate restTemplate() {
return new RestTemplate(); return new RestTemplate();
} }
}
@Bean
@Configuration @SentinelRestTemplate
public static class TestConfig11 { RestTemplate restTemplate2() {
@Bean return new RestTemplate();
SentinelBeanPostProcessor sentinelBeanPostProcessor( }
ApplicationContext applicationContext) { }
return new SentinelBeanPostProcessor(applicationContext);
} @Configuration
public static class TestConfig11 {
@Bean @Bean
@SentinelRestTemplate(urlCleaner = "cln") SentinelBeanPostProcessor sentinelBeanPostProcessor(
RestTemplate restTemplate() { ApplicationContext applicationContext) {
return new RestTemplate(); return new SentinelBeanPostProcessor(applicationContext);
} }
}
@Bean
@Configuration @SentinelRestTemplate(urlCleaner = "cln")
public static class TestConfig12 { RestTemplate restTemplate() {
@Bean return new RestTemplate();
SentinelBeanPostProcessor sentinelBeanPostProcessor( }
ApplicationContext applicationContext) { }
return new SentinelBeanPostProcessor(applicationContext);
} @Configuration
public static class TestConfig12 {
@Bean @Bean
@SentinelRestTemplate(urlCleanerClass = UrlCleanUtil.class) SentinelBeanPostProcessor sentinelBeanPostProcessor(
RestTemplate restTemplate() { ApplicationContext applicationContext) {
return new RestTemplate(); return new SentinelBeanPostProcessor(applicationContext);
} }
}
@Bean
@Configuration @SentinelRestTemplate(urlCleanerClass = UrlCleanUtil.class)
public static class TestConfig13 { RestTemplate restTemplate() {
@Bean return new RestTemplate();
SentinelBeanPostProcessor sentinelBeanPostProcessor( }
ApplicationContext applicationContext) { }
return new SentinelBeanPostProcessor(applicationContext);
} @Configuration
public static class TestConfig13 {
@Bean @Bean
@SentinelRestTemplate(urlCleanerClass = SentinelRestTemplateTests.UrlCleanUtil.class, urlCleaner = "clean1") SentinelBeanPostProcessor sentinelBeanPostProcessor(
RestTemplate restTemplate() { ApplicationContext applicationContext) {
return new RestTemplate(); return new SentinelBeanPostProcessor(applicationContext);
} }
}
@Bean
@Configuration @SentinelRestTemplate(urlCleanerClass = SentinelRestTemplateTests.UrlCleanUtil.class, urlCleaner = "clean1")
public static class TestConfig14 { RestTemplate restTemplate() {
@Bean return new RestTemplate();
SentinelBeanPostProcessor sentinelBeanPostProcessor( }
ApplicationContext applicationContext) { }
return new SentinelBeanPostProcessor(applicationContext);
} @Configuration
public static class TestConfig14 {
@Bean @Bean
@SentinelRestTemplate(urlCleanerClass = SentinelRestTemplateTests.UrlCleanUtil.class, urlCleaner = "clean2") SentinelBeanPostProcessor sentinelBeanPostProcessor(
RestTemplate restTemplate() { ApplicationContext applicationContext) {
return new RestTemplate(); return new SentinelBeanPostProcessor(applicationContext);
} }
}
@Bean
public static class ExceptionUtil { @SentinelRestTemplate(urlCleanerClass = SentinelRestTemplateTests.UrlCleanUtil.class, urlCleaner = "clean2")
public static SentinelClientHttpResponse handleException(HttpRequest request, RestTemplate restTemplate() {
byte[] body, ClientHttpRequestExecution execution, BlockException ex) { return new RestTemplate();
System.out.println("Oops: " + ex.getClass().getCanonicalName()); }
return new SentinelClientHttpResponse("Oops"); }
}
@Configuration
public static void handleException2(HttpRequest request, byte[] body, public static class TestConfig15 {
ClientHttpRequestExecution execution, BlockException ex) { @Bean
System.out.println("Oops: " + ex.getClass().getCanonicalName()); SentinelBeanPostProcessor sentinelBeanPostProcessor(
} ApplicationContext applicationContext) {
return new SentinelBeanPostProcessor(applicationContext);
public static SentinelClientHttpResponse fallbackException(HttpRequest request, }
byte[] body, ClientHttpRequestExecution execution, BlockException ex) {
System.out.println("Oops: " + ex.getClass().getCanonicalName()); @Bean
return new SentinelClientHttpResponse("Oops fallback"); @SentinelRestTemplate(fallbackClass = TestConfig15.class,
} fallback = "fallbackHandler",
blockHandlerClass = TestConfig15.class,
public static void fallbackException2(HttpRequest request, byte[] body, blockHandler = "flowHandler")
ClientHttpRequestExecution execution, BlockException ex) { RestTemplate restTemplate() {
System.out.println("Oops: " + ex.getClass().getCanonicalName()); return new RestTemplate();
} }
}
@Bean
public static class UrlCleanUtil { public SentinelRestTemplateExceptionHandler globalExceptionHandler() {
public static String clean(String url) { return new SentinelRestTemplateExceptionHandler();
return url; }
}
public static SentinelClientHttpResponse flowHandler(HttpRequest request,
public static void clean2(String url) { byte[] body,
} ClientHttpRequestExecution execution,
} BlockException exception) {
if (exception instanceof FlowException) {
throw new SentinelRestTemplateFlowException(exception.getMessage(), exception);
}
return new SentinelClientHttpResponse("Oops flowHandler");
}
public static SentinelClientHttpResponse fallbackHandler(HttpRequest request,
byte[] body,
ClientHttpRequestExecution execution,
BlockException exception) {
if (exception instanceof DegradeException) {
throw new SentinelRestTemplateDegradeException(exception.getMessage(), exception);
}
return new SentinelClientHttpResponse("Oops fallback");
}
public static class SentinelRestTemplateFlowException extends RuntimeException {
SentinelRestTemplateFlowException(String message, Throwable cause) {
super(message, cause);
}
}
public static class SentinelRestTemplateDegradeException extends RuntimeException {
SentinelRestTemplateDegradeException(String message, Throwable cause) {
super(message, cause);
}
}
@ControllerAdvice
public class SentinelRestTemplateExceptionHandler {
@ExceptionHandler(SentinelRestTemplateFlowException.class)
public ResponseEntity<String> restTemplateFlowExceptionHandler(SentinelRestTemplateFlowException exception) {
return ResponseEntity.status(HttpStatus.TOO_MANY_REQUESTS).body("PS: have a rest.");
}
@ExceptionHandler(SentinelRestTemplateDegradeException.class)
public ResponseEntity<String> restTemplateDegradeExceptionHandler(SentinelRestTemplateDegradeException exception) {
return ResponseEntity.status(HttpStatus.SERVICE_UNAVAILABLE).body("PS: " + HttpStatus.SERVICE_UNAVAILABLE.getReasonPhrase());
}
}
}
public static class ExceptionUtil {
public static SentinelClientHttpResponse handleException(HttpRequest request,
byte[] body, ClientHttpRequestExecution execution, BlockException ex) {
System.out.println("Oops: " + ex.getClass().getCanonicalName());
return new SentinelClientHttpResponse("Oops");
}
public static void handleException2(HttpRequest request, byte[] body,
ClientHttpRequestExecution execution, BlockException ex) {
System.out.println("Oops: " + ex.getClass().getCanonicalName());
}
public static SentinelClientHttpResponse fallbackException(HttpRequest request,
byte[] body, ClientHttpRequestExecution execution, BlockException ex) {
System.out.println("Oops: " + ex.getClass().getCanonicalName());
return new SentinelClientHttpResponse("Oops fallback");
}
public static void fallbackException2(HttpRequest request, byte[] body,
ClientHttpRequestExecution execution, BlockException ex) {
System.out.println("Oops: " + ex.getClass().getCanonicalName());
}
}
public static class UrlCleanUtil {
public static String clean(String url) {
return url;
}
public static void clean2(String url) {
}
}
} }

Write Preview
Loading…
Cancel
Save