From 3fc6877b42661fef6cc43d4f3816c4cd3eed4986 Mon Sep 17 00:00:00 2001 From: timis1 <12120641+timis1@users.noreply.github.com> Date: Sun, 26 Feb 2023 17:35:12 +0200 Subject: [PATCH] JAVA-14723 Some additional improvements (#13517) Co-authored-by: timis1 --- .../java/com/baeldung/config/WebConfig.java | 43 ------------------- ...ssParametersControllerIntegrationTest.java | 6 +-- ...rWithRequiredAttributeIntegrationTest.java | 9 ++-- 3 files changed, 7 insertions(+), 51 deletions(-) diff --git a/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/config/WebConfig.java b/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/config/WebConfig.java index 9901915b03..e9b59a2b23 100644 --- a/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/config/WebConfig.java +++ b/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/config/WebConfig.java @@ -41,47 +41,4 @@ public class WebConfig { public ObjectMapper objectMapper() { return new ObjectMapper(); } - - // Thymeleaf configuration - @Bean - public ViewResolver thymeleafViewResolver() { - - ThymeleafViewResolver viewResolver = new ThymeleafViewResolver(); - - viewResolver.setTemplateEngine(thymeleafTemplateEngine()); - viewResolver.setCharacterEncoding("UTF-8"); - viewResolver.setOrder(0); - - return viewResolver; - } - - // Thymeleaf template engine with Spring integration - @Bean - public SpringTemplateEngine thymeleafTemplateEngine() { - - SpringTemplateEngine templateEngine = new SpringTemplateEngine(); - templateEngine.setTemplateResolver(thymeleafTemplateResolver()); - templateEngine.setEnableSpringELCompiler(true); - - return templateEngine; - } - - @Bean - public SpringResourceTemplateResolver springResourceTemplateResolver() { - return new SpringResourceTemplateResolver(); - } - - @Bean - public ITemplateResolver thymeleafTemplateResolver() { - - ClassLoaderTemplateResolver templateResolver = new ClassLoaderTemplateResolver(); - - templateResolver.setPrefix("/templates/"); - templateResolver.setCacheable(false); - templateResolver.setSuffix(".html"); - templateResolver.setTemplateMode(TemplateMode.HTML); - templateResolver.setCharacterEncoding("UTF-8"); - - return templateResolver; - } } diff --git a/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/controller/PassParametersControllerIntegrationTest.java b/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/controller/PassParametersControllerIntegrationTest.java index c1311acba0..7408ae825d 100644 --- a/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/controller/PassParametersControllerIntegrationTest.java +++ b/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/controller/PassParametersControllerIntegrationTest.java @@ -39,7 +39,7 @@ public class PassParametersControllerIntegrationTest { ModelAndView mv = this.mockMvc.perform(MockMvcRequestBuilders.get("/showViewPage")).andReturn().getModelAndView(); //Validate view - Assert.assertEquals(mv.getViewName(), "viewPage"); + Assert.assertEquals(mv.getViewName(), "view/viewPage"); //Validate attribute Assert.assertEquals(mv.getModelMap().get("message").toString(), "Baeldung"); @@ -50,7 +50,7 @@ public class PassParametersControllerIntegrationTest { ModelAndView mv = this.mockMvc.perform(MockMvcRequestBuilders.get("/printViewPage")).andReturn().getModelAndView(); //Validate view - Assert.assertEquals(mv.getViewName(), "viewPage"); + Assert.assertEquals(mv.getViewName(), "view/viewPage"); //Validate attribute Assert.assertEquals(mv.getModelMap().get("message").toString(), "Baeldung"); @@ -61,7 +61,7 @@ public class PassParametersControllerIntegrationTest { ModelAndView mv = this.mockMvc.perform(MockMvcRequestBuilders.get("/goToViewPage")).andReturn().getModelAndView(); //Validate view - Assert.assertEquals(mv.getViewName(), "viewPage"); + Assert.assertEquals(mv.getViewName(), "view/viewPage"); //Validate attribute Assert.assertEquals(mv.getModelMap().get("message").toString(), "Baeldung"); diff --git a/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/optionalpathvars/ArticleViewerControllerWithRequiredAttributeIntegrationTest.java b/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/optionalpathvars/ArticleViewerControllerWithRequiredAttributeIntegrationTest.java index 6e087a1640..e7d864d9be 100644 --- a/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/optionalpathvars/ArticleViewerControllerWithRequiredAttributeIntegrationTest.java +++ b/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/optionalpathvars/ArticleViewerControllerWithRequiredAttributeIntegrationTest.java @@ -34,17 +34,16 @@ public class ArticleViewerControllerWithRequiredAttributeIntegrationTest { int articleId = 5; this.mockMvc - .perform(MockMvcRequestBuilders.get("/article/{id}", articleId)) + .perform(MockMvcRequestBuilders.get("/requiredAttribute/article/{id}", articleId)) .andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.jsonPath("$.id").value(articleId)); - } @Test - public void whenIdPathVariableIsNotPassed_thenResponse500() throws Exception { + public void whenIdPathVariableIsNotPassed_thenResponseOK() throws Exception { this.mockMvc - .perform(MockMvcRequestBuilders.get("/article")) - .andExpect(MockMvcResultMatchers.status().isInternalServerError()); + .perform(MockMvcRequestBuilders.get("/requiredAttribute/article")) + .andExpect(MockMvcResultMatchers.status().isOk()); } } \ No newline at end of file