From 7630dd2160a05f05ba4f18ecd3b3046f96b86b38 Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Tue, 27 Mar 2018 15:46:01 +0200 Subject: [PATCH] SONAR-10121 api/qualityprofiles desc should not refer to deprecated key --- .../org/sonar/server/qualityprofile/ws/ExportAction.java | 6 +++--- .../sonar/server/qualityprofile/ws/QProfileReference.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ExportAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ExportAction.java index e9d29cf2ad2..cf100e7551d 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ExportAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ExportAction.java @@ -87,13 +87,13 @@ public class ExportAction implements QProfileWsAction { .setExampleValue(UUID_EXAMPLE_01); action.createParam(PARAM_QUALITY_PROFILE) - .setDescription("Quality profile name to export. If left empty, the default profile for the language is exported. If this parameter is set, '%s' must not be set.", - PARAM_KEY) + .setDescription("Quality profile name to export. If left empty, the default profile for the language is exported.", + PARAM_QUALITY_PROFILE) .setDeprecatedKey("name", "6.6") .setExampleValue("My Sonar way"); action.createParam(PARAM_LANGUAGE) - .setDescription("Quality profile language. If this parameter is set, '%s' must not be set.", PARAM_KEY) + .setDescription("Quality profile language") .setExampleValue(LanguageParamUtils.getExampleValue(languages)) .setPossibleValues(LanguageParamUtils.getLanguageKeys(languages)); diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileReference.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileReference.java index d8ea70c425a..d8525eaded1 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileReference.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileReference.java @@ -34,8 +34,8 @@ import static java.util.Objects.requireNonNull; import static org.apache.commons.lang.StringUtils.isEmpty; import static org.sonar.core.util.Uuids.UUID_EXAMPLE_01; import static org.sonarqube.ws.client.component.ComponentsWsParameters.PARAM_ORGANIZATION; -import static org.sonarqube.ws.client.qualityprofile.QualityProfileWsParameters.PARAM_LANGUAGE; import static org.sonarqube.ws.client.qualityprofile.QualityProfileWsParameters.PARAM_KEY; +import static org.sonarqube.ws.client.qualityprofile.QualityProfileWsParameters.PARAM_LANGUAGE; import static org.sonarqube.ws.client.qualityprofile.QualityProfileWsParameters.PARAM_QUALITY_PROFILE; /** @@ -182,12 +182,12 @@ public class QProfileReference { .setExampleValue(UUID_EXAMPLE_01); action.createParam(PARAM_QUALITY_PROFILE) - .setDescription("Quality profile name. If this parameter is set, '%s' must not be set and '%s' must be set to disambiguate.", PARAM_KEY, PARAM_LANGUAGE) + .setDescription("Quality profile name") .setDeprecatedKey("profileName", "6.6") .setExampleValue("Sonar way"); action.createParam(PARAM_LANGUAGE) - .setDescription("Quality profile language. If this parameter is set, '%s' must not be set and '%s' must be set to disambiguate.", PARAM_KEY, PARAM_LANGUAGE) + .setDescription("Quality profile language") .setPossibleValues(Arrays.stream(languages.all()).map(Language::getKey).collect(MoreCollectors.toSet())); } } -- 2.39.5