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

Lazy registration in ReactiveAdapterRegistry

Browse Source 
Issue: SPR-15747
This commit is contained in:
Rossen Stoyanchev
2017-07-11 13:04:43 +02:00
parent 1d5bd8ef35
commit dfcc9af938
1 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,10 +29,11 @@ import reactor.core.publisher.Mono;
import rx.RxReactiveStreams;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
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
@@ -48,18 +49,7 @@ import static org.springframework.core.ReactiveTypeDescriptor.*;
*/
public class ReactiveAdapterRegistry {
private static final boolean reactorPresent =
ClassUtils.isPresent("reactor.core.publisher.Flux", ReactiveAdapterRegistry.class.getClassLoader());
private static final boolean rxJava1Present =
ClassUtils.isPresent("rx.Observable", ReactiveAdapterRegistry.class.getClassLoader());
private static final boolean rxReactiveStreamsPresent =
ClassUtils.isPresent("rx.RxReactiveStreams", ReactiveAdapterRegistry.class.getClassLoader());
private static final boolean rxJava2Present =
ClassUtils.isPresent("io.reactivex.Flowable", ReactiveAdapterRegistry.class.getClassLoader());
private final boolean reactorPresent;
private final List<ReactiveAdapter> adapters = new ArrayList<>(32);
@@ -68,15 +58,33 @@ public class ReactiveAdapterRegistry {
* Create a registry and auto-register default adapters.
*/
public ReactiveAdapterRegistry() {
if (reactorPresent) {
// Reactor
boolean reactorRegistered = false;
try {
new ReactorRegistrar().registerAdapters(this);
reactorRegistered = true;
}
if (rxJava1Present && rxReactiveStreamsPresent) {
catch (Throwable ex) {
// Ignore
}
this.reactorPresent = reactorRegistered;
// RxJava1
try {
new RxJava1Registrar().registerAdapters(this);
}
if (rxJava2Present) {
catch (Throwable ex) {
// Ignore
}
// RxJava2
try {
new RxJava2Registrar().registerAdapters(this);
}
catch (Throwable ex) {
// Ignore
}
}
@@ -130,10 +138,6 @@ public class ReactiveAdapterRegistry {
return null;
}
Assert.isTrue(!rxJava1Present || rxReactiveStreamsPresent || !clazz.getName().startsWith("rx."),
"For RxJava 1.x adapter support please add " +
"\"io.reactivex:rxjava-reactive-streams\": " + clazz.getName());
return this.adapters.stream()
.filter(adapter -> adapter.getReactiveType() == clazz)
.findFirst()