From 19295e8e4c8bd2ac80095343f7f5205a6f15ef81 Mon Sep 17 00:00:00 2001 From: Michal Duda Date: Thu, 25 Feb 2021 11:12:59 +0100 Subject: [PATCH] SONAR-13848 remove deprecated param 'componentKey' from api/settings/* --- .../main/java/org/sonar/server/setting/ws/ResetAction.java | 4 ++-- .../src/main/java/org/sonar/server/setting/ws/SetAction.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/setting/ws/ResetAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/setting/ws/ResetAction.java index 63d1a482726..e09641b88d2 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/setting/ws/ResetAction.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/setting/ws/ResetAction.java @@ -59,7 +59,7 @@ public class ResetAction implements SettingsWsAction { private final SettingValidations validations; public ResetAction(DbClient dbClient, ComponentFinder componentFinder, SettingsUpdater settingsUpdater, UserSession userSession, PropertyDefinitions definitions, - SettingValidations validations) { + SettingValidations validations) { this.dbClient = dbClient; this.settingsUpdater = settingsUpdater; this.userSession = userSession; @@ -80,6 +80,7 @@ public class ResetAction implements SettingsWsAction { "") .setSince("6.1") .setChangelog( + new Change("8.8", "Deprecated parameter 'componentKey' has been removed"), new Change("7.6", String.format("The use of module keys in parameter '%s' is deprecated", PARAM_COMPONENT)), new Change("7.1", "The settings defined in conf/sonar.properties are read-only and can't be changed")) .setPost(true) @@ -91,7 +92,6 @@ public class ResetAction implements SettingsWsAction { .setRequired(true); action.createParam(PARAM_COMPONENT) .setDescription("Component key") - .setDeprecatedKey("componentKey", "6.3") .setExampleValue(KEY_PROJECT_EXAMPLE_001); action.createParam(PARAM_BRANCH) .setDescription("Branch key") diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/setting/ws/SetAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/setting/ws/SetAction.java index 83621aa1d07..3170aed7c4b 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/setting/ws/SetAction.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/setting/ws/SetAction.java @@ -104,6 +104,7 @@ public class SetAction implements SettingsWsAction { PARAM_VALUE, PARAM_VALUES) .setSince("6.1") .setChangelog( + new Change("8.8", "Deprecated parameter 'componentKey' has been removed"), new Change("7.6", String.format("The use of module keys in parameter '%s' is deprecated", PARAM_COMPONENT)), new Change("7.1", "The settings defined in conf/sonar.properties are read-only and can't be changed")) .setPost(true) @@ -129,7 +130,6 @@ public class SetAction implements SettingsWsAction { action.createParam(PARAM_COMPONENT) .setDescription("Component key") - .setDeprecatedKey("componentKey", "6.3") .setExampleValue(KEY_PROJECT_EXAMPLE_001); } -- 2.39.5