From abbf32571232db81a5343db17a933a9ce6923b44 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Mon, 8 Jun 2015 15:22:34 +0200 Subject: [PATCH] SONAR-6567 move notifications from sonar-core to sonar-server --- .../step/SendIssueNotificationsStep.java | 4 ++-- .../java/org/sonar/server/event/NewAlerts.java | 6 +++--- .../server/issue/IssueBulkChangeService.java | 2 +- .../org/sonar/server/issue/IssueService.java | 2 +- .../ChangesOnMyIssueNotificationDispatcher.java | 6 +++--- .../DoNotFixNotificationDispatcher.java | 6 +++--- .../MyNewIssuesNotificationDispatcher.java | 6 +++--- .../NewIssuesNotificationDispatcher.java | 6 +++--- .../notification/DefaultNotificationManager.java | 13 ++++--------- .../NotificationCenter.java | 3 +-- .../notification/NotificationDispatcher.java | 2 +- .../NotificationDispatcherMetadata.java | 2 +- .../notification/NotificationManager.java | 16 +++------------- .../NotificationService.java | 4 +--- .../email/AlertsEmailTemplate.java | 2 +- .../email/EmailNotificationChannel.java | 2 +- .../email/package-info.java | 2 +- .../package-info.java | 2 +- .../platform/platformlevel/PlatformLevel4.java | 10 +++++----- .../step/SendIssueNotificationsStepTest.java | 2 +- .../org/sonar/server/event/NewAlertsTest.java | 4 ++-- ...angesOnMyIssueNotificationDispatcherTest.java | 6 +++--- .../DoNotFixNotificationDispatcherTest.java | 6 +++--- .../MyNewIssuesNotificationDispatcherTest.java | 4 ++-- .../NewIssuesNotificationDispatcherTest.java | 4 ++-- .../DefaultNotificationManagerTest.java | 2 +- .../NotificationCenterTest.java | 3 +-- .../notification/NotificationChannelTest.java | 2 +- .../NotificationDispatcherMetadataTest.java | 2 +- .../notification/NotificationDispatcherTest.java | 2 +- .../NotificationServiceTest.java | 4 +--- .../NotificationTest.java | 2 +- .../email/AlertsEmailTemplateTest.java | 2 +- .../email/EmailNotificationChannelTest.java | 2 +- .../sonar/batch/bootstrap/BatchComponents.java | 3 --- 35 files changed, 61 insertions(+), 85 deletions(-) rename {sonar-core/src/main/java/org/sonar/core => server/sonar-server/src/main/java/org/sonar/server}/notification/DefaultNotificationManager.java (96%) rename server/sonar-server/src/main/java/org/sonar/server/{notifications => notification}/NotificationCenter.java (96%) rename {sonar-core/src/main/java/org/sonar/core => server/sonar-server/src/main/java/org/sonar/server}/notification/NotificationDispatcher.java (99%) rename {sonar-core/src/main/java/org/sonar/core => server/sonar-server/src/main/java/org/sonar/server}/notification/NotificationDispatcherMetadata.java (98%) rename {sonar-core/src/main/java/org/sonar/core => server/sonar-server/src/main/java/org/sonar/server}/notification/NotificationManager.java (91%) rename server/sonar-server/src/main/java/org/sonar/server/{notifications => notification}/NotificationService.java (98%) rename server/sonar-server/src/main/java/org/sonar/server/{notifications => notification}/email/AlertsEmailTemplate.java (98%) rename server/sonar-server/src/main/java/org/sonar/server/{notifications => notification}/email/EmailNotificationChannel.java (99%) rename server/sonar-server/src/main/java/org/sonar/server/{notifications => notification}/email/package-info.java (95%) rename server/sonar-server/src/main/java/org/sonar/server/{notifications => notification}/package-info.java (96%) rename {sonar-core/src/test/java/org/sonar/core => server/sonar-server/src/test/java/org/sonar/server}/notification/DefaultNotificationManagerTest.java (99%) rename server/sonar-server/src/test/java/org/sonar/server/{notifications => notification}/NotificationCenterTest.java (96%) rename {sonar-core/src/test/java/org/sonar/core => server/sonar-server/src/test/java/org/sonar/server}/notification/NotificationChannelTest.java (97%) rename {sonar-core/src/test/java/org/sonar/core => server/sonar-server/src/test/java/org/sonar/server}/notification/NotificationDispatcherMetadataTest.java (97%) rename {sonar-core/src/test/java/org/sonar/core => server/sonar-server/src/test/java/org/sonar/server}/notification/NotificationDispatcherTest.java (98%) rename server/sonar-server/src/test/java/org/sonar/server/{notifications => notification}/NotificationServiceTest.java (98%) rename server/sonar-server/src/test/java/org/sonar/server/{notifications => notification}/NotificationTest.java (98%) rename server/sonar-server/src/test/java/org/sonar/server/{notifications => notification}/email/AlertsEmailTemplateTest.java (99%) rename server/sonar-server/src/test/java/org/sonar/server/{notifications => notification}/email/EmailNotificationChannelTest.java (99%) diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/SendIssueNotificationsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/SendIssueNotificationsStep.java index cbc929306ea..5129e8a4959 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/SendIssueNotificationsStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/SendIssueNotificationsStep.java @@ -34,13 +34,13 @@ import org.sonar.server.issue.notification.MyNewIssuesNotification; import org.sonar.server.issue.notification.NewIssuesNotification; import org.sonar.server.issue.notification.NewIssuesNotificationFactory; import org.sonar.server.issue.notification.NewIssuesStatistics; -import org.sonar.server.notifications.NotificationService; +import org.sonar.server.notification.NotificationService; import org.sonar.server.util.CloseableIterator; /** * Reads issues from disk cache and send related notifications. For performance reasons, * the standard notification DB queue is not used as a temporary storage. Notifications - * are directly processed by {@link org.sonar.server.notifications.NotificationService}. + * are directly processed by {@link NotificationService}. */ public class SendIssueNotificationsStep implements ComputationStep { /** diff --git a/server/sonar-server/src/main/java/org/sonar/server/event/NewAlerts.java b/server/sonar-server/src/main/java/org/sonar/server/event/NewAlerts.java index cf4c219e848..6ec224ec1f6 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/event/NewAlerts.java +++ b/server/sonar-server/src/main/java/org/sonar/server/event/NewAlerts.java @@ -24,9 +24,9 @@ import org.sonar.api.notifications.*; import java.util.Collection; import java.util.Map; -import org.sonar.core.notification.NotificationDispatcher; -import org.sonar.core.notification.NotificationDispatcherMetadata; -import org.sonar.core.notification.NotificationManager; +import org.sonar.server.notification.NotificationDispatcher; +import org.sonar.server.notification.NotificationDispatcherMetadata; +import org.sonar.server.notification.NotificationManager; /** * This dispatcher means: "notify me each new alert event". diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueBulkChangeService.java b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueBulkChangeService.java index 29f84cafcca..53c4539b16f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueBulkChangeService.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueBulkChangeService.java @@ -44,7 +44,7 @@ import org.sonar.api.utils.log.Loggers; import org.sonar.core.component.ComponentDto; import org.sonar.core.issue.db.IssueDto; import org.sonar.core.issue.db.IssueStorage; -import org.sonar.core.notification.NotificationManager; +import org.sonar.server.notification.NotificationManager; import org.sonar.core.persistence.DbSession; import org.sonar.core.persistence.MyBatis; import org.sonar.server.db.DbClient; diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java index b407ec4b635..0f342ce585a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java @@ -26,7 +26,7 @@ import org.sonar.api.issue.ActionPlan; import org.sonar.api.issue.Issue; import org.sonar.api.issue.internal.DefaultIssue; import org.sonar.api.issue.internal.IssueChangeContext; -import org.sonar.core.notification.NotificationManager; +import org.sonar.server.notification.NotificationManager; import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.Severity; import org.sonar.api.rules.Rule; diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/notification/ChangesOnMyIssueNotificationDispatcher.java b/server/sonar-server/src/main/java/org/sonar/server/issue/notification/ChangesOnMyIssueNotificationDispatcher.java index b38eb2f855b..5aa290eb83b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/notification/ChangesOnMyIssueNotificationDispatcher.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/notification/ChangesOnMyIssueNotificationDispatcher.java @@ -25,9 +25,9 @@ import org.sonar.api.notifications.*; import javax.annotation.Nullable; import java.util.Collection; -import org.sonar.core.notification.NotificationDispatcher; -import org.sonar.core.notification.NotificationDispatcherMetadata; -import org.sonar.core.notification.NotificationManager; +import org.sonar.server.notification.NotificationDispatcher; +import org.sonar.server.notification.NotificationDispatcherMetadata; +import org.sonar.server.notification.NotificationManager; /** * This dispatcher means: "notify me when a change is done on an issue that is assigned to me or reported by me". diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/notification/DoNotFixNotificationDispatcher.java b/server/sonar-server/src/main/java/org/sonar/server/issue/notification/DoNotFixNotificationDispatcher.java index e4f0a5f81d9..1ee261ea214 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/notification/DoNotFixNotificationDispatcher.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/notification/DoNotFixNotificationDispatcher.java @@ -27,9 +27,9 @@ import org.sonar.api.notifications.*; import java.util.Collection; import java.util.Map; -import org.sonar.core.notification.NotificationDispatcher; -import org.sonar.core.notification.NotificationDispatcherMetadata; -import org.sonar.core.notification.NotificationManager; +import org.sonar.server.notification.NotificationDispatcher; +import org.sonar.server.notification.NotificationDispatcherMetadata; +import org.sonar.server.notification.NotificationManager; /** * This dispatcher means: "notify me when an issue is resolved as false positive or won't fix". diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/notification/MyNewIssuesNotificationDispatcher.java b/server/sonar-server/src/main/java/org/sonar/server/issue/notification/MyNewIssuesNotificationDispatcher.java index 3810279554f..c4be5a62776 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/notification/MyNewIssuesNotificationDispatcher.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/notification/MyNewIssuesNotificationDispatcher.java @@ -24,9 +24,9 @@ import com.google.common.collect.Multimap; import org.sonar.api.notifications.*; import java.util.Collection; -import org.sonar.core.notification.NotificationDispatcher; -import org.sonar.core.notification.NotificationDispatcherMetadata; -import org.sonar.core.notification.NotificationManager; +import org.sonar.server.notification.NotificationDispatcher; +import org.sonar.server.notification.NotificationDispatcherMetadata; +import org.sonar.server.notification.NotificationManager; /** * This dispatcher means: "notify me when new issues are introduced during project analysis" diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/notification/NewIssuesNotificationDispatcher.java b/server/sonar-server/src/main/java/org/sonar/server/issue/notification/NewIssuesNotificationDispatcher.java index e346b1af744..6c28a8aadf9 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/notification/NewIssuesNotificationDispatcher.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/notification/NewIssuesNotificationDispatcher.java @@ -24,9 +24,9 @@ import org.sonar.api.notifications.*; import java.util.Collection; import java.util.Map; -import org.sonar.core.notification.NotificationDispatcher; -import org.sonar.core.notification.NotificationDispatcherMetadata; -import org.sonar.core.notification.NotificationManager; +import org.sonar.server.notification.NotificationDispatcher; +import org.sonar.server.notification.NotificationDispatcherMetadata; +import org.sonar.server.notification.NotificationManager; /** * This dispatcher means: "notify me when new issues are introduced during project analysis" diff --git a/sonar-core/src/main/java/org/sonar/core/notification/DefaultNotificationManager.java b/server/sonar-server/src/main/java/org/sonar/server/notification/DefaultNotificationManager.java similarity index 96% rename from sonar-core/src/main/java/org/sonar/core/notification/DefaultNotificationManager.java rename to server/sonar-server/src/main/java/org/sonar/server/notification/DefaultNotificationManager.java index 6857590edda..82706d1001d 100644 --- a/sonar-core/src/main/java/org/sonar/core/notification/DefaultNotificationManager.java +++ b/server/sonar-server/src/main/java/org/sonar/server/notification/DefaultNotificationManager.java @@ -17,7 +17,7 @@ * 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.core.notification; +package org.sonar.server.notification; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Function; @@ -30,23 +30,18 @@ import java.io.InvalidClassException; import java.util.Arrays; import java.util.List; import javax.annotation.Nullable; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.sonar.api.batch.RequiresDB; import org.sonar.api.notifications.Notification; import org.sonar.api.notifications.NotificationChannel; import org.sonar.api.utils.SonarException; +import org.sonar.api.utils.log.Logger; +import org.sonar.api.utils.log.Loggers; import org.sonar.core.notification.db.NotificationQueueDao; import org.sonar.core.notification.db.NotificationQueueDto; import org.sonar.core.properties.PropertiesDao; -/** - * @since 2.10 - */ -@RequiresDB public class DefaultNotificationManager implements NotificationManager { - private static final Logger LOG = LoggerFactory.getLogger(DefaultNotificationManager.class); + private static final Logger LOG = Loggers.get(DefaultNotificationManager.class); private static final String UNABLE_TO_READ_NOTIFICATION = "Unable to read notification"; diff --git a/server/sonar-server/src/main/java/org/sonar/server/notifications/NotificationCenter.java b/server/sonar-server/src/main/java/org/sonar/server/notification/NotificationCenter.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/notifications/NotificationCenter.java rename to server/sonar-server/src/main/java/org/sonar/server/notification/NotificationCenter.java index cf43dca0c31..b739a60edcd 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/notifications/NotificationCenter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/notification/NotificationCenter.java @@ -17,12 +17,11 @@ * 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.notifications; +package org.sonar.server.notification; import com.google.common.collect.Lists; import org.sonar.api.server.ServerSide; import org.sonar.api.notifications.NotificationChannel; -import org.sonar.core.notification.NotificationDispatcherMetadata; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; diff --git a/sonar-core/src/main/java/org/sonar/core/notification/NotificationDispatcher.java b/server/sonar-server/src/main/java/org/sonar/server/notification/NotificationDispatcher.java similarity index 99% rename from sonar-core/src/main/java/org/sonar/core/notification/NotificationDispatcher.java rename to server/sonar-server/src/main/java/org/sonar/server/notification/NotificationDispatcher.java index 33a127af77f..3c99cbe0003 100644 --- a/sonar-core/src/main/java/org/sonar/core/notification/NotificationDispatcher.java +++ b/server/sonar-server/src/main/java/org/sonar/server/notification/NotificationDispatcher.java @@ -17,7 +17,7 @@ * 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.core.notification; +package org.sonar.server.notification; import org.apache.commons.lang.StringUtils; import org.sonar.api.ExtensionPoint; diff --git a/sonar-core/src/main/java/org/sonar/core/notification/NotificationDispatcherMetadata.java b/server/sonar-server/src/main/java/org/sonar/server/notification/NotificationDispatcherMetadata.java similarity index 98% rename from sonar-core/src/main/java/org/sonar/core/notification/NotificationDispatcherMetadata.java rename to server/sonar-server/src/main/java/org/sonar/server/notification/NotificationDispatcherMetadata.java index 2eb04a59c21..de80ec7a2a7 100644 --- a/sonar-core/src/main/java/org/sonar/core/notification/NotificationDispatcherMetadata.java +++ b/server/sonar-server/src/main/java/org/sonar/server/notification/NotificationDispatcherMetadata.java @@ -17,7 +17,7 @@ * 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.core.notification; +package org.sonar.server.notification; import com.google.common.collect.Maps; import java.util.Map; diff --git a/sonar-core/src/main/java/org/sonar/core/notification/NotificationManager.java b/server/sonar-server/src/main/java/org/sonar/server/notification/NotificationManager.java similarity index 91% rename from sonar-core/src/main/java/org/sonar/core/notification/NotificationManager.java rename to server/sonar-server/src/main/java/org/sonar/server/notification/NotificationManager.java index f9b5e0a8489..d499a8fcc5c 100644 --- a/sonar-core/src/main/java/org/sonar/core/notification/NotificationManager.java +++ b/server/sonar-server/src/main/java/org/sonar/server/notification/NotificationManager.java @@ -17,18 +17,13 @@ * 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.core.notification; +package org.sonar.server.notification; import com.google.common.collect.Multimap; -import org.sonar.api.batch.BatchSide; +import java.util.List; +import javax.annotation.Nullable; import org.sonar.api.notifications.Notification; import org.sonar.api.notifications.NotificationChannel; -import org.sonar.api.server.ServerSide; -import org.sonar.api.batch.InstantiationStrategy; - -import javax.annotation.Nullable; - -import java.util.List; /** *

@@ -38,12 +33,7 @@ import java.util.List; * Pico provides an instance of this class, and plugins just need to create notifications and pass them to this manager with * the {@link NotificationManager#scheduleForSending(Notification)} method. *

- * - * @since 2.10 */ -@ServerSide -@BatchSide -@InstantiationStrategy(InstantiationStrategy.PER_BATCH) public interface NotificationManager { /** diff --git a/server/sonar-server/src/main/java/org/sonar/server/notifications/NotificationService.java b/server/sonar-server/src/main/java/org/sonar/server/notification/NotificationService.java similarity index 98% rename from server/sonar-server/src/main/java/org/sonar/server/notifications/NotificationService.java rename to server/sonar-server/src/main/java/org/sonar/server/notification/NotificationService.java index e33af89334d..b3951e8ee02 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/notifications/NotificationService.java +++ b/server/sonar-server/src/main/java/org/sonar/server/notification/NotificationService.java @@ -17,7 +17,7 @@ * 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.notifications; +package org.sonar.server.notification; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.HashMultimap; @@ -38,10 +38,8 @@ import org.sonar.api.server.ServerSide; import org.sonar.api.config.Settings; import org.sonar.api.notifications.Notification; import org.sonar.api.notifications.NotificationChannel; -import org.sonar.core.notification.NotificationDispatcher; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; -import org.sonar.core.notification.DefaultNotificationManager; import org.sonar.jpa.session.DatabaseSessionFactory; import org.sonar.server.db.DbClient; diff --git a/server/sonar-server/src/main/java/org/sonar/server/notifications/email/AlertsEmailTemplate.java b/server/sonar-server/src/main/java/org/sonar/server/notification/email/AlertsEmailTemplate.java similarity index 98% rename from server/sonar-server/src/main/java/org/sonar/server/notifications/email/AlertsEmailTemplate.java rename to server/sonar-server/src/main/java/org/sonar/server/notification/email/AlertsEmailTemplate.java index 0ea9c3c5544..77a53501929 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/notifications/email/AlertsEmailTemplate.java +++ b/server/sonar-server/src/main/java/org/sonar/server/notification/email/AlertsEmailTemplate.java @@ -17,7 +17,7 @@ * 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.notifications.email; +package org.sonar.server.notification.email; import org.apache.commons.lang.StringUtils; import org.sonar.api.config.EmailSettings; diff --git a/server/sonar-server/src/main/java/org/sonar/server/notifications/email/EmailNotificationChannel.java b/server/sonar-server/src/main/java/org/sonar/server/notification/email/EmailNotificationChannel.java similarity index 99% rename from server/sonar-server/src/main/java/org/sonar/server/notifications/email/EmailNotificationChannel.java rename to server/sonar-server/src/main/java/org/sonar/server/notification/email/EmailNotificationChannel.java index 3b96270736b..de7dc0f81ea 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/notifications/email/EmailNotificationChannel.java +++ b/server/sonar-server/src/main/java/org/sonar/server/notification/email/EmailNotificationChannel.java @@ -17,7 +17,7 @@ * 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.notifications.email; +package org.sonar.server.notification.email; import java.net.MalformedURLException; import java.net.URL; diff --git a/server/sonar-server/src/main/java/org/sonar/server/notifications/email/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/notification/email/package-info.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/notifications/email/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/notification/email/package-info.java index a81d297b0c7..f583fa78310 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/notifications/email/package-info.java +++ b/server/sonar-server/src/main/java/org/sonar/server/notification/email/package-info.java @@ -18,6 +18,6 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ @ParametersAreNonnullByDefault -package org.sonar.server.notifications.email; +package org.sonar.server.notification.email; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/notifications/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/notification/package-info.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/notifications/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/notification/package-info.java index 34262049a99..71e0748a18c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/notifications/package-info.java +++ b/server/sonar-server/src/main/java/org/sonar/server/notification/package-info.java @@ -19,6 +19,6 @@ */ @ParametersAreNonnullByDefault -package org.sonar.server.notifications; +package org.sonar.server.notification; import javax.annotation.ParametersAreNonnullByDefault; 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 ca0260e5dea..21f69f49d65 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 @@ -38,7 +38,7 @@ import org.sonar.core.issue.IssueUpdater; import org.sonar.core.issue.workflow.FunctionExecutor; import org.sonar.core.issue.workflow.IssueWorkflow; import org.sonar.core.metric.DefaultMetricFinder; -import org.sonar.core.notification.DefaultNotificationManager; +import org.sonar.server.notification.DefaultNotificationManager; import org.sonar.core.permission.PermissionFacade; import org.sonar.core.qualitygate.db.ProjectQgateAssociationDao; import org.sonar.core.qualitygate.db.QualityGateConditionDao; @@ -171,10 +171,10 @@ import org.sonar.server.measure.ws.ManualMeasuresWs; import org.sonar.server.measure.ws.TimeMachineWs; import org.sonar.server.metric.CoreCustomMetrics; import org.sonar.server.metric.ws.MetricsWsModule; -import org.sonar.server.notifications.NotificationCenter; -import org.sonar.server.notifications.NotificationService; -import org.sonar.server.notifications.email.AlertsEmailTemplate; -import org.sonar.server.notifications.email.EmailNotificationChannel; +import org.sonar.server.notification.NotificationCenter; +import org.sonar.server.notification.NotificationService; +import org.sonar.server.notification.email.AlertsEmailTemplate; +import org.sonar.server.notification.email.EmailNotificationChannel; import org.sonar.server.permission.InternalPermissionService; import org.sonar.server.permission.InternalPermissionTemplateService; import org.sonar.server.permission.PermissionFinder; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/SendIssueNotificationsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/SendIssueNotificationsStepTest.java index 7fb81786e6c..a66e2c4085e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/SendIssueNotificationsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/SendIssueNotificationsStepTest.java @@ -40,7 +40,7 @@ import org.sonar.server.computation.issue.RuleCache; import org.sonar.server.issue.notification.IssueChangeNotification; import org.sonar.server.issue.notification.NewIssuesNotification; import org.sonar.server.issue.notification.NewIssuesNotificationFactory; -import org.sonar.server.notifications.NotificationService; +import org.sonar.server.notification.NotificationService; import static org.mockito.Mockito.any; import static org.mockito.Mockito.atLeastOnce; diff --git a/server/sonar-server/src/test/java/org/sonar/server/event/NewAlertsTest.java b/server/sonar-server/src/test/java/org/sonar/server/event/NewAlertsTest.java index 49bb6f7e6f0..d2b2f653eb9 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/event/NewAlertsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/event/NewAlertsTest.java @@ -24,8 +24,8 @@ import com.google.common.collect.Multimap; import org.junit.Test; import org.sonar.api.notifications.Notification; import org.sonar.api.notifications.NotificationChannel; -import org.sonar.core.notification.NotificationDispatcher; -import org.sonar.core.notification.NotificationManager; +import org.sonar.server.notification.NotificationDispatcher; +import org.sonar.server.notification.NotificationManager; import static org.mockito.Mockito.*; diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/notification/ChangesOnMyIssueNotificationDispatcherTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/notification/ChangesOnMyIssueNotificationDispatcherTest.java index fdcefadb1ba..a11fd69465c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/notification/ChangesOnMyIssueNotificationDispatcherTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/notification/ChangesOnMyIssueNotificationDispatcherTest.java @@ -27,9 +27,9 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; import org.sonar.api.notifications.*; -import org.sonar.core.notification.NotificationDispatcher; -import org.sonar.core.notification.NotificationDispatcherMetadata; -import org.sonar.core.notification.NotificationManager; +import org.sonar.server.notification.NotificationDispatcher; +import org.sonar.server.notification.NotificationDispatcherMetadata; +import org.sonar.server.notification.NotificationManager; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.*; diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/notification/DoNotFixNotificationDispatcherTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/notification/DoNotFixNotificationDispatcherTest.java index 4f42809dfb7..91061b4cb7e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/notification/DoNotFixNotificationDispatcherTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/notification/DoNotFixNotificationDispatcherTest.java @@ -25,9 +25,9 @@ import org.junit.Test; import org.sonar.api.issue.Issue; import org.sonar.api.notifications.Notification; import org.sonar.api.notifications.NotificationChannel; -import org.sonar.core.notification.NotificationDispatcher; -import org.sonar.core.notification.NotificationDispatcherMetadata; -import org.sonar.core.notification.NotificationManager; +import org.sonar.server.notification.NotificationDispatcher; +import org.sonar.server.notification.NotificationDispatcherMetadata; +import org.sonar.server.notification.NotificationManager; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.*; diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/notification/MyNewIssuesNotificationDispatcherTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/notification/MyNewIssuesNotificationDispatcherTest.java index 9173ef7227c..b697cdfe159 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/notification/MyNewIssuesNotificationDispatcherTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/notification/MyNewIssuesNotificationDispatcherTest.java @@ -26,8 +26,8 @@ import org.junit.Before; import org.junit.Test; import org.sonar.api.notifications.Notification; import org.sonar.api.notifications.NotificationChannel; -import org.sonar.core.notification.NotificationDispatcher; -import org.sonar.core.notification.NotificationManager; +import org.sonar.server.notification.NotificationDispatcher; +import org.sonar.server.notification.NotificationManager; import static org.mockito.Mockito.*; diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/notification/NewIssuesNotificationDispatcherTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/notification/NewIssuesNotificationDispatcherTest.java index 656d3bb4231..ec975b52966 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/notification/NewIssuesNotificationDispatcherTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/notification/NewIssuesNotificationDispatcherTest.java @@ -25,8 +25,8 @@ import org.junit.Before; import org.junit.Test; import org.sonar.api.notifications.Notification; import org.sonar.api.notifications.NotificationChannel; -import org.sonar.core.notification.NotificationDispatcher; -import org.sonar.core.notification.NotificationManager; +import org.sonar.server.notification.NotificationDispatcher; +import org.sonar.server.notification.NotificationManager; import static org.mockito.Mockito.*; diff --git a/sonar-core/src/test/java/org/sonar/core/notification/DefaultNotificationManagerTest.java b/server/sonar-server/src/test/java/org/sonar/server/notification/DefaultNotificationManagerTest.java similarity index 99% rename from sonar-core/src/test/java/org/sonar/core/notification/DefaultNotificationManagerTest.java rename to server/sonar-server/src/test/java/org/sonar/server/notification/DefaultNotificationManagerTest.java index c5e60e1afa5..e534646911c 100644 --- a/sonar-core/src/test/java/org/sonar/core/notification/DefaultNotificationManagerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/notification/DefaultNotificationManagerTest.java @@ -17,7 +17,7 @@ * 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.core.notification; +package org.sonar.server.notification; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; diff --git a/server/sonar-server/src/test/java/org/sonar/server/notifications/NotificationCenterTest.java b/server/sonar-server/src/test/java/org/sonar/server/notification/NotificationCenterTest.java similarity index 96% rename from server/sonar-server/src/test/java/org/sonar/server/notifications/NotificationCenterTest.java rename to server/sonar-server/src/test/java/org/sonar/server/notification/NotificationCenterTest.java index ecd6ef52117..e4d7b28fca5 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/notifications/NotificationCenterTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/notification/NotificationCenterTest.java @@ -17,14 +17,13 @@ * 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.notifications; +package org.sonar.server.notification; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.sonar.api.notifications.NotificationChannel; -import org.sonar.core.notification.NotificationDispatcherMetadata; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sonar-core/src/test/java/org/sonar/core/notification/NotificationChannelTest.java b/server/sonar-server/src/test/java/org/sonar/server/notification/NotificationChannelTest.java similarity index 97% rename from sonar-core/src/test/java/org/sonar/core/notification/NotificationChannelTest.java rename to server/sonar-server/src/test/java/org/sonar/server/notification/NotificationChannelTest.java index dcd80b4c08d..e0a0c823bcf 100644 --- a/sonar-core/src/test/java/org/sonar/core/notification/NotificationChannelTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/notification/NotificationChannelTest.java @@ -17,7 +17,7 @@ * 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.core.notification; +package org.sonar.server.notification; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; diff --git a/sonar-core/src/test/java/org/sonar/core/notification/NotificationDispatcherMetadataTest.java b/server/sonar-server/src/test/java/org/sonar/server/notification/NotificationDispatcherMetadataTest.java similarity index 97% rename from sonar-core/src/test/java/org/sonar/core/notification/NotificationDispatcherMetadataTest.java rename to server/sonar-server/src/test/java/org/sonar/server/notification/NotificationDispatcherMetadataTest.java index c19e5453be6..7874ab50f45 100644 --- a/sonar-core/src/test/java/org/sonar/core/notification/NotificationDispatcherMetadataTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/notification/NotificationDispatcherMetadataTest.java @@ -17,7 +17,7 @@ * 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.core.notification; +package org.sonar.server.notification; import org.junit.Before; import org.junit.Test; diff --git a/sonar-core/src/test/java/org/sonar/core/notification/NotificationDispatcherTest.java b/server/sonar-server/src/test/java/org/sonar/server/notification/NotificationDispatcherTest.java similarity index 98% rename from sonar-core/src/test/java/org/sonar/core/notification/NotificationDispatcherTest.java rename to server/sonar-server/src/test/java/org/sonar/server/notification/NotificationDispatcherTest.java index 89296125536..e6ec1a7d450 100644 --- a/sonar-core/src/test/java/org/sonar/core/notification/NotificationDispatcherTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/notification/NotificationDispatcherTest.java @@ -17,7 +17,7 @@ * 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.core.notification; +package org.sonar.server.notification; import org.junit.Before; import org.junit.Test; diff --git a/server/sonar-server/src/test/java/org/sonar/server/notifications/NotificationServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/notification/NotificationServiceTest.java similarity index 98% rename from server/sonar-server/src/test/java/org/sonar/server/notifications/NotificationServiceTest.java rename to server/sonar-server/src/test/java/org/sonar/server/notification/NotificationServiceTest.java index c818dee6eac..515c4279864 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/notifications/NotificationServiceTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/notification/NotificationServiceTest.java @@ -17,7 +17,7 @@ * 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.notifications; +package org.sonar.server.notification; import com.google.common.collect.Sets; import org.junit.Test; @@ -26,8 +26,6 @@ import org.mockito.stubbing.Answer; import org.sonar.api.config.Settings; import org.sonar.api.notifications.Notification; import org.sonar.api.notifications.NotificationChannel; -import org.sonar.core.notification.NotificationDispatcher; -import org.sonar.core.notification.DefaultNotificationManager; import org.sonar.core.properties.PropertiesDao; import org.sonar.jpa.session.DatabaseSessionFactory; import org.sonar.server.db.DbClient; diff --git a/server/sonar-server/src/test/java/org/sonar/server/notifications/NotificationTest.java b/server/sonar-server/src/test/java/org/sonar/server/notification/NotificationTest.java similarity index 98% rename from server/sonar-server/src/test/java/org/sonar/server/notifications/NotificationTest.java rename to server/sonar-server/src/test/java/org/sonar/server/notification/NotificationTest.java index 2c7c9194f9c..d90b000212c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/notifications/NotificationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/notification/NotificationTest.java @@ -17,7 +17,7 @@ * 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.notifications; +package org.sonar.server.notification; import org.junit.Before; import org.junit.Test; diff --git a/server/sonar-server/src/test/java/org/sonar/server/notifications/email/AlertsEmailTemplateTest.java b/server/sonar-server/src/test/java/org/sonar/server/notification/email/AlertsEmailTemplateTest.java similarity index 99% rename from server/sonar-server/src/test/java/org/sonar/server/notifications/email/AlertsEmailTemplateTest.java rename to server/sonar-server/src/test/java/org/sonar/server/notification/email/AlertsEmailTemplateTest.java index 3834df8b9e8..3d81a495628 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/notifications/email/AlertsEmailTemplateTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/notification/email/AlertsEmailTemplateTest.java @@ -17,7 +17,7 @@ * 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.notifications.email; +package org.sonar.server.notification.email; import org.junit.Before; import org.junit.Test; diff --git a/server/sonar-server/src/test/java/org/sonar/server/notifications/email/EmailNotificationChannelTest.java b/server/sonar-server/src/test/java/org/sonar/server/notification/email/EmailNotificationChannelTest.java similarity index 99% rename from server/sonar-server/src/test/java/org/sonar/server/notifications/email/EmailNotificationChannelTest.java rename to server/sonar-server/src/test/java/org/sonar/server/notification/email/EmailNotificationChannelTest.java index 3c5e94587af..e7cbcce0d57 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/notifications/email/EmailNotificationChannelTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/notification/email/EmailNotificationChannelTest.java @@ -17,7 +17,7 @@ * 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.notifications.email; +package org.sonar.server.notification.email; import java.io.IOException; import java.net.ServerSocket; diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchComponents.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchComponents.java index ac15c254939..1773cd1e7a6 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchComponents.java +++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchComponents.java @@ -69,7 +69,6 @@ import org.sonar.batch.scm.ScmSensor; import org.sonar.batch.source.CodeColorizerSensor; import org.sonar.batch.source.LinesSensor; import org.sonar.core.config.CorePropertyDefinitions; -import org.sonar.core.notification.DefaultNotificationManager; import org.sonar.core.resource.DefaultResourceTypes; public class BatchComponents { @@ -108,8 +107,6 @@ public class BatchComponents { SqaleRatingDecorator.class, SqaleRatingSettings.class, - DefaultNotificationManager.class, - // Quality Gate QualityGateVerifier.class, -- 2.39.5