Add conditional beans for JSP InternalResourceViewResolver

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

@@ -38,6 +38,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBooleanProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
@@ -139,6 +140,7 @@
  * @author Bruce Brouwer
  * @author Artsiom Yudovin
  * @author Scott Frederick
+ * @author daewon kim
  * @since 2.0.0
  */
 @AutoConfiguration(after = { DispatcherServletAutoConfiguration.class, TaskExecutionAutoConfiguration.class,
@@ -282,13 +284,23 @@ public void configureContentNegotiation(ContentNegotiationConfigurer configurer)
 
 		@Bean
 		@ConditionalOnMissingBean
+		@ConditionalOnProperty(prefix = "spring.mvc.view", name = {"prefix", "suffix"})
 		public InternalResourceViewResolver defaultViewResolver() {
 			InternalResourceViewResolver resolver = new InternalResourceViewResolver();
 			resolver.setPrefix(this.mvcProperties.getView().getPrefix());
 			resolver.setSuffix(this.mvcProperties.getView().getSuffix());
 			return resolver;
 		}
 
+		@Bean
+		@ConditionalOnProperty(prefix = "spring.mvc.jsp", name = {"prefix", "suffix"})
+		public InternalResourceViewResolver jspViewResolver() {
+			InternalResourceViewResolver resolver = new InternalResourceViewResolver();
+			resolver.setPrefix(this.mvcProperties.getJsp().getPrefix());
+			resolver.setSuffix(this.mvcProperties.getJsp().getSuffix());
+			return resolver;
+		}
+
 		@Bean
 		@ConditionalOnBean(View.class)
 		@ConditionalOnMissingBean