From 8174016225ccf95889e51f5af87ae1ef07c9d8d1 Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Fri, 6 Jun 2014 15:18:57 +0200 Subject: [PATCH] SONAR-5362 Do not fail if not all parameters are set --- .../main/java/org/sonar/server/rule/RuleUpdate.java | 11 +++++++++-- .../main/java/org/sonar/server/rule/RuleUpdater.java | 5 +---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/sonar-server/src/main/java/org/sonar/server/rule/RuleUpdate.java b/sonar-server/src/main/java/org/sonar/server/rule/RuleUpdate.java index ad0eccdee74..cf6bddc1d2a 100644 --- a/sonar-server/src/main/java/org/sonar/server/rule/RuleUpdate.java +++ b/sonar-server/src/main/java/org/sonar/server/rule/RuleUpdate.java @@ -111,6 +111,7 @@ public class RuleUpdate { return this; } + @CheckForNull public String getName() { return name; } @@ -122,6 +123,7 @@ public class RuleUpdate { return this; } + @CheckForNull public String getHtmlDescription() { return htmlDescription; } @@ -133,28 +135,33 @@ public class RuleUpdate { return this; } + @CheckForNull public String getSeverity() { return severity; } - public RuleUpdate setSeverity(String severity) { + public RuleUpdate setSeverity(@Nullable String severity) { checkCustomRule(); this.severity = severity; this.changeSeverity = true; return this; } + @CheckForNull public RuleStatus getStatus() { return status; } - public RuleUpdate setStatus(RuleStatus status) { + public RuleUpdate setStatus(@Nullable RuleStatus status) { checkCustomRule(); this.status = status; this.changeStatus = true; return this; } + /** + * Parameters to be updated (only for custom rules) + */ public RuleUpdate setParameters(Map params) { checkCustomRule(); this.parameters.clear(); diff --git a/sonar-server/src/main/java/org/sonar/server/rule/RuleUpdater.java b/sonar-server/src/main/java/org/sonar/server/rule/RuleUpdater.java index 27a393a4402..80dac2aa2e8 100644 --- a/sonar-server/src/main/java/org/sonar/server/rule/RuleUpdater.java +++ b/sonar-server/src/main/java/org/sonar/server/rule/RuleUpdater.java @@ -177,12 +177,9 @@ public class RuleUpdater implements ServerComponent { } private void updateParameters(RuleUpdate update, Context context) { - // All parameters have to be updated for (RuleParamDto ruleParamDto : context.parameters) { String value = update.parameter(ruleParamDto.getName()); - if (Strings.isNullOrEmpty(value)) { - throw new IllegalArgumentException(String.format("The parameter '%s' has not been set", ruleParamDto.getName())); - } else { + if (!Strings.isNullOrEmpty(value)) { ruleParamDto.setDefaultValue(value); } } -- 2.39.5