SONAR-11757 single notification for FPs and changes on my issues

2 files changed, 16 insertions, 0 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 2a785123b6d..d35642a7904 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
@@ -100,6 +100,10 @@ public class EmailSettings {
       .orElse(SERVER_BASE_URL_DEFAULT_VALUE);
   }
 
+  public String getInstanceName() {
+    return config.getBoolean("sonar.sonarcloud.enabled").orElse(false) ? "SonarCloud" : "SonarQube";
+  }
+
   private String get(String key, String defaultValue) {
     return config.get(key).orElse(defaultValue);
   }
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 af8963c085d..72c2fea4607 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
@@ -61,6 +61,18 @@ public class EmailSettingsTest {
   }
 
   @Test
+  public void getInstanceName_returns_sonarqube_when_not_on_SonarCloud() {
+    assertThat(underTest.getInstanceName()).isEqualTo("SonarQube");
+  }
+
+  @Test
+  public void getInstanceName_returns_sonarcloud_on_SonarCloud() {
+    settings.setProperty("sonar.sonarcloud.enabled", true);
+
+    assertThat(underTest.getInstanceName()).isEqualTo("SonarCloud");
+  }
+
+  @Test
   public void return_definitions() {
     assertThat(EmailSettings.definitions()).hasSize(8);
   }