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

CustomBooleanEditor avoids potential NPE in case of allowEmpty=false 

Issue: SPR-13010
This commit is contained in:
Juergen Hoeller 2015-05-11 14:20:19 +02:00
parent d14e29a5c0
commit 549e888cd7
2 changed files with 38 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomBooleanEditor.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2012 the original author or authors. * Copyright 2002-2015 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -95,6 +95,7 @@ public class CustomBooleanEditor extends PropertyEditorSupport {
this.allowEmpty = allowEmpty; this.allowEmpty = allowEmpty;
} }
@Override @Override
public void setAsText(String text) throws IllegalArgumentException { public void setAsText(String text) throws IllegalArgumentException {
String input = (text != null ? text.trim() : null); String input = (text != null ? text.trim() : null);
@ -102,20 +103,20 @@ public class CustomBooleanEditor extends PropertyEditorSupport {
// Treat empty String as null value. // Treat empty String as null value.
setValue(null); setValue(null);
} }
else if (this.trueString != null && input.equalsIgnoreCase(this.trueString)) { else if (this.trueString != null && this.trueString.equalsIgnoreCase(input)) {
setValue(Boolean.TRUE); setValue(Boolean.TRUE);
} }
else if (this.falseString != null && input.equalsIgnoreCase(this.falseString)) { else if (this.falseString != null && this.falseString.equalsIgnoreCase(input)) {
setValue(Boolean.FALSE); setValue(Boolean.FALSE);
} }
else if (this.trueString == null && else if (this.trueString == null &&
(input.equalsIgnoreCase(VALUE_TRUE) || input.equalsIgnoreCase(VALUE_ON) || (VALUE_TRUE.equalsIgnoreCase(input) || VALUE_ON.equalsIgnoreCase(input) ||
input.equalsIgnoreCase(VALUE_YES) || input.equals(VALUE_1))) { VALUE_YES.equalsIgnoreCase(input) || VALUE_1.equals(input))) {
setValue(Boolean.TRUE); setValue(Boolean.TRUE);
} }
else if (this.falseString == null && else if (this.falseString == null &&
(input.equalsIgnoreCase(VALUE_FALSE) || input.equalsIgnoreCase(VALUE_OFF) || (VALUE_FALSE.equalsIgnoreCase(input) || VALUE_OFF.equalsIgnoreCase(input) ||
input.equalsIgnoreCase(VALUE_NO) || input.equals(VALUE_0))) { VALUE_NO.equalsIgnoreCase(input) || VALUE_0.equals(input))) {
setValue(Boolean.FALSE); setValue(Boolean.FALSE);
} }
else { else {

39
spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2013 the original author or authors. * Copyright 2002-2015 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -59,7 +59,6 @@ import static org.junit.Assert.*;
* @author Rob Harrop * @author Rob Harrop
* @author Arjen Poutsma * @author Arjen Poutsma
* @author Chris Beams * @author Chris Beams
*
* @since 10.06.2003 * @since 10.06.2003
*/ */
public class CustomEditorTests { public class CustomEditorTests {
@ -302,8 +301,8 @@ public class CustomEditorTests {
@Test @Test
public void testCustomBooleanEditorWithSpecialTrueAndFalseStrings() throws Exception { public void testCustomBooleanEditorWithSpecialTrueAndFalseStrings() throws Exception {
final String trueString = "pechorin"; String trueString = "pechorin";
final String falseString = "nash"; String falseString = "nash";
CustomBooleanEditor editor = new CustomBooleanEditor(trueString, falseString, false); CustomBooleanEditor editor = new CustomBooleanEditor(trueString, falseString, false);
@ -320,6 +319,14 @@ public class CustomEditorTests {
editor.setAsText(falseString.toUpperCase()); editor.setAsText(falseString.toUpperCase());
assertFalse(((Boolean) editor.getValue()).booleanValue()); assertFalse(((Boolean) editor.getValue()).booleanValue());
assertEquals(falseString, editor.getAsText()); assertEquals(falseString, editor.getAsText());
try {
editor.setAsText(null);
fail("Should have thrown IllegalArgumentException");
}
catch (IllegalArgumentException ex) {
// expected
}
} }
@Test @Test
@ -423,7 +430,7 @@ public class CustomEditorTests {
assertTrue("Correct bigDecimal value", new BigDecimal("4.5").equals(tb.getBigDecimal())); assertTrue("Correct bigDecimal value", new BigDecimal("4.5").equals(tb.getBigDecimal()));
} }
@Test(expected=IllegalArgumentException.class) @Test(expected = IllegalArgumentException.class)
public void testCustomNumberEditorCtorWithNullNumberType() throws Exception { public void testCustomNumberEditorCtorWithNullNumberType() throws Exception {
new CustomNumberEditor(null, true); new CustomNumberEditor(null, true);
} }
@ -543,7 +550,7 @@ public class CustomEditorTests {
assertNull(cb.getMyCharacter()); assertNull(cb.getMyCharacter());
} }
@Test(expected=IllegalArgumentException.class) @Test(expected = IllegalArgumentException.class)
public void testCharacterEditorSetAsTextWithStringLongerThanOneCharacter() throws Exception { public void testCharacterEditorSetAsTextWithStringLongerThanOneCharacter() throws Exception {
PropertyEditor charEditor = new CharacterEditor(false); PropertyEditor charEditor = new CharacterEditor(false);
charEditor.setAsText("ColdWaterCanyon"); charEditor.setAsText("ColdWaterCanyon");
@ -562,7 +569,7 @@ public class CustomEditorTests {
assertEquals(" ", charEditor.getAsText()); assertEquals(" ", charEditor.getAsText());
} }
@Test(expected=IllegalArgumentException.class) @Test(expected = IllegalArgumentException.class)
public void testCharacterEditorSetAsTextWithNullNotAllowingEmptyAsNull() throws Exception { public void testCharacterEditorSetAsTextWithNullNotAllowingEmptyAsNull() throws Exception {
PropertyEditor charEditor = new CharacterEditor(false); PropertyEditor charEditor = new CharacterEditor(false);
charEditor.setAsText(null); charEditor.setAsText(null);
@ -583,7 +590,7 @@ public class CustomEditorTests {
assertEquals("", classEditor.getAsText()); assertEquals("", classEditor.getAsText());
} }
@Test(expected=IllegalArgumentException.class) @Test(expected = IllegalArgumentException.class)
public void testClassEditorWithNonExistentClass() throws Exception { public void testClassEditorWithNonExistentClass() throws Exception {
PropertyEditor classEditor = new ClassEditor(); PropertyEditor classEditor = new ClassEditor();
classEditor.setAsText("hairdresser.on.Fire"); classEditor.setAsText("hairdresser.on.Fire");
@ -685,26 +692,40 @@ public class CustomEditorTests {
@Test @Test
public void testCustomBooleanEditor() { public void testCustomBooleanEditor() {
CustomBooleanEditor editor = new CustomBooleanEditor(false); CustomBooleanEditor editor = new CustomBooleanEditor(false);
editor.setAsText("true"); editor.setAsText("true");
assertEquals(Boolean.TRUE, editor.getValue()); assertEquals(Boolean.TRUE, editor.getValue());
assertEquals("true", editor.getAsText()); assertEquals("true", editor.getAsText());
editor.setAsText("false"); editor.setAsText("false");
assertEquals(Boolean.FALSE, editor.getValue()); assertEquals(Boolean.FALSE, editor.getValue());
assertEquals("false", editor.getAsText()); assertEquals("false", editor.getAsText());
editor.setValue(null); editor.setValue(null);
assertEquals(null, editor.getValue()); assertEquals(null, editor.getValue());
assertEquals("", editor.getAsText()); assertEquals("", editor.getAsText());
try {
editor.setAsText(null);
fail("Should have thrown IllegalArgumentException");
}
catch (IllegalArgumentException ex) {
// expected
}
} }
@Test @Test
public void testCustomBooleanEditorWithEmptyAsNull() { public void testCustomBooleanEditorWithEmptyAsNull() {
CustomBooleanEditor editor = new CustomBooleanEditor(true); CustomBooleanEditor editor = new CustomBooleanEditor(true);
editor.setAsText("true"); editor.setAsText("true");
assertEquals(Boolean.TRUE, editor.getValue()); assertEquals(Boolean.TRUE, editor.getValue());
assertEquals("true", editor.getAsText()); assertEquals("true", editor.getAsText());
editor.setAsText("false"); editor.setAsText("false");
assertEquals(Boolean.FALSE, editor.getValue()); assertEquals(Boolean.FALSE, editor.getValue());
assertEquals("false", editor.getAsText()); assertEquals("false", editor.getAsText());
editor.setValue(null); editor.setValue(null);
assertEquals(null, editor.getValue()); assertEquals(null, editor.getValue());
assertEquals("", editor.getAsText()); assertEquals("", editor.getAsText());
@ -750,7 +771,7 @@ public class CustomEditorTests {
} }
catch (IllegalArgumentException ex) { catch (IllegalArgumentException ex) {
// expected // expected
assertTrue(ex.getMessage().indexOf("10") != -1); assertTrue(ex.getMessage().contains("10"));
} }
} }