SONAR-9771 remove "SonarQube" from wording of links in notifications

diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/notification/AbstractNewIssuesEmailTemplate.java b/server/sonar-server/src/main/java/org/sonar/server/issue/notification/AbstractNewIssuesEmailTemplate.java
index 46c7ef956f70e765604b0cd8c60ae316eb755908..cf7bfafbe796ce255c86a41f77c8e7289eae2636 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/notification/AbstractNewIssuesEmailTemplate.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/notification/AbstractNewIssuesEmailTemplate.java
@@ -196,7 +196,7 @@ public abstract class AbstractNewIssuesEmailTemplate extends EmailTemplate {
       }
       url += "&createdAt=" + encode(DateUtils.formatDateTime(date));
       message
-        .append("See it in SonarQube: ")
+        .append("More details at: ")
         .append(url)
         .append(NEW_LINE);
     }

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 81c8a698502dde6548031c059437717703ac47a2..c8e066918156ccdddfbdc4f40b11358955f659b4 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
@@ -106,7 +106,7 @@ public class IssueChangesEmailTemplate extends EmailTemplate {
   private void appendFooter(StringBuilder sb, Notification notification){
     String issueKey = notification.getFieldValue("key");
     try {
-      sb.append("See it in SonarQube: ").append(settings.getServerBaseURL())
+      sb.append("More details at: ").append(settings.getServerBaseURL())
         .append("/project/issues?id=").append(encode(notification.getFieldValue("projectKey"), "UTF-8"))
         .append("&issues=").append(issueKey)
         .append("&open=").append(issueKey);

diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/notification/MyNewIssuesEmailTemplate.java b/server/sonar-server/src/main/java/org/sonar/server/issue/notification/MyNewIssuesEmailTemplate.java
index 5d079155a50453987d3ef8ef5867c0ffa9f2f8f0..fcf02e34b469f626a12db0b8499f89d7e449da85 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/notification/MyNewIssuesEmailTemplate.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/notification/MyNewIssuesEmailTemplate.java
@@ -69,7 +69,7 @@ public class MyNewIssuesEmailTemplate extends AbstractNewIssuesEmailTemplate {
       }
       url += "&createdAt=" + encode(DateUtils.formatDateTime(date));
       message
-        .append("See it in SonarQube: ")
+        .append("More details at: ")
         .append(url)
         .append(NEW_LINE);
     }

diff --git a/server/sonar-server/src/main/java/org/sonar/server/notification/email/AlertsEmailTemplate.java b/server/sonar-server/src/main/java/org/sonar/server/notification/email/AlertsEmailTemplate.java
index 214fd5b898514eea4938edbb2f35d8aa31563f68..d00e7600396cd69fe03cd21d5b341ea005c08cfc 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/notification/email/AlertsEmailTemplate.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/notification/email/AlertsEmailTemplate.java
@@ -109,7 +109,7 @@ public class AlertsEmailTemplate extends EmailTemplate {
       }
     }
 
-    messageBody.append("\n").append("See it in SonarQube: ").append(configuration.getServerBaseURL()).append("/dashboard?id=").append(projectKey);
+    messageBody.append("\n").append("More details at: ").append(configuration.getServerBaseURL()).append("/dashboard?id=").append(projectKey);
     if (branchName != null) {
       messageBody.append("&branch=").append(branchName);
     }

diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/notification/MyNewIssuesEmailTemplateTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/notification/MyNewIssuesEmailTemplateTest.java
index 587ecd3c92a4aac8d61507308864c9386f4e48f1..e5300cd493b61945798bca63bb33e8d69849b70a 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/notification/MyNewIssuesEmailTemplateTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/notification/MyNewIssuesEmailTemplateTest.java
@@ -107,7 +107,7 @@ public class MyNewIssuesEmailTemplateTest {
         "        /path/to/file: 3\n" +
         "        /path/to/directory: 7\n" +
         "\n" +
-        "See it in SonarQube: http://nemo.sonarsource.org/project/issues?id=org.apache%3Astruts&assignees=lo.gin&createdAt=2010-05-18");
+        "More details at: http://nemo.sonarsource.org/project/issues?id=org.apache%3Astruts&assignees=lo.gin&createdAt=2010-05-18");
   }
 
   @Test
@@ -153,7 +153,7 @@ public class MyNewIssuesEmailTemplateTest {
         "    Type\n" +
         "        Bug: 1    Vulnerability: 3    Code Smell: 0\n" +
         "\n" +
-        "See it in SonarQube: http://nemo.sonarsource.org/project/issues?id=org.apache%3Astruts&assignees=lo.gin&createdAt=2010-05-18");
+        "More details at: http://nemo.sonarsource.org/project/issues?id=org.apache%3Astruts&assignees=lo.gin&createdAt=2010-05-18");
   }
 
   @Test
@@ -172,7 +172,7 @@ public class MyNewIssuesEmailTemplateTest {
         "    Type\n" +
         "        Bug: 1    Vulnerability: 3    Code Smell: 0\n" +
         "\n" +
-        "See it in SonarQube: http://nemo.sonarsource.org/project/issues?id=org.apache%3Astruts&assignees=lo.gin&branch=feature1&createdAt=2010-05-18");
+        "More details at: http://nemo.sonarsource.org/project/issues?id=org.apache%3Astruts&assignees=lo.gin&branch=feature1&createdAt=2010-05-18");
   }
 
   @Test

diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/notification/NewIssuesEmailTemplateTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/notification/NewIssuesEmailTemplateTest.java
index 80455bb8205a1c133ce80e09b3cd9a0f8e1d8977..03a63654ebff6c378203b5fb0f19e55e14081296 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/notification/NewIssuesEmailTemplateTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/notification/NewIssuesEmailTemplateTest.java
@@ -138,7 +138,7 @@ public class NewIssuesEmailTemplateTest {
         "        /path/to/file: 3\n" +
         "        /path/to/directory: 7\n" +
         "\n" +
-        "See it in SonarQube: http://nemo.sonarsource.org/project/issues?id=org.apache%3Astruts&createdAt=2010-05-1");
+        "More details at: http://nemo.sonarsource.org/project/issues?id=org.apache%3Astruts&createdAt=2010-05-1");
   }
 
   @Test
@@ -156,7 +156,7 @@ public class NewIssuesEmailTemplateTest {
         "    Type\n" +
         "        Bug: 1    Vulnerability: 10    Code Smell: 3\n" +
         "\n" +
-        "See it in SonarQube: http://nemo.sonarsource.org/project/issues?id=org.apache%3Astruts&createdAt=2010-05-1");
+        "More details at: http://nemo.sonarsource.org/project/issues?id=org.apache%3Astruts&createdAt=2010-05-1");
   }
 
   @Test
@@ -185,7 +185,7 @@ public class NewIssuesEmailTemplateTest {
         "    Type\n" +
         "        Bug: 1    Vulnerability: 10    Code Smell: 3\n" +
         "\n" +
-        "See it in SonarQube: http://nemo.sonarsource.org/project/issues?id=org.apache%3Astruts&branch=feature1&createdAt=2010-05-1");
+        "More details at: http://nemo.sonarsource.org/project/issues?id=org.apache%3Astruts&branch=feature1&createdAt=2010-05-1");
   }
 
   @Test

diff --git a/server/sonar-server/src/test/java/org/sonar/server/notification/email/AlertsEmailTemplateTest.java b/server/sonar-server/src/test/java/org/sonar/server/notification/email/AlertsEmailTemplateTest.java
index af8a6e5df94388c93fea1fe7d1be9b99e140768e..bf35696f17c16399a3854c2eaed828d174fac5a3 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/notification/email/AlertsEmailTemplateTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/notification/email/AlertsEmailTemplateTest.java
@@ -64,7 +64,7 @@ public class AlertsEmailTemplateTest {
       "  - violations > 4\n" +
       "  - coverage < 75%\n" +
       "\n" +
-      "See it in SonarQube: http://nemo.sonarsource.org/dashboard?id=org.sonar.foo:foo"));
+      "More details at: http://nemo.sonarsource.org/dashboard?id=org.sonar.foo:foo"));
   }
 
   @Test
@@ -83,7 +83,7 @@ public class AlertsEmailTemplateTest {
       "  - violations > 4\n" +
       "  - coverage < 75%\n" +
       "\n" +
-      "See it in SonarQube: http://nemo.sonarsource.org/dashboard?id=org.sonar.foo:foo&branch=feature"));
+      "More details at: http://nemo.sonarsource.org/dashboard?id=org.sonar.foo:foo&branch=feature"));
   }
 
   @Test
@@ -101,7 +101,7 @@ public class AlertsEmailTemplateTest {
       "  - violations > 4\n" +
       "  - coverage < 75%\n" +
       "\n" +
-      "See it in SonarQube: http://nemo.sonarsource.org/dashboard?id=org.sonar.foo:foo"));
+      "More details at: http://nemo.sonarsource.org/dashboard?id=org.sonar.foo:foo"));
   }
 
   @Test
@@ -117,7 +117,7 @@ public class AlertsEmailTemplateTest {
       "\n" +
       "New quality gate threshold: violations > 4\n" +
       "\n" +
-      "See it in SonarQube: http://nemo.sonarsource.org/dashboard?id=org.sonar.foo:foo"));
+      "More details at: http://nemo.sonarsource.org/dashboard?id=org.sonar.foo:foo"));
   }
 
   @Test
@@ -134,7 +134,7 @@ public class AlertsEmailTemplateTest {
       "\n" +
       "New quality gate threshold: violations > 4\n" +
       "\n" +
-      "See it in SonarQube: http://nemo.sonarsource.org/dashboard?id=org.sonar.foo:foo&branch=feature"));
+      "More details at: http://nemo.sonarsource.org/dashboard?id=org.sonar.foo:foo&branch=feature"));
   }
 
   @Test
@@ -149,7 +149,7 @@ public class AlertsEmailTemplateTest {
       "Quality gate status: Green (was Red)\n" +
       "\n" +
       "\n" +
-      "See it in SonarQube: http://nemo.sonarsource.org/dashboard?id=org.sonar.foo:foo"));
+      "More details at: http://nemo.sonarsource.org/dashboard?id=org.sonar.foo:foo"));
   }
 
   @Test
@@ -165,7 +165,7 @@ public class AlertsEmailTemplateTest {
       "Quality gate status: Green (was Red)\n" +
       "\n" +
       "\n" +
-      "See it in SonarQube: http://nemo.sonarsource.org/dashboard?id=org.sonar.foo:foo&branch=feature"));
+      "More details at: http://nemo.sonarsource.org/dashboard?id=org.sonar.foo:foo&branch=feature"));
   }
 
   private Notification createNotification(String alertName, String alertText, String alertLevel, String isNewAlert) {

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/display_component_key_if_no_component_name.txt b/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/display_component_key_if_no_component_name.txt
index d60a94074b71454278b934fc9f244ab8a870cfe4..44247b63e912504f3b3893a20c7eb4aa9b5025e6 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/display_component_key_if_no_component_name.txt
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/display_component_key_if_no_component_name.txt
@@ -3,4 +3,4 @@ Rule: Avoid Cycles
 Message: Has 3 cycles
 
 
-See it in SonarQube: http://nemo.sonarsource.org/project/issues?id=org.apache%3Astruts&issues=ABCDE&open=ABCDE
+More details at: http://nemo.sonarsource.org/project/issues?id=org.apache%3Astruts&issues=ABCDE&open=ABCDE

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 a098041a84834ab6f1c3ad1cbc63c9bae901ace4..012179a97198fbe7fe2a8fd0e73731c20e5f2bfb 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
@@ -4,4 +4,4 @@ Message: Has 3 cycles
 
 Resolution: FIXED (was FALSE-POSITIVE)
 
-See it in SonarQube: http://nemo.sonarsource.org/project/issues?id=org.apache%3Astruts&issues=ABCDE&open=ABCDE
+More details at: http://nemo.sonarsource.org/project/issues?id=org.apache%3Astruts&issues=ABCDE&open=ABCDE

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 5bc4f6237daa8dec7cc12d5b354c68c05593273f..38b0ad5c0705e0c824471020e01de6217afb2f49 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
@@ -4,4 +4,4 @@ Message: Has 3 cycles
 
 Action Plan changed to ABC 1.0
 
-See it in SonarQube: http://nemo.sonarsource.org/project/issues?id=org.apache%3Astruts&issues=ABCDE&open=ABCDE
+More details at: http://nemo.sonarsource.org/project/issues?id=org.apache%3Astruts&issues=ABCDE&open=ABCDE

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 15768633c9d9efe37654f2f7aa2369025de08a69..86d1601fe6d98aeecf2ad4f4c8134f820e86c80b 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
@@ -4,4 +4,4 @@ Message: Has 3 cycles
 
 Assignee changed to louis
 
-See it in SonarQube: http://nemo.sonarsource.org/project/issues?id=org.apache%3Astruts&issues=ABCDE&open=ABCDE
+More details at: http://nemo.sonarsource.org/project/issues?id=org.apache%3Astruts&issues=ABCDE&open=ABCDE

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_with_issue_on_branch.txt b/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_with_issue_on_branch.txt
index b9a5c6bee22c0da201d30b78c224f4f6afac05e7..27b7a1db23af804215a5d75469602377a8a6e79f 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_with_issue_on_branch.txt
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_with_issue_on_branch.txt
@@ -3,4 +3,4 @@ Rule: Avoid Cycles
 Message: Has 3 cycles
 
 
-See it in SonarQube: http://nemo.sonarsource.org/project/issues?id=org.apache%3Astruts&issues=ABCDE&open=ABCDE&branch=feature1
+More details at: http://nemo.sonarsource.org/project/issues?id=org.apache%3Astruts&issues=ABCDE&open=ABCDE&branch=feature1

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 5def650c04170c9b94e779cc0fd1c17cd178ed7b..7d229f5deb86998e3406a2053dd85e35f76796e1 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
@@ -9,4 +9,4 @@ Resolution: FALSE-POSITIVE
 Status: RESOLVED
 Tags: [bug performance]
 
-See it in SonarQube: http://nemo.sonarsource.org/project/issues?id=org.apache%3Astruts&issues=ABCDE&open=ABCDE
+More details at: http://nemo.sonarsource.org/project/issues?id=org.apache%3Astruts&issues=ABCDE&open=ABCDE

diff --git a/tests/src/test/java/org/sonarqube/tests/issue/IssueNotificationsTest.java b/tests/src/test/java/org/sonarqube/tests/issue/IssueNotificationsTest.java
index a8c63074e1ded0a9a0a546aa487c6bed34a14d82..7fb89f7cdaf8f9c2a9c3ba834a77673aa229319a 100644 (file)
--- a/tests/src/test/java/org/sonarqube/tests/issue/IssueNotificationsTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/issue/IssueNotificationsTest.java
@@ -156,7 +156,7 @@ public class IssueNotificationsTest extends AbstractIssueTest {
     assertThat((String) message.getContent()).contains("Type");
     assertThat((String) message.getContent()).contains("One Issue Per Line (xoo): 17");
     assertThat((String) message.getContent()).contains(
-      "See it in SonarQube: http://localhost:9000/project/issues?id=sample&createdAt=2015-12-15T00%3A00%3A00%2B");
+      "More details at: http://localhost:9000/project/issues?id=sample&createdAt=2015-12-15T00%3A00%3A00%2B");
 
     assertThat(emails.hasNext()).isTrue();
     message = emails.next().getMimeMessage();
@@ -164,7 +164,7 @@ public class IssueNotificationsTest extends AbstractIssueTest {
     assertThat((String) message.getContent()).contains("sample/Sample.xoo");
     assertThat((String) message.getContent()).contains("Assignee changed to Tester");
     assertThat((String) message.getContent()).contains(
-      "See it in SonarQube: http://localhost:9000/project/issues?id=sample&issues=" + issue.key() + "&open=" + issue.key());
+      "More details at: http://localhost:9000/project/issues?id=sample&issues=" + issue.key() + "&open=" + issue.key());
 
     assertThat(emails.hasNext()).isFalse();
   }
@@ -226,7 +226,7 @@ public class IssueNotificationsTest extends AbstractIssueTest {
     assertThat((String) message.getContent()).contains("sample/Sample.xoo");
     assertThat((String) message.getContent()).contains("Severity: BLOCKER (was MINOR)");
     assertThat((String) message.getContent()).contains(
-      "See it in SonarQube: http://localhost:9000/project/issues?id=sample&issues=" + issue.key() + "&open=" + issue.key());
+      "More details at: http://localhost:9000/project/issues?id=sample&issues=" + issue.key() + "&open=" + issue.key());
 
     assertThat(emails.hasNext()).isFalse();
   }