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

Add shared instance of ReactiveAdapterRegistry

Browse Source 
Issue: SPR-16218
This commit is contained in:
Rossen Stoyanchev
2017-11-20 17:02:22 -05:00
parent 6f24c0de17
commit bc8e525e60
39 changed files with 74 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-core/src/main/java/org/springframework/core/Conventions.java
View File

@@ -59,7 +59,7 @@ public abstract class Conventions {
}
private static final ReactiveAdapterRegistry reactiveAdapterRegistry =
new ReactiveAdapterRegistry();
ReactiveAdapterRegistry.getSharedInstance();
/**

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

@@ -33,7 +33,10 @@ import org.springframework.lang.Nullable;
import org.springframework.util.ClassUtils;
import org.springframework.util.ReflectionUtils;
import static org.springframework.core.ReactiveTypeDescriptor.*;
import static org.springframework.core.ReactiveTypeDescriptor.multiValue;
import static org.springframework.core.ReactiveTypeDescriptor.noValue;
import static org.springframework.core.ReactiveTypeDescriptor.singleOptionalValue;
import static org.springframework.core.ReactiveTypeDescriptor.singleRequiredValue;
/**
* A registry of adapters to adapt a Reactive Streams {@link Publisher} to/from
@@ -50,6 +53,9 @@ import static org.springframework.core.ReactiveTypeDescriptor.*;
*/
public class ReactiveAdapterRegistry {
@Nullable
private static volatile ReactiveAdapterRegistry sharedInstance;
private final boolean reactorPresent;
private final List<ReactiveAdapter> adapters = new ArrayList<>(32);
@@ -98,6 +104,31 @@ public class ReactiveAdapterRegistry {
}
/**
* Return a shared default {@code ReactiveAdapterRegistry} instance, lazily
* building it once needed.
* <p><b>NOTE:</b> We highly recommend passing a long-lived, pre-configured
* {@code ReactiveAdapterRegistry} instance for customization purposes.
* This accessor is only meant as a fallback for code paths that want to
* fall back on a default instance if one isn't provided.
* @return the shared {@code ReactiveAdapterRegistry} instance (never {@code null})
* @since 5.0.2
*/
public static ReactiveAdapterRegistry getSharedInstance() {
ReactiveAdapterRegistry ar = sharedInstance;
if (ar == null) {
synchronized (ReactiveAdapterRegistry.class) {
ar = sharedInstance;
if (ar == null) {
ar = new ReactiveAdapterRegistry();
sharedInstance = ar;
}
}
}
return ar;
}
/**
* Whether the registry has any adapters which would be the case if any of
* Reactor, RxJava 2, or RxJava 1 (+ RxJava Reactive Streams bridge) are