From a9503346ee526d2d5cee4b74658736ec62846a69 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Lesaint?= Date: Tue, 26 Mar 2019 17:26:21 +0100 Subject: [PATCH] SONAR-11753 move "QG change" notification classes to single package --- .../org/sonar/ce/container/ComputeEngineContainerImpl.java | 4 ++-- .../notification}/AlertsEmailTemplate.java | 2 +- .../server/{event => qualitygate/notification}/NewAlerts.java | 2 +- .../{event => qualitygate/notification}/package-info.java | 2 +- .../qualitygate/notification}/AlertsEmailTemplateTest.java | 3 ++- .../{event => qualitygate/notification}/NewAlertsTest.java | 2 +- .../org/sonar/server/notification/ws/DispatchersImpl.java | 2 +- .../sonar/server/platform/platformlevel/PlatformLevel4.java | 2 +- .../org/sonar/server/notification/ws/DispatchersImplTest.java | 2 +- 9 files changed, 11 insertions(+), 10 deletions(-) rename server/sonar-server-common/src/main/java/org/sonar/server/{notification/email => qualitygate/notification}/AlertsEmailTemplate.java (99%) rename server/sonar-server-common/src/main/java/org/sonar/server/{event => qualitygate/notification}/NewAlerts.java (98%) rename server/sonar-server-common/src/main/java/org/sonar/server/{event => qualitygate/notification}/package-info.java (94%) rename server/{sonar-server/src/test/java/org/sonar/server/notification/email => sonar-server-common/src/test/java/org/sonar/server/qualitygate/notification}/AlertsEmailTemplateTest.java (98%) rename server/sonar-server-common/src/test/java/org/sonar/server/{event => qualitygate/notification}/NewAlertsTest.java (98%) 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 4e5a5d16b9a..f17fed85c8a 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 @@ -91,7 +91,7 @@ import org.sonar.server.component.index.ComponentIndexer; import org.sonar.server.config.ConfigurationProvider; import org.sonar.server.es.EsModule; import org.sonar.server.es.ProjectIndexersImpl; -import org.sonar.server.event.NewAlerts; +import org.sonar.server.qualitygate.notification.NewAlerts; import org.sonar.server.extension.CoreExtensionBootstraper; import org.sonar.server.extension.CoreExtensionStopper; import org.sonar.server.favorite.FavoriteUpdater; @@ -115,7 +115,7 @@ import org.sonar.server.metric.CoreCustomMetrics; import org.sonar.server.metric.DefaultMetricFinder; import org.sonar.server.notification.DefaultNotificationManager; import org.sonar.server.notification.NotificationService; -import org.sonar.server.notification.email.AlertsEmailTemplate; +import org.sonar.server.qualitygate.notification.AlertsEmailTemplate; import org.sonar.server.notification.email.EmailNotificationChannel; import org.sonar.server.organization.BillingValidationsProxyImpl; import org.sonar.server.organization.DefaultOrganizationProviderImpl; diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/notification/email/AlertsEmailTemplate.java b/server/sonar-server-common/src/main/java/org/sonar/server/qualitygate/notification/AlertsEmailTemplate.java similarity index 99% rename from server/sonar-server-common/src/main/java/org/sonar/server/notification/email/AlertsEmailTemplate.java rename to server/sonar-server-common/src/main/java/org/sonar/server/qualitygate/notification/AlertsEmailTemplate.java index 519ac52d502..1fa513208a4 100644 --- a/server/sonar-server-common/src/main/java/org/sonar/server/notification/email/AlertsEmailTemplate.java +++ b/server/sonar-server-common/src/main/java/org/sonar/server/qualitygate/notification/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.notification.email; +package org.sonar.server.qualitygate.notification; import javax.annotation.Nullable; import org.apache.commons.lang.StringUtils; diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/event/NewAlerts.java b/server/sonar-server-common/src/main/java/org/sonar/server/qualitygate/notification/NewAlerts.java similarity index 98% rename from server/sonar-server-common/src/main/java/org/sonar/server/event/NewAlerts.java rename to server/sonar-server-common/src/main/java/org/sonar/server/qualitygate/notification/NewAlerts.java index 31eee0c973b..61adbc65d4d 100644 --- a/server/sonar-server-common/src/main/java/org/sonar/server/event/NewAlerts.java +++ b/server/sonar-server-common/src/main/java/org/sonar/server/qualitygate/notification/NewAlerts.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.event; +package org.sonar.server.qualitygate.notification; import com.google.common.collect.Multimap; import java.util.Collection; diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/event/package-info.java b/server/sonar-server-common/src/main/java/org/sonar/server/qualitygate/notification/package-info.java similarity index 94% rename from server/sonar-server-common/src/main/java/org/sonar/server/event/package-info.java rename to server/sonar-server-common/src/main/java/org/sonar/server/qualitygate/notification/package-info.java index e91ec90276f..b3abc41d5ba 100644 --- a/server/sonar-server-common/src/main/java/org/sonar/server/event/package-info.java +++ b/server/sonar-server-common/src/main/java/org/sonar/server/qualitygate/notification/package-info.java @@ -18,6 +18,6 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ @ParametersAreNonnullByDefault -package org.sonar.server.event; +package org.sonar.server.qualitygate.notification; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/test/java/org/sonar/server/notification/email/AlertsEmailTemplateTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/qualitygate/notification/AlertsEmailTemplateTest.java similarity index 98% rename from server/sonar-server/src/test/java/org/sonar/server/notification/email/AlertsEmailTemplateTest.java rename to server/sonar-server-common/src/test/java/org/sonar/server/qualitygate/notification/AlertsEmailTemplateTest.java index 164abbbaf72..e8a06c216bb 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/notification/email/AlertsEmailTemplateTest.java +++ b/server/sonar-server-common/src/test/java/org/sonar/server/qualitygate/notification/AlertsEmailTemplateTest.java @@ -17,13 +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.notification.email; +package org.sonar.server.qualitygate.notification; import org.junit.Before; import org.junit.Test; import org.sonar.api.config.EmailSettings; import org.sonar.api.notifications.Notification; import org.sonar.plugins.emailnotifications.api.EmailMessage; +import org.sonar.server.qualitygate.notification.AlertsEmailTemplate; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.nullValue; diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/event/NewAlertsTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/qualitygate/notification/NewAlertsTest.java similarity index 98% rename from server/sonar-server-common/src/test/java/org/sonar/server/event/NewAlertsTest.java rename to server/sonar-server-common/src/test/java/org/sonar/server/qualitygate/notification/NewAlertsTest.java index 811122a80e8..48a7b9f036c 100644 --- a/server/sonar-server-common/src/test/java/org/sonar/server/event/NewAlertsTest.java +++ b/server/sonar-server-common/src/test/java/org/sonar/server/qualitygate/notification/NewAlertsTest.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.event; +package org.sonar.server.qualitygate.notification; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; diff --git a/server/sonar-server/src/main/java/org/sonar/server/notification/ws/DispatchersImpl.java b/server/sonar-server/src/main/java/org/sonar/server/notification/ws/DispatchersImpl.java index 9c755aebced..5800cca5d34 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/notification/ws/DispatchersImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/notification/ws/DispatchersImpl.java @@ -26,7 +26,7 @@ import java.util.function.Predicate; import org.sonar.api.Startable; import org.sonar.api.config.Configuration; import org.sonar.process.ProcessProperties; -import org.sonar.server.event.NewAlerts; +import org.sonar.server.qualitygate.notification.NewAlerts; import org.sonar.server.issue.notification.DoNotFixNotificationHandler; import org.sonar.server.issue.notification.NewIssuesNotificationHandler; import org.sonar.server.notification.NotificationCenter; 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 e10db664628..bdb47697472 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 @@ -64,7 +64,7 @@ import org.sonar.server.es.RecoveryIndexer; import org.sonar.server.es.metadata.EsDbCompatibilityImpl; import org.sonar.server.es.metadata.MetadataIndex; import org.sonar.server.es.metadata.MetadataIndexDefinition; -import org.sonar.server.event.NewAlerts; +import org.sonar.server.qualitygate.notification.NewAlerts; import org.sonar.server.extension.CoreExtensionBootstraper; import org.sonar.server.extension.CoreExtensionStopper; import org.sonar.server.favorite.FavoriteModule; diff --git a/server/sonar-server/src/test/java/org/sonar/server/notification/ws/DispatchersImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/notification/ws/DispatchersImplTest.java index 5aa8aec6f5d..8b6c25b88fe 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/notification/ws/DispatchersImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/notification/ws/DispatchersImplTest.java @@ -22,7 +22,7 @@ package org.sonar.server.notification.ws; import org.junit.Test; import org.sonar.api.config.internal.MapSettings; import org.sonar.api.notifications.NotificationChannel; -import org.sonar.server.event.NewAlerts; +import org.sonar.server.qualitygate.notification.NewAlerts; import org.sonar.server.issue.notification.DoNotFixNotificationHandler; import org.sonar.server.issue.notification.MyNewIssuesNotificationHandler; import org.sonar.server.issue.notification.NewIssuesNotificationHandler; -- 2.39.5