Commit 8023ddd0 authored by Phillip Webb's avatar Phillip Webb

Rename AbstractBasicTemplateViewResolverProperties

Rename AbstractBasicTemplateViewResolverProperties to
AbstractViewResolverProperties.

See gh-1835
parent d097c9a2
...@@ -19,7 +19,7 @@ package org.springframework.boot.autoconfigure.groovy.template; ...@@ -19,7 +19,7 @@ package org.springframework.boot.autoconfigure.groovy.template;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; 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; import org.springframework.boot.context.properties.ConfigurationProperties;
/** /**
...@@ -29,7 +29,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; ...@@ -29,7 +29,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
* @since 1.1.0 * @since 1.1.0
*/ */
@ConfigurationProperties(prefix = "spring.groovy.template", ignoreUnknownFields = false) @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/"; public static final String DEFAULT_PREFIX = "classpath:/templates/";
......
...@@ -22,13 +22,14 @@ import org.springframework.util.Assert; ...@@ -22,13 +22,14 @@ import org.springframework.util.Assert;
import org.springframework.web.servlet.view.AbstractTemplateViewResolver; import org.springframework.web.servlet.view.AbstractTemplateViewResolver;
/** /**
* Abstract base class for {@link ConfigurationProperties} for * Base class for {@link ConfigurationProperties} of a
* {@link AbstractTemplateViewResolver view resolvers}. * {@link AbstractTemplateViewResolver}.
* *
* @author Andy Wilkinson * @author Andy Wilkinson
* @since 1.1.0 * @since 1.1.0
*/ */
public abstract class AbstractTemplateViewResolverProperties extends AbstractBasicTemplateViewResolverProperties { public abstract class AbstractTemplateViewResolverProperties extends
AbstractViewResolverProperties {
private String prefix; private String prefix;
......
...@@ -17,14 +17,17 @@ ...@@ -17,14 +17,17 @@
package org.springframework.boot.autoconfigure.template; package org.springframework.boot.autoconfigure.template;
import org.springframework.boot.context.properties.ConfigurationProperties; 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 * @author Stephane Nicoll
* @since 1.2.0 * @since 1.2.0
* @see AbstractTemplateViewResolverProperties
*/ */
public abstract class AbstractBasicTemplateViewResolverProperties { public abstract class AbstractViewResolverProperties {
private boolean cache; private boolean cache;
...@@ -63,7 +66,7 @@ public abstract class AbstractBasicTemplateViewResolverProperties { ...@@ -63,7 +66,7 @@ public abstract class AbstractBasicTemplateViewResolverProperties {
public String getContentType() { public String getContentType() {
return this.contentType return this.contentType
+ (this.contentType.contains(";charset=") ? "" : ";charset=" + (this.contentType.contains(";charset=") ? "" : ";charset="
+ this.charset); + this.charset);
} }
public void setContentType(String contentType) { public void setContentType(String contentType) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment