From 31c926c78d568493881d04c64c38124d1b83ffb3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Lesaint?= Date: Thu, 31 Mar 2016 09:55:58 +0200 Subject: [PATCH] SONAR-7441 deprecated Actions must be available in CE because we currently support loading components annotated with @ServerSide --- .../org/sonar/ce/container/ComputeEngineContainerImpl.java | 3 ++- .../org/sonar/ce/container/ComputeEngineContainerImplTest.java | 2 +- 2 files changed, 3 insertions(+), 2 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 9a02f215935..168b1b2dae1 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 @@ -24,6 +24,7 @@ import java.util.List; import javax.annotation.CheckForNull; import org.sonar.api.config.EmailSettings; import org.sonar.api.internal.SonarQubeVersionFactory; +import org.sonar.api.issue.action.Actions; import org.sonar.api.profiles.AnnotationProfileParser; import org.sonar.api.profiles.XMLProfileParser; import org.sonar.api.profiles.XMLProfileSerializer; @@ -427,7 +428,7 @@ public class ComputeEngineContainerImpl implements ComputeEngineContainer { // InternalRubyIssueService.class, indirectly used only in Web Services // IssueChangelogService.class, indirectly used only in Web Services // ActionService.class, indirectly used only in Web Services - // Actions.class, long time deprecated and does not make sense to use it in any Component loaded in the CE + Actions.class, // IssueBulkChangeService.class, indirectly used only in Web Services // WsResponseCommonFormat.class, indirectly used only in Web Services // IssueWsModule.class, no Web Service in CE 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 4b071c4c72d..d767f42a1bb 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 @@ -79,7 +79,7 @@ public class ComputeEngineContainerImplTest { assertThat(picoContainer.getComponentAdapters()) .hasSize( CONTAINER_ITSELF - + 77 // level 4 + + 78 // level 4 + 5 // content of CeModule + 7 // content of CeQueueModule + 4 // content of ReportProcessingModule -- 2.39.5