root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Rename AbstractBasicTemplateViewResolverProperties 

Rename AbstractBasicTemplateViewResolverProperties to
AbstractViewResolverProperties.

See gh-1835
This commit is contained in:
Phillip Webb 2014-11-07 09:24:07 -08:00
parent d097c9a2f9
commit 8023ddd0c2
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateProperties.java
View File

@ -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;
* @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/";

7
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/template/AbstractTemplateViewResolverProperties.java
View File

@ -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;

9
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/template/AbstractBasicTemplateViewResolverProperties.java → spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/template/AbstractViewResolverProperties.java
View File

@ -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 {
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) {