spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-24 15:49:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '7.0.x'

Browse Source
This commit is contained in:
Brian Clozel
2026-09-09 14:56:35 +02:00
parent aa655718a8 d3d8e05fa9
commit 60b9f4cd3a
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java
+1 -1
View File
@@ -375,7 +375,7 @@ public class ReactiveAdapterRegistry {
void registerAdapters(ReactiveAdapterRegistry registry) {
ReactiveTypeDescriptor uniDesc = ReactiveTypeDescriptor.singleOptionalValue(
io.smallrye.mutiny.Uni.class,
() -> io.smallrye.mutiny.Uni.createFrom().nothing());
() -> io.smallrye.mutiny.Uni.createFrom().nullItem());
ReactiveTypeDescriptor multiDesc = ReactiveTypeDescriptor.multiValue(
io.smallrye.mutiny.Multi.class,
() -> io.smallrye.mutiny.Multi.createFrom().empty());
spring-core/src/test/java/org/springframework/core/ReactiveAdapterRegistryTests.java
+14
View File
@@ -300,6 +300,20 @@ class ReactiveAdapterRegistryTests {
assertThat(((Mono<Integer>) target).block(FIVE_SECONDS)).isEqualTo(Integer.valueOf(1));
}
@Test
void fromNullValue() {
Object target = getAdapter(Uni.class).toPublisher(null);
assertThat(target).isInstanceOf(Mono.class);
assertThat(((Mono<Integer>) target).block(FIVE_SECONDS)).isNull();
}
@Test
void toUniFromEmptyPublisher() {
Object target = getAdapter(Uni.class).fromPublisher(Mono.empty());
assertThat(target).isInstanceOf(Uni.class);
assertThat(((Uni<Integer>) target).await().atMost(FIVE_SECONDS)).isNull();
}
@Test
void toMulti() {
List<Integer> sequence = Arrays.asList(1, 2, 3);