SONAR-7473 Clean useless code

15 files changed, 11 insertions, 469 deletions

diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/notification/ChangesOnMyIssueNotificationDispatcher.java b/server/sonar-server/src/main/java/org/sonar/server/issue/notification/ChangesOnMyIssueNotificationDispatcher.java
index e19336c5ea0..69789360368 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/notification/ChangesOnMyIssueNotificationDispatcher.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/notification/ChangesOnMyIssueNotificationDispatcher.java
@@ -21,9 +21,8 @@ package org.sonar.server.issue.notification;
 
 import com.google.common.base.Objects;
 import com.google.common.collect.Multimap;
-
-import javax.annotation.Nullable;
 import java.util.Collection;
+import javax.annotation.Nullable;
 import org.sonar.api.notifications.Notification;
 import org.sonar.api.notifications.NotificationChannel;
 import org.sonar.server.notification.NotificationDispatcher;
@@ -65,12 +64,8 @@ public class ChangesOnMyIssueNotificationDispatcher extends NotificationDispatch
 
     // All the following users can be null
     String changeAuthor = notification.getFieldValue("changeAuthor");
-    String reporter = notification.getFieldValue("reporter");
     String assignee = notification.getFieldValue("assignee");
 
-    if (!Objects.equal(changeAuthor, reporter)) {
-      addUserToContextIfSubscribed(context, reporter, subscribedRecipients);
-    }
     if (!Objects.equal(changeAuthor, assignee)) {
       addUserToContextIfSubscribed(context, assignee, subscribedRecipients);
     }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/IssueWorkflow.java b/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/IssueWorkflow.java
index 37a6d23fac7..f0ad17fa053 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/IssueWorkflow.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/IssueWorkflow.java
@@ -21,11 +21,11 @@ package org.sonar.server.issue.workflow;
 
 import java.util.List;
 import org.picocontainer.Startable;
+import org.sonar.api.ce.ComputeEngineSide;
 import org.sonar.api.issue.DefaultTransitions;
 import org.sonar.api.issue.Issue;
 import org.sonar.api.issue.condition.HasResolution;
 import org.sonar.api.issue.condition.NotCondition;
-import org.sonar.api.ce.ComputeEngineSide;
 import org.sonar.api.server.ServerSide;
 import org.sonar.api.web.UserRole;
 import org.sonar.core.issue.DefaultIssue;
@@ -152,7 +152,6 @@ public class IssueWorkflow implements Startable {
         .build())
 
       // Reopen issues that are marked as resolved but that are still alive.
-      // Manual issues are kept resolved.
       .transition(Transition.builder("automaticreopen")
         .from(Issue.STATUS_RESOLVED).to(Issue.STATUS_REOPENED)
         .conditions(new NotCondition(IsBeingClosed.INSTANCE), new HasResolution(Issue.RESOLUTION_FIXED))
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/issue_filter.html.erb b/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/issue_filter.html.erb
index 235a9fb3017..2106a53cd55 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/issue_filter.html.erb
+++ b/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/issue_filter.html.erb
@@ -20,7 +20,7 @@
     <div id="<%= container_id -%>"></div>
 
     <% if distribution_axis == 'reporters' %>
-      <p class="note spacer-bottom">The distribution by rReporter is no more supported. Please update this widget.</p>
+      <p class="note spacer-bottom">The distribution by reporter is no more supported. Please update this widget.</p>
     <% end %>
 
     <script>
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueQueryServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueQueryServiceTest.java
index f547dfd01e9..07eb14ed93f 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueQueryServiceTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueQueryServiceTest.java
@@ -124,7 +124,6 @@ public class IssueQueryServiceTest {
     map.put("directories", newArrayList("/src/main/java/example"));
     ArrayList<String> fileUuids = newArrayList("CDEF");
     map.put("fileUuids", fileUuids);
-    map.put("reporters", newArrayList("marilyn"));
     map.put("assignees", newArrayList("joanna"));
     map.put("languages", newArrayList("xoo"));
     map.put("tags", newArrayList("tag1", "tag2"));
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/notification/ChangesOnMyIssueNotificationDispatcherTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/notification/ChangesOnMyIssueNotificationDispatcherTest.java
index 3fce37203c1..98c75e1d698 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/notification/ChangesOnMyIssueNotificationDispatcherTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/notification/ChangesOnMyIssueNotificationDispatcherTest.java
@@ -33,7 +33,11 @@ import org.sonar.server.notification.NotificationDispatcherMetadata;
 import org.sonar.server.notification.NotificationManager;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
 public class ChangesOnMyIssueNotificationDispatcherTest {
@@ -74,7 +78,7 @@ public class ChangesOnMyIssueNotificationDispatcherTest {
   }
 
   @Test
-  public void should_dispatch_to_reporter_and_assignee() {
+  public void should_dispatch_to_assignee() {
     Multimap<String, NotificationChannel> recipients = HashMultimap.create();
     recipients.put("simon", emailChannel);
     recipients.put("freddy", twitterChannel);
@@ -83,11 +87,9 @@ public class ChangesOnMyIssueNotificationDispatcherTest {
 
     Notification notification = new IssueChangeNotification().setFieldValue("projectKey", "struts")
       .setFieldValue("changeAuthor", "olivier")
-      .setFieldValue("reporter", "simon")
       .setFieldValue("assignee", "freddy");
     dispatcher.performDispatch(notification, context);
 
-    verify(context).addUser("simon", emailChannel);
     verify(context).addUser("freddy", twitterChannel);
     verify(context, never()).addUser("godin", twitterChannel);
     verifyNoMoreInteractions(context);
@@ -101,10 +103,6 @@ public class ChangesOnMyIssueNotificationDispatcherTest {
     recipients.put("godin", twitterChannel);
     when(notifications.findNotificationSubscribers(dispatcher, "struts")).thenReturn(recipients);
 
-    // change author is the reporter
-    dispatcher.performDispatch(new IssueChangeNotification().setFieldValue("projectKey", "struts")
-      .setFieldValue("changeAuthor", "simon").setFieldValue("reporter", "simon"), context);
-
     // change author is the assignee
     dispatcher.performDispatch(new IssueChangeNotification().setFieldValue("projectKey", "struts")
       .setFieldValue("changeAuthor", "simon").setFieldValue("assignee", "simon"), context);
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/IssueWorkflowTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/IssueWorkflowTest.java
index 5c8f378e789..44bbc214efb 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/IssueWorkflowTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/IssueWorkflowTest.java
@@ -36,7 +36,6 @@ import org.sonar.server.issue.IssueUpdater;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.fail;
-import static org.mockito.Mockito.mock;
 import static org.sonar.api.issue.Issue.RESOLUTION_FALSE_POSITIVE;
 import static org.sonar.api.issue.Issue.RESOLUTION_FIXED;
 import static org.sonar.api.issue.Issue.RESOLUTION_WONT_FIX;
@@ -256,77 +255,6 @@ public class IssueWorkflowTest {
     assertThat(issue.assignee()).isNull();
   }
 
-  @Test
-  public void manual_issues_be_confirmed_then_kept_open() {
-    // Manual issue because of reporter
-    DefaultIssue issue = new DefaultIssue()
-      .setKey("ABCDE")
-      .setStatus(STATUS_OPEN)
-      .setRuleKey(RuleKey.of("manual", "Performance"));
-
-    workflow.start();
-
-    assertThat(workflow.outTransitions(issue)).containsOnly(
-      Transition.create("confirm", "OPEN", "CONFIRMED"),
-      Transition.create("resolve", "OPEN", "RESOLVED"),
-      Transition.create("falsepositive", "OPEN", "RESOLVED"),
-      Transition.create("wontfix", "OPEN", "RESOLVED"));
-
-    workflow.doTransition(issue, "confirm", mock(IssueChangeContext.class));
-    assertThat(issue.resolution()).isNull();
-    assertThat(issue.status()).isEqualTo("CONFIRMED");
-
-    assertThat(workflow.outTransitions(issue)).containsOnly(
-      Transition.create("unconfirm", "CONFIRMED", "REOPENED"),
-      Transition.create("resolve", "CONFIRMED", "RESOLVED"),
-      Transition.create("falsepositive", "CONFIRMED", "RESOLVED"),
-      Transition.create("wontfix", "CONFIRMED", "RESOLVED"));
-
-    // keep confirmed and unresolved
-    workflow.doAutomaticTransition(issue, mock(IssueChangeContext.class));
-    assertThat(issue.resolution()).isNull();
-    assertThat(issue.status()).isEqualTo("CONFIRMED");
-
-    // unconfirm
-    workflow.doTransition(issue, "unconfirm", mock(IssueChangeContext.class));
-    assertThat(issue.resolution()).isNull();
-    assertThat(issue.status()).isEqualTo("REOPENED");
-  }
-
-  @Test
-  public void manual_issue_on_removed_rule_be_closed() {
-    // Manual issue because of reporter
-    DefaultIssue issue = new DefaultIssue()
-      .setKey("ABCDE")
-      .setStatus(STATUS_OPEN)
-      .setRuleKey(RuleKey.of("manual", "Performance"))
-      .setBeingClosed(true)
-      .setOnDisabledRule(true);
-
-    workflow.start();
-
-    workflow.doAutomaticTransition(issue, mock(IssueChangeContext.class));
-    assertThat(issue.resolution()).isEqualTo("REMOVED");
-    assertThat(issue.status()).isEqualTo(STATUS_CLOSED);
-  }
-
-  @Test
-  public void manual_issue_on_removed_component_be_closed() {
-    // Manual issue because of reporter
-    DefaultIssue issue = new DefaultIssue()
-      .setKey("ABCDE")
-      .setStatus(STATUS_OPEN)
-      .setRuleKey(RuleKey.of("manual", "Performance"))
-      .setBeingClosed(true)
-      .setOnDisabledRule(false);
-
-    workflow.start();
-
-    workflow.doAutomaticTransition(issue, mock(IssueChangeContext.class));
-    assertThat(issue.resolution()).isEqualTo(RESOLUTION_FIXED);
-    assertThat(issue.status()).isEqualTo(STATUS_CLOSED);
-  }
-
   private Collection<String> keys(List<Transition> transitions) {
     return Collections2.transform(transitions, new Function<Transition, String>() {
       @Override
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/AnalysisReportServiceTest/report-folder/1/issues-1.json b/server/sonar-server/src/test/resources/org/sonar/server/computation/AnalysisReportServiceTest/report-folder/1/issues-1.json
deleted file mode 100644
index fa3eec4d9f7..00000000000
--- a/server/sonar-server/src/test/resources/org/sonar/server/computation/AnalysisReportServiceTest/report-folder/1/issues-1.json
+++ /dev/null
@@ -1,182 +0,0 @@
-[
-  {
-    "isNew": false,
-    "key": "key",
-    "manualSeverity": false,
-    "assignee": "Assignee",
-    "attributes": "attributes",
-    "authorLogin": "login",
-    "isChanged": true,
-    "ruleKey": "ruleKey",
-    "ruleRepo": "local",
-    "severity": "INFO",
-    "message": "message",
-    "line": 25,
-    "effortToFix": 30,
-    "debtInMinutes": 25,
-    "status": "NEW",
-    "resolution": "Non Solved",
-    "reporter": "reporter",
-    "assignee": "assignee",
-    "checkSum": "checkSum",
-    "attributes": "toto=25",
-    "authorLogin": "author",
-    "actionPlanKey": "actionPlanKey",
-    "creationDate": "2014-12-19T00:03:14+0100",
-    "updateDate": "2014-12-19T00:03:14+0100",
-    "closeDate": "2014-12-19T00:03:14+0100",
-    "currentChange": "coucou,c'est,nous",
-    "isChange": false,
-    "selectAt": 564897564
-  },
-  {
-    "isNew": false,
-    "key": "key",
-    "manualSeverity": false,
-    "assignee": "Assignee",
-    "attributes": "attributes",
-    "authorLogin": "login",
-    "isChanged": true,
-    "ruleKey": "ruleKey",
-    "ruleRepo": "local",
-    "severity": "INFO",
-    "message": "message",
-    "line": 25,
-    "effortToFix": 30,
-    "debtInMinutes": 25,
-    "status": "NEW",
-    "resolution": "Non Solved",
-    "reporter": "reporter",
-    "assignee": "assignee",
-    "checkSum": "checkSum",
-    "attributes": "toto=25",
-    "authorLogin": "author",
-    "actionPlanKey": "actionPlanKey",
-    "creationDate": "2014-12-19T00:03:14+0100",
-    "updateDate": "2014-12-19T00:03:14+0100",
-    "closeDate": "2014-12-19T00:03:14+0100",
-    "currentChange": "coucou,c'est,nous",
-    "isChange": false,
-    "selectAt": 564897564
-  },
-  {
-    "isNew": false,
-    "key": "key",
-    "manualSeverity": false,
-    "assignee": "Assignee",
-    "attributes": "attributes",
-    "authorLogin": "login",
-    "isChanged": true,
-    "ruleKey": "ruleKey",
-    "ruleRepo": "local",
-    "severity": "INFO",
-    "message": "message",
-    "line": 25,
-    "effortToFix": 30,
-    "debtInMinutes": 25,
-    "status": "NEW",
-    "resolution": "Non Solved",
-    "reporter": "reporter",
-    "assignee": "assignee",
-    "checkSum": "checkSum",
-    "attributes": "toto=25",
-    "authorLogin": "author",
-    "actionPlanKey": "actionPlanKey",
-    "creationDate": "2014-12-19T00:03:14+0100",
-    "updateDate": "2014-12-19T00:03:14+0100",
-    "closeDate": "2014-12-19T00:03:14+0100",
-    "currentChange": "coucou,c'est,nous",
-    "isChange": false,
-    "selectAt": 564897564
-  },
-  {
-    "isNew": false,
-    "key": "key",
-    "manualSeverity": false,
-    "assignee": "Assignee",
-    "attributes": "attributes",
-    "authorLogin": "login",
-    "isChanged": true,
-    "ruleKey": "ruleKey",
-    "ruleRepo": "local",
-    "severity": "INFO",
-    "message": "message",
-    "line": 25,
-    "effortToFix": 30,
-    "debtInMinutes": 25,
-    "status": "NEW",
-    "resolution": "Non Solved",
-    "reporter": "reporter",
-    "assignee": "assignee",
-    "checkSum": "checkSum",
-    "attributes": "toto=25",
-    "authorLogin": "author",
-    "actionPlanKey": "actionPlanKey",
-    "creationDate": "2014-12-19T00:03:14+0100",
-    "updateDate": "2014-12-19T00:03:14+0100",
-    "closeDate": "2014-12-19T00:03:14+0100",
-    "currentChange": "coucou,c'est,nous",
-    "isChange": false,
-    "selectAt": 564897564
-  },
-  {
-    "isNew": false,
-    "key": "key",
-    "manualSeverity": false,
-    "assignee": "Assignee",
-    "attributes": "attributes",
-    "authorLogin": "login",
-    "isChanged": true,
-    "ruleKey": "ruleKey",
-    "ruleRepo": "local",
-    "severity": "INFO",
-    "message": "message",
-    "line": 25,
-    "effortToFix": 30,
-    "debtInMinutes": 25,
-    "status": "NEW",
-    "resolution": "Non Solved",
-    "reporter": "reporter",
-    "assignee": "assignee",
-    "checkSum": "checkSum",
-    "attributes": "toto=25",
-    "authorLogin": "author",
-    "actionPlanKey": "actionPlanKey",
-    "creationDate": "2014-12-19T00:03:14+0100",
-    "updateDate": "2014-12-19T00:03:14+0100",
-    "closeDate": "2014-12-19T00:03:14+0100",
-    "currentChange": "coucou,c'est,nous",
-    "isChange": false,
-    "selectAt": 564897564
-  },
-  {
-    "isNew": false,
-    "key": "key",
-    "manualSeverity": false,
-    "assignee": "Assignee",
-    "attributes": "attributes",
-    "authorLogin": "login",
-    "isChanged": true,
-    "ruleKey": "ruleKey",
-    "ruleRepo": "local",
-    "severity": "INFO",
-    "message": "message",
-    "line": 25,
-    "effortToFix": 30,
-    "debtInMinutes": 25,
-    "status": "NEW",
-    "resolution": "Non Solved",
-    "reporter": "reporter",
-    "assignee": "assignee",
-    "checkSum": "checkSum",
-    "attributes": "toto=25",
-    "authorLogin": "author",
-    "actionPlanKey": "actionPlanKey",
-    "creationDate": "2014-12-19T00:03:14+0100",
-    "updateDate": "2014-12-19T00:03:14+0100",
-    "closeDate": "2014-12-19T00:03:14+0100",
-    "currentChange": "coucou,c'est,nous",
-    "isChange": false,
-    "selectAt": 564897564
-  }
-]
\ No newline at end of file
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/AnalysisReportServiceTest/report-folder/components.json b/server/sonar-server/src/test/resources/org/sonar/server/computation/AnalysisReportServiceTest/report-folder/components.json
deleted file mode 100644
index 4c642a06ba0..00000000000
--- a/server/sonar-server/src/test/resources/org/sonar/server/computation/AnalysisReportServiceTest/report-folder/components.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "analysisDate": "2012-12-12T00:00:00+0100",
-  "root": {
-    "batchId": 1,
-    "id": 11,
-    "snapshotId": 111,
-    "name": "Root project",
-    "type": "PRJ",
-    "children": [
-      {
-        "batchId": 2,
-        "id": 22,
-        "snapshotId": 222,
-        "path": "module1",
-        "name": "Module",
-        "type": "MOD",
-        "children": [
-          {
-            "batchId": 3,
-            "id": 33,
-            "snapshotId": 333,
-            "path": "src",
-            "name": "src",
-            "type": "DIR",
-            "children": [
-              {
-                "batchId": 4,
-                "id": 44,
-                "snapshotId": 444,
-                "path": "Foo.java",
-                "name": "Foo.java",
-                "type": "FIL",
-                "children": []
-              }
-            ]
-          }
-        ]
-      }
-    ]
-  }
-}
\ No newline at end of file
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/AnalysisReportServiceTest/report-folder/empty.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/AnalysisReportServiceTest/report-folder/empty.xml
deleted file mode 100644
index 871dedcb5e9..00000000000
--- a/server/sonar-server/src/test/resources/org/sonar/server/computation/AnalysisReportServiceTest/report-folder/empty.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<dataset>
-
-</dataset>
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/AnalysisReportServiceTest/report-folder/snapshots.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/AnalysisReportServiceTest/report-folder/snapshots.xml
deleted file mode 100644
index 6bc85fcec05..00000000000
--- a/server/sonar-server/src/test/resources/org/sonar/server/computation/AnalysisReportServiceTest/report-folder/snapshots.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<dataset>
-
-  <!-- NEW SNAPSHOT -->
-  <snapshots id="1" project_id="123" parent_snapshot_id="2" root_project_id="123" root_snapshot_id="1"
-             status="U" islast="[false]" purge_status="1"
-             period1_mode="days1" period1_param="30" period1_date="1316815200000"
-             period2_mode="days2" period2_param="31" period2_date="1316901600000"
-             period3_mode="days3" period3_param="32" period3_date="1316988000000"
-             period4_mode="days4" period4_param="33" period4_date="1317074400000"
-             period5_mode="days5" period5_param="34" period5_date="1317160800000"
-             depth="1" scope="PRJ" qualifier="PAC" created_at="1228258800000" build_date="1317247200000"
-             version="2.1-SNAPSHOT" path="1.2."/>
-  <snapshots id="2" project_id="1" parent_snapshot_id="2" root_project_id="123" root_snapshot_id="1"
-             status="U" islast="[false]" purge_status="1"
-             period1_mode="days1" period1_param="30" period1_date="1316815200000"
-             period2_mode="days2" period2_param="31" period2_date="1316901600000"
-             period3_mode="days3" period3_param="32" period3_date="1316988000000"
-             period4_mode="days4" period4_param="33" period4_date="1317074400000"
-             period5_mode="days5" period5_param="34" period5_date="1317160800000"
-             depth="1" scope="DIR" qualifier="PAC" created_at="1228258800000" build_date="1317247200000"
-             version="2.1-SNAPSHOT" path="1.2."/>
-  <snapshots id="3" project_id="1" parent_snapshot_id="2" root_project_id="123" root_snapshot_id="1"
-             status="U" islast="[false]" purge_status="1"
-             period1_mode="days1" period1_param="30" period1_date="1316815200000"
-             period2_mode="days2" period2_param="31" period2_date="1316901600000"
-             period3_mode="days3" period3_param="32" period3_date="1316988000000"
-             period4_mode="days4" period4_param="33" period4_date="1317074400000"
-             period5_mode="days5" period5_param="34" period5_date="1317160800000"
-             depth="1" scope="DIR" qualifier="PAC" created_at="1228258800000" build_date="1317247200000"
-             version="2.1-SNAPSHOT" path="1.2."/>
-  <!-- PROJECT_ID = 3 - no last snapshot -->
-  <snapshots id="4" project_id="3" parent_snapshot_id="2" root_project_id="123" root_snapshot_id="1"
-             status="U" islast="[false]" purge_status="1"
-             period1_mode="days1" period1_param="30" period1_date="1316815200000"
-             period2_mode="days2" period2_param="31" period2_date="1316901600000"
-             period3_mode="days3" period3_param="32" period3_date="1316988000000"
-             period4_mode="days4" period4_param="33" period4_date="1317074400000"
-             period5_mode="days5" period5_param="34" period5_date="1317160800000"
-             depth="1" scope="DIR" qualifier="PAC" created_at="1228258800000" build_date="1317247200000"
-             version="2.1-SNAPSHOT" path="1.2."/>
-  <!-- Child of snapshot id=1 -->
-  <snapshots id="5" project_id="55" parent_snapshot_id="2" root_project_id="123" root_snapshot_id="1"
-             status="U" islast="[false]" purge_status="1"
-             period1_mode="days1" period1_param="30" period1_date="1316815200000"
-             period2_mode="days2" period2_param="31" period2_date="1316901600000"
-             period3_mode="days3" period3_param="32" period3_date="1316988000000"
-             period4_mode="days4" period4_param="33" period4_date="1317074400000"
-             period5_mode="days5" period5_param="34" period5_date="1317160800000"
-             depth="1" scope="PRJ" qualifier="PAC" created_at="1228258800000" build_date="1317247200000"
-             version="2.1-SNAPSHOT" path="1.2."/>
-
-  <!-- LAST FLAGGED SNAPSHOT -->
-  <snapshots id="21" project_id="123" parent_snapshot_id="2" root_project_id="123" root_snapshot_id="21"
-             status="P" islast="[true]" purge_status="1"
-             period1_mode="days1" period1_param="30" period1_date="1316815200000"
-             period2_mode="days2" period2_param="31" period2_date="1316901600000"
-             period3_mode="days3" period3_param="32" period3_date="1316988000000"
-             period4_mode="days4" period4_param="33" period4_date="1317074400000"
-             period5_mode="days5" period5_param="34" period5_date="1317160800000"
-             depth="1" scope="PRJ" qualifier="PAC" created_at="1228172400000" build_date="1317247200000"
-             version="2.1-SNAPSHOT" path="1.2."/>
-  <snapshots id="22" project_id="1" parent_snapshot_id="2" root_project_id="123" root_snapshot_id="21"
-             status="P" islast="[true]" purge_status="1"
-             period1_mode="days1" period1_param="30" period1_date="1316815200000"
-             period2_mode="days2" period2_param="31" period2_date="1316901600000"
-             period3_mode="days3" period3_param="32" period3_date="1316988000000"
-             period4_mode="days4" period4_param="33" period4_date="1317074400000"
-             period5_mode="days5" period5_param="34" period5_date="1317160800000"
-             depth="1" scope="DIR" qualifier="PAC" created_at="1228172400000" build_date="1317247200000"
-             version="2.1-SNAPSHOT" path="1.2."/>
-  <snapshots id="23" project_id="1" parent_snapshot_id="2" root_project_id="123" root_snapshot_id="21"
-             status="P" islast="[true]" purge_status="1"
-             period1_mode="days1" period1_param="30" period1_date="1316815200000"
-             period2_mode="days2" period2_param="31" period2_date="1316901600000"
-             period3_mode="days3" period3_param="32" period3_date="1316988000000"
-             period4_mode="days4" period4_param="33" period4_date="1317074400000"
-             period5_mode="days5" period5_param="34" period5_date="1317160800000"
-             depth="1" scope="DIR" qualifier="PAC" created_at="1228172400000" build_date="1317247200000"
-             version="2.1-SNAPSHOT" path="1.2."/>
-  <!-- PROJECT_ID = 3 - no last snapshot -->
-  <snapshots id="24" project_id="3" parent_snapshot_id="2" root_project_id="123" root_snapshot_id="21"
-             status="P" islast="[true]" purge_status="1"
-             period1_mode="days1" period1_param="30" period1_date="1316815200000"
-             period2_mode="days2" period2_param="31" period2_date="1316901600000"
-             period3_mode="days3" period3_param="32" period3_date="1316988000000"
-             period4_mode="days4" period4_param="33" period4_date="1317074400000"
-             period5_mode="days5" period5_param="34" period5_date="1317160800000"
-             depth="1" scope="DIR" qualifier="PAC" created_at="1228172400000" build_date="1317247200000"
-             version="2.1-SNAPSHOT" path="1.2."/>
-  <!-- Child of snapshot id=1 -->
-  <snapshots id="25" project_id="55" parent_snapshot_id="2" root_project_id="123" root_snapshot_id="21"
-             status="P" islast="[true]" purge_status="1"
-             period1_mode="days1" period1_param="30" period1_date="1316815200000"
-             period2_mode="days2" period2_param="31" period2_date="1316901600000"
-             period3_mode="days3" period3_param="32" period3_date="1316988000000"
-             period4_mode="days4" period4_param="33" period4_date="1317074400000"
-             period5_mode="days5" period5_param="34" period5_date="1317160800000"
-             depth="1" scope="PRJ" qualifier="PAC" created_at="1228172400000" build_date="1317247200000"
-             version="2.1-SNAPSHOT" path="1.2."/>
-
-  <!-- OLD SNAPSHOT -->
-  <snapshots id="46" project_id="123" parent_snapshot_id="2" root_project_id="123" root_snapshot_id="46"
-             status="P" islast="[false]" purge_status="1"
-             period1_mode="days1" period1_param="30" period1_date="1316815200000"
-             period2_mode="days2" period2_param="31" period2_date="1316901600000"
-             period3_mode="days3" period3_param="32" period3_date="1316988000000"
-             period4_mode="days4" period4_param="33" period4_date="1317074400000"
-             period5_mode="days5" period5_param="34" period5_date="1317160800000"
-             depth="1" scope="PRJ" qualifier="PAC" created_at="1228086000000" build_date="1317247200000"
-             version="2.1-SNAPSHOT" path="1.2."/>
-  <snapshots id="47" project_id="1" parent_snapshot_id="2" root_project_id="123" root_snapshot_id="46"
-             status="P" islast="[false]" purge_status="1"
-             period1_mode="days1" period1_param="30" period1_date="1316815200000"
-             period2_mode="days2" period2_param="31" period2_date="1316901600000"
-             period3_mode="days3" period3_param="32" period3_date="1316988000000"
-             period4_mode="days4" period4_param="33" period4_date="1317074400000"
-             period5_mode="days5" period5_param="34" period5_date="1317160800000"
-             depth="1" scope="DIR" qualifier="PAC" created_at="1228086000000" build_date="1317247200000"
-             version="2.1-SNAPSHOT" path="1.2."/>
-  <snapshots id="48" project_id="1" parent_snapshot_id="2" root_project_id="123" root_snapshot_id="46"
-             status="P" islast="[false]" purge_status="1"
-             period1_mode="days1" period1_param="30" period1_date="1316815200000"
-             period2_mode="days2" period2_param="31" period2_date="1316901600000"
-             period3_mode="days3" period3_param="32" period3_date="1316988000000"
-             period4_mode="days4" period4_param="33" period4_date="1317074400000"
-             period5_mode="days5" period5_param="34" period5_date="1317160800000"
-             depth="1" scope="DIR" qualifier="PAC" created_at="1228086000000" build_date="1317247200000"
-             version="2.1-SNAPSHOT" path="1.2."/>
-  <!-- PROJECT_ID = 3 - no last snapshot -->
-  <snapshots id="49" project_id="3" parent_snapshot_id="2" root_project_id="123" root_snapshot_id="46"
-             status="P" islast="[false]" purge_status="1"
-             period1_mode="days1" period1_param="30" period1_date="1316815200000"
-             period2_mode="days2" period2_param="31" period2_date="1316901600000"
-             period3_mode="days3" period3_param="32" period3_date="1316988000000"
-             period4_mode="days4" period4_param="33" period4_date="1317074400000"
-             period5_mode="days5" period5_param="34" period5_date="1317160800000"
-             depth="1" scope="DIR" qualifier="PAC" created_at="1228086000000" build_date="1317247200000"
-             version="2.1-SNAPSHOT" path="1.2."/>
-  <!-- Child of snapshot id=1 -->
-  <snapshots id="50" project_id="55" parent_snapshot_id="2" root_project_id="123" root_snapshot_id="46"
-             status="P" islast="[false]" purge_status="1"
-             period1_mode="days1" period1_param="30" period1_date="1316815200000"
-             period2_mode="days2" period2_param="31" period2_date="1316901600000"
-             period3_mode="days3" period3_param="32" period3_date="1316988000000"
-             period4_mode="days4" period4_param="33" period4_date="1317074400000"
-             period5_mode="days5" period5_param="34" period5_date="1317160800000"
-             depth="1" scope="PRJ" qualifier="PAC" created_at="1228086000000" build_date="1317247200000"
-             version="2.1-SNAPSHOT" path="1.2."/>
-</dataset>
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/AnalysisReportServiceTest/report-folder/sub-folder/zip.zip b/server/sonar-server/src/test/resources/org/sonar/server/computation/AnalysisReportServiceTest/report-folder/sub-folder/zip.zip
deleted file mode 100644
index a540bc5b5ca..00000000000
--- a/server/sonar-server/src/test/resources/org/sonar/server/computation/AnalysisReportServiceTest/report-folder/sub-folder/zip.zip
+++ /dev/null
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues-result.xml
index c02840c9fd8..4a0178334cf 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues-result.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues-result.xml
@@ -17,7 +17,7 @@
           rule_id="200"
           created_at="1000000000"
           updated_at="2000000000"
-          reporter="emmerik"
+          reporter="[null]"
           issue_attributes="foo=bar"
           tags="[null]"
           action_plan_key="[null]"
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues.xml
index f78e4ce9343..bdaace4d67c 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues.xml
@@ -24,7 +24,7 @@
           rule_id="200"
           created_at="1000000000"
           updated_at="1000000000"
-          reporter="emmerik"
+          reporter="[null]"
           issue_attributes="foo=bar"
           action_plan_key="[null]"
           issue_creation_date="1262300400000"
diff --git a/server/sonar-web/src/main/js/components/issue/collections/issues.js b/server/sonar-web/src/main/js/components/issue/collections/issues.js
index ee155975159..c0cce9910f0 100644
--- a/server/sonar-web/src/main/js/components/issue/collections/issues.js
+++ b/server/sonar-web/src/main/js/components/issue/collections/issues.js
@@ -96,7 +96,6 @@ export default Backbone.Collection.extend({
       issue = that._injectRelational(issue, r.rules, 'rule', 'key');
       issue = that._injectRelational(issue, r.users, 'assignee', 'login');
       issue = that._injectCommentsRelational(issue, r.users);
-      issue = that._injectRelational(issue, r.users, 'reporter', 'login');
       issue = that._prepareClosed(issue);
       issue = that.ensureTextRange(issue);
       return issue;
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/models/issue.rb b/server/sonar-web/src/main/webapp/WEB-INF/app/models/issue.rb
index 2ecd2c7bded..870a44a6645 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/models/issue.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/models/issue.rb
@@ -36,7 +36,6 @@ class Issue
     hash[:effortToFix] = issue.effortToFix.to_f if issue.effortToFix
     hash[:debt] = Internal.durations.encode(issue.effort) if issue.effort
     hash[:effort] = Internal.durations.encode(issue.effort) if issue.effort
-    hash[:reporter] = issue.reporter if issue.reporter
     hash[:assignee] = issue.assignee if issue.assignee
     hash[:author] = issue.authorLogin if issue.authorLogin
     hash[:creationDate] = Api::Utils.format_datetime(issue.creationDate) if issue.creationDate