From a1902d9cf02179a32429306ae38ea1c020c7a886 Mon Sep 17 00:00:00 2001 From: gaoyunpeng Date: Thu, 17 Jan 2019 17:28:21 +0800 Subject: [PATCH] 1.update cobertura settings 2.fix endpoint's degradeRules return value --- pom.xml | 8 ++++++++ .../cloud/alibaba/sentinel/endpoint/SentinelEndpoint.java | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 92bd96cb4..bd0b9c847 100644 --- a/pom.xml +++ b/pom.xml @@ -200,7 +200,15 @@ org.codehaus.mojo cobertura-maven-plugin ${cobertura-maven-plugin.version} + + + org.ow2.asm + asm + 5.0.3 + + + true html xml diff --git a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/endpoint/SentinelEndpoint.java b/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/endpoint/SentinelEndpoint.java index d2500768f..df8934425 100644 --- a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/endpoint/SentinelEndpoint.java +++ b/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/endpoint/SentinelEndpoint.java @@ -19,6 +19,7 @@ package org.springframework.cloud.alibaba.sentinel.endpoint; import java.util.HashMap; import java.util.Map; +import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRuleManager; import org.springframework.boot.actuate.endpoint.annotation.Endpoint; import org.springframework.boot.actuate.endpoint.annotation.ReadOperation; import org.springframework.cloud.alibaba.sentinel.SentinelProperties; @@ -67,7 +68,7 @@ public class SentinelEndpoint { final Map rules = new HashMap<>(); result.put("rules", rules); rules.put("flowRules", FlowRuleManager.getRules()); - rules.put("degradeRules", SystemRuleManager.getRules()); + rules.put("degradeRules", DegradeRuleManager.getRules()); rules.put("systemRules", SystemRuleManager.getRules()); rules.put("authorityRule", AuthorityRuleManager.getRules()); rules.put("paramFlowRule", ParamFlowRuleManager.getRules());