root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '2.6.x' into 2.7.x 

Closes gh-31806
This commit is contained in:
Andy Wilkinson 2022-07-20 10:52:00 +01:00
parent 10e19d504a bcbe072d96
commit 84efc89d76
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/reactive/DispatcherHandlersMappingDescriptionProvider.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2020 the original author or authors.
* Copyright 2012-2022 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.
@ -184,8 +184,6 @@ public class DispatcherHandlersMappingDescriptionProvider implements MappingDesc
@Override
public void attributes(Map<String, Object> attributes) {
// TODO Auto-generated method stub
throw new UnsupportedOperationException("Auto-generated method stub");
}
@Override

9
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/web/mappings/MappingsEndpointTests.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2021 the original author or authors.
* Copyright 2012-2022 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.
@ -164,7 +164,7 @@ class MappingsEndpointTests {
contextMappings, "dispatcherHandlers");
assertThat(dispatcherHandlers).containsOnlyKeys("webHandler");
List<DispatcherHandlerMappingDescription> handlerMappings = dispatcherHandlers.get("webHandler");
assertThat(handlerMappings).hasSize(3);
assertThat(handlerMappings).hasSize(4);
});
}
@ -211,6 +211,11 @@ class MappingsEndpointTests {
}
@Bean
RouterFunction<ServerResponse> routerFunctionWithAttributes() {
return route(GET("/four"), (request) -> ServerResponse.ok().build()).withAttribute("test", "test");
}
}
@Configuration(proxyBeanMethods = false)