SONAR-8798 move listAuthors and listTagsForComponent to AuthorsAction…

… and ComponentTagsAction
SonarSource · Aug 9, 2017 · d87c484 · d87c484
1 parent 98267a0
commit d87c484
Show file tree

Hide file tree

Showing 9 changed files with 83 additions and 244 deletions.
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
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/AuthorsAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/AuthorsAction.java
@@ -20,22 +20,25 @@
 package org.sonar.server.issue.ws;
 
 import com.google.common.io.Resources;
+import java.util.List;
+import javax.annotation.Nullable;
 import org.sonar.api.server.ws.Request;
 import org.sonar.api.server.ws.Response;
 import org.sonar.api.server.ws.WebService;
 import org.sonar.api.server.ws.WebService.NewAction;
 import org.sonar.api.server.ws.WebService.Param;
 import org.sonar.api.utils.text.JsonWriter;
-import org.sonar.server.issue.IssueService;
+import org.sonar.server.issue.IssueQuery;
+import org.sonar.server.issue.index.IssueIndex;
 
 import static org.sonarqube.ws.client.issue.IssuesWsParameters.ACTION_AUTHORS;
 
 public class AuthorsAction implements IssuesWsAction {
 
-  private final IssueService service;
+  private final IssueIndex issueIndex;
 
-  public AuthorsAction(IssueService service) {
+  public AuthorsAction(IssueIndex issueIndex) {
-    this.service = service;
+    this.issueIndex = issueIndex;
   }
 
   @Override
@@ -65,11 +68,17 @@ public void handle(Request request, Response response) throws Exception {
         .name("authors")
         .beginArray();
 
-      for (String login : service.listAuthors(query, pageSize)) {
+      for (String login : listAuthors(query, pageSize)) {
         json.value(login);
       }
 
       json.endArray().endObject();
     }
   }
+
+  public List<String> listAuthors(@Nullable String textQuery, int pageSize) {
+    return issueIndex.listAuthors(IssueQuery.builder()
+      .checkAuthorization(false)
+      .build(), textQuery, pageSize);
+  }
 }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/ComponentTagsAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/ComponentTagsAction.java
@@ -28,7 +28,7 @@
 import org.sonar.api.utils.text.JsonWriter;
 import org.sonar.server.issue.IssueQuery;
 import org.sonar.server.issue.IssueQueryFactory;
-import org.sonar.server.issue.IssueService;
+import org.sonar.server.issue.index.IssueIndex;
 import org.sonarqube.ws.client.issue.SearchWsRequest;
 
 import static java.util.Collections.singletonList;
@@ -42,11 +42,11 @@
  */
 public class ComponentTagsAction implements IssuesWsAction {
 
-  private final IssueService service;
+  private final IssueIndex issueIndex;
   private final IssueQueryFactory queryService;
 
-  public ComponentTagsAction(IssueService service, IssueQueryFactory queryService) {
+  public ComponentTagsAction(IssueIndex issueIndex, IssueQueryFactory queryService) {
-    this.service = service;
+    this.issueIndex = issueIndex;
     this.queryService = queryService;
   }
 
@@ -82,7 +82,7 @@ public void handle(Request request, Response response) throws Exception {
     int pageSize = request.mandatoryParamAsInt(PAGE_SIZE);
     try (JsonWriter json = response.newJsonWriter()) {
       json.beginObject().name("tags").beginArray();
-      for (Map.Entry<String, Long> tag : service.listTagsForComponent(query, pageSize).entrySet()) {
+      for (Map.Entry<String, Long> tag : issueIndex.countTags(query, pageSize).entrySet()) {
         json.beginObject()
           .prop("key", tag.getKey())
           .prop("value", tag.getValue())

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
@@ -24,7 +24,6 @@
 import org.sonar.server.issue.IssueFieldsSetter;
 import org.sonar.server.issue.IssueFinder;
 import org.sonar.server.issue.IssueQueryFactory;
-import org.sonar.server.issue.IssueService;
 import org.sonar.server.issue.IssueUpdater;
 import org.sonar.server.issue.ServerIssueStorage;
 import org.sonar.server.issue.TransitionService;
@@ -44,7 +43,6 @@ protected void configureModule() {
       IssueFieldsSetter.class,
       FunctionExecutor.class,
       IssueWorkflow.class,
-      IssueService.class,
       IssueQueryFactory.class,
       IssuesWs.class,
       AvatarResolverImpl.class,

diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceMediumTest.java