Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-15 01:07:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.7.x'

Browse Source 
Closes gh-31807
This commit is contained in:
Andy Wilkinson 2022-07-20 10:52:30 +01:00
commit 1acc7857e6
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -190,8 +190,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

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

@ -163,7 +163,7 @@ class MappingsEndpointTests {
contextMappings, "dispatcherHandlers");
assertThat(dispatcherHandlers).containsOnlyKeys("webHandler");
List<DispatcherHandlerMappingDescription> handlerMappings = dispatcherHandlers.get("webHandler");
assertThat(handlerMappings).hasSize(3);
assertThat(handlerMappings).hasSize(4);
});
}
@ -210,6 +210,11 @@ class MappingsEndpointTests {
}
@Bean
RouterFunction<ServerResponse> routerFunctionWithAttributes() {
return route(GET("/four"), (request) -> ServerResponse.ok().build()).withAttribute("test", "test");
}
}
@Configuration(proxyBeanMethods = false)