SONAR-8899 Move list issues tags code from IssueService to TagsAction

server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleDbTester.java

@@ -19,8 +19,11 @@
  */
 package org.sonar.db.rule;
 
+import java.util.function.Consumer;
 import org.sonar.db.DbTester;
 
+import static org.sonar.db.rule.RuleTesting.newRuleDto;
+
 public class RuleDbTester {
 
   private final DbTester db;
@@ -34,4 +37,17 @@ public RuleDto insertRule(RuleDto ruleDto) {
     db.commit();
     return ruleDto;
   }
+
+  public RuleDto insertRule() {
+    return insertRule(rule -> {
+    });
+  }
+
+  public RuleDto insertRule(Consumer<RuleDto> populateRuleDto) {
+    RuleDto ruleDto = newRuleDto();
+    populateRuleDto.accept(ruleDto);
+    db.getDbClient().ruleDao().insert(db.getSession(), ruleDto);
+    db.commit();
+    return ruleDto;
+  }
 }

server/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java

@@ -54,16 +54,6 @@ public IssueService(DbClient dbClient, IssueIndex issueIndex, IssueFinder issueF
     this.userSession = userSession;
   }
 
-  /**
-   * Search for all tags, whatever issue resolution or user access rights
-   */
-  public List<String> listTags(@Nullable String textQuery, int pageSize) {
-    IssueQuery query = IssueQuery.builder()
-      .checkAuthorization(false)
-      .build();
-    return issueIndex.listTags(query, textQuery, pageSize);
-  }
-
   public List<String> listAuthors(@Nullable String textQuery, int pageSize) {
     IssueQuery query = IssueQuery.builder()
       .checkAuthorization(false)

server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java

@@ -587,11 +587,12 @@ private static QueryBuilder createTermsFilter(String field, Collection<?> values
     return values.isEmpty() ? null : termsQuery(field, values);
   }
 
-  public List<String> listTags(IssueQuery query, @Nullable String textQuery, int maxNumberOfTags) {
+  public List<String> listTags(@Nullable String textQuery, int maxNumberOfTags) {
     SearchRequestBuilder requestBuilder = getClient()
       .prepareSearch(IssueIndexDefinition.INDEX_TYPE_ISSUE, RuleIndexDefinition.INDEX_TYPE_RULE);
 
-    requestBuilder.setQuery(boolQuery().must(matchAllQuery()).filter(createBoolFilter(query)));
+    requestBuilder.setQuery(boolQuery().must(matchAllQuery()).filter(createBoolFilter(
+      IssueQuery.builder().checkAuthorization(false).build())));
 
     GlobalBuilder topAggreg = AggregationBuilders.global("tags");
     String tagsOnIssuesSubAggregation = "tags__issues";

server/sonar-server/src/main/java/org/sonar/server/issue/ws/TagsAction.java

@@ -20,24 +20,28 @@
 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.index.IssueIndex;
+
+import static org.sonar.api.server.ws.WebService.Param.PAGE_SIZE;
 
 /**
  * List issue tags matching a given query.
  * @since 5.1
  */
 public class TagsAction implements IssuesWsAction {
 
-  private final IssueService service;
+  private final IssueIndex issueIndex;
 
-  public TagsAction(IssueService service) {
-    this.service = service;
+  public TagsAction(IssueIndex issueIndex) {
+    this.issueIndex = issueIndex;
   }
 
   @Override
@@ -50,7 +54,7 @@ public void define(WebService.NewController controller) {
     action.createParam(Param.TEXT_QUERY)
       .setDescription("A pattern to match tags against")
       .setExampleValue("misra");
-    action.createParam("ps")
+    action.createParam(PAGE_SIZE)
       .setDescription("The size of the list to return")
       .setExampleValue("25")
       .setDefaultValue("10");
@@ -60,11 +64,20 @@ public void define(WebService.NewController controller) {
   public void handle(Request request, Response response) throws Exception {
     String query = request.param(Param.TEXT_QUERY);
     int pageSize = request.mandatoryParamAsInt("ps");
-    JsonWriter json = response.newJsonWriter().beginObject().name("tags").beginArray();
-    for (String tag: service.listTags(query, pageSize)) {
-      json.value(tag);
+    List<String> tags = listTags(query, pageSize);
+    writeTags(response, tags);
+  }
+
+  private List<String> listTags(@Nullable String textQuery, int pageSize) {
+    return issueIndex.listTags(textQuery, pageSize);
+  }
+
+  private static void writeTags(Response response, List<String> tags) {
+    try (JsonWriter json = response.newJsonWriter()) {
+      json.beginObject().name("tags").beginArray();
+      tags.forEach(json::value);
+      json.endArray().endObject();
     }
-    json.endArray().endObject().close();
   }
 
 }

server/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceMediumTest.java

@@ -88,25 +88,6 @@ public void after() {
     session.close();
   }
 
-  @Test
-  public void list_tags() {
-    RuleDto rule = newRule();
-    ComponentDto project = newProject();
-    ComponentDto file = newFile(project);
-    saveIssue(IssueTesting.newDto(rule, file, project).setTags(ImmutableSet.of("convention", "java8", "bug")));
-    saveIssue(IssueTesting.newDto(rule, file, project).setTags(ImmutableSet.of("convention", "bug")));
-    saveIssue(IssueTesting.newDto(rule, file, project));
-    saveIssue(IssueTesting.newDto(rule, file, project).setTags(ImmutableSet.of("convention")));
-
-    assertThat(service.listTags(null, 5)).containsOnly("convention", "java8", "bug" /* from issues */, "systag1", "systag2" /* from rules */);
-    assertThat(service.listTags(null, 2)).containsOnly("bug", "convention");
-    assertThat(service.listTags("vent", 5)).containsOnly("convention");
-    assertThat(service.listTags("sys", 5)).containsOnly("systag1", "systag2");
-    assertThat(service.listTags(null, 1)).containsOnly("bug");
-    assertThat(service.listTags(null, Integer.MAX_VALUE)).containsOnly("convention", "java8", "bug", "systag1", "systag2", "tag1", "tag2");
-    assertThat(service.listTags("invalidRegexp[", 5)).isEmpty();
-  }
-
   @Test
   public void set_tags() {
     RuleDto rule = newRule();