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

removed obsolete System.err logging for the property-not-found case

This commit is contained in:
Juergen Hoeller 2009-11-27 01:28:54 +00:00
parent 5e68cc5a58
commit bc06ffb6b8
1 changed files with 21 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
org.springframework.core/src/main/java/org/springframework/util/SystemPropertyUtils.java
View File

@ -26,11 +26,12 @@ import org.springframework.util.PropertyPlaceholderHelper.PlaceholderResolver;
* and value. * and value.
* *
* @author Juergen Hoeller * @author Juergen Hoeller
* @author Rob Harrop
* @author Dave Syer * @author Dave Syer
* @since 1.2.5
* @see #PLACEHOLDER_PREFIX * @see #PLACEHOLDER_PREFIX
* @see #PLACEHOLDER_SUFFIX * @see #PLACEHOLDER_SUFFIX
* @see System#getProperty(String) * @see System#getProperty(String)
* @since 1.2.5
*/ */
public abstract class SystemPropertyUtils { public abstract class SystemPropertyUtils {
@ -43,11 +44,13 @@ public abstract class SystemPropertyUtils {
/** Value separator for system property placeholders: ":" */ /** Value separator for system property placeholders: ":" */
public static final String VALUE_SEPARATOR = ":"; public static final String VALUE_SEPARATOR = ":";
private static final PropertyPlaceholderHelper strictHelper = new PropertyPlaceholderHelper(PLACEHOLDER_PREFIX,
PLACEHOLDER_SUFFIX, VALUE_SEPARATOR, false);
private static final PropertyPlaceholderHelper nonStrictHelper = new PropertyPlaceholderHelper(PLACEHOLDER_PREFIX, private static final PropertyPlaceholderHelper strictHelper =
PLACEHOLDER_SUFFIX, VALUE_SEPARATOR, true); new PropertyPlaceholderHelper(PLACEHOLDER_PREFIX, PLACEHOLDER_SUFFIX, VALUE_SEPARATOR, false);
private static final PropertyPlaceholderHelper nonStrictHelper =
new PropertyPlaceholderHelper(PLACEHOLDER_PREFIX, PLACEHOLDER_SUFFIX, VALUE_SEPARATOR, true);
/** /**
* Resolve ${...} placeholders in the given text, replacing them with corresponding system property values. * Resolve ${...} placeholders in the given text, replacing them with corresponding system property values.
@ -55,7 +58,6 @@ public abstract class SystemPropertyUtils {
* @return the resolved String * @return the resolved String
* @see #PLACEHOLDER_PREFIX * @see #PLACEHOLDER_PREFIX
* @see #PLACEHOLDER_SUFFIX * @see #PLACEHOLDER_SUFFIX
*
* @throws IllegalArgumentException if there is an unresolvable placeholder * @throws IllegalArgumentException if there is an unresolvable placeholder
*/ */
public static String resolvePlaceholders(final String text) { public static String resolvePlaceholders(final String text) {
@ -66,49 +68,41 @@ public abstract class SystemPropertyUtils {
* Resolve ${...} placeholders in the given text, replacing them with corresponding system property values. * Resolve ${...} placeholders in the given text, replacing them with corresponding system property values.
* Unresolvable placeholders with no default value are ignored and passed through unchanged if the * Unresolvable placeholders with no default value are ignored and passed through unchanged if the
* flag is set to true. * flag is set to true.
*
* @param text the String to resolve * @param text the String to resolve
* @param ignoreUnresolvablePlaceholders flag to determine is unresolved placeholders are ignored * @param ignoreUnresolvablePlaceholders flag to determine is unresolved placeholders are ignored
* @return the resolved String * @return the resolved String
* @see #PLACEHOLDER_PREFIX * @see #PLACEHOLDER_PREFIX
* @see #PLACEHOLDER_SUFFIX * @see #PLACEHOLDER_SUFFIX
*
* @throws IllegalArgumentException if there is an unresolvable placeholder and the flag is false * @throws IllegalArgumentException if there is an unresolvable placeholder and the flag is false
*
*/ */
public static String resolvePlaceholders(final String text, boolean ignoreUnresolvablePlaceholders) { public static String resolvePlaceholders(final String text, boolean ignoreUnresolvablePlaceholders) {
if (ignoreUnresolvablePlaceholders) { PropertyPlaceholderHelper helper = (ignoreUnresolvablePlaceholders ? nonStrictHelper : strictHelper);
return nonStrictHelper.replacePlaceholders(text, new PlaceholderResolverImplementation(text)); return helper.replacePlaceholders(text, new SystemPropertyPlaceholderResolver(text));
}
return strictHelper.replacePlaceholders(text, new PlaceholderResolverImplementation(text));
} }
private static final class PlaceholderResolverImplementation implements PlaceholderResolver {
private static class SystemPropertyPlaceholderResolver implements PlaceholderResolver {
private final String text; private final String text;
private PlaceholderResolverImplementation(String text) { public SystemPropertyPlaceholderResolver(String text) {
this.text = text; this.text = text;
} }
public String resolvePlaceholder(String placeholderName) { public String resolvePlaceholder(String placeholderName) {
String propVal = null;
try { try {
propVal = System.getProperty(placeholderName); String propVal = System.getProperty(placeholderName);
if (propVal == null) { if (propVal == null) {
// Fall back to searching the system environment. // Fall back to searching the system environment.
propVal = System.getenv(placeholderName); propVal = System.getenv(placeholderName);
} }
return propVal;
if (propVal == null) { }
System.err.println("Could not resolve placeholder '" + placeholderName + "' in [" + text catch (Throwable ex) {
+ "] as system property: neither system property nor environment variable found"); System.err.println("Could not resolve placeholder '" + placeholderName + "' in [" +
} this.text + "] as system property: " + ex);
} catch (Throwable ex) { return null;
System.err.println("Could not resolve placeholder '" + placeholderName + "' in [" + text
+ "] as system property: " + ex);
} }
return propVal;
} }
} }