diff options
author | Teryk Bellahsene <teryk.bellahsene@sonarsource.com> | 2017-06-22 10:19:14 +0200 |
---|---|---|
committer | Teryk Bellahsene <teryk.bellahsene@sonarsource.com> | 2017-06-26 09:09:42 +0200 |
commit | fbaa68cccc07bd04d40c49bb36df1fefe37c861e (patch) | |
tree | 7c3e8503c7d709010bed135f59e857897bbe0f8e | |
parent | 2d66533d9b4e47cd15ff58441e7971da4f5257f9 (diff) | |
download | sonarqube-fbaa68cccc07bd04d40c49bb36df1fefe37c861e.tar.gz sonarqube-fbaa68cccc07bd04d40c49bb36df1fefe37c861e.zip |
SONAR-9448 Sanitize api/qualityprofiles/compare
-rw-r--r-- | server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/CompareAction.java | 13 | ||||
-rw-r--r-- | server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/compare-example.json (renamed from server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/example-compare.json) | 0 |
2 files changed, 7 insertions, 6 deletions
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/CompareAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/CompareAction.java index 6bd6685c4d0..2afadf8c4a3 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/CompareAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/CompareAction.java @@ -35,7 +35,6 @@ import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService.NewAction; import org.sonar.api.server.ws.WebService.NewController; import org.sonar.api.utils.text.JsonWriter; -import org.sonar.core.util.Uuids; import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.qualityprofile.ActiveRuleDto; @@ -47,6 +46,8 @@ import org.sonar.server.qualityprofile.QProfileComparison.ActiveRuleDiff; import org.sonar.server.qualityprofile.QProfileComparison.QProfileComparisonResult; import static com.google.common.base.Preconditions.checkArgument; +import static org.sonar.core.util.Uuids.UUID_EXAMPLE_01; +import static org.sonar.core.util.Uuids.UUID_EXAMPLE_02; public class CompareAction implements QProfileWsAction { @@ -84,17 +85,17 @@ public class CompareAction implements QProfileWsAction { .setDescription("Compare two quality profiles.") .setHandler(this) .setInternal(true) - .setResponseExample(getClass().getResource("example-compare.json")) + .setResponseExample(getClass().getResource("compare-example.json")) .setSince("5.2"); compare.createParam(PARAM_LEFT_KEY) - .setDescription("A profile key.") - .setExampleValue(Uuids.UUID_EXAMPLE_01) + .setDescription("Profile key.") + .setExampleValue(UUID_EXAMPLE_01) .setRequired(true); compare.createParam(PARAM_RIGHT_KEY) .setDescription("Another profile key.") - .setExampleValue(Uuids.UUID_EXAMPLE_02) + .setExampleValue(UUID_EXAMPLE_02) .setRequired(true); } @@ -148,7 +149,7 @@ public class CompareAction implements QProfileWsAction { json.endObject().close(); } - private void writeProfile(JsonWriter json, QProfileDto profile) { + private static void writeProfile(JsonWriter json, QProfileDto profile) { json.prop(ATTRIBUTE_KEY, profile.getKee()) .prop(ATTRIBUTE_NAME, profile.getName()); } diff --git a/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/example-compare.json b/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/compare-example.json index 82f84ee0446..82f84ee0446 100644 --- a/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/example-compare.json +++ b/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/compare-example.json |