Skip to content

Commit 1acc785

Browse files
committed
Merge branch '2.7.x'
Closes gh-31807
2 parents 18d3d4d + 84efc89 commit 1acc785

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,6 @@ public void resources(Function<ServerRequest, Mono<Resource>> lookupFunction) {
190190

191191
@Override
192192
public void attributes(Map<String, Object> attributes) {
193-
// TODO Auto-generated method stub
194-
throw new UnsupportedOperationException("Auto-generated method stub");
195193
}
196194

197195
@Override

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ void reactiveWebMappings() {
163163
contextMappings, "dispatcherHandlers");
164164
assertThat(dispatcherHandlers).containsOnlyKeys("webHandler");
165165
List<DispatcherHandlerMappingDescription> handlerMappings = dispatcherHandlers.get("webHandler");
166-
assertThat(handlerMappings).hasSize(3);
166+
assertThat(handlerMappings).hasSize(4);
167167
});
168168
}
169169

@@ -210,6 +210,11 @@ void three() {
210210

211211
}
212212

213+
@Bean
214+
RouterFunction<ServerResponse> routerFunctionWithAttributes() {
215+
return route(GET("/four"), (request) -> ServerResponse.ok().build()).withAttribute("test", "test");
216+
}
217+
213218
}
214219

215220
@Configuration(proxyBeanMethods = false)

0 commit comments

Comments
 (0)