Fix quality flaws

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 53424f2778c0468f93aa67bc268a28d9ae91e33b..e4f06348279653f985028afef05eeef8e522fdfe 100644 (file)
--- 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<String> options) {
+  public void validate(String value, @Nullable List<String> 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 31f87e6a0de800ed97c6a4c0ca5b980dc390a11c..f0f931957043e1c38763e30ed0fa36c345c0d810 100644 (file)
--- 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<String> options) {
+  public void validate(String value, @Nullable List<String> 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 762f21effba82c6e01ac30d4dd466efc21c02e6b..b12d9d9ed95640932d3df05afd0c8686c325f631 100644 (file)
--- 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<String> options) {
-    if (!options.contains(value)) {
+  public void validate(String value, @Nullable List<String> 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 f5e7f5bce72991ab13178b068dddaeab5daea82f..7c9312763390070f7bba6603a2b6538ec0bcfbe5 100644 (file)
--- 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<String> options) {
+  public void validate(String value, @Nullable List<String> 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 ccde7d29970457e43f62e647e6191827ee0b5601..340d87e81d6ed083cac45a67cb797b7219d38d43 100644 (file)
--- 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<String> options) {
+  public void validate(String value, @Nullable List<String> 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 750d91ef7f1c9201fa13e789dcb11bcd10e94385..3977228c6362d52eeb053ad6bf82a93c27fdca99 100644 (file)
--- 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