Consistent logging in ignoreResourceNotFound scenarios

Issue: SPR-15218
(cherry picked from commit 448ea4c)

Author: jhoeller

spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java

@@ -419,14 +419,24 @@ private void processPropertySource(AnnotationAttributes propertySource) throws I
 				addPropertySource(factory.createPropertySource(name, new EncodedResource(resource, encoding)));
 			}
 			catch (IllegalArgumentException ex) {
-				// from resolveRequiredPlaceholders
-				if (!ignoreResourceNotFound) {
+				// Placeholders not resolvable
+				if (ignoreResourceNotFound) {
+					if (logger.isInfoEnabled()) {
+						logger.info("Properties location [" + location + "] not resolvable: " + ex.getMessage());
+					}
+				}
+				else {
 					throw ex;
 				}
 			}
 			catch (FileNotFoundException ex) {
-				// from ResourcePropertySource constructor
-				if (!ignoreResourceNotFound) {
+				// Resource not found when trying to open it
+				if (ignoreResourceNotFound) {
+					if (logger.isInfoEnabled()) {
+						logger.info("Properties location [" + location + "] not resolvable: " + ex.getMessage());
+					}
+				}
+				else {
 					throw ex;
 				}
 			}

spring-core/src/main/java/org/springframework/core/io/support/PropertiesLoaderSupport.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package org.springframework.core.io.support;
 
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.Properties;
 
@@ -168,17 +169,17 @@ protected Properties mergeProperties() throws IOException {
 	protected void loadProperties(Properties props) throws IOException {
 		if (this.locations != null) {
 			for (Resource location : this.locations) {
-				if (logger.isInfoEnabled()) {
-					logger.info("Loading properties file from " + location);
+				if (logger.isDebugEnabled()) {
+					logger.debug("Loading properties file from " + location);
 				}
 				try {
 					PropertiesLoaderUtils.fillProperties(
 							props, new EncodedResource(location, this.fileEncoding), this.propertiesPersister);
 				}
-				catch (IOException ex) {
+				catch (FileNotFoundException ex) {
 					if (this.ignoreResourceNotFound) {
-						if (logger.isWarnEnabled()) {
-							logger.warn("Could not load properties from " + location + ": " + ex.getMessage());
+						if (logger.isInfoEnabled()) {
+							logger.info("Properties resource not found: " + ex.getMessage());
 						}
 					}
 					else {

spring-core/src/main/java/org/springframework/util/PropertyPlaceholderHelper.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -127,11 +127,11 @@ public String replacePlaceholders(String value, PlaceholderResolver placeholderR
 	}
 
 	protected String parseStringValue(
-			String strVal, PlaceholderResolver placeholderResolver, Set<String> visitedPlaceholders) {
+			String value, PlaceholderResolver placeholderResolver, Set<String> visitedPlaceholders) {
 
-		StringBuilder result = new StringBuilder(strVal);
+		StringBuilder result = new StringBuilder(value);
 
-		int startIndex = strVal.indexOf(this.placeholderPrefix);
+		int startIndex = value.indexOf(this.placeholderPrefix);
 		while (startIndex != -1) {
 			int endIndex = findPlaceholderEndIndex(result, startIndex);
 			if (endIndex != -1) {
@@ -172,7 +172,7 @@ else if (this.ignoreUnresolvablePlaceholders) {
 				}
 				else {
 					throw new IllegalArgumentException("Could not resolve placeholder '" +
-							placeholder + "'" + " in string value \"" + strVal + "\"");
+							placeholder + "'" + " in value \"" + value + "\"");
 				}
 				visitedPlaceholders.remove(originalPlaceholder);
 			}
@@ -212,7 +212,7 @@ else if (StringUtils.substringMatch(buf, index, this.simplePrefix)) {
 	/**
 	 * Strategy interface used to resolve replacement values for placeholders contained in Strings.
 	 */
-	public static interface PlaceholderResolver {
+	public interface PlaceholderResolver {
 
 		/**
 		 * Resolve the supplied placeholder name to the replacement value.

spring-core/src/test/java/org/springframework/core/env/PropertySourcesPropertyResolverTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -388,7 +388,7 @@ public void resolveNestedPropertyPlaceholders() {
 		}
 		catch (IllegalArgumentException ex) {
 			assertThat(ex.getMessage(), containsString(
-					"Could not resolve placeholder 'bogus' in string value \"${p1}:${p2}:${bogus}\""));
+					"Could not resolve placeholder 'bogus' in value \"${p1}:${p2}:${bogus}\""));
 		}
 		assertThat(pr.getProperty("p6"), equalTo("v1:v2:def"));
 		try {
@@ -420,7 +420,7 @@ public void ignoreUnresolvableNestedPlaceholdersIsConfigurable() {
 		}
 		catch (IllegalArgumentException ex) {
 			assertThat(ex.getMessage(), containsString(
-					"Could not resolve placeholder 'bogus' in string value \"${p1}:${p2}:${bogus}\""));
+					"Could not resolve placeholder 'bogus' in value \"${p1}:${p2}:${bogus}\""));
 		}
 
 		// relax the treatment of unresolvable nested placeholders
@@ -436,7 +436,7 @@ public void ignoreUnresolvableNestedPlaceholdersIsConfigurable() {
 		}
 		catch (IllegalArgumentException ex) {
 			assertThat(ex.getMessage(), containsString(
-					"Could not resolve placeholder 'bogus' in string value \"${p1}:${p2}:${bogus}\""));
+					"Could not resolve placeholder 'bogus' in value \"${p1}:${p2}:${bogus}\""));
 		}
 	}