summaryrefslogtreecommitdiffstats
path: root/sonar-server/src/main
diff options
context:
space:
mode:
authorJulien Lancelot <julien.lancelot@sonarsource.com>2014-06-06 15:18:57 +0200
committerJulien Lancelot <julien.lancelot@sonarsource.com>2014-06-06 15:18:57 +0200
commit8174016225ccf95889e51f5af87ae1ef07c9d8d1 (patch)
tree107bfc9ac3998599940468d593d2c04cf58b78be /sonar-server/src/main
parent1b4f0d57af056859ad489b07d3d1b5199f72d8b3 (diff)
downloadsonarqube-8174016225ccf95889e51f5af87ae1ef07c9d8d1.tar.gz
sonarqube-8174016225ccf95889e51f5af87ae1ef07c9d8d1.zip
SONAR-5362 Do not fail if not all parameters are set
Diffstat (limited to 'sonar-server/src/main')
-rw-r--r--sonar-server/src/main/java/org/sonar/server/rule/RuleUpdate.java11
-rw-r--r--sonar-server/src/main/java/org/sonar/server/rule/RuleUpdater.java5
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<String, String> 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);
}
}