root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

understand "on"/"off", "yes"/"no", "1"/"0" as boolean values (analogous to CustomBooleanEditor)

This commit is contained in:
Juergen Hoeller 2009-10-01 11:18:48 +00:00
parent b465f204bd
commit 7a700edaa7
2 changed files with 38 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
org.springframework.core/src/main/java/org/springframework/core/convert/support/StringToBooleanConverter.java
View File

@ -16,27 +16,53 @@
package org.springframework.core.convert.support; package org.springframework.core.convert.support;
import java.util.HashSet;
import java.util.Set;
import org.springframework.core.convert.converter.Converter; import org.springframework.core.convert.converter.Converter;
import org.springframework.util.StringUtils;
/** /**
* Converts String to a Boolean. * Converts String to a Boolean.
* *
* @author Keith Donald * @author Keith Donald
* @author Juergen Hoeller
* @since 3.0 * @since 3.0
*/ */
final class StringToBooleanConverter implements Converter<String, Boolean> { final class StringToBooleanConverter implements Converter<String, Boolean> {
private static final Set<String> trueValues = new HashSet<String>(4);
private static final Set<String> falseValues = new HashSet<String>(4);
static {
trueValues.add("true");
falseValues.add("false");
trueValues.add("on");
falseValues.add("off");
trueValues.add("yes");
falseValues.add("no");
trueValues.add("1");
falseValues.add("0");
}
public Boolean convert(String source) { public Boolean convert(String source) {
if (source.equals("")) { String value = (source != null ? source.trim() : null);
if (!StringUtils.hasLength(value)) {
return null; return null;
} else if (source.equals("true")) { }
else if (trueValues.contains(value)) {
return Boolean.TRUE; return Boolean.TRUE;
} }
else if (source.equals("false")) { else if (falseValues.contains(value)) {
return Boolean.FALSE; return Boolean.FALSE;
} }
else { else {
throw new IllegalArgumentException("Invalid boolean string '" + source + "'; expected \"\", 'true', or 'false'"); throw new IllegalArgumentException("Invalid boolean value '" + source + "'");
} }
} }

11
org.springframework.core/src/test/java/org/springframework/core/convert/support/DefaultConversionServiceTests.java
View File

@ -16,14 +16,13 @@
package org.springframework.core.convert.support; package org.springframework.core.convert.support;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.BigInteger; import java.math.BigInteger;
import java.util.Locale; import java.util.Locale;
import static org.junit.Assert.*;
import org.junit.Test; import org.junit.Test;
import org.springframework.core.convert.converter.Converter; import org.springframework.core.convert.converter.Converter;
/** /**
@ -56,12 +55,18 @@ public class DefaultConversionServiceTests {
public void testStringToBooleanTrue() { public void testStringToBooleanTrue() {
StringToBooleanConverter c = new StringToBooleanConverter(); StringToBooleanConverter c = new StringToBooleanConverter();
assertEquals(Boolean.valueOf(true), c.convert("true")); assertEquals(Boolean.valueOf(true), c.convert("true"));
assertEquals(Boolean.valueOf(true), c.convert("on"));
assertEquals(Boolean.valueOf(true), c.convert("yes"));
assertEquals(Boolean.valueOf(true), c.convert("1"));
} }
@Test @Test
public void testStringToBooleanFalse() { public void testStringToBooleanFalse() {
StringToBooleanConverter c = new StringToBooleanConverter(); StringToBooleanConverter c = new StringToBooleanConverter();
assertEquals(Boolean.valueOf(false), c.convert("false")); assertEquals(Boolean.valueOf(false), c.convert("false"));
assertEquals(Boolean.valueOf(false), c.convert("off"));
assertEquals(Boolean.valueOf(false), c.convert("no"));
assertEquals(Boolean.valueOf(false), c.convert("0"));
} }
@Test @Test