Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update ViewResolver registration classes

Browse Source 
Following the separation of FreeMarker/Velocity/TilesConfigurer-related
configuration via separate interface, simplify and streamline the
view registration helper classes which no longer have much difference
(most are UrlBasedViewResolver's).

Updates to Javadoc and tests.

Issue: SPR-7093
This commit is contained in:
Rossen Stoyanchev
2014-07-12 16:52:02 -04:00
parent 5bc793768c
commit f54cee47b0
28 changed files with 807 additions and 894 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/JavaConfigTests.java
View File

@@ -126,7 +126,7 @@ public class JavaConfigTests {
}
@Override
public void configureViewResolution(ViewResolutionRegistry registry) {
public void configureViewResolvers(ViewResolverRegistry registry) {
registry.tiles();
}

6
spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/EncodedUriTests.java
View File

@@ -40,7 +40,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.context.WebApplicationContext;
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
import org.springframework.web.servlet.config.annotation.ViewResolutionRegistry;
import org.springframework.web.servlet.config.annotation.ViewResolverRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
import org.springframework.web.util.UriComponentsBuilder;
@@ -97,7 +97,7 @@ public class EncodedUriTests {
}
@Override
public void configureViewResolution(ViewResolutionRegistry registry) {
public void configureViewResolvers(ViewResolverRegistry registry) {
registry.jsp("", "");
}
}
@@ -121,9 +121,7 @@ public class EncodedUriTests {
// URL decode after request mapping, not before.
requestMappingHandlerMapping.setUrlDecode(false);
}
return bean;
}