Merge branch '1.4.x' into 1.5.x

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerTemplateAvailabilityProvider.java

@@ -20,7 +20,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.springframework.boot.autoconfigure.template.AbstractTemplateAvailabilityProvider;
+import org.springframework.boot.autoconfigure.template.PathBasedTemplateAvailabilityProvider;
 import org.springframework.boot.autoconfigure.template.TemplateAvailabilityProvider;
 
 /**
@@ -31,7 +31,7 @@ import org.springframework.boot.autoconfigure.template.TemplateAvailabilityProvi
  * @since 1.1.0
  */
 public class FreeMarkerTemplateAvailabilityProvider
-		extends AbstractTemplateAvailabilityProvider {
+		extends PathBasedTemplateAvailabilityProvider {
 
 	public FreeMarkerTemplateAvailabilityProvider() {
 		super("freemarker.template.Configuration",

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateAvailabilityProvider.java

@@ -20,7 +20,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.springframework.boot.autoconfigure.template.AbstractTemplateAvailabilityProvider;
+import org.springframework.boot.autoconfigure.template.PathBasedTemplateAvailabilityProvider;
 import org.springframework.boot.autoconfigure.template.TemplateAvailabilityProvider;
 
 /**
@@ -31,7 +31,7 @@ import org.springframework.boot.autoconfigure.template.TemplateAvailabilityProvi
  * @since 1.1.0
  */
 public class GroovyTemplateAvailabilityProvider
-		extends AbstractTemplateAvailabilityProvider {
+		extends PathBasedTemplateAvailabilityProvider {
 
 	public GroovyTemplateAvailabilityProvider() {
 		super("groovy.text.TemplateEngine", GroovyTemplateAvailabilityProperties.class,

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/template/AbstractTemplateAvailabilityProvider.java → spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/template/PathBasedTemplateAvailabilityProvider.java

@@ -27,13 +27,14 @@ import org.springframework.core.io.ResourceLoader;
 import org.springframework.util.ClassUtils;
 
 /**
- * Abstract base class for {@link TemplateAvailabilityProvider} implementations.
+ * Abstract base class for {@link TemplateAvailabilityProvider} implementations that find
+ * templates from paths.
  *
  * @author Andy Wilkinson
  * @author Phillip Webb
  * @since 1.4.6
  */
-public abstract class AbstractTemplateAvailabilityProvider
+public abstract class PathBasedTemplateAvailabilityProvider
 		implements TemplateAvailabilityProvider {
 
 	private final String className;
@@ -42,7 +43,7 @@ public abstract class AbstractTemplateAvailabilityProvider
 
 	private final String propertyPrefix;
 
-	public AbstractTemplateAvailabilityProvider(String className,
+	public PathBasedTemplateAvailabilityProvider(String className,
 			Class<? extends TemplateAvailabilityProperties> propertiesClass,
 			String propertyPrefix) {
 		this.className = className;