SONAR-3755 Fix problem when setting rule key from db

diff --git a/sonar-core/src/main/java/org/sonar/core/issue/IssueDto.java b/sonar-core/src/main/java/org/sonar/core/issue/IssueDto.java
index 982176c8ed3d9bd593789121c9d61ac9604d7e6d..36734e69e5022ebe8c7372dfe921e41e8840af73 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/issue/IssueDto.java
+++ b/sonar-core/src/main/java/org/sonar/core/issue/IssueDto.java
@@ -58,9 +58,7 @@ public final class IssueDto {
   private Date closedAt;
 
   // joins
-  private String rule;
-
-  // This fields are not persited in db
+  private transient String ruleKey;
   private transient String ruleRepo;
   private transient String componentKey;
 
@@ -256,7 +254,7 @@ public final class IssueDto {
   }
 
   public String getRule() {
-    return rule;
+    return ruleKey;
   }
 
   public String getRuleRepo() {
@@ -272,7 +270,7 @@ public final class IssueDto {
    */
   public IssueDto setRuleKey_unit_test_only(String repo, String rule) {
     this.ruleRepo = repo;
-    this.rule = rule;
+    this.ruleKey = rule;
     return this;
   }
 
@@ -353,7 +351,7 @@ public final class IssueDto {
     issue.setComponentKey(componentKey);
     issue.setManual(manualIssue);
     issue.setManualSeverity(manualSeverity);
-    issue.setRuleKey(RuleKey.of(ruleRepo, rule));
+    issue.setRuleKey(RuleKey.of(ruleRepo, ruleKey));
     issue.setNew(false);
     // TODO personId
     return issue;

diff --git a/sonar-core/src/test/java/org/sonar/core/issue/IssueDaoTest.java b/sonar-core/src/test/java/org/sonar/core/issue/IssueDaoTest.java
index 9f45587d8ba1127edc84c23ffcb42d6f702203a5..f4970730160257e1dfc15d52b142ca247c0a1ba8 100644 (file)
--- a/sonar-core/src/test/java/org/sonar/core/issue/IssueDaoTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/issue/IssueDaoTest.java
@@ -118,6 +118,8 @@ public class IssueDaoTest extends AbstractDaoTestCase {
     assertThat(issue.getCreatedAt()).isNotNull();
     assertThat(issue.getUpdatedAt()).isNotNull();
     assertThat(issue.getClosedAt()).isNotNull();
+    assertThat(issue.getRule()).isNotNull();
+    assertThat(issue.getRuleRepo()).isNotNull();
   }
 
   @Test