diff options
| author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2017-05-09 08:52:08 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2017-05-12 14:11:19 +0200 |
| commit | 0411a04805221c350bc9507757d3d9b2cdacd408 (patch) | |
| tree | bf7551462ef176099949dfcaa62d403c5e477e64 /server/sonar-ce | |
| parent | b5ea54e92dd0d86d0d159c31813a2f884e256d66 (diff) | |
| download | sonarqube-0411a04805221c350bc9507757d3d9b2cdacd408.tar.gz sonarqube-0411a04805221c350bc9507757d3d9b2cdacd408.zip | |
Remove dead code in CE notifications
Diffstat (limited to 'server/sonar-ce')
| -rw-r--r-- | server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java | 6 | ||||
| -rw-r--r-- | server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java | 2 |
2 files changed, 3 insertions, 5 deletions
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 fceab035a97..992df9f4a30 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 @@ -40,9 +40,11 @@ import org.sonar.api.utils.System2; import org.sonar.api.utils.UriReader; import org.sonar.api.utils.Version; import org.sonar.ce.CeConfigurationModule; +import org.sonar.ce.CeDistributedInformationImpl; import org.sonar.ce.CeHttpModule; import org.sonar.ce.CeQueueModule; import org.sonar.ce.CeTaskCommonsModule; +import org.sonar.ce.StandaloneCeDistributedInformation; import org.sonar.ce.cleaning.CeCleaningModule; import org.sonar.ce.cluster.HazelcastClientWrapperImpl; import org.sonar.ce.db.ReadOnlyPropertiesDao; @@ -53,8 +55,6 @@ import org.sonar.ce.queue.PurgeCeActivities; import org.sonar.ce.settings.ProjectSettingsFactory; import org.sonar.ce.taskprocessor.CeTaskProcessorModule; import org.sonar.ce.user.CeUserSession; -import org.sonar.ce.CeDistributedInformationImpl; -import org.sonar.ce.StandaloneCeDistributedInformation; import org.sonar.core.component.DefaultResourceTypes; import org.sonar.core.config.CorePropertyDefinitions; import org.sonar.core.i18n.DefaultI18n; @@ -97,7 +97,6 @@ import org.sonar.server.measure.index.ProjectMeasuresIndexer; import org.sonar.server.metric.CoreCustomMetrics; import org.sonar.server.metric.DefaultMetricFinder; import org.sonar.server.notification.DefaultNotificationManager; -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; @@ -385,7 +384,6 @@ public class ComputeEngineContainerImpl implements ComputeEngineContainer { AlertsEmailTemplate.class, EmailSettings.class, NotificationService.class, - NotificationCenter.class, DefaultNotificationManager.class, EmailNotificationChannel.class, 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 4dd55fabb19..1e4445ed39f 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 @@ -113,7 +113,7 @@ public class ComputeEngineContainerImplTest { assertThat(picoContainer.getComponentAdapters()) .hasSize( CONTAINER_ITSELF - + 74 // level 4 + + 73 // level 4 + 4 // content of CeConfigurationModule + 4 // content of CeQueueModule + 3 // content of CeHttpModule |