mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Merge branch '2.7.x'
Closes gh-31807
This commit is contained in:
commit
1acc7857e6
@ -190,8 +190,6 @@ public class DispatcherHandlersMappingDescriptionProvider implements MappingDesc
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void attributes(Map<String, Object> attributes) {
|
public void attributes(Map<String, Object> attributes) {
|
||||||
// TODO Auto-generated method stub
|
|
||||||
throw new UnsupportedOperationException("Auto-generated method stub");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -163,7 +163,7 @@ class MappingsEndpointTests {
|
|||||||
contextMappings, "dispatcherHandlers");
|
contextMappings, "dispatcherHandlers");
|
||||||
assertThat(dispatcherHandlers).containsOnlyKeys("webHandler");
|
assertThat(dispatcherHandlers).containsOnlyKeys("webHandler");
|
||||||
List<DispatcherHandlerMappingDescription> handlerMappings = dispatcherHandlers.get("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)
|
@Configuration(proxyBeanMethods = false)
|
||||||
|
Loading…
Reference in New Issue
Block a user