SONAR-14929 - Save a new issue as new on branch using reference branch

2 files changed, 28 insertions, 0 deletions

diff --git a/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssue.java b/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssue.java
index e52dc7355d1..89aa9a7fa3b 100644
--- a/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssue.java
+++ b/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssue.java
@@ -100,6 +100,12 @@ public class DefaultIssue implements Issue, Trackable, org.sonar.api.ce.measure.
   // true if the issue did not exist in the previous scan.
   private boolean isNew = true;
 
+  // true if the issue is on a branch using the reference branch new code strategy
+  private boolean isOnReferencedBranch = false;
+
+  // true if the issue is on a changed line on a branch using the reference branch new code strategy
+  private boolean isOnChangedLine = false;
+
   // true if the issue is being copied between branch
   private boolean isCopied = false;
 
@@ -388,6 +394,14 @@ public class DefaultIssue implements Issue, Trackable, org.sonar.api.ce.measure.
     return isNew;
   }
 
+  public boolean isOnReferencedBranch() {
+    return isOnReferencedBranch;
+  }
+
+  public boolean isOnChangedLine() {
+    return isOnChangedLine;
+  }
+
   @Override
   public boolean isCopied() {
     return isCopied;
@@ -403,6 +417,16 @@ public class DefaultIssue implements Issue, Trackable, org.sonar.api.ce.measure.
     return this;
   }
 
+  public DefaultIssue setIsOnReferencedBranch(boolean b) {
+    isOnReferencedBranch = b;
+    return this;
+  }
+
+  public DefaultIssue setIsOnChangedLine(boolean b) {
+    isOnChangedLine = b;
+    return this;
+  }
+
   /**
    * True when one of the following conditions is true :
    * <ul>
diff --git a/sonar-core/src/test/java/org/sonar/core/issue/DefaultIssueTest.java b/sonar-core/src/test/java/org/sonar/core/issue/DefaultIssueTest.java
index 528d6b91740..874272d2d40 100644
--- a/sonar-core/src/test/java/org/sonar/core/issue/DefaultIssueTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/issue/DefaultIssueTest.java
@@ -56,6 +56,8 @@ public class DefaultIssueTest {
       .setAuthorLogin("steph")
       .setChecksum("c7b5db46591806455cf082bb348631e8")
       .setNew(true)
+      .setIsOnReferencedBranch(true)
+      .setIsOnChangedLine(true)
       .setBeingClosed(true)
       .setOnDisabledRule(true)
       .setCopied(true)
@@ -83,6 +85,8 @@ public class DefaultIssueTest {
     assertThat(issue.authorLogin()).isEqualTo("steph");
     assertThat(issue.checksum()).isEqualTo("c7b5db46591806455cf082bb348631e8");
     assertThat(issue.isNew()).isTrue();
+    assertThat(issue.isOnReferencedBranch()).isTrue();
+    assertThat(issue.isOnChangedLine()).isTrue();
     assertThat(issue.isCopied()).isTrue();
     assertThat(issue.isBeingClosed()).isTrue();
     assertThat(issue.isOnDisabledRule()).isTrue();