spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-29 21:59:02 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.5.x' into 4.0.x

Browse Source 
Closes gh-49593
This commit is contained in:
Brian Clozel
2026-03-13 16:48:49 +01:00
parent c088d33765 c366ddaca0
commit ed8cba80b6
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/spring-boot-rsocket/src/main/java/org/springframework/boot/rsocket/autoconfigure/RSocketServerAutoConfiguration.java
+1 -1
View File
@@ -150,7 +150,7 @@ public final class RSocketServerAutoConfiguration {
}
@ConditionalOnProperty(name = "spring.rsocket.server.port", matchIfMissing = true)
@ConditionalOnProperty(name = "spring.rsocket.server.port", havingValue = "false", matchIfMissing = true)
static class HasNoPortConfigured {
}
module/spring-boot-rsocket/src/test/java/org/springframework/boot/rsocket/autoconfigure/RSocketServerAutoConfigurationTests.java
+11
View File
@@ -84,6 +84,17 @@ class RSocketServerAutoConfigurationTests {
.run((context) -> assertThat(context).hasSingleBean(RSocketWebSocketNettyRouteProvider.class));
}
@Test
void shouldNotCreateWebSocketRouteProviderWhenDedicatedPortIsSet() {
reactiveWebContextRunner()
.withPropertyValues("spring.rsocket.server.port=0", "spring.rsocket.server.transport=websocket",
"spring.rsocket.server.mapping-path=/rsocket")
.run((context) -> {
assertThat(context).hasSingleBean(RSocketServerFactory.class);
assertThat(context).doesNotHaveBean(RSocketWebSocketNettyRouteProvider.class);
});
}
@Test
void shouldCreateDefaultBeansForRSocketServerWhenPortIsSet() {
reactiveWebContextRunner().withPropertyValues("spring.rsocket.server.port=0")