From 8023ddd0c272d62c2cebc94e39a8e19940736ce4 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Fri, 7 Nov 2014 09:24:07 -0800
Subject: [PATCH] Rename AbstractBasicTemplateViewResolverProperties

Rename AbstractBasicTemplateViewResolverProperties to
AbstractViewResolverProperties.

See gh-1835
---
 .../groovy/template/GroovyTemplateProperties.java        | 4 ++--
 .../template/AbstractTemplateViewResolverProperties.java | 7 ++++---
 ...operties.java => AbstractViewResolverProperties.java} | 9 ++++++---
 3 files changed, 12 insertions(+), 8 deletions(-)
 rename spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/template/{AbstractBasicTemplateViewResolverProperties.java => AbstractViewResolverProperties.java} (88%)

diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateProperties.java
index c1a47b609e..e90ba3eed8 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateProperties.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateProperties.java
@@ -19,7 +19,7 @@ package org.springframework.boot.autoconfigure.groovy.template;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.springframework.boot.autoconfigure.template.AbstractBasicTemplateViewResolverProperties;
+import org.springframework.boot.autoconfigure.template.AbstractViewResolverProperties;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**
@@ -29,7 +29,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
  * @since 1.1.0
  */
 @ConfigurationProperties(prefix = "spring.groovy.template", ignoreUnknownFields = false)
-public class GroovyTemplateProperties extends AbstractBasicTemplateViewResolverProperties {
+public class GroovyTemplateProperties extends AbstractViewResolverProperties {
 
 	public static final String DEFAULT_PREFIX = "classpath:/templates/";
 
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/template/AbstractTemplateViewResolverProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/template/AbstractTemplateViewResolverProperties.java
index b8eb376975..d077cb58a3 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/template/AbstractTemplateViewResolverProperties.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/template/AbstractTemplateViewResolverProperties.java
@@ -22,13 +22,14 @@ import org.springframework.util.Assert;
 import org.springframework.web.servlet.view.AbstractTemplateViewResolver;
 
 /**
- * Abstract base class for {@link ConfigurationProperties} for
- * {@link AbstractTemplateViewResolver view resolvers}.
+ * Base class for {@link ConfigurationProperties} of a
+ * {@link AbstractTemplateViewResolver}.
  *
  * @author Andy Wilkinson
  * @since 1.1.0
  */
-public abstract class AbstractTemplateViewResolverProperties extends AbstractBasicTemplateViewResolverProperties {
+public abstract class AbstractTemplateViewResolverProperties extends
+		AbstractViewResolverProperties {
 
 	private String prefix;
 
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/template/AbstractBasicTemplateViewResolverProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/template/AbstractViewResolverProperties.java
similarity index 88%
rename from spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/template/AbstractBasicTemplateViewResolverProperties.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/template/AbstractViewResolverProperties.java
index d3e9134a31..04264da201 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/template/AbstractBasicTemplateViewResolverProperties.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/template/AbstractViewResolverProperties.java
@@ -17,14 +17,17 @@
 package org.springframework.boot.autoconfigure.template;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.web.servlet.ViewResolver;
 
 /**
- * Basic base {@link ConfigurationProperties} class for view resolvers.
+ * Base class for {@link ConfigurationProperties} of a {@link ViewResolver}.
  *
+ * @author Andy Wilkinson
  * @author Stephane Nicoll
  * @since 1.2.0
+ * @see AbstractTemplateViewResolverProperties
  */
-public abstract class AbstractBasicTemplateViewResolverProperties {
+public abstract class AbstractViewResolverProperties {
 
 	private boolean cache;
 
@@ -63,7 +66,7 @@ public abstract class AbstractBasicTemplateViewResolverProperties {
 	public String getContentType() {
 		return this.contentType
 				+ (this.contentType.contains(";charset=") ? "" : ";charset="
-				+ this.charset);
+						+ this.charset);
 	}
 
 	public void setContentType(String contentType) {