From 2dc32c2ca235ea40b191c2e5593e4ab377efcadb Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Tue, 4 Nov 2014 16:18:09 +0100 Subject: [PATCH] Fix quality flaws --- .../java/org/sonar/server/util/BooleanTypeValidation.java | 4 +++- .../java/org/sonar/server/util/IntegerTypeValidation.java | 4 +++- .../org/sonar/server/util/StringListTypeValidation.java | 6 ++++-- .../java/org/sonar/server/util/StringTypeValidation.java | 4 +++- .../main/java/org/sonar/server/util/TextTypeValidation.java | 4 +++- .../org/sonar/server/util/StringListTypeValidationTest.java | 1 + 6 files changed, 17 insertions(+), 6 deletions(-) diff --git a/server/sonar-server/src/main/java/org/sonar/server/util/BooleanTypeValidation.java b/server/sonar-server/src/main/java/org/sonar/server/util/BooleanTypeValidation.java index 53424f2778c..e4f06348279 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/util/BooleanTypeValidation.java +++ b/server/sonar-server/src/main/java/org/sonar/server/util/BooleanTypeValidation.java @@ -24,6 +24,8 @@ import org.apache.commons.lang.StringUtils; import org.sonar.api.PropertyType; import org.sonar.server.exceptions.BadRequestException; +import javax.annotation.Nullable; + import java.util.List; public class BooleanTypeValidation implements TypeValidation { @@ -34,7 +36,7 @@ public class BooleanTypeValidation implements TypeValidation { } @Override - public void validate(String value, List options) { + public void validate(String value, @Nullable List options) { if (!StringUtils.equalsIgnoreCase(value, "true") && !StringUtils.equalsIgnoreCase(value, "false")) { throw new BadRequestException("errors.type.notBoolean", value); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/util/IntegerTypeValidation.java b/server/sonar-server/src/main/java/org/sonar/server/util/IntegerTypeValidation.java index 31f87e6a0de..f0f93195704 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/util/IntegerTypeValidation.java +++ b/server/sonar-server/src/main/java/org/sonar/server/util/IntegerTypeValidation.java @@ -24,6 +24,8 @@ import org.apache.commons.lang.math.NumberUtils; import org.sonar.api.PropertyType; import org.sonar.server.exceptions.BadRequestException; +import javax.annotation.Nullable; + import java.util.List; public class IntegerTypeValidation implements TypeValidation { @@ -34,7 +36,7 @@ public class IntegerTypeValidation implements TypeValidation { } @Override - public void validate(String value, List options) { + public void validate(String value, @Nullable List options) { if (!NumberUtils.isDigits(value)) { throw new BadRequestException("errors.type.notInteger", value); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/util/StringListTypeValidation.java b/server/sonar-server/src/main/java/org/sonar/server/util/StringListTypeValidation.java index 762f21effba..b12d9d9ed95 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/util/StringListTypeValidation.java +++ b/server/sonar-server/src/main/java/org/sonar/server/util/StringListTypeValidation.java @@ -24,6 +24,8 @@ import org.apache.commons.lang.StringUtils; import org.sonar.api.PropertyType; import org.sonar.server.exceptions.BadRequestException; +import javax.annotation.Nullable; + import java.util.List; public class StringListTypeValidation implements TypeValidation { @@ -34,8 +36,8 @@ public class StringListTypeValidation implements TypeValidation { } @Override - public void validate(String value, List options) { - if (!options.contains(value)) { + public void validate(String value, @Nullable List options) { + if (options != null && !options.contains(value)) { String optionsAsString = StringUtils.join(options, ", "); throw new BadRequestException("errors.type.notInOptions", value, optionsAsString); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/util/StringTypeValidation.java b/server/sonar-server/src/main/java/org/sonar/server/util/StringTypeValidation.java index f5e7f5bce72..7c931276339 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/util/StringTypeValidation.java +++ b/server/sonar-server/src/main/java/org/sonar/server/util/StringTypeValidation.java @@ -22,6 +22,8 @@ package org.sonar.server.util; import org.sonar.api.PropertyType; +import javax.annotation.Nullable; + import java.util.List; public class StringTypeValidation implements TypeValidation { @@ -32,7 +34,7 @@ public class StringTypeValidation implements TypeValidation { } @Override - public void validate(String value, List options) { + public void validate(String value, @Nullable List options) { // Nothing to do } diff --git a/server/sonar-server/src/main/java/org/sonar/server/util/TextTypeValidation.java b/server/sonar-server/src/main/java/org/sonar/server/util/TextTypeValidation.java index ccde7d29970..340d87e81d6 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/util/TextTypeValidation.java +++ b/server/sonar-server/src/main/java/org/sonar/server/util/TextTypeValidation.java @@ -22,6 +22,8 @@ package org.sonar.server.util; import org.sonar.api.PropertyType; +import javax.annotation.Nullable; + import java.util.List; public class TextTypeValidation implements TypeValidation { @@ -32,7 +34,7 @@ public class TextTypeValidation implements TypeValidation { } @Override - public void validate(String value, List options) { + public void validate(String value, @Nullable List options) { // Nothing to do } diff --git a/server/sonar-server/src/test/java/org/sonar/server/util/StringListTypeValidationTest.java b/server/sonar-server/src/test/java/org/sonar/server/util/StringListTypeValidationTest.java index 750d91ef7f1..3977228c636 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/util/StringListTypeValidationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/util/StringListTypeValidationTest.java @@ -45,6 +45,7 @@ public class StringListTypeValidationTest { @Test public void not_fail_on_valid_option() { validation.validate("a", newArrayList("a", "b", "c")); + validation.validate("a", null); } @Test -- 2.39.5