From: Teryk Bellahsene Date: Thu, 28 Jul 2016 09:10:44 +0000 (+0200) Subject: Rename Quality Gate WS classes X-Git-Tag: 6.1-RC1~483 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=88c26b4030c29372e57847eed22646b259d1a9c1;p=sonarqube.git Rename Quality Gate WS classes --- 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 14dc8817611..f64df96c3e8 100644 --- 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 @@ -187,7 +187,7 @@ import org.sonar.server.qualitygate.ws.DeleteConditionAction; import org.sonar.server.qualitygate.ws.DeselectAction; import org.sonar.server.qualitygate.ws.DestroyAction; import org.sonar.server.qualitygate.ws.ProjectStatusAction; -import org.sonar.server.qualitygate.ws.QGatesWs; +import org.sonar.server.qualitygate.ws.QualityGatesWs; import org.sonar.server.qualitygate.ws.SelectAction; import org.sonar.server.qualitygate.ws.SetAsDefaultAction; import org.sonar.server.qualitygate.ws.UnsetDefaultAction; @@ -481,7 +481,7 @@ public class PlatformLevel4 extends PlatformLevel { UpdateConditionAction.class, org.sonar.server.qualitygate.ws.AppAction.class, ProjectStatusAction.class, - QGatesWs.class, + QualityGatesWs.class, // web services WebServiceEngine.class, diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/AppAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/AppAction.java index 81e5ec071ab..90aa2d27707 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/AppAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/AppAction.java @@ -27,7 +27,7 @@ import org.sonar.api.server.ws.WebService; import org.sonar.api.utils.text.JsonWriter; import org.sonar.server.qualitygate.QualityGates; -public class AppAction implements QGateWsAction { +public class AppAction implements QualityGatesWsAction { private final QualityGates qualityGates; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/CopyAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/CopyAction.java index a18f1bb8b69..89e77f7998e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/CopyAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/CopyAction.java @@ -26,7 +26,7 @@ import org.sonar.api.utils.text.JsonWriter; import org.sonar.db.qualitygate.QualityGateDto; import org.sonar.server.qualitygate.QualityGates; -public class CopyAction implements QGateWsAction { +public class CopyAction implements QualityGatesWsAction { private final QualityGates qualityGates; @@ -42,12 +42,12 @@ public class CopyAction implements QGateWsAction { .setSince("4.3") .setHandler(this); - action.createParam(QGatesWs.PARAM_ID) + action.createParam(QualityGatesWs.PARAM_ID) .setDescription("The ID of the source quality gate") .setRequired(true) .setExampleValue("1"); - action.createParam(QGatesWs.PARAM_NAME) + action.createParam(QualityGatesWs.PARAM_NAME) .setDescription("The name of the quality gate to create") .setRequired(true) .setExampleValue("My Quality Gate"); @@ -55,9 +55,9 @@ public class CopyAction implements QGateWsAction { @Override public void handle(Request request, Response response) { - QualityGateDto newQualityGate = qualityGates.copy(QGatesWs.parseId(request, QGatesWs.PARAM_ID), request.mandatoryParam(QGatesWs.PARAM_NAME)); + QualityGateDto newQualityGate = qualityGates.copy(QualityGatesWs.parseId(request, QualityGatesWs.PARAM_ID), request.mandatoryParam(QualityGatesWs.PARAM_NAME)); JsonWriter writer = response.newJsonWriter(); - QGatesWs.writeQualityGate(newQualityGate, writer).close(); + QualityGatesWs.writeQualityGate(newQualityGate, writer).close(); } } diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/CreateAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/CreateAction.java index 0413a9d8bea..5ddc735e02b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/CreateAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/CreateAction.java @@ -26,7 +26,7 @@ import org.sonar.api.utils.text.JsonWriter; import org.sonar.db.qualitygate.QualityGateDto; import org.sonar.server.qualitygate.QualityGates; -public class CreateAction implements QGateWsAction { +public class CreateAction implements QualityGatesWsAction { private final QualityGates qualityGates; @@ -42,7 +42,7 @@ public class CreateAction implements QGateWsAction { .setPost(true) .setHandler(this); - action.createParam(QGatesWs.PARAM_NAME) + action.createParam(QualityGatesWs.PARAM_NAME) .setDescription("The name of the quality gate to create") .setRequired(true) .setExampleValue("My Quality Gate"); @@ -50,9 +50,9 @@ public class CreateAction implements QGateWsAction { @Override public void handle(Request request, Response response) { - QualityGateDto newQualityGate = qualityGates.create(request.mandatoryParam(QGatesWs.PARAM_NAME)); + QualityGateDto newQualityGate = qualityGates.create(request.mandatoryParam(QualityGatesWs.PARAM_NAME)); JsonWriter writer = response.newJsonWriter(); - QGatesWs.writeQualityGate(newQualityGate, writer).close(); + QualityGatesWs.writeQualityGate(newQualityGate, writer).close(); } } diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/CreateConditionAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/CreateConditionAction.java index fc77616ba0b..aa572402040 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/CreateConditionAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/CreateConditionAction.java @@ -24,7 +24,7 @@ import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; import org.sonar.server.qualitygate.QualityGates; -public class CreateConditionAction implements QGateWsAction { +public class CreateConditionAction implements QualityGatesWsAction { private final QualityGates qualityGates; @@ -41,24 +41,24 @@ public class CreateConditionAction implements QGateWsAction { .setHandler(this); createCondition - .createParam(QGatesWs.PARAM_GATE_ID) + .createParam(QualityGatesWs.PARAM_GATE_ID) .setDescription("ID of the quality gate") .setRequired(true) .setExampleValue("1"); - QGatesWs.addConditionParams(createCondition); + QualityGatesWs.addConditionParams(createCondition); } @Override public void handle(Request request, Response response) { - QGatesWs.writeQualityGateCondition( + QualityGatesWs.writeQualityGateCondition( qualityGates.createCondition( - QGatesWs.parseId(request, QGatesWs.PARAM_GATE_ID), - request.mandatoryParam(QGatesWs.PARAM_METRIC), - request.mandatoryParam(QGatesWs.PARAM_OPERATOR), - request.param(QGatesWs.PARAM_WARNING), - request.param(QGatesWs.PARAM_ERROR), - request.paramAsInt(QGatesWs.PARAM_PERIOD) + QualityGatesWs.parseId(request, QualityGatesWs.PARAM_GATE_ID), + request.mandatoryParam(QualityGatesWs.PARAM_METRIC), + request.mandatoryParam(QualityGatesWs.PARAM_OPERATOR), + request.param(QualityGatesWs.PARAM_WARNING), + request.param(QualityGatesWs.PARAM_ERROR), + request.paramAsInt(QualityGatesWs.PARAM_PERIOD) ), response.newJsonWriter() ).close(); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/DeleteConditionAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/DeleteConditionAction.java index ac01a7868b8..cd1f94f0f9a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/DeleteConditionAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/DeleteConditionAction.java @@ -24,7 +24,7 @@ import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; import org.sonar.server.qualitygate.QualityGates; -public class DeleteConditionAction implements QGateWsAction { +public class DeleteConditionAction implements QualityGatesWsAction { private final QualityGates qualityGates; @@ -41,7 +41,7 @@ public class DeleteConditionAction implements QGateWsAction { .setHandler(this); createCondition - .createParam(QGatesWs.PARAM_ID) + .createParam(QualityGatesWs.PARAM_ID) .setRequired(true) .setDescription("Condition ID") .setExampleValue("2"); @@ -49,7 +49,7 @@ public class DeleteConditionAction implements QGateWsAction { @Override public void handle(Request request, Response response) { - qualityGates.deleteCondition(QGatesWs.parseId(request, QGatesWs.PARAM_ID)); + qualityGates.deleteCondition(QualityGatesWs.parseId(request, QualityGatesWs.PARAM_ID)); response.noContent(); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/DeselectAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/DeselectAction.java index 059bbd35d6f..1f1bfee0a47 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/DeselectAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/DeselectAction.java @@ -24,7 +24,7 @@ import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; import org.sonar.server.qualitygate.QualityGates; -public class DeselectAction implements QGateWsAction { +public class DeselectAction implements QualityGatesWsAction { private final QualityGates qualityGates; @@ -40,12 +40,12 @@ public class DeselectAction implements QGateWsAction { .setSince("4.3") .setHandler(this); - action.createParam(QGatesWs.PARAM_GATE_ID) + action.createParam(QualityGatesWs.PARAM_GATE_ID) .setDescription("Quality Gate ID") .setRequired(true) .setExampleValue("1"); - action.createParam(QGatesWs.PARAM_PROJECT_ID) + action.createParam(QualityGatesWs.PARAM_PROJECT_ID) .setDescription("Project ID") .setRequired(true) .setExampleValue("12"); @@ -53,7 +53,7 @@ public class DeselectAction implements QGateWsAction { @Override public void handle(Request request, Response response) { - qualityGates.dissociateProject(QGatesWs.parseId(request, QGatesWs.PARAM_GATE_ID), QGatesWs.parseId(request, QGatesWs.PARAM_PROJECT_ID)); + qualityGates.dissociateProject(QualityGatesWs.parseId(request, QualityGatesWs.PARAM_GATE_ID), QualityGatesWs.parseId(request, QualityGatesWs.PARAM_PROJECT_ID)); response.noContent(); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/DestroyAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/DestroyAction.java index 27c234a36d3..654a693e7f0 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/DestroyAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/DestroyAction.java @@ -24,7 +24,7 @@ import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; import org.sonar.server.qualitygate.QualityGates; -public class DestroyAction implements QGateWsAction { +public class DestroyAction implements QualityGatesWsAction { private final QualityGates qualityGates; @@ -40,7 +40,7 @@ public class DestroyAction implements QGateWsAction { .setPost(true) .setHandler(this); - action.createParam(QGatesWs.PARAM_ID) + action.createParam(QualityGatesWs.PARAM_ID) .setDescription("ID of the quality gate to delete") .setRequired(true) .setExampleValue("1"); @@ -48,7 +48,7 @@ public class DestroyAction implements QGateWsAction { @Override public void handle(Request request, Response response) { - qualityGates.delete(QGatesWs.parseId(request, QGatesWs.PARAM_ID)); + qualityGates.delete(QualityGatesWs.parseId(request, QualityGatesWs.PARAM_ID)); response.noContent(); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/ListAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/ListAction.java index aa44510fdc5..dd2f0a49937 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/ListAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/ListAction.java @@ -27,7 +27,7 @@ import org.sonar.api.utils.text.JsonWriter; import org.sonar.db.qualitygate.QualityGateDto; import org.sonar.server.qualitygate.QualityGates; -public class ListAction implements QGateWsAction { +public class ListAction implements QualityGatesWsAction { private final QualityGates qualityGates; @@ -48,7 +48,7 @@ public class ListAction implements QGateWsAction { public void handle(Request request, Response response) { JsonWriter writer = response.newJsonWriter().beginObject().name("qualitygates").beginArray(); for (QualityGateDto qgate : qualityGates.list()) { - QGatesWs.writeQualityGate(qgate, writer); + QualityGatesWs.writeQualityGate(qgate, writer); } writer.endArray(); QualityGateDto defaultQgate = qualityGates.getDefault(); diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/ProjectStatusAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/ProjectStatusAction.java index ce4c6acd578..40b7cc507e6 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/ProjectStatusAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/ProjectStatusAction.java @@ -56,7 +56,7 @@ import static org.sonarqube.ws.client.qualitygate.QualityGatesWsParameters.PARAM import static org.sonarqube.ws.client.qualitygate.QualityGatesWsParameters.PARAM_PROJECT_ID; import static org.sonarqube.ws.client.qualitygate.QualityGatesWsParameters.PARAM_PROJECT_KEY; -public class ProjectStatusAction implements QGateWsAction { +public class ProjectStatusAction implements QualityGatesWsAction { private static final String QG_STATUSES_ONE_LINE = Joiner.on(", ") .join(Lists.transform(Arrays.asList(ProjectStatusWsResponse.Status.values()), new Function() { @Nonnull diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGateWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGateWsAction.java deleted file mode 100644 index e162a69d24d..00000000000 --- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGateWsAction.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2016 SonarSource SA - * mailto:contact AT sonarsource DOT com - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonar.server.qualitygate.ws; - -import org.sonar.server.ws.WsAction; - -public interface QGateWsAction extends WsAction { - - // Marker interface -} diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesWs.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesWs.java deleted file mode 100644 index 6342b7c59dc..00000000000 --- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesWs.java +++ /dev/null @@ -1,127 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2016 SonarSource SA - * mailto:contact AT sonarsource DOT com - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonar.server.qualitygate.ws; - -import org.sonar.api.server.ws.Request; -import org.sonar.api.server.ws.WebService; -import org.sonar.api.utils.text.JsonWriter; -import org.sonar.db.qualitygate.QualityGateConditionDto; -import org.sonar.db.qualitygate.QualityGateDto; -import org.sonar.server.exceptions.BadRequestException; - -public class QGatesWs implements WebService { - - static final String PARAM_PAGE_SIZE = "pageSize"; - static final String PARAM_PAGE = "page"; - static final String PARAM_QUERY = "query"; - static final String PARAM_NAME = "name"; - static final String PARAM_ERROR = "error"; - static final String PARAM_WARNING = "warning"; - static final String PARAM_PERIOD = "period"; - static final String PARAM_OPERATOR = "op"; - static final String PARAM_METRIC = "metric"; - static final String PARAM_GATE_ID = "gateId"; - static final String PARAM_PROJECT_ID = "projectId"; - static final String PARAM_ID = "id"; - - private final QGateWsAction[] actions; - - public QGatesWs(QGateWsAction... actions) { - this.actions = actions; - } - - @Override - public void define(Context context) { - NewController controller = context.createController("api/qualitygates") - .setSince("4.3") - .setDescription("Manage quality gates, including conditions and project association."); - - for (QGateWsAction action : actions) { - action.define(controller); - } - - controller.done(); - } - - static void addConditionParams(NewAction action) { - action - .createParam(PARAM_METRIC) - .setDescription("Condition metric") - .setRequired(true) - .setExampleValue("blocker_violations"); - - action.createParam(PARAM_OPERATOR) - .setDescription("Condition operator:
" + - "