SONAR-7290 Move issues classes related to ws to IssueWsModule

diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueWsModule.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueWsModule.java
index 60592790f70fc692e59890d5ade896fd294fce1e..7a6c6905fe6a30f0377baf69a1bd18547bc9ef66 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueWsModule.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueWsModule.java
@@ -20,21 +20,45 @@
 package org.sonar.server.issue.ws;
 
 import org.sonar.core.platform.Module;
+import org.sonar.server.issue.ActionFinder;
+import org.sonar.server.issue.InternalRubyIssueService;
+import org.sonar.server.issue.IssueBulkChangeService;
+import org.sonar.server.issue.IssueChangelogService;
+import org.sonar.server.issue.IssueCommentService;
+import org.sonar.server.issue.IssueFieldsSetter;
 import org.sonar.server.issue.IssueFinder;
+import org.sonar.server.issue.IssueQueryService;
+import org.sonar.server.issue.IssueService;
 import org.sonar.server.issue.IssueUpdater;
+import org.sonar.server.issue.ServerIssueStorage;
 import org.sonar.server.issue.TransitionService;
+import org.sonar.server.issue.workflow.FunctionExecutor;
+import org.sonar.server.issue.workflow.IssueWorkflow;
+import org.sonar.server.ws.WsResponseCommonFormat;
 
 public class IssueWsModule extends Module {
   @Override
   protected void configureModule() {
     add(
+      ActionFinder.class,
       IssueUpdater.class,
       IssueFinder.class,
       TransitionService.class,
+      ServerIssueStorage.class,
+      IssueFieldsSetter.class,
+      FunctionExecutor.class,
+      IssueWorkflow.class,
+      IssueCommentService.class,
+      InternalRubyIssueService.class,
+      IssueChangelogService.class,
+      IssueBulkChangeService.class,
+      IssueService.class,
+      IssueQueryService.class,
       IssuesWs.class,
       SearchResponseLoader.class,
       SearchResponseFormat.class,
       OperationResponseWriter.class,
+      WsResponseCommonFormat.class,
       AssignAction.class,
       DoTransitionAction.class,
       SearchAction.class,

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 606982791a83caf44f0130dd0f8d92e5ea2dfe94..f7a71af88bbd8ac873e1588d4df30e301391f44a 100644 (file)
--- 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
@@ -57,19 +57,10 @@ import org.sonar.server.email.ws.EmailsWsModule;
 import org.sonar.server.es.IndexCreator;
 import org.sonar.server.es.IndexDefinitions;
 import org.sonar.server.event.NewAlerts;
-import org.sonar.server.issue.ActionFinder;
 import org.sonar.server.issue.AddTagsAction;
 import org.sonar.server.issue.AssignAction;
 import org.sonar.server.issue.CommentAction;
-import org.sonar.server.issue.InternalRubyIssueService;
-import org.sonar.server.issue.IssueBulkChangeService;
-import org.sonar.server.issue.IssueChangelogService;
-import org.sonar.server.issue.IssueCommentService;
-import org.sonar.server.issue.IssueFieldsSetter;
-import org.sonar.server.issue.IssueQueryService;
-import org.sonar.server.issue.IssueService;
 import org.sonar.server.issue.RemoveTagsAction;
-import org.sonar.server.issue.ServerIssueStorage;
 import org.sonar.server.issue.SetSeverityAction;
 import org.sonar.server.issue.SetTypeAction;
 import org.sonar.server.issue.TransitionAction;
@@ -83,8 +74,6 @@ import org.sonar.server.issue.notification.MyNewIssuesNotificationDispatcher;
 import org.sonar.server.issue.notification.NewIssuesEmailTemplate;
 import org.sonar.server.issue.notification.NewIssuesNotificationDispatcher;
 import org.sonar.server.issue.notification.NewIssuesNotificationFactory;
-import org.sonar.server.issue.workflow.FunctionExecutor;
-import org.sonar.server.issue.workflow.IssueWorkflow;
 import org.sonar.server.issue.ws.IssueWsModule;
 import org.sonar.server.language.ws.LanguageWs;
 import org.sonar.server.license.ws.LicensesWsModule;
@@ -233,7 +222,6 @@ import org.sonar.server.webhook.ws.WebhooksWsModule;
 import org.sonar.server.ws.WebServiceEngine;
 import org.sonar.server.ws.WebServiceFilter;
 import org.sonar.server.ws.WebServicesWs;
-import org.sonar.server.ws.WsResponseCommonFormat;
 
 public class PlatformLevel4 extends PlatformLevel {
 
@@ -397,19 +385,7 @@ public class PlatformLevel4 extends PlatformLevel {
       IssueIndexDefinition.class,
       IssueIndexer.class,
       PermissionIndexer.class,
-      ServerIssueStorage.class,
-      IssueFieldsSetter.class,
-      FunctionExecutor.class,
-      IssueWorkflow.class,
-      IssueCommentService.class,
-      InternalRubyIssueService.class,
-      IssueChangelogService.class,
-      ActionFinder.class,
-      IssueBulkChangeService.class,
-      WsResponseCommonFormat.class,
       IssueWsModule.class,
-      IssueService.class,
-      IssueQueryService.class,
       NewIssuesEmailTemplate.class,
       MyNewIssuesEmailTemplate.class,
       IssueChangesEmailTemplate.class,

diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueWsModuleTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueWsModuleTest.java
index fe31bf90df404013808e161d7a93269fbfb41bac..6ae3ed69b16f6161333e06a518e533f21638a70b 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueWsModuleTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueWsModuleTest.java
@@ -29,6 +29,6 @@ public class IssueWsModuleTest {
   public void verify_count_of_added_components() {
     ComponentContainer container = new ComponentContainer();
     new IssueWsModule().configure(container);
-    assertThat(container.size()).isEqualTo(2 + 16);
+    assertThat(container.size()).isEqualTo(2 + 28);
   }
 }