From 155d3d07c1e888a7cd51c57dceb58188e06635e7 Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Wed, 16 Mar 2016 12:08:57 +0100 Subject: SONAR-7453 Finish renaming of debt to effort --- .../ws/client/rule/RulesWsParameters.java | 33 ++++++++++++++++++++-- sonar-ws/src/main/protobuf/ws-rules.proto | 2 ++ 2 files changed, 32 insertions(+), 3 deletions(-) (limited to 'sonar-ws') diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/rule/RulesWsParameters.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/rule/RulesWsParameters.java index 503ba93a322..3060d43fc50 100644 --- a/sonar-ws/src/main/java/org/sonarqube/ws/client/rule/RulesWsParameters.java +++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/rule/RulesWsParameters.java @@ -56,17 +56,44 @@ public class RulesWsParameters { public static final String FIELD_NOTE_LOGIN = "noteLogin"; public static final String FIELD_MARKDOWN_NOTE = "mdNote"; public static final String FIELD_HTML_NOTE = "htmlNote"; + + /** + * @deprecated since 5.5, replaced by {@link #FIELD_DEFAULT_REM_FUNCTION} + */ + @Deprecated public static final String FIELD_DEFAULT_DEBT_REM_FUNCTION = "defaultDebtRemFn"; + public static final String FIELD_DEFAULT_REM_FUNCTION = "defaultRemFn"; + + /** + * @deprecated since 5.5, replaced by {@link #FIELD_REM_FUNCTION} + */ + @Deprecated + public static final String FIELD_DEBT_REM_FUNCTION = "debtRemFn"; + public static final String FIELD_REM_FUNCTION = "remFn"; + + /** + * @deprecated since 5.5, replaced by {@link #FIELD_GAP_DESCRIPTION} + */ + @Deprecated public static final String FIELD_EFFORT_TO_FIX_DESCRIPTION = "effortToFixDescription"; + public static final String FIELD_GAP_DESCRIPTION = "gapDescription"; + + /** + * @deprecated since 5.5, replaced by {@link #FIELD_REM_FUNCTION_OVERLOADED} + */ + @Deprecated public static final String FIELD_DEBT_OVERLOADED = "debtOverloaded"; - public static final String FIELD_DEBT_REM_FUNCTION = "debtRemFn"; + public static final String FIELD_REM_FUNCTION_OVERLOADED = "remFnOverloaded"; + public static final String FIELD_PARAMS = "params"; public static final String FIELD_ACTIVES = "actives"; public static final Set OPTIONAL_FIELDS = ImmutableSet.of(FIELD_REPO, FIELD_NAME, FIELD_CREATED_AT, FIELD_SEVERITY, FIELD_STATUS, FIELD_INTERNAL_KEY, FIELD_IS_TEMPLATE, FIELD_TEMPLATE_KEY, FIELD_TAGS, FIELD_SYSTEM_TAGS, FIELD_LANGUAGE, FIELD_LANGUAGE_NAME, FIELD_HTML_DESCRIPTION, FIELD_MARKDOWN_DESCRIPTION, FIELD_NOTE_LOGIN, - FIELD_MARKDOWN_NOTE, FIELD_HTML_NOTE, FIELD_DEFAULT_DEBT_REM_FUNCTION, FIELD_EFFORT_TO_FIX_DESCRIPTION, FIELD_DEBT_OVERLOADED, FIELD_DEBT_REM_FUNCTION, FIELD_PARAMS, - FIELD_ACTIVES); + FIELD_MARKDOWN_NOTE, FIELD_HTML_NOTE, + FIELD_DEFAULT_DEBT_REM_FUNCTION, FIELD_EFFORT_TO_FIX_DESCRIPTION, FIELD_DEBT_OVERLOADED, FIELD_DEBT_REM_FUNCTION, + FIELD_DEFAULT_REM_FUNCTION, FIELD_GAP_DESCRIPTION, FIELD_REM_FUNCTION_OVERLOADED, FIELD_REM_FUNCTION, + FIELD_PARAMS, FIELD_ACTIVES); private RulesWsParameters() { // prevent instantiation diff --git a/sonar-ws/src/main/protobuf/ws-rules.proto b/sonar-ws/src/main/protobuf/ws-rules.proto index 46fc628ab16..08067de63ea 100644 --- a/sonar-ws/src/main/protobuf/ws-rules.proto +++ b/sonar-ws/src/main/protobuf/ws-rules.proto @@ -102,6 +102,7 @@ message Rule { optional string defaultDebtRemFnOffset = 31; // Deprecated since 5.5, replaced by gapDescription optional string effortToFixDescription = 32; + // Deprecated since 5.5, replaced by remFnOverloaded optional bool debtOverloaded = 33; // Deprecated since 5.5, replaced by remFnType optional string debtRemFnType = 34; @@ -116,6 +117,7 @@ message Rule { optional string remFnType = 41; optional string remFnGapMultiplier = 42; optional string remFnBaseEffort = 43; + optional bool remFnOverloaded = 45; optional string gapDescription = 44; optional sonarqube.ws.commons.RuleType type = 37; -- cgit v1.2.3