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

Pull up default getProperty variants to base class 

Issue: SPR-8322
This commit is contained in:
Chris Beams 2011-05-11 07:35:16 +00:00
parent dc2d5c107f
commit 3622c6f340
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
org.springframework.core/src/main/java/org/springframework/core/env/AbstractPropertyResolver.java vendored
View File

@ -55,6 +55,16 @@ public abstract class AbstractPropertyResolver implements ConfigurablePropertyRe
this.conversionService = conversionService; this.conversionService = conversionService;
} }
public String getProperty(String key, String defaultValue) {
String value = getProperty(key);
return value == null ? defaultValue : value;
}
public <T> T getProperty(String key, Class<T> targetType, T defaultValue) {
T value = getProperty(key, targetType);
return value == null ? defaultValue : value;
}
public String getRequiredProperty(String key) throws IllegalStateException { public String getRequiredProperty(String key) throws IllegalStateException {
String value = getProperty(key); String value = getProperty(key);
if (value == null) { if (value == null) {

10
org.springframework.core/src/main/java/org/springframework/core/env/PropertySourcesPropertyResolver.java vendored
View File

@ -56,11 +56,6 @@ public class PropertySourcesPropertyResolver extends AbstractPropertyResolver {
return this.getProperty(key, String.class); return this.getProperty(key, String.class);
} }
public String getProperty(String key, String defaultValue) {
String value = getProperty(key);
return value == null ? defaultValue : value;
}
public <T> T getProperty(String key, Class<T> targetValueType) { public <T> T getProperty(String key, Class<T> targetValueType) {
boolean debugEnabled = logger.isDebugEnabled(); boolean debugEnabled = logger.isDebugEnabled();
if (logger.isTraceEnabled()) { if (logger.isTraceEnabled()) {
@ -94,11 +89,6 @@ public class PropertySourcesPropertyResolver extends AbstractPropertyResolver {
return null; return null;
} }
public <T> T getProperty(String key, Class<T> targetType, T defaultValue) {
T value = getProperty(key, targetType);
return value == null ? defaultValue : value;
};
public <T> Class<T> getPropertyAsClass(String key, Class<T> targetValueType) { public <T> Class<T> getPropertyAsClass(String key, Class<T> targetValueType) {
boolean debugEnabled = logger.isDebugEnabled(); boolean debugEnabled = logger.isDebugEnabled();
if (logger.isTraceEnabled()) { if (logger.isTraceEnabled()) {