Browse Source

Polishing

pull/758/merge
Juergen Hoeller 9 years ago
parent
commit
bb3ff25cad
  1. 6
      spring-beans/src/main/java/org/springframework/beans/propertyeditors/ResourceBundleEditor.java
  2. 15
      spring-beans/src/test/java/org/springframework/beans/propertyeditors/ResourceBundleEditorTests.java

6
spring-beans/src/main/java/org/springframework/beans/propertyeditors/ResourceBundleEditor.java

@ -61,8 +61,8 @@ import org.springframework.util.StringUtils;
* </property> * </property>
* &lt;/bean&gt;</pre> * &lt;/bean&gt;</pre>
* *
* <p>Please note that this {@link java.beans.PropertyEditor} is * <p>Please note that this {@link java.beans.PropertyEditor} is <b>not</b>
* <b>not</b> registered by default with any of the Spring infrastructure. * registered by default with any of the Spring infrastructure.
* *
* <p>Thanks to David Leal Valmana for the suggestion and initial prototype. * <p>Thanks to David Leal Valmana for the suggestion and initial prototype.
* *
@ -89,7 +89,7 @@ public class ResourceBundleEditor extends PropertyEditorSupport {
setValue(ResourceBundle.getBundle(name)); setValue(ResourceBundle.getBundle(name));
} }
else { else {
// Tge basename potentially has locale information // The name potentially contains locale information
String baseName = name.substring(0, separator); String baseName = name.substring(0, separator);
if (!StringUtils.hasText(baseName)) { if (!StringUtils.hasText(baseName)) {
throw new IllegalArgumentException("Invalid ResourceBundle name: '" + text + "'"); throw new IllegalArgumentException("Invalid ResourceBundle name: '" + text + "'");

15
spring-beans/src/test/java/org/springframework/beans/propertyeditors/ResourceBundleEditorTests.java

@ -41,7 +41,8 @@ public class ResourceBundleEditorTests {
editor.setAsText(BASE_NAME); editor.setAsText(BASE_NAME);
Object value = editor.getValue(); Object value = editor.getValue();
assertNotNull("Returned ResourceBundle was null (must not be for valid setAsText(..) call).", value); assertNotNull("Returned ResourceBundle was null (must not be for valid setAsText(..) call).", value);
assertTrue("Returned object was not a ResourceBundle (must be for valid setAsText(..) call).", value instanceof ResourceBundle); assertTrue("Returned object was not a ResourceBundle (must be for valid setAsText(..) call).",
value instanceof ResourceBundle);
ResourceBundle bundle = (ResourceBundle) value; ResourceBundle bundle = (ResourceBundle) value;
String string = bundle.getString(MESSAGE_KEY); String string = bundle.getString(MESSAGE_KEY);
assertEquals(MESSAGE_KEY, string); assertEquals(MESSAGE_KEY, string);
@ -53,7 +54,8 @@ public class ResourceBundleEditorTests {
editor.setAsText(BASE_NAME + "_"); editor.setAsText(BASE_NAME + "_");
Object value = editor.getValue(); Object value = editor.getValue();
assertNotNull("Returned ResourceBundle was null (must not be for valid setAsText(..) call).", value); assertNotNull("Returned ResourceBundle was null (must not be for valid setAsText(..) call).", value);
assertTrue("Returned object was not a ResourceBundle (must be for valid setAsText(..) call).", value instanceof ResourceBundle); assertTrue("Returned object was not a ResourceBundle (must be for valid setAsText(..) call).",
value instanceof ResourceBundle);
ResourceBundle bundle = (ResourceBundle) value; ResourceBundle bundle = (ResourceBundle) value;
String string = bundle.getString(MESSAGE_KEY); String string = bundle.getString(MESSAGE_KEY);
assertEquals(MESSAGE_KEY, string); assertEquals(MESSAGE_KEY, string);
@ -65,7 +67,8 @@ public class ResourceBundleEditorTests {
editor.setAsText(BASE_NAME + "Lang" + "_en"); editor.setAsText(BASE_NAME + "Lang" + "_en");
Object value = editor.getValue(); Object value = editor.getValue();
assertNotNull("Returned ResourceBundle was null (must not be for valid setAsText(..) call).", value); assertNotNull("Returned ResourceBundle was null (must not be for valid setAsText(..) call).", value);
assertTrue("Returned object was not a ResourceBundle (must be for valid setAsText(..) call).", value instanceof ResourceBundle); assertTrue("Returned object was not a ResourceBundle (must be for valid setAsText(..) call).",
value instanceof ResourceBundle);
ResourceBundle bundle = (ResourceBundle) value; ResourceBundle bundle = (ResourceBundle) value;
String string = bundle.getString(MESSAGE_KEY); String string = bundle.getString(MESSAGE_KEY);
assertEquals("yob", string); assertEquals("yob", string);
@ -77,7 +80,8 @@ public class ResourceBundleEditorTests {
editor.setAsText(BASE_NAME + "LangCountry" + "_en_GB"); editor.setAsText(BASE_NAME + "LangCountry" + "_en_GB");
Object value = editor.getValue(); Object value = editor.getValue();
assertNotNull("Returned ResourceBundle was null (must not be for valid setAsText(..) call).", value); assertNotNull("Returned ResourceBundle was null (must not be for valid setAsText(..) call).", value);
assertTrue("Returned object was not a ResourceBundle (must be for valid setAsText(..) call).", value instanceof ResourceBundle); assertTrue("Returned object was not a ResourceBundle (must be for valid setAsText(..) call).",
value instanceof ResourceBundle);
ResourceBundle bundle = (ResourceBundle) value; ResourceBundle bundle = (ResourceBundle) value;
String string = bundle.getString(MESSAGE_KEY); String string = bundle.getString(MESSAGE_KEY);
assertEquals("chav", string); assertEquals("chav", string);
@ -89,7 +93,8 @@ public class ResourceBundleEditorTests {
editor.setAsText(BASE_NAME + "LangCountryDialect" + "_en_GB_GLASGOW"); editor.setAsText(BASE_NAME + "LangCountryDialect" + "_en_GB_GLASGOW");
Object value = editor.getValue(); Object value = editor.getValue();
assertNotNull("Returned ResourceBundle was null (must not be for valid setAsText(..) call).", value); assertNotNull("Returned ResourceBundle was null (must not be for valid setAsText(..) call).", value);
assertTrue("Returned object was not a ResourceBundle (must be for valid setAsText(..) call).", value instanceof ResourceBundle); assertTrue("Returned object was not a ResourceBundle (must be for valid setAsText(..) call).",
value instanceof ResourceBundle);
ResourceBundle bundle = (ResourceBundle) value; ResourceBundle bundle = (ResourceBundle) value;
String string = bundle.getString(MESSAGE_KEY); String string = bundle.getString(MESSAGE_KEY);
assertEquals("ned", string); assertEquals("ned", string);

Loading…
Cancel
Save