From befc4c94fd7e3e5450028ae8452636f06436ef1a Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Thu, 4 Apr 2019 10:28:21 +0200
Subject: SONAR-11752 disable global subscription to notifs on new/fixed issues

---
 .../java/org/sonar/ce/container/ComputeEngineContainerImplTest.java   | 2 +-
 .../sonar/server/issue/notification/DoNotFixNotificationHandler.java  | 2 +-
 .../sonar/server/issue/notification/NewIssuesNotificationHandler.java | 2 +-
 .../server/issue/notification/DoNotFixNotificationHandlerTest.java    | 4 ++--
 .../server/issue/notification/NewIssuesNotificationHandlerTest.java   | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java
index f0033d34392..6af124eb4be 100644
--- a/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java
+++ b/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java
@@ -115,7 +115,7 @@ public class ComputeEngineContainerImplTest {
       );
       assertThat(picoContainer.getParent().getParent().getComponentAdapters()).hasSize(
         CONTAINER_ITSELF
-          + 21 // MigrationConfigurationModule
+          + 22 // MigrationConfigurationModule
           + 17 // level 2
       );
       assertThat(picoContainer.getParent().getParent().getParent().getComponentAdapters()).hasSize(
diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/issue/notification/DoNotFixNotificationHandler.java b/server/sonar-server-common/src/main/java/org/sonar/server/issue/notification/DoNotFixNotificationHandler.java
index cbe83b961d5..fc86ef73da2 100644
--- a/server/sonar-server-common/src/main/java/org/sonar/server/issue/notification/DoNotFixNotificationHandler.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/issue/notification/DoNotFixNotificationHandler.java
@@ -44,7 +44,7 @@ public class DoNotFixNotificationHandler extends EmailNotificationHandler<IssueC
 
   public static final String KEY = "NewFalsePositiveIssue";
   private static final NotificationDispatcherMetadata METADATA = NotificationDispatcherMetadata.create(KEY)
-    .setProperty(NotificationDispatcherMetadata.GLOBAL_NOTIFICATION, String.valueOf(true))
+    .setProperty(NotificationDispatcherMetadata.GLOBAL_NOTIFICATION, String.valueOf(false))
     .setProperty(NotificationDispatcherMetadata.PER_PROJECT_NOTIFICATION, String.valueOf(true));
 
   private static final Set<String> SUPPORTED_NEW_RESOLUTIONS = ImmutableSet.of(Issue.RESOLUTION_FALSE_POSITIVE, Issue.RESOLUTION_WONT_FIX);
diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/issue/notification/NewIssuesNotificationHandler.java b/server/sonar-server-common/src/main/java/org/sonar/server/issue/notification/NewIssuesNotificationHandler.java
index c15302172c0..cfa8a67503e 100644
--- a/server/sonar-server-common/src/main/java/org/sonar/server/issue/notification/NewIssuesNotificationHandler.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/issue/notification/NewIssuesNotificationHandler.java
@@ -39,7 +39,7 @@ public class NewIssuesNotificationHandler extends EmailNotificationHandler<NewIs
 
   public static final String KEY = "NewIssues";
   private static final NotificationDispatcherMetadata METADATA = NotificationDispatcherMetadata.create(KEY)
-    .setProperty(NotificationDispatcherMetadata.GLOBAL_NOTIFICATION, String.valueOf(true))
+    .setProperty(NotificationDispatcherMetadata.GLOBAL_NOTIFICATION, String.valueOf(false))
     .setProperty(NotificationDispatcherMetadata.PER_PROJECT_NOTIFICATION, String.valueOf(true));
 
   private final NotificationManager notificationManager;
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/issue/notification/DoNotFixNotificationHandlerTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/issue/notification/DoNotFixNotificationHandlerTest.java
index abb8ad1ca82..9994f7d3d4c 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/issue/notification/DoNotFixNotificationHandlerTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/issue/notification/DoNotFixNotificationHandlerTest.java
@@ -70,10 +70,10 @@ public class DoNotFixNotificationHandlerTest {
   }
 
   @Test
-  public void changeOnMyIssues_notification_is_enable_at_global_level() {
+  public void changeOnMyIssues_notification_is_disabled_at_global_level() {
     NotificationDispatcherMetadata metadata = DoNotFixNotificationHandler.newMetadata();
 
-    assertThat(metadata.getProperty(GLOBAL_NOTIFICATION)).isEqualTo("true");
+    assertThat(metadata.getProperty(GLOBAL_NOTIFICATION)).isEqualTo("false");
   }
 
   @Test
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/issue/notification/NewIssuesNotificationHandlerTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/issue/notification/NewIssuesNotificationHandlerTest.java
index 80816321682..8898251494d 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/issue/notification/NewIssuesNotificationHandlerTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/issue/notification/NewIssuesNotificationHandlerTest.java
@@ -66,10 +66,10 @@ public class NewIssuesNotificationHandlerTest {
   }
 
   @Test
-  public void myNewIssues_notification_is_enable_at_global_level() {
+  public void myNewIssues_notification_is_disabled_at_global_level() {
     NotificationDispatcherMetadata metadata = NewIssuesNotificationHandler.newMetadata();
 
-    assertThat(metadata.getProperty(GLOBAL_NOTIFICATION)).isEqualTo("true");
+    assertThat(metadata.getProperty(GLOBAL_NOTIFICATION)).isEqualTo("false");
   }
 
   @Test
-- 
cgit v1.2.3