[servicecomb-java-chassis] branch master updated: [SCB2236]fix circuit breaker bean property slidingWindowType(#2316)

[liubao]

This is an automated email from the ASF dual-hosted git repository.

liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git


The following commit(s) were added to refs/heads/master by this push:
     new 41eccb2  [SCB2236]fix circuit breaker bean property 
slidingWindowType(#2316)
41eccb2 is described below

commit 41eccb2970ca7290d70ba1afddea4c5f2f634f66
Author: wxkwxkwxk1231 <kaist...@protonmail.com>
AuthorDate: Fri Mar 26 09:51:56 2021 +0800

    [SCB2236]fix circuit breaker bean property slidingWindowType(#2316)
---
 .../servicecomb/governance/handler/CircuitBreakerHandler.java       | 2 +-
 .../apache/servicecomb/governance/policy/CircuitBreakerPolicy.java  | 6 +++++-
 governance/src/test/resources/application.yaml                      | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git 
a/governance/src/main/java/org/apache/servicecomb/governance/handler/CircuitBreakerHandler.java
 
b/governance/src/main/java/org/apache/servicecomb/governance/handler/CircuitBreakerHandler.java
index 7d83093..155671d 100644
--- 
a/governance/src/main/java/org/apache/servicecomb/governance/handler/CircuitBreakerHandler.java
+++ 
b/governance/src/main/java/org/apache/servicecomb/governance/handler/CircuitBreakerHandler.java
@@ -69,7 +69,7 @@ public class CircuitBreakerHandler extends 
AbstractGovernanceHandler<CircuitBrea
         //可以达到熔断条件的请求数量下限
         .minimumNumberOfCalls(policy.getMinimumNumberOfCalls())
         //可以选择基于时间的滑动窗口计数或者基于请求数量的滑动窗口计数
-        .slidingWindowType(policy.getSlidingWindowType())
+        .slidingWindowType(policy.getSlidingWindowTypeEnum())
         //滑动窗口，单位可能是请求数或者秒
         .slidingWindowSize(policy.getSlidingWindowSize())
         .build();
diff --git 
a/governance/src/main/java/org/apache/servicecomb/governance/policy/CircuitBreakerPolicy.java
 
b/governance/src/main/java/org/apache/servicecomb/governance/policy/CircuitBreakerPolicy.java
index 7bc2539..744b044 100644
--- 
a/governance/src/main/java/org/apache/servicecomb/governance/policy/CircuitBreakerPolicy.java
+++ 
b/governance/src/main/java/org/apache/servicecomb/governance/policy/CircuitBreakerPolicy.java
@@ -129,7 +129,7 @@ public class CircuitBreakerPolicy extends AbstractPolicy {
     this.minimumNumberOfCalls = minimumNumberOfCalls;
   }
 
-  public SlidingWindowType getSlidingWindowType() {
+  public SlidingWindowType getSlidingWindowTypeEnum() {
     if (StringUtils.isEmpty(slidingWindowType)) {
       slidingWindowType = "count";
     }
@@ -142,6 +142,10 @@ public class CircuitBreakerPolicy extends AbstractPolicy {
     }
   }
 
+  public String getSlidingWindowType() {
+    return this.slidingWindowType;
+  }
+
   public void setSlidingWindowType(String slidingWindowType) {
     this.slidingWindowType = slidingWindowType;
   }
diff --git a/governance/src/test/resources/application.yaml 
b/governance/src/test/resources/application.yaml
index 9ac6a00..5875e83 100644
--- a/governance/src/test/resources/application.yaml
+++ b/governance/src/test/resources/application.yaml
@@ -54,6 +54,7 @@ servicecomb:
     demo-circuitBreaker: |
       minimumNumberOfCalls: 2
       slidingWindowSize: 2
+      slidingWindowType: count
       services: myself:1.0,other
     wrongIngored: |
       rules: