spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-10-08 08:09:09 +00:00
Code Issues Projects Releases Wiki Activity

Pull up default getProperty variants to base class

Browse Source 
Issue: SPR-8322

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4284 50f2f4bb-b051-0410-bef5-90022cba6387
This commit is contained in:
Chris Beams
2011-05-11 07:35:16 +00:00
parent 11cf5f0d3b
commit 26e6c9f1df
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
org.springframework.core/src/main/java/org/springframework/core/env/AbstractPropertyResolver.java
Vendored
+10
View File
@@ -55,6 +55,16 @@ public abstract class AbstractPropertyResolver implements ConfigurablePropertyRe
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 {
String value = getProperty(key);
if (value == null) {
org.springframework.core/src/main/java/org/springframework/core/env/PropertySourcesPropertyResolver.java
Vendored
-10
View File
@@ -56,11 +56,6 @@ public class PropertySourcesPropertyResolver extends AbstractPropertyResolver {
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) {
boolean debugEnabled = logger.isDebugEnabled();
if (logger.isTraceEnabled()) {
@@ -94,11 +89,6 @@ public class PropertySourcesPropertyResolver extends AbstractPropertyResolver {
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) {
boolean debugEnabled = logger.isDebugEnabled();
if (logger.isTraceEnabled()) {