SONAR-6364 Line number should be unset on closed issues

diff --git a/sonar-core/src/main/java/org/sonar/core/issue/workflow/Function.java b/sonar-core/src/main/java/org/sonar/core/issue/workflow/Function.java
index 987031fd9094aef23b78da123abc67347bc0c068..ad25ff016a3f76a6527f0b916792f1b5a317ecbc 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/issue/workflow/Function.java
+++ b/sonar-core/src/main/java/org/sonar/core/issue/workflow/Function.java
@@ -30,6 +30,7 @@ interface Function {
     Context setAssignee(@Nullable User user);
     Context setResolution(@Nullable String s);
     Context setCloseDate(boolean b);
+    Context setLine(@Nullable Integer line);
   }
 
   void execute(Context context);

diff --git a/sonar-core/src/main/java/org/sonar/core/issue/workflow/FunctionExecutor.java b/sonar-core/src/main/java/org/sonar/core/issue/workflow/FunctionExecutor.java
index d843eb598282e34b0a9bd99920c2b132a1132ffb..c530ede249a581e9de309905e93a7260bce686de 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/issue/workflow/FunctionExecutor.java
+++ b/sonar-core/src/main/java/org/sonar/core/issue/workflow/FunctionExecutor.java
@@ -77,7 +77,13 @@ public class FunctionExecutor implements BatchComponent, ServerComponent {
     @Override
     public Function.Context setCloseDate(boolean b) {
       updater.setCloseDate(issue, b ? changeContext.date() : null, changeContext);
-      return null;
+      return this;
+    }
+
+    @Override
+    public Function.Context setLine(@Nullable Integer line) {
+      updater.setLine(issue, line);
+      return this;
     }
   }
 }

diff --git a/sonar-core/src/main/java/org/sonar/core/issue/workflow/IssueWorkflow.java b/sonar-core/src/main/java/org/sonar/core/issue/workflow/IssueWorkflow.java
index f1b66748c152e03140ff2988fd570b0e6660586d..10924b43533ee20e7edf5e54202fe0e4ecbac6b1 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/issue/workflow/IssueWorkflow.java
+++ b/sonar-core/src/main/java/org/sonar/core/issue/workflow/IssueWorkflow.java
@@ -131,25 +131,25 @@ public class IssueWorkflow implements BatchComponent, ServerComponent, Startable
     builder.transition(Transition.builder("automaticclose")
       .from(Issue.STATUS_OPEN).to(Issue.STATUS_CLOSED)
       .conditions(new IsEndOfLife(true))
-      .functions(new SetEndOfLifeResolution(), new SetCloseDate(true))
+      .functions(new SetEndOfLife(), new SetCloseDate(true))
       .automatic()
       .build())
       .transition(Transition.builder("automaticclose")
         .from(Issue.STATUS_REOPENED).to(Issue.STATUS_CLOSED)
         .conditions(new IsEndOfLife(true))
-        .functions(new SetEndOfLifeResolution(), new SetCloseDate(true))
+        .functions(new SetEndOfLife(), new SetCloseDate(true))
         .automatic()
         .build())
       .transition(Transition.builder("automaticclose")
         .from(Issue.STATUS_CONFIRMED).to(Issue.STATUS_CLOSED)
         .conditions(new IsEndOfLife(true))
-        .functions(new SetEndOfLifeResolution(), new SetCloseDate(true))
+        .functions(new SetEndOfLife(), new SetCloseDate(true))
         .automatic()
         .build())
       .transition(Transition.builder("automaticclose")
         .from(Issue.STATUS_RESOLVED).to(Issue.STATUS_CLOSED)
         .conditions(new IsEndOfLife(true))
-        .functions(new SetEndOfLifeResolution(), new SetCloseDate(true))
+        .functions(new SetEndOfLife(), new SetCloseDate(true))
         .automatic()
         .build())
       .transition(Transition.builder("automaticclosemanual")

diff --git a/sonar-core/src/main/java/org/sonar/core/issue/workflow/SetEndOfLife.java b/sonar-core/src/main/java/org/sonar/core/issue/workflow/SetEndOfLife.java
new file mode 100644 (file)
index 0000000..ae45caa
--- /dev/null
+++ b/sonar-core/src/main/java/org/sonar/core/issue/workflow/SetEndOfLife.java
@@ -0,0 +1,43 @@
+/*
+ * SonarQube, open source software quality management tool.
+ * Copyright (C) 2008-2014 SonarSource
+ * mailto:contact AT sonarsource DOT com
+ *
+ * SonarQube is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * SonarQube is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+package org.sonar.core.issue.workflow;
+
+import org.sonar.api.issue.Issue;
+import org.sonar.api.issue.internal.DefaultIssue;
+
+public class SetEndOfLife implements Function {
+  @Override
+  public void execute(Context context) {
+    DefaultIssue issue = (DefaultIssue) context.issue();
+    if (!issue.isEndOfLife()) {
+      throw new IllegalStateException("Issue is still alive: " + issue);
+    }
+    if (issue.isOnDisabledRule()) {
+      context.setResolution(Issue.RESOLUTION_REMOVED);
+    } else {
+      context.setResolution(Issue.RESOLUTION_FIXED);
+    }
+
+    // closed issues are not "tracked" -> the line number does not evolve anymore
+    // when code changes. That's misleading for end-users, so line number
+    // is unset.
+    context.setLine(null);
+  }
+}

diff --git a/sonar-core/src/main/java/org/sonar/core/issue/workflow/SetEndOfLifeResolution.java b/sonar-core/src/main/java/org/sonar/core/issue/workflow/SetEndOfLifeResolution.java
deleted file mode 100644 (file)
index e7b6cfd..0000000
--- a/sonar-core/src/main/java/org/sonar/core/issue/workflow/SetEndOfLifeResolution.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2014 SonarSource
- * mailto:contact AT sonarsource DOT com
- *
- * SonarQube is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * SonarQube is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package org.sonar.core.issue.workflow;
-
-import org.sonar.api.issue.Issue;
-import org.sonar.api.issue.internal.DefaultIssue;
-
-public class SetEndOfLifeResolution implements Function {
-  @Override
-  public void execute(Context context) {
-    DefaultIssue issue = (DefaultIssue) context.issue();
-    if (!issue.isEndOfLife()) {
-      throw new IllegalStateException("Issue is still alive: " + issue);
-    }
-    if (issue.isOnDisabledRule()) {
-      context.setResolution(Issue.RESOLUTION_REMOVED);
-    } else {
-      context.setResolution(Issue.RESOLUTION_FIXED);
-    }
-  }
-}

diff --git a/sonar-core/src/test/java/org/sonar/core/issue/workflow/SetEndOfLifeResolutionTest.java b/sonar-core/src/test/java/org/sonar/core/issue/workflow/SetEndOfLifeResolutionTest.java
deleted file mode 100644 (file)
index 4a2f88e..0000000
--- a/sonar-core/src/test/java/org/sonar/core/issue/workflow/SetEndOfLifeResolutionTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2014 SonarSource
- * mailto:contact AT sonarsource DOT com
- *
- * SonarQube is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * SonarQube is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package org.sonar.core.issue.workflow;
-
-import org.junit.Test;
-import org.sonar.api.issue.Issue;
-import org.sonar.api.issue.internal.DefaultIssue;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.fail;
-import static org.mockito.Mockito.*;
-
-public class SetEndOfLifeResolutionTest {
-
-  Function.Context context = mock(Function.Context.class);
-  SetEndOfLifeResolution function = new SetEndOfLifeResolution();
-
-  @Test
-  public void should_resolve_as_fixed() throws Exception {
-    Issue issue = new DefaultIssue().setEndOfLife(true).setOnDisabledRule(false);
-    when(context.issue()).thenReturn(issue);
-    function.execute(context);
-    verify(context, times(1)).setResolution(Issue.RESOLUTION_FIXED);
-  }
-
-  @Test
-  public void should_resolve_as_removed_when_rule_is_disabled() throws Exception {
-    Issue issue = new DefaultIssue().setEndOfLife(true).setOnDisabledRule(true);
-    when(context.issue()).thenReturn(issue);
-    function.execute(context);
-    verify(context, times(1)).setResolution(Issue.RESOLUTION_REMOVED);
-  }
-
-  @Test
-  public void should_fail_if_issue_is_not_resolved() throws Exception {
-    Issue issue = new DefaultIssue().setEndOfLife(false);
-    when(context.issue()).thenReturn(issue);
-    try {
-      function.execute(context);
-      fail();
-    } catch (IllegalStateException e) {
-      assertThat(e.getMessage()).contains("Issue is still alive");
-      verify(context, never()).setResolution(anyString());
-    }
-  }
-}

diff --git a/sonar-core/src/test/java/org/sonar/core/issue/workflow/SetEndOfLifeTest.java b/sonar-core/src/test/java/org/sonar/core/issue/workflow/SetEndOfLifeTest.java
new file mode 100644 (file)
index 0000000..a05e9d0
--- /dev/null
+++ b/sonar-core/src/test/java/org/sonar/core/issue/workflow/SetEndOfLifeTest.java
@@ -0,0 +1,71 @@
+/*
+ * SonarQube, open source software quality management tool.
+ * Copyright (C) 2008-2014 SonarSource
+ * mailto:contact AT sonarsource DOT com
+ *
+ * SonarQube is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * SonarQube is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+package org.sonar.core.issue.workflow;
+
+import org.junit.Test;
+import org.sonar.api.issue.Issue;
+import org.sonar.api.issue.internal.DefaultIssue;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.*;
+
+public class SetEndOfLifeTest {
+
+  Function.Context context = mock(Function.Context.class);
+  SetEndOfLife function = new SetEndOfLife();
+
+  @Test
+  public void should_resolve_as_fixed() throws Exception {
+    Issue issue = new DefaultIssue().setEndOfLife(true).setOnDisabledRule(false);
+    when(context.issue()).thenReturn(issue);
+    function.execute(context);
+    verify(context, times(1)).setResolution(Issue.RESOLUTION_FIXED);
+  }
+
+  @Test
+  public void should_resolve_as_removed_when_rule_is_disabled() throws Exception {
+    Issue issue = new DefaultIssue().setEndOfLife(true).setOnDisabledRule(true);
+    when(context.issue()).thenReturn(issue);
+    function.execute(context);
+    verify(context, times(1)).setResolution(Issue.RESOLUTION_REMOVED);
+  }
+
+  @Test
+  public void should_fail_if_issue_is_not_resolved() throws Exception {
+    Issue issue = new DefaultIssue().setEndOfLife(false);
+    when(context.issue()).thenReturn(issue);
+    try {
+      function.execute(context);
+      fail();
+    } catch (IllegalStateException e) {
+      assertThat(e.getMessage()).contains("Issue is still alive");
+      verify(context, never()).setResolution(anyString());
+    }
+  }
+
+  @Test
+  public void line_number_must_be_unset() throws Exception {
+    Issue issue = new DefaultIssue().setEndOfLife(true).setLine(10);
+    when(context.issue()).thenReturn(issue);
+    function.execute(context);
+    verify(context).setLine(null);
+  }
+}