Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.2.x' into 2.3.x

Browse Source 
Closes gh-24411
This commit is contained in:
Phillip Webb
2020-12-08 17:09:20 -08:00
parent 30717b6ae3 286ef61071
commit 49e754f48b
8 changed files with 61 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigureOrder.java
View File

@@ -48,6 +48,9 @@ import org.springframework.core.annotation.Order;
@Documented
public @interface AutoConfigureOrder {
/**
* The default order value.
*/
int DEFAULT_ORDER = 0;
/**

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/EnableAutoConfiguration.java
View File

@@ -83,6 +83,10 @@ import org.springframework.core.io.support.SpringFactoriesLoader;
@Import(AutoConfigurationImportSelector.class)
public @interface EnableAutoConfiguration {
/**
* Environment property that can be used to override when auto-configuration is
* enabled.
*/
String ENABLED_OVERRIDE_PROPERTY = "spring.boot.enableautoconfiguration";
/**

13
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionMessage.java
View File

@@ -401,23 +401,28 @@ public final class ConditionMessage {
*/
public enum Style {
/**
* Render with normal styling.
*/
NORMAL {
@Override
protected Object applyToItem(Object item) {
return item;
}
@Override
public Collection<?> applyTo(Collection<?> items) {
return items;
}
},
/**
* Render with the item surrounded by quotes.
*/
QUOTE {
@Override
protected String applyToItem(Object item) {
return (item != null) ? "'" + item + "'" : null;
}
};
public Collection<?> applyTo(Collection<?> items) {

8
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/DispatcherServletAutoConfiguration.java
View File

@@ -69,13 +69,13 @@ import org.springframework.web.servlet.DispatcherServlet;
@AutoConfigureAfter(ServletWebServerFactoryAutoConfiguration.class)
public class DispatcherServletAutoConfiguration {
/*
* The bean name for a DispatcherServlet that will be mapped to the root URL "/"
/**
* The bean name for a DispatcherServlet that will be mapped to the root URL "/".
*/
public static final String DEFAULT_DISPATCHER_SERVLET_BEAN_NAME = "dispatcherServlet";
/*
* The bean name for a ServletRegistrationBean for the DispatcherServlet "/"
/**
* The bean name for a ServletRegistrationBean for the DispatcherServlet "/".
*/
public static final String DEFAULT_DISPATCHER_SERVLET_REGISTRATION_BEAN_NAME = "dispatcherServletRegistration";

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

@@ -145,8 +145,14 @@ import org.springframework.web.util.UrlPathHelper;
ValidationAutoConfiguration.class })
public class WebMvcAutoConfiguration {
/**
* The default Spring MVC view prefix.
*/
public static final String DEFAULT_PREFIX = "";
/**
* The default Spring MVC view suffix.
*/
public static final String DEFAULT_SUFFIX = "";
private static final String[] SERVLET_LOCATIONS = { "/" };