SONAR-9771 add property email.fromName and use it in email notifications

2 files changed, 15 insertions, 1 deletions

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/config/EmailSettings.java b/sonar-plugin-api/src/main/java/org/sonar/api/config/EmailSettings.java
index f079a49dc67..db04d12b285 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/config/EmailSettings.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/config/EmailSettings.java
@@ -50,6 +50,8 @@ public class EmailSettings {
   public static final String SMTP_PASSWORD_DEFAULT = "";
   public static final String FROM = "email.from";
   public static final String FROM_DEFAULT = "noreply@nowhere";
+  public static final String FROM_NAME = "email.fromName";
+  public static final String FROM_NAME_DEFAULT = "SonarQube";
   public static final String PREFIX = "email.prefix";
   public static final String PREFIX_DEFAULT = "[SONARQUBE]";
 
@@ -83,6 +85,10 @@ public class EmailSettings {
     return get(FROM, FROM_DEFAULT);
   }
 
+  public String getFromName() {
+    return get(FROM_NAME, FROM_NAME_DEFAULT);
+  }
+
   public String getPrefix() {
     return get(PREFIX, PREFIX_DEFAULT);
   }
@@ -146,6 +152,13 @@ public class EmailSettings {
         .category(CATEGORY_GENERAL)
         .subCategory(SUBCATEGORY_EMAIL)
         .build(),
+      PropertyDefinition.builder(FROM_NAME)
+        .name("From name")
+        .description("Emails will come from this address name. For example - \"SonarQube\". Note that server may ignore this setting.")
+        .defaultValue(FROM_NAME_DEFAULT)
+        .category(CATEGORY_GENERAL)
+        .subCategory(SUBCATEGORY_EMAIL)
+        .build(),
       PropertyDefinition.builder(PREFIX)
         .name("Email prefix")
         .description("Prefix will be prepended to all outgoing email subjects.")
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/config/EmailSettingsTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/config/EmailSettingsTest.java
index 0ce63c67563..b569fd1db2a 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/config/EmailSettingsTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/config/EmailSettingsTest.java
@@ -37,12 +37,13 @@ public class EmailSettingsTest {
     assertThat(underTest.getSmtpPassword()).isEmpty();
     assertThat(underTest.getSecureConnection()).isEmpty();
     assertThat(underTest.getFrom()).isEqualTo("noreply@nowhere");
+    assertThat(underTest.getFromName()).isEqualTo("SonarQube");
     assertThat(underTest.getPrefix()).isEqualTo("[SONARQUBE]");
     assertThat(underTest.getServerBaseURL()).isEqualTo(CoreProperties.SERVER_BASE_URL_DEFAULT_VALUE);
   }
 
   @Test
   public void return_definitions() {
-    assertThat(EmailSettings.definitions()).hasSize(7);
+    assertThat(EmailSettings.definitions()).hasSize(8);
   }
 }