Browse Source

Fix quality flaws

tags/5.0-RC1
Julien Lancelot 9 years ago
parent
commit
2dc32c2ca2

+ 3
- 1
server/sonar-server/src/main/java/org/sonar/server/util/BooleanTypeValidation.java View File

@@ -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);
}

+ 3
- 1
server/sonar-server/src/main/java/org/sonar/server/util/IntegerTypeValidation.java View File

@@ -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);
}

+ 4
- 2
server/sonar-server/src/main/java/org/sonar/server/util/StringListTypeValidation.java View File

@@ -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);
}

+ 3
- 1
server/sonar-server/src/main/java/org/sonar/server/util/StringTypeValidation.java View File

@@ -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
}


+ 3
- 1
server/sonar-server/src/main/java/org/sonar/server/util/TextTypeValidation.java View File

@@ -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
}


+ 1
- 0
server/sonar-server/src/test/java/org/sonar/server/util/StringListTypeValidationTest.java View File

@@ -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

Loading…
Cancel
Save