From 5a4caef0bc2a542724ef4510968937d0658d3431 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Lesaint?= Date: Wed, 27 Mar 2019 16:29:47 +0100 Subject: [PATCH] SONAR-11753 NewIssuesNotificationFactory is not used in Web --- .../notification/NewIssuesNotificationFactory.java | 6 +++--- .../projectanalysis/step/SendIssueNotificationsStep.java | 2 +- .../step/SendIssueNotificationsStepTest.java | 2 +- .../org/sonar/ce/container/ComputeEngineContainerImpl.java | 2 +- .../server/issue/notification/MyNewIssuesNotification.java | 2 +- .../server/issue/notification/NewIssuesNotification.java | 2 +- .../sonar/server/platform/platformlevel/PlatformLevel4.java | 2 -- 7 files changed, 8 insertions(+), 10 deletions(-) rename server/{sonar-server-common/src/main/java/org/sonar/server/issue => sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis}/notification/NewIssuesNotificationFactory.java (88%) diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/issue/notification/NewIssuesNotificationFactory.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/notification/NewIssuesNotificationFactory.java similarity index 88% rename from server/sonar-server-common/src/main/java/org/sonar/server/issue/notification/NewIssuesNotificationFactory.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/notification/NewIssuesNotificationFactory.java index 5e398569abf..8c1b8efccce 100644 --- a/server/sonar-server-common/src/main/java/org/sonar/server/issue/notification/NewIssuesNotificationFactory.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/notification/NewIssuesNotificationFactory.java @@ -17,14 +17,14 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.issue.notification; +package org.sonar.ce.task.projectanalysis.notification; import org.sonar.api.ce.ComputeEngineSide; -import org.sonar.api.server.ServerSide; import org.sonar.api.utils.Durations; import org.sonar.db.DbClient; +import org.sonar.server.issue.notification.MyNewIssuesNotification; +import org.sonar.server.issue.notification.NewIssuesNotification; -@ServerSide @ComputeEngineSide public class NewIssuesNotificationFactory { private final DbClient dbClient; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/SendIssueNotificationsStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/SendIssueNotificationsStep.java index 02c2e2a7f9e..b6737988677 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/SendIssueNotificationsStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/SendIssueNotificationsStep.java @@ -53,7 +53,7 @@ import org.sonar.db.user.UserDto; import org.sonar.server.issue.notification.IssueChangeNotification; import org.sonar.server.issue.notification.MyNewIssuesNotification; import org.sonar.server.issue.notification.NewIssuesNotification; -import org.sonar.server.issue.notification.NewIssuesNotificationFactory; +import org.sonar.ce.task.projectanalysis.notification.NewIssuesNotificationFactory; import org.sonar.server.issue.notification.NewIssuesStatistics; import org.sonar.server.notification.NotificationService; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/SendIssueNotificationsStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/SendIssueNotificationsStepTest.java index f17efdeb442..6ff4f15ff70 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/SendIssueNotificationsStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/SendIssueNotificationsStepTest.java @@ -56,7 +56,7 @@ import org.sonar.server.issue.notification.DistributedMetricStatsInt; import org.sonar.server.issue.notification.IssueChangeNotification; import org.sonar.server.issue.notification.MyNewIssuesNotification; import org.sonar.server.issue.notification.NewIssuesNotification; -import org.sonar.server.issue.notification.NewIssuesNotificationFactory; +import org.sonar.ce.task.projectanalysis.notification.NewIssuesNotificationFactory; import org.sonar.server.issue.notification.NewIssuesStatistics; import org.sonar.server.notification.NotificationService; diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java b/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java index a09aaff37b5..fe0b5ae6f30 100644 --- a/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java +++ b/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java @@ -105,7 +105,7 @@ import org.sonar.server.issue.notification.IssueChangesEmailTemplate; import org.sonar.server.issue.notification.MyNewIssuesEmailTemplate; import org.sonar.server.issue.notification.MyNewIssuesNotificationHandler; import org.sonar.server.issue.notification.NewIssuesEmailTemplate; -import org.sonar.server.issue.notification.NewIssuesNotificationFactory; +import org.sonar.ce.task.projectanalysis.notification.NewIssuesNotificationFactory; import org.sonar.server.issue.notification.NewIssuesNotificationHandler; import org.sonar.server.issue.workflow.FunctionExecutor; import org.sonar.server.issue.workflow.IssueWorkflow; diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/issue/notification/MyNewIssuesNotification.java b/server/sonar-server-common/src/main/java/org/sonar/server/issue/notification/MyNewIssuesNotification.java index 54d0d1aeb25..d8651e599dd 100644 --- a/server/sonar-server-common/src/main/java/org/sonar/server/issue/notification/MyNewIssuesNotification.java +++ b/server/sonar-server-common/src/main/java/org/sonar/server/issue/notification/MyNewIssuesNotification.java @@ -32,7 +32,7 @@ public class MyNewIssuesNotification extends NewIssuesNotification { public static final String MY_NEW_ISSUES_NOTIF_TYPE = "my-new-issues"; - MyNewIssuesNotification(DbClient dbClient, Durations durations) { + public MyNewIssuesNotification(DbClient dbClient, Durations durations) { super(MY_NEW_ISSUES_NOTIF_TYPE, dbClient, durations); } diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/issue/notification/NewIssuesNotification.java b/server/sonar-server-common/src/main/java/org/sonar/server/issue/notification/NewIssuesNotification.java index 28eb3f673b3..fcfbe7c3b8d 100644 --- a/server/sonar-server-common/src/main/java/org/sonar/server/issue/notification/NewIssuesNotification.java +++ b/server/sonar-server-common/src/main/java/org/sonar/server/issue/notification/NewIssuesNotification.java @@ -66,7 +66,7 @@ public class NewIssuesNotification extends Notification { private final transient DbClient dbClient; private final transient Durations durations; - NewIssuesNotification(DbClient dbClient, Durations durations) { + public NewIssuesNotification(DbClient dbClient, Durations durations) { this(TYPE, dbClient, durations); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java index d1960a8d73e..5cf298967a8 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java @@ -86,7 +86,6 @@ import org.sonar.server.issue.notification.IssueChangesEmailTemplate; import org.sonar.server.issue.notification.MyNewIssuesEmailTemplate; import org.sonar.server.issue.notification.MyNewIssuesNotificationHandler; import org.sonar.server.issue.notification.NewIssuesEmailTemplate; -import org.sonar.server.issue.notification.NewIssuesNotificationFactory; import org.sonar.server.issue.notification.NewIssuesNotificationHandler; import org.sonar.server.issue.ws.IssueWsModule; import org.sonar.server.language.ws.LanguageWs; @@ -418,7 +417,6 @@ public class PlatformLevel4 extends PlatformLevel { MyNewIssuesNotificationHandler.newMetadata(), DoNotFixNotificationDispatcher.class, DoNotFixNotificationDispatcher.newMetadata(), - NewIssuesNotificationFactory.class, // Security reports SecurityReportsWsModule.class, -- 2.39.5