Test for JSP view resolver with prefix and suffix

Signed-off-by: dae won <[email protected]>

Author: big-cir

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java

@@ -284,7 +284,7 @@ public void configureContentNegotiation(ContentNegotiationConfigurer configurer)
 
 		@Bean
 		@ConditionalOnMissingBean
-		@ConditionalOnProperty(prefix = "spring.mvc.view", name = {"prefix", "suffix"})
+		@ConditionalOnProperty(prefix = "spring.mvc.view", name = { "prefix", "suffix" })
 		public InternalResourceViewResolver defaultViewResolver() {
 			InternalResourceViewResolver resolver = new InternalResourceViewResolver();
 			resolver.setPrefix(this.mvcProperties.getView().getPrefix());
@@ -293,7 +293,7 @@ public InternalResourceViewResolver defaultViewResolver() {
 		}
 
 		@Bean
-		@ConditionalOnProperty(prefix = "spring.mvc.jsp", name = {"prefix", "suffix"})
+		@ConditionalOnProperty(prefix = "spring.mvc.jsp", name = { "prefix", "suffix" })
 		public InternalResourceViewResolver jspViewResolver() {
 			InternalResourceViewResolver resolver = new InternalResourceViewResolver();
 			resolver.setPrefix(this.mvcProperties.getJsp().getPrefix());

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java

@@ -142,6 +142,7 @@
 import org.springframework.web.servlet.view.AbstractView;
 import org.springframework.web.servlet.view.ContentNegotiatingViewResolver;
 import org.springframework.web.servlet.view.DefaultRequestToViewNameTranslator;
+import org.springframework.web.servlet.view.InternalResourceViewResolver;
 import org.springframework.web.util.UrlPathHelper;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -160,6 +161,7 @@
  * @author Artsiom Yudovin
  * @author Scott Frederick
  * @author Vedran Pavic
+ * @author daewon kim
  */
 class WebMvcAutoConfigurationTests {
 
@@ -1028,6 +1030,22 @@ void problemDetailsExceptionHandlerIsOrderedAt0() {
 						OrderedControllerAdviceBeansConfiguration.LowestOrderedControllerAdvice.class));
 	}
 
+	@Test
+	void jspViewResolverIsAutoConfiguredWhenJspPrefixIsSet() {
+		this.contextRunner.withConfiguration(AutoConfigurations.of(WebMvcAutoConfiguration.class))
+			.withPropertyValues("spring.mvc.jsp.prefix=/WEB-INF/views/", "spring.mvc.jsp.suffix=.jsp")
+			.run((context) -> {
+				assertThat(context).hasSingleBean(InternalResourceViewResolver.class);
+
+				InternalResourceViewResolver resolver = context.getBean(InternalResourceViewResolver.class);
+				String prefix = (String) ReflectionTestUtils.getField(resolver, "prefix");
+				String suffix = (String) ReflectionTestUtils.getField(resolver, "suffix");
+
+				assertThat(prefix).isEqualTo("/WEB-INF/views/");
+				assertThat(suffix).isEqualTo(".jsp");
+			});
+	}
+
 	private void assertResourceHttpRequestHandler(AssertableWebApplicationContext context,
 			Consumer<ResourceHttpRequestHandler> handlerConsumer) {
 		Map<String, Object> handlerMap = getHandlerMap(context.getBean("resourceHandlerMapping", HandlerMapping.class));