summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorDaniel Schwarz <daniel.schwarz@sonarsource.com>2017-12-01 17:25:43 +0100
committerDaniel Schwarz <bartfastiel@users.noreply.github.com>2017-12-06 14:40:17 +0100
commitba4329be29c76d61cafedd0fb642117fc75b2a4c (patch)
tree7d20cfacad85b914c3552ce1f0f0b6b3736d8c2b /server
parent2d211ab5fd27358de3d07990f3dc1b487d29c994 (diff)
downloadsonarqube-ba4329be29c76d61cafedd0fb642117fc75b2a4c.tar.gz
sonarqube-ba4329be29c76d61cafedd0fb642117fc75b2a4c.zip
Remove legacy sonar-ws code for issues
Diffstat (limited to 'server')
-rw-r--r--server/sonar-server/src/main/java/org/sonar/server/issue/ws/TagsAction.java16
1 files changed, 7 insertions, 9 deletions
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/TagsAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/TagsAction.java
index f208ca97812..de2f6ba3f98 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/TagsAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/TagsAction.java
@@ -38,7 +38,10 @@ import org.sonar.db.DbSession;
import org.sonar.db.organization.OrganizationDto;
import org.sonar.server.issue.index.IssueIndex;
import org.sonar.server.rule.index.RuleIndex;
+import org.sonar.server.ws.WsUtils;
+import org.sonarqube.ws.Issues;
+import static org.sonar.server.ws.WsUtils.writeProtobuf;
import static org.sonar.server.ws.WsUtils.checkFoundWithOptional;
import static org.sonarqube.ws.client.component.ComponentsWsParameters.PARAM_ORGANIZATION;
@@ -58,14 +61,6 @@ public class TagsAction implements IssuesWsAction {
this.dbClient = dbClient;
}
- private static void writeResponse(Response response, List<String> tags) {
- try (JsonWriter json = response.newJsonWriter()) {
- json.beginObject().name("tags").beginArray();
- tags.forEach(json::value);
- json.endArray().endObject();
- }
- }
-
@Override
public void define(WebService.NewController controller) {
NewAction action = controller.createAction("tags")
@@ -89,7 +84,10 @@ public class TagsAction implements IssuesWsAction {
int pageSize = request.mandatoryParamAsInt("ps");
OrganizationDto organization = getOrganization(request.param(PARAM_ORGANIZATION));
List<String> tags = listTags(organization, query, pageSize == 0 ? Integer.MAX_VALUE : pageSize);
- writeResponse(response, tags);
+
+ Issues.TagsResponse.Builder tagsResponseBuilder = Issues.TagsResponse.newBuilder();
+ tags.forEach(tagsResponseBuilder::addTags);
+ writeProtobuf(tagsResponseBuilder.build(), request, response);
}
private List<String> listTags(@Nullable OrganizationDto organization, @Nullable String textQuery, int pageSize) {