Skip to content

Commit 7fef269

Browse files
committed
Modified code to support both thymeleaf and existing viewResolvers
1 parent 1e91b46 commit 7fef269

File tree

1 file changed

+14
-7
lines changed

1 file changed

+14
-7
lines changed

spring-mvc-java/src/main/java/org/baeldung/spring/web/config/ClientWebConfig.java

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
1616
import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
1717
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
18+
import org.springframework.web.servlet.view.InternalResourceViewResolver;
19+
import org.springframework.web.servlet.view.JstlView;
1820
import org.thymeleaf.dialect.IDialect;
1921
import org.thymeleaf.spring4.SpringTemplateEngine;
2022
import org.thymeleaf.spring4.view.ThymeleafViewResolver;
@@ -39,18 +41,23 @@ public void addViewControllers(final ViewControllerRegistry registry) {
3941
}
4042

4143
@Bean
42-
public ViewResolver viewResolver() {
43-
/*final InternalResourceViewResolver bean = new InternalResourceViewResolver();
44-
bean.setViewClass(JstlView.class);
45-
bean.setPrefix("/WEB-INF/view/");
46-
bean.setSuffix(".jsp");*/
47-
44+
public ViewResolver thymeleafViewResolver() {
4845
final ThymeleafViewResolver viewResolver = new ThymeleafViewResolver();
4946
viewResolver.setTemplateEngine(templateEngine());
50-
47+
viewResolver.setOrder(1);
5148
return viewResolver;
5249
}
5350

51+
@Bean
52+
public ViewResolver viewResolver() {
53+
final InternalResourceViewResolver bean = new InternalResourceViewResolver();
54+
bean.setViewClass(JstlView.class);
55+
bean.setPrefix("/WEB-INF/view/");
56+
bean.setSuffix(".jsp");
57+
bean.setOrder(0);
58+
return bean;
59+
}
60+
5461
@Bean
5562
@Description("Thymeleaf template resolver serving HTML 5")
5663
public ServletContextTemplateResolver templateResolver() {

0 commit comments

Comments
 (0)