SONAR-4897 Improve the way are displayed characteristic infos on an issue

2 files changed, 6 insertions, 8 deletions

diff --git a/sonar-core/src/main/java/org/sonar/core/technicaldebt/TechnicalDebtFinder.java b/sonar-core/src/main/java/org/sonar/core/technicaldebt/TechnicalDebtFinder.java
index ae5605bf84d..4a512a7d3e9 100644
--- a/sonar-core/src/main/java/org/sonar/core/technicaldebt/TechnicalDebtFinder.java
+++ b/sonar-core/src/main/java/org/sonar/core/technicaldebt/TechnicalDebtFinder.java
@@ -66,9 +66,8 @@ public class TechnicalDebtFinder implements ServerComponent, BatchComponent {
     return model;
   }
 
-  public Requirement findRequirement(Integer ruleId) {
-    Rule rule = ruleFinder.findById(ruleId);
-    CharacteristicDto requirementDto = dao.selectRequirement(ruleId);
+  public Requirement findRequirement(Rule rule) {
+    CharacteristicDto requirementDto = dao.selectRequirement(rule.getId());
     CharacteristicDto characteristicDto = dao.selectCharacteristic(requirementDto.getParentId());
     CharacteristicDto rootCharacteristicDto = dao.selectCharacteristic(characteristicDto.getParentId());
 
diff --git a/sonar-core/src/test/java/org/sonar/core/technicaldebt/TechnicalDebtFinderTest.java b/sonar-core/src/test/java/org/sonar/core/technicaldebt/TechnicalDebtFinderTest.java
index 575656459d7..46608377b31 100644
--- a/sonar-core/src/test/java/org/sonar/core/technicaldebt/TechnicalDebtFinderTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/technicaldebt/TechnicalDebtFinderTest.java
@@ -132,18 +132,17 @@ public class TechnicalDebtFinderTest {
 
   @Test
   public void find_requirement() throws Exception {
-    Integer ruleId = 1;
+    Rule rule = Rule.create("repo", "key");
+    rule.setId(1);
 
-    when(dao.selectRequirement(ruleId)).thenReturn(
+    when(dao.selectRequirement(rule.getId())).thenReturn(
       new CharacteristicDto().setId(3).setRuleId(10).setParentId(2).setFunction("linear").setFactorValue(30.0).setFactorUnit("mn"));
     when(dao.selectCharacteristic(2)).thenReturn(
       new CharacteristicDto().setId(2).setKey("COMPILER_RELATED_PORTABILITY").setParentId(1));
     when(dao.selectCharacteristic(1)).thenReturn(
       new CharacteristicDto().setId(1).setKey("PORTABILITY"));
 
-    when(ruleFinder.findById(ruleId)).thenReturn(Rule.create("repo", "key"));
-
-    Requirement result = finder.findRequirement(1);
+    Requirement result = finder.findRequirement(rule);
 
     assertThat(result.ruleKey()).isEqualTo(RuleKey.of("repo", "key"));
     assertThat(result.characteristic().key()).isEqualTo("COMPILER_RELATED_PORTABILITY");