This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch samples-for-2.7.0-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-samples.git
commit ebfb4b6dcc2d44e1798e55022e459e6dba587ebb
Merge: 8660a3f f8ed983
Author: ken.lj <ken.lj...@gmail.com>
AuthorDate: Wed Jan 2 19:55:49 2019 +0800
Merge remote-tracking branch 'origin/samples-for-2.7.0-SNAPSHOT' into
samples-for-2.7.0-SNAPSHOT
# Conflicts:
#
dubbo-samples-api/src/main/java/org/apache/dubbo/samples/api/GreetingsService.java
#
dubbo-samples-async/dubbo-samples-async-generated-future/src/main/java/org/apache/dubbo/samples/governance/AsyncConsumer.java
#
dubbo-samples-async/dubbo-samples-async-original-future/src/main/java/org/apache/dubbo/samples/governance/filter/AsyncPostprocessFilter.java
.../main/resources/spring/dubbo-demo-consumer.xml | 2 +-
.../main/resources/spring/dubbo-demo-provider.xml | 4 +-
.../Resilience4jAnnotationConsumer.java | 2 +-
.../resilience4j/action/AnnotationAction.java | 39 ++++--
.../filter/Resilience4jCircuitBreakerFilter.java | 39 +++++-
.../filter/Resilience4jRateLimiterFilter.java | 13 +-
.../resilience4j/impl/AnnotationServiceImpl.java | 2 +-
.../impl/CircuitBreakerServiceImpl.java | 14 ++-
.../resilience4j/impl/RateLimiterServiceImpl.java | 2 +-
.../resources/spring/dubbo-consumer.properties | 3 +-
.../resources/spring/dubbo-provider.properties | 2 +-
.../dubbo-samples-resilience4j-springboot2/pom.xml | 95 ++++++++++++++
.../Resilience4jBootAnnotationConsumer.java | 58 ---------
.../Resilience4jBootAnnotationProvider.java | 61 ---------
.../EmbeddedZooKeeper.java | 2 +-
.../api/AnnotationService.java | 2 +-
.../api/CircuitBreakerService.java} | 10 +-
.../api/RateLimiterService.java} | 10 +-
.../Resilience4jBootConsumerApplication.java | 57 +++++++++
.../consumer}/action/AnnotationAction.java | 10 +-
.../action/CircuitBreakMethodWrapper.java} | 28 ++---
.../consumer/action/CircuitBreakTypeWrapper.java} | 28 ++---
.../consumer/action/CircuitBreakerAction.java | 138 +++++++++++++++++++++
.../consumer/action/RateLimiterAction.java | 75 +++++++++++
.../consumer/controller/TestController.java | 103 +++++++++++++++
.../provider/DubbConfiguration.java} | 19 ++-
.../Resilience4jBootProviderApplication.java | 67 ++++++++++
.../provider}/impl/AnnotationServiceImpl.java | 10 +-
.../provider}/impl/CircuitBreakerServiceImpl.java | 18 ++-
.../provider}/impl/RateLimiterServiceImpl.java | 8 +-
...onsumer.properties => application-consumer.yml} | 16 ++-
...onsumer.properties => application-provider.yml} | 15 ++-
.../{log4j.properties => application.yml} | 28 +++--
.../src/main/resources/logback-spring.xml | 45 +++++++
.../resources/spring/dubbo-consumer.properties | 11 +-
.../resources/spring/dubbo-provider.properties | 11 +-
dubbo-samples-resilience4j/pom.xml | 2 +-
.../src/main/resources/dubbo.properties | 8 +-
dubbo-samples-spring-boot-hystrix/pom.xml | 6 +
39 files changed, 801 insertions(+), 262 deletions(-)
