diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcProperties.java index 6f4a9e1bbd..ac3af5d8d1 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcProperties.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2015 the original author or authors. + * Copyright 2012-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,6 @@ import java.util.LinkedHashMap; import java.util.Locale; import java.util.Map; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.http.MediaType; import org.springframework.validation.DefaultMessageCodesResolver; @@ -193,13 +192,11 @@ public class WebMvcProperties { /** * Spring MVC view prefix. */ - @Value("${spring.view.prefix:}") private String prefix; /** * Spring MVC view suffix. */ - @Value("${spring.view.suffix:}") private String suffix; public String getPrefix() { diff --git a/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json index f5034020e3..cb6e7d7cac 100644 --- a/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -159,22 +159,6 @@ "type": "java.lang.Boolean", "description": "Enable the connection status view for supported providers.", "defaultValue": false - }, - { - "name": "spring.view.prefix", - "type": "java.lang.String", - "description": "Spring MVC view prefix.", - "deprecation": { - "replacement": "spring.mvc.view.prefix" - } - }, - { - "name": "spring.view.suffix", - "type": "java.lang.String", - "description": "Spring MVC view suffix.", - "deprecation": { - "replacement": "spring.mvc.view.suffix" - } } ],"hints": [ {