Revert "SONAR-6996 Replace the issue key by the file name in the 'issue changed'...

This reverts commit 5e09c80b98511948c5c261181deaab035f627bc6.

diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/notification/IssueChangeNotification.java b/server/sonar-server/src/main/java/org/sonar/server/issue/notification/IssueChangeNotification.java
index b208d50f55c6a7efeadb87435b46e28dffdc588a..1d6155bace3c6e82c7b0ac0a1c09e64361b97597 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/notification/IssueChangeNotification.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/notification/IssueChangeNotification.java
@@ -68,7 +68,6 @@ public class IssueChangeNotification extends Notification {
 
   public IssueChangeNotification setComponent(Component component) {
     setFieldValue("componentName", component.longName());
-    setFieldValue("componentShortName", component.name());
     return this;
   }
 

diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/notification/IssueChangesEmailTemplate.java b/server/sonar-server/src/main/java/org/sonar/server/issue/notification/IssueChangesEmailTemplate.java
index 1984ec83f2907041197f55fd173ab46d7b04e6bb..23914040db4359b97c48a1bf59ce39c8ae856d88 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/notification/IssueChangesEmailTemplate.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/notification/IssueChangesEmailTemplate.java
@@ -20,8 +20,6 @@
 package org.sonar.server.issue.notification;
 
 import com.google.common.base.Strings;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nullable;
 import org.apache.commons.lang.StringUtils;
 import org.sonar.api.config.EmailSettings;
 import org.sonar.api.notifications.Notification;
@@ -30,6 +28,9 @@ import org.sonar.api.user.UserFinder;
 import org.sonar.plugins.emailnotifications.api.EmailMessage;
 import org.sonar.plugins.emailnotifications.api.EmailTemplate;
 
+import javax.annotation.CheckForNull;
+import javax.annotation.Nullable;
+
 /**
  * Creates email message for notification "issue-changes".
  */
@@ -58,13 +59,12 @@ public class IssueChangesEmailTemplate extends EmailTemplate {
     appendFooter(sb, notif);
 
     String projectName = notif.getFieldValue("projectName");
-    String componentShortName = notif.getFieldValue("componentShortName");
     String issueKey = notif.getFieldValue("key");
     String author = notif.getFieldValue("changeAuthor");
 
     EmailMessage message = new EmailMessage()
       .setMessageId("issue-changes/" + issueKey)
-      .setSubject(projectName + ", change on issue in " + componentShortName)
+      .setSubject(projectName + ", change on issue #" + issueKey)
       .setMessage(sb.toString());
     if (author != null) {
       message.setFrom(getUserFullName(author));

diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest.java
index 707b739ccf52abdbd2d980c210c95d45d3eee851..ee8789673c6e97881d64d0e3271974efbcf0b509 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest.java
@@ -68,7 +68,7 @@ public class IssueChangesEmailTemplateTest {
 
     EmailMessage email = template.format(notification);
     assertThat(email.getMessageId()).isEqualTo("issue-changes/ABCDE");
-    assertThat(email.getSubject()).isEqualTo("Struts, change on issue in Action.java");
+    assertThat(email.getSubject()).isEqualTo("Struts, change on issue #ABCDE");
 
     String message = email.getMessage();
     String expected = Resources.toString(Resources.getResource(
@@ -88,7 +88,7 @@ public class IssueChangesEmailTemplateTest {
 
     EmailMessage email = template.format(notification);
     assertThat(email.getMessageId()).isEqualTo("issue-changes/ABCDE");
-    assertThat(email.getSubject()).isEqualTo("Struts, change on issue in Action.java");
+    assertThat(email.getSubject()).isEqualTo("Struts, change on issue #ABCDE");
 
     String message = email.getMessage();
     String expected = Resources.toString(Resources.getResource(
@@ -108,7 +108,7 @@ public class IssueChangesEmailTemplateTest {
 
     EmailMessage email = template.format(notification);
     assertThat(email.getMessageId()).isEqualTo("issue-changes/ABCDE");
-    assertThat(email.getSubject()).isEqualTo("Struts, change on issue in Action.java");
+    assertThat(email.getSubject()).isEqualTo("Struts, change on issue #ABCDE");
 
     String message = email.getMessage();
     String expected = Resources.toString(Resources.getResource(
@@ -127,7 +127,7 @@ public class IssueChangesEmailTemplateTest {
 
     EmailMessage email = template.format(notification);
     assertThat(email.getMessageId()).isEqualTo("issue-changes/ABCDE");
-    assertThat(email.getSubject()).isEqualTo("Struts, change on issue in Action.java");
+    assertThat(email.getSubject()).isEqualTo("Struts, change on issue #ABCDE");
 
     String message = email.getMessage();
     String expected = Resources.toString(Resources.getResource(
@@ -150,7 +150,7 @@ public class IssueChangesEmailTemplateTest {
 
     EmailMessage email = template.format(notification);
     assertThat(email.getMessageId()).isEqualTo("issue-changes/ABCDE");
-    assertThat(email.getSubject()).isEqualTo("Struts, change on issue in Action.java");
+    assertThat(email.getSubject()).isEqualTo("Struts, change on issue #ABCDE");
 
     String message = email.getMessage();
     String expected = Resources.toString(Resources.getResource(
@@ -178,8 +178,7 @@ public class IssueChangesEmailTemplateTest {
     Notification notification = new IssueChangeNotification()
       .setFieldValue("projectName", "Struts")
       .setFieldValue("projectKey", "org.apache:struts")
-      .setFieldValue("componentName", "org/apache/struts/Action.java")
-      .setFieldValue("componentShortName", "Action.java")
+      .setFieldValue("componentName", "Action")
       .setFieldValue("componentKey", "org.apache.struts.Action")
       .setFieldValue("key", "ABCDE")
       .setFieldValue("ruleName", "Avoid Cycles")

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_should_display_resolution_change.txt b/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_should_display_resolution_change.txt
index e766a8644fcb7213224b9912cbd23d32aa98820d..39a302e0f7f1b08084d78fe96907681250e1b057 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_should_display_resolution_change.txt
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_should_display_resolution_change.txt
@@ -1,4 +1,4 @@
-org/apache/struts/Action.java
+Action
 Rule: Avoid Cycles
 Message: Has 3 cycles
 

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_with_action_plan_change.txt b/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_with_action_plan_change.txt
index 467238cc17e1c173d3380a6abb2fbbc527b7399e..f9a4356907a92428de92df5b1d9847f924a1c164 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_with_action_plan_change.txt
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_with_action_plan_change.txt
@@ -1,4 +1,4 @@
-org/apache/struts/Action.java
+Action
 Rule: Avoid Cycles
 Message: Has 3 cycles
 

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_with_assignee_change.txt b/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_with_assignee_change.txt
index 181bac45aa23564e27cfbf1a0205eb76be7a8c37..fd4c140e55ed021e84f5ff265054528d76a77bd0 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_with_assignee_change.txt
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_with_assignee_change.txt
@@ -1,4 +1,4 @@
-org/apache/struts/Action.java
+Action
 Rule: Avoid Cycles
 Message: Has 3 cycles
 

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_with_multiple_changes.txt b/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_with_multiple_changes.txt
index 65bf3e19ed480d74c22e194316e3ace97d4cf3ad..6f4b09018eabee94512474ece0a5a84eabcfb50f 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_with_multiple_changes.txt
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_with_multiple_changes.txt
@@ -1,4 +1,4 @@
-org/apache/struts/Action.java
+Action
 Rule: Avoid Cycles
 Message: Has 3 cycles