Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Defensively register Flow bridge in delegate class

Browse Source 
See gh-31000
This commit is contained in:
Juergen Hoeller
2023-08-08 09:52:42 +02:00
parent 3b093754c8
commit c4896aca9b
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java
View File

@@ -86,7 +86,6 @@ public class ReactiveAdapterRegistry {
* Create a registry and auto-register default adapters.
* @see #getSharedInstance()
*/
@SuppressWarnings("unchecked")
public ReactiveAdapterRegistry() {
// Defensive guard for the Reactive Streams API itself
if (!reactiveStreamsPresent) {
@@ -115,10 +114,7 @@ public class ReactiveAdapterRegistry {
// Simple Flow.Publisher bridge if Reactor is not present
if (!reactorPresent) {
this.adapters.add(new ReactiveAdapter(
ReactiveTypeDescriptor.multiValue(Flow.Publisher.class, () -> PublisherToRS.EMPTY_FLOW),
source -> new PublisherToRS<>((Flow.Publisher<Object>) source),
source -> new PublisherToFlow<>((Publisher<Object>) source)));
new FlowBridgeRegistrar().registerAdapter(this);
}
}
@@ -375,6 +371,18 @@ public class ReactiveAdapterRegistry {
}
private static class FlowBridgeRegistrar {
@SuppressWarnings("unchecked")
void registerAdapter(ReactiveAdapterRegistry registry) {
registry.registerReactiveType(
ReactiveTypeDescriptor.multiValue(Flow.Publisher.class, () -> PublisherToRS.EMPTY_FLOW),
source -> new PublisherToRS<>((Flow.Publisher<Object>) source),
source -> new PublisherToFlow<>((Publisher<Object>) source));
}
}
private static class PublisherToFlow<T> implements Flow.Publisher<T> {
private static final Flow.Subscription EMPTY_SUBSCRIPTION = new Flow.Subscription() {