mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '1.5.x' into 2.0.x
This commit is contained in:
commit
bb34846630
@ -29,7 +29,7 @@ import org.springframework.util.StringUtils;
|
|||||||
* The JSON web token provided with each request that originates from Cloud Foundry.
|
* The JSON web token provided with each request that originates from Cloud Foundry.
|
||||||
*
|
*
|
||||||
* @author Madhura Bhave
|
* @author Madhura Bhave
|
||||||
* @since 2.0.0
|
* @since 1.5.22
|
||||||
*/
|
*/
|
||||||
public class Token {
|
public class Token {
|
||||||
|
|
||||||
|
@ -40,7 +40,7 @@ import org.springframework.util.MultiValueMap;
|
|||||||
* Abstract base class for nested conditions.
|
* Abstract base class for nested conditions.
|
||||||
*
|
*
|
||||||
* @author Phillip Webb
|
* @author Phillip Webb
|
||||||
* @since 2.0.1
|
* @since 1.5.22
|
||||||
*/
|
*/
|
||||||
public abstract class AbstractNestedCondition extends SpringBootCondition implements ConfigurationCondition {
|
public abstract class AbstractNestedCondition extends SpringBootCondition implements ConfigurationCondition {
|
||||||
|
|
||||||
|
@ -28,8 +28,9 @@ import org.springframework.test.web.servlet.setup.ConfigurableMockMvcBuilder;
|
|||||||
* A {@link MockMvcBuilderCustomizer} that configures Spring REST Docs.
|
* A {@link MockMvcBuilderCustomizer} that configures Spring REST Docs.
|
||||||
*
|
*
|
||||||
* @author Andy Wilkinson
|
* @author Andy Wilkinson
|
||||||
|
* @since 1.5.22
|
||||||
*/
|
*/
|
||||||
class RestDocsMockMvcBuilderCustomizer implements InitializingBean, MockMvcBuilderCustomizer {
|
public class RestDocsMockMvcBuilderCustomizer implements InitializingBean, MockMvcBuilderCustomizer {
|
||||||
|
|
||||||
private final RestDocsProperties properties;
|
private final RestDocsProperties properties;
|
||||||
|
|
||||||
|
@ -41,9 +41,9 @@ import org.springframework.util.StringUtils;
|
|||||||
*
|
*
|
||||||
* @param <T> the type of {@link Filter} to register
|
* @param <T> the type of {@link Filter} to register
|
||||||
* @author Phillip Webb
|
* @author Phillip Webb
|
||||||
* @since 2.0.1
|
* @since 1.5.22
|
||||||
*/
|
*/
|
||||||
public abstract class AbstractFilterRegistrationBean<T extends Filter> extends DynamicRegistrationBean<Dynamic> {
|
public abstract class AbstractFilterRegistrationBean extends RegistrationBean {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Filters that wrap the servlet request should be ordered less than or equal to this.
|
* Filters that wrap the servlet request should be ordered less than or equal to this.
|
||||||
|
Loading…
Reference in New Issue
Block a user