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

MessageSourceResourceBundle overrides JDK 1.6 containsKey method, avoiding NPE in getKeys 

Issue: SPR-10136
This commit is contained in:
Juergen Hoeller 2013-01-03 16:31:00 +01:00 committed by unknown
parent 10dceb182e
commit 3a9ca4a6bb
2 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
spring-context/src/main/java/org/springframework/context/support/MessageSourceResourceBundle.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2012 the original author or authors. * Copyright 2002-2013 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.
@ -70,9 +70,9 @@ public class MessageSourceResourceBundle extends ResourceBundle {
* Returns {@code null} if the message could not be resolved. * Returns {@code null} if the message could not be resolved.
*/ */
@Override @Override
protected Object handleGetObject(String code) { protected Object handleGetObject(String key) {
try { try {
return this.messageSource.getMessage(code, null, this.locale); return this.messageSource.getMessage(key, null, this.locale);
} }
catch (NoSuchMessageException ex) { catch (NoSuchMessageException ex) {
return null; return null;
@ -80,12 +80,29 @@ public class MessageSourceResourceBundle extends ResourceBundle {
} }
/** /**
* This implementation returns {@code null}, as a MessageSource does * This implementation checks whether the target MessageSource can resolve
* not allow for enumerating the defined message codes. * a message for the given key, translating {@code NoSuchMessageException}
* accordingly. In contrast to ResourceBundle's default implementation in
* JDK 1.6, this does not rely on the capability to enumerate message keys.
*/
@Override
public boolean containsKey(String key) {
try {
this.messageSource.getMessage(key, null, this.locale);
return true;
}
catch (NoSuchMessageException ex) {
return false;
}
}
/**
* This implementation throws {@code UnsupportedOperationException},
* as a MessageSource does not allow for enumerating the defined message codes.
*/ */
@Override @Override
public Enumeration<String> getKeys() { public Enumeration<String> getKeys() {
return null; throw new UnsupportedOperationException("MessageSourceResourceBundle does not support enumerating its keys");
} }
/** /**

13
spring-context/src/test/java/org/springframework/context/support/ResourceBundleMessageSourceTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2012 the original author or authors. * Copyright 2002-2013 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.
@ -340,6 +340,17 @@ public class ResourceBundleMessageSourceTests extends TestCase {
assertEquals(0, filenames.size()); assertEquals(0, filenames.size());
} }
public void testMessageSourceResourceBundle() {
ResourceBundleMessageSource ms = new ResourceBundleMessageSource();
ms.setBasename("org/springframework/context/support/messages");
MessageSourceResourceBundle rbe = new MessageSourceResourceBundle(ms, Locale.ENGLISH);
assertEquals("message1", rbe.getString("code1"));
assertTrue(rbe.containsKey("code1"));
MessageSourceResourceBundle rbg = new MessageSourceResourceBundle(ms, Locale.GERMAN);
assertEquals("nachricht2", rbg.getString("code2"));
assertTrue(rbg.containsKey("code2"));
}
@Override @Override
protected void tearDown() throws Exception { protected void tearDown() throws Exception {
if (JdkVersion.getMajorJavaVersion() >= JdkVersion.JAVA_16) { if (JdkVersion.getMajorJavaVersion() >= JdkVersion.JAVA_16) {