GitHub-Spring
/
spring-data-commons
mirror of https://github.com/spring-projects/spring-data-commons.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

DATACMNS-947 - Adopt ReactiveTypeDescriptor and ReactiveAdapterRegistry changes. 

Remove our own ReactiveWrappers.Descriptor type in favor of ReactiveTypeDescriptor. Adopt changes in ReactiveAdapterRegistry.
pull/194/head
Mark Paluch 9 years ago
parent
cb6d2f7cc3
commit
e768e8eb5e
3 changed files with 60 additions and 105 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 38
      src/main/java/org/springframework/data/repository/util/ReactiveWrapperConverters.java
  2. 123
      src/main/java/org/springframework/data/repository/util/ReactiveWrappers.java
  3. 4
      src/test/java/org/springframework/data/repository/util/ReactiveWrappersUnitTests.java

38
src/main/java/org/springframework/data/repository/util/ReactiveWrapperConverters.java
Unescape View File

@ -169,7 +169,7 @@ public class ReactiveWrapperConverters {
*/ */
public static boolean supports(Class<?> type) { public static boolean supports(Class<?> type) {
return RegistryHolder.REACTIVE_ADAPTER_REGISTRY != null return RegistryHolder.REACTIVE_ADAPTER_REGISTRY != null
&& RegistryHolder.REACTIVE_ADAPTER_REGISTRY.getAdapterFrom(type) != null; && RegistryHolder.REACTIVE_ADAPTER_REGISTRY.getAdapter(type) != null;
} }
/** /**
@ -476,7 +476,7 @@ public class ReactiveWrapperConverters {
@Override @Override
public Single<?> convert(Publisher<?> source) { public Single<?> convert(Publisher<?> source) {
return (Single<?>) REACTIVE_ADAPTER_REGISTRY.getAdapterTo(Single.class).fromPublisher(Mono.from(source)); return (Single<?>) REACTIVE_ADAPTER_REGISTRY.getAdapter(Single.class).fromPublisher(Mono.from(source));
} }
} }
@ -492,7 +492,7 @@ public class ReactiveWrapperConverters {
@Override @Override
public Completable convert(Publisher<?> source) { public Completable convert(Publisher<?> source) {
return (Completable) REACTIVE_ADAPTER_REGISTRY.getAdapterTo(Completable.class).fromPublisher(source); return (Completable) REACTIVE_ADAPTER_REGISTRY.getAdapter(Completable.class).fromPublisher(source);
} }
} }
@ -508,7 +508,7 @@ public class ReactiveWrapperConverters {
@Override @Override
public Observable<?> convert(Publisher<?> source) { public Observable<?> convert(Publisher<?> source) {
return (Observable<?>) REACTIVE_ADAPTER_REGISTRY.getAdapterTo(Observable.class).fromPublisher(Flux.from(source)); return (Observable<?>) REACTIVE_ADAPTER_REGISTRY.getAdapter(Observable.class).fromPublisher(Flux.from(source));
} }
} }
@ -524,7 +524,7 @@ public class ReactiveWrapperConverters {
@Override @Override
public Publisher<?> convert(Single<?> source) { public Publisher<?> convert(Single<?> source) {
return Flux.defer(() -> REACTIVE_ADAPTER_REGISTRY.getAdapterFrom(Single.class).toPublisher(source)); return Flux.defer(() -> REACTIVE_ADAPTER_REGISTRY.getAdapter(Single.class).toPublisher(source));
} }
} }
@ -540,7 +540,7 @@ public class ReactiveWrapperConverters {
@Override @Override
public Mono<?> convert(Single<?> source) { public Mono<?> convert(Single<?> source) {
return Mono.defer(() -> REACTIVE_ADAPTER_REGISTRY.getAdapterFrom(Single.class).toMono(source)); return Mono.defer(() -> Mono.from(REACTIVE_ADAPTER_REGISTRY.getAdapter(Single.class).toPublisher(source)));
} }
} }
@ -556,7 +556,7 @@ public class ReactiveWrapperConverters {
@Override @Override
public Flux<?> convert(Single<?> source) { public Flux<?> convert(Single<?> source) {
return Flux.defer(() -> REACTIVE_ADAPTER_REGISTRY.getAdapterFrom(Single.class).toFlux(source)); return Flux.defer(() -> REACTIVE_ADAPTER_REGISTRY.getAdapter(Single.class).toPublisher(source));
} }
} }
@ -572,7 +572,7 @@ public class ReactiveWrapperConverters {
@Override @Override
public Publisher<?> convert(Completable source) { public Publisher<?> convert(Completable source) {
return Flux.defer(() -> REACTIVE_ADAPTER_REGISTRY.getAdapterFrom(Completable.class).toFlux(source)); return Flux.defer(() -> REACTIVE_ADAPTER_REGISTRY.getAdapter(Completable.class).toPublisher(source));
} }
} }
@ -604,7 +604,7 @@ public class ReactiveWrapperConverters {
@Override @Override
public Publisher<?> convert(Observable<?> source) { public Publisher<?> convert(Observable<?> source) {
return Flux.defer(() -> REACTIVE_ADAPTER_REGISTRY.getAdapterFrom(Observable.class).toFlux(source)); return Flux.defer(() -> REACTIVE_ADAPTER_REGISTRY.getAdapter(Observable.class).toPublisher(source));
} }
} }
@ -620,7 +620,7 @@ public class ReactiveWrapperConverters {
@Override @Override
public Mono<?> convert(Observable<?> source) { public Mono<?> convert(Observable<?> source) {
return Mono.defer(() -> REACTIVE_ADAPTER_REGISTRY.getAdapterFrom(Observable.class).toMono(source)); return Mono.defer(() -> Mono.from(REACTIVE_ADAPTER_REGISTRY.getAdapter(Observable.class).toPublisher(source)));
} }
} }
@ -636,7 +636,7 @@ public class ReactiveWrapperConverters {
@Override @Override
public Flux<?> convert(Observable<?> source) { public Flux<?> convert(Observable<?> source) {
return Flux.defer(() -> REACTIVE_ADAPTER_REGISTRY.getAdapterFrom(Observable.class).toFlux(source)); return Flux.defer(() -> REACTIVE_ADAPTER_REGISTRY.getAdapter(Observable.class).toPublisher(source));
} }
} }
@ -688,7 +688,7 @@ public class ReactiveWrapperConverters {
@Override @Override
public io.reactivex.Single<?> convert(Publisher<?> source) { public io.reactivex.Single<?> convert(Publisher<?> source) {
return (io.reactivex.Single<?>) REACTIVE_ADAPTER_REGISTRY.getAdapterTo(io.reactivex.Single.class) return (io.reactivex.Single<?>) REACTIVE_ADAPTER_REGISTRY.getAdapter(io.reactivex.Single.class)
.fromPublisher(source); .fromPublisher(source);
} }
} }
@ -705,7 +705,7 @@ public class ReactiveWrapperConverters {
@Override @Override
public io.reactivex.Completable convert(Publisher<?> source) { public io.reactivex.Completable convert(Publisher<?> source) {
return (io.reactivex.Completable) REACTIVE_ADAPTER_REGISTRY.getAdapterTo(io.reactivex.Completable.class) return (io.reactivex.Completable) REACTIVE_ADAPTER_REGISTRY.getAdapter(io.reactivex.Completable.class)
.fromPublisher(source); .fromPublisher(source);
} }
} }
@ -722,7 +722,7 @@ public class ReactiveWrapperConverters {
@Override @Override
public io.reactivex.Observable<?> convert(Publisher<?> source) { public io.reactivex.Observable<?> convert(Publisher<?> source) {
return (io.reactivex.Observable<?>) REACTIVE_ADAPTER_REGISTRY.getAdapterTo(io.reactivex.Single.class) return (io.reactivex.Observable<?>) REACTIVE_ADAPTER_REGISTRY.getAdapter(io.reactivex.Single.class)
.fromPublisher(source); .fromPublisher(source);
} }
} }
@ -739,7 +739,7 @@ public class ReactiveWrapperConverters {
@Override @Override
public Publisher<?> convert(io.reactivex.Single<?> source) { public Publisher<?> convert(io.reactivex.Single<?> source) {
return REACTIVE_ADAPTER_REGISTRY.getAdapterFrom(io.reactivex.Single.class).toMono(source); return REACTIVE_ADAPTER_REGISTRY.getAdapter(io.reactivex.Single.class).toPublisher(source);
} }
} }
@ -755,7 +755,7 @@ public class ReactiveWrapperConverters {
@Override @Override
public Mono<?> convert(io.reactivex.Single<?> source) { public Mono<?> convert(io.reactivex.Single<?> source) {
return REACTIVE_ADAPTER_REGISTRY.getAdapterFrom(io.reactivex.Single.class).toMono(source); return Mono.from(REACTIVE_ADAPTER_REGISTRY.getAdapter(io.reactivex.Single.class).toPublisher(source));
} }
} }
@ -771,7 +771,7 @@ public class ReactiveWrapperConverters {
@Override @Override
public Flux<?> convert(io.reactivex.Single<?> source) { public Flux<?> convert(io.reactivex.Single<?> source) {
return REACTIVE_ADAPTER_REGISTRY.getAdapterFrom(io.reactivex.Single.class).toFlux(source); return Flux.from(REACTIVE_ADAPTER_REGISTRY.getAdapter(io.reactivex.Single.class).toPublisher(source));
} }
} }
@ -787,7 +787,7 @@ public class ReactiveWrapperConverters {
@Override @Override
public Publisher<?> convert(io.reactivex.Completable source) { public Publisher<?> convert(io.reactivex.Completable source) {
return REACTIVE_ADAPTER_REGISTRY.getAdapterFrom(io.reactivex.Completable.class).toFlux(source); return REACTIVE_ADAPTER_REGISTRY.getAdapter(io.reactivex.Completable.class).toPublisher(source);
} }
} }
@ -899,7 +899,7 @@ public class ReactiveWrapperConverters {
@Override @Override
public io.reactivex.Maybe<?> convert(Publisher<?> source) { public io.reactivex.Maybe<?> convert(Publisher<?> source) {
return (io.reactivex.Maybe<?>) REACTIVE_ADAPTER_REGISTRY.getAdapterTo(Maybe.class).fromPublisher(source); return (io.reactivex.Maybe<?>) REACTIVE_ADAPTER_REGISTRY.getAdapter(Maybe.class).fromPublisher(source);
} }
} }

123
src/main/java/org/springframework/data/repository/util/ReactiveWrappers.java
Unescape View File

@ -15,9 +15,6 @@
*/ */
package org.springframework.data.repository.util; package org.springframework.data.repository.util;
import lombok.AccessLevel;
import lombok.RequiredArgsConstructor;
import lombok.Value;
import lombok.experimental.UtilityClass; import lombok.experimental.UtilityClass;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
@ -25,17 +22,16 @@ import rx.Completable;
import rx.Observable; import rx.Observable;
import rx.Single; import rx.Single;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Optional; import java.util.Optional;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.reactivestreams.Publisher; import org.reactivestreams.Publisher;
import org.springframework.core.ReactiveAdapter;
import org.springframework.core.ReactiveTypeDescriptor;
import org.springframework.data.util.ReflectionUtils; import org.springframework.data.util.ReflectionUtils;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.util.ClassUtils; import org.springframework.util.ClassUtils;
@ -75,7 +71,7 @@ public class ReactiveWrappers {
private static final boolean RXJAVA2_PRESENT = ClassUtils.isPresent("io.reactivex.Flowable", private static final boolean RXJAVA2_PRESENT = ClassUtils.isPresent("io.reactivex.Flowable",
ReactiveWrappers.class.getClassLoader()); ReactiveWrappers.class.getClassLoader());
private static final Map<Class<?>, Descriptor> REACTIVE_WRAPPERS; private static final Collection<ReactiveTypeDescriptor> REACTIVE_WRAPPERS;
/** /**
* Enumeration of supported reactive libraries. * Enumeration of supported reactive libraries.
@ -88,32 +84,36 @@ public class ReactiveWrappers {
static { static {
Map<Class<?>, Descriptor> reactiveWrappers = new LinkedHashMap<>(5); Collection<ReactiveTypeDescriptor> reactiveWrappers = new ArrayList<>(5);
if (RXJAVA1_PRESENT) { if (RXJAVA1_PRESENT) {
reactiveWrappers.put(Single.class, Descriptor.forSingleValue().forValue()); reactiveWrappers.add(ReactiveTypeDescriptor.singleRequiredValue(Single.class));
reactiveWrappers.put(Completable.class, Descriptor.forSingleValue().forNoValue()); reactiveWrappers.add(ReactiveTypeDescriptor.noValue(Completable.class, Completable::complete));
reactiveWrappers.put(Observable.class, Descriptor.forMultiValue().forValue()); reactiveWrappers.add(ReactiveTypeDescriptor.multiValue(Observable.class, Observable::empty));
} }
if (RXJAVA2_PRESENT) { if (RXJAVA2_PRESENT) {
reactiveWrappers.put(io.reactivex.Single.class, Descriptor.forSingleValue().forValue()); reactiveWrappers.add(ReactiveTypeDescriptor.singleRequiredValue(io.reactivex.Single.class));
reactiveWrappers.put(io.reactivex.Maybe.class, Descriptor.forSingleValue().forValue()); reactiveWrappers
reactiveWrappers.put(io.reactivex.Completable.class, Descriptor.forSingleValue().forNoValue()); .add(ReactiveTypeDescriptor.singleOptionalValue(io.reactivex.Maybe.class, io.reactivex.Maybe::empty));
reactiveWrappers.put(io.reactivex.Flowable.class, Descriptor.forMultiValue().forValue()); reactiveWrappers
reactiveWrappers.put(io.reactivex.Observable.class, Descriptor.forMultiValue().forValue()); .add(ReactiveTypeDescriptor.noValue(io.reactivex.Completable.class, io.reactivex.Completable::complete));
reactiveWrappers
.add(ReactiveTypeDescriptor.multiValue(io.reactivex.Flowable.class, io.reactivex.Flowable::empty));
reactiveWrappers
.add(ReactiveTypeDescriptor.multiValue(io.reactivex.Observable.class, io.reactivex.Observable::empty));
} }
if (PROJECT_REACTOR_PRESENT) { if (PROJECT_REACTOR_PRESENT) {
reactiveWrappers.put(Mono.class, Descriptor.forSingleValue().forValue()); reactiveWrappers.add(ReactiveTypeDescriptor.singleOptionalValue(Mono.class, Mono::empty));
reactiveWrappers.put(Flux.class, Descriptor.forMultiValue().forNoValue()); reactiveWrappers.add(ReactiveTypeDescriptor.multiValue(Flux.class, Flux::empty));
reactiveWrappers.put(Publisher.class, Descriptor.forMultiValue().forNoValue()); reactiveWrappers.add(ReactiveTypeDescriptor.multiValue(Publisher.class, Flux::empty));
} }
REACTIVE_WRAPPERS = Collections.unmodifiableMap(reactiveWrappers); REACTIVE_WRAPPERS = Collections.unmodifiableCollection(reactiveWrappers);
} }
/** /**
@ -183,7 +183,7 @@ public class ReactiveWrappers {
Assert.notNull(type, "Candidate type must not be null!"); Assert.notNull(type, "Candidate type must not be null!");
return findDescriptor(type).map(Descriptor::isNoValue).orElse(false); return findDescriptor(type).map(ReactiveTypeDescriptor::isNoValue).orElse(false);
} }
/** /**
@ -213,7 +213,8 @@ public class ReactiveWrappers {
// Prevent single-types with a multi-hierarchy supertype to be reported as multi type // Prevent single-types with a multi-hierarchy supertype to be reported as multi type
// See Mono implements Publisher // See Mono implements Publisher
return isSingleValueType(type) ? false : findDescriptor(type).map(Descriptor::isMultiValue).orElse(false); return isSingleValueType(type) ? false
: findDescriptor(type).map(ReactiveTypeDescriptor::isMultiValue).orElse(false);
} }
/** /**
@ -223,9 +224,10 @@ public class ReactiveWrappers {
*/ */
public static Collection<Class<?>> getNoValueTypes() { public static Collection<Class<?>> getNoValueTypes() {
return REACTIVE_WRAPPERS.entrySet().stream()// return REACTIVE_WRAPPERS.stream()//
.filter(entry -> entry.getValue().isNoValue())// .filter(ReactiveTypeDescriptor::isNoValue)//
.map(Entry::getKey).collect(Collectors.toList()); .map(ReactiveTypeDescriptor::getReactiveType)//
.collect(Collectors.toList());
} }
/** /**
@ -235,9 +237,9 @@ public class ReactiveWrappers {
*/ */
public static Collection<Class<?>> getSingleValueTypes() { public static Collection<Class<?>> getSingleValueTypes() {
return REACTIVE_WRAPPERS.entrySet().stream()// return REACTIVE_WRAPPERS.stream()//
.filter(entry -> !entry.getValue().isMultiValue())// .filter(entry -> !entry.isMultiValue())//
.map(Entry::getKey).collect(Collectors.toList()); .map(ReactiveTypeDescriptor::getReactiveType).collect(Collectors.toList());
} }
/** /**
@ -247,9 +249,9 @@ public class ReactiveWrappers {
*/ */
public static Collection<Class<?>> getMultiValueTypes() { public static Collection<Class<?>> getMultiValueTypes() {
return REACTIVE_WRAPPERS.entrySet().stream()// return REACTIVE_WRAPPERS.stream()//
.filter(entry -> entry.getValue().isMultiValue())// .filter(ReactiveTypeDescriptor::isMultiValue)//
.map(Entry::getKey)// .map(ReactiveTypeDescriptor::getReactiveType)//
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
@ -267,64 +269,17 @@ public class ReactiveWrappers {
} }
/** /**
* Looks up a {@link Descriptor} for the given wrapper type. * Looks up a {@link ReactiveTypeDescriptor} for the given wrapper type.
* *
* @param type must not be {@literal null}. * @param type must not be {@literal null}.
* @return * @return
*/ */
private static Optional<Descriptor> findDescriptor(Class<?> type) { private static Optional<ReactiveTypeDescriptor> findDescriptor(Class<?> type) {
Assert.notNull(type, "Wrapper type must not be null!"); Assert.notNull(type, "Wrapper type must not be null!");
return REACTIVE_WRAPPERS.entrySet().stream()// return REACTIVE_WRAPPERS.stream()//
.filter(it -> ClassUtils.isAssignable(it.getKey(), type))// .filter(it -> ClassUtils.isAssignable(it.getReactiveType(), type))//
.findFirst().map(it -> it.getValue()); .findFirst();
}
/**
* Basically a copy of Spring's {@link ReactiveAdapter.Descriptor} but without introducing the strong dependency to
* Reactor so that we can safely use the class in non-reactive environments.
*
* @author Oliver Gierke
* @since 2.0
*/
@Value
@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
private static class Descriptor {
/**
* Return {@code true} if the adaptee implies 0..N values can be produced and is therefore a good fit to adapt to
* {@link Flux}. A {@code false} return value implies the adaptee will produce 1 value at most and is therefore a
* good fit for {@link Mono}.
*/
private final boolean multiValue;
/**
* Return {@code true} if the adaptee implies no values will be produced, i.e. providing only completion or error
* signal.
*/
private final boolean noValue;
public static DescriptorBuilder forSingleValue() {
return new DescriptorBuilder(false);
}
public static DescriptorBuilder forMultiValue() {
return new DescriptorBuilder(true);
}
@RequiredArgsConstructor
static class DescriptorBuilder {
private final boolean multi;
public Descriptor forValue() {
return new Descriptor(multi, false);
}
public Descriptor forNoValue() {
return new Descriptor(multi, true);
}
}
} }
} }

4
src/test/java/org/springframework/data/repository/util/ReactiveWrappersUnitTests.java
Unescape View File

@ -40,11 +40,11 @@ public class ReactiveWrappersUnitTests {
public void isSingleLikeShouldReportCorrectNoTypes() { public void isSingleLikeShouldReportCorrectNoTypes() {
assertThat(ReactiveWrappers.isNoValueType(Mono.class)).isFalse(); assertThat(ReactiveWrappers.isNoValueType(Mono.class)).isFalse();
assertThat(ReactiveWrappers.isNoValueType(Flux.class)).isTrue(); assertThat(ReactiveWrappers.isNoValueType(Flux.class)).isFalse();
assertThat(ReactiveWrappers.isNoValueType(Single.class)).isFalse(); assertThat(ReactiveWrappers.isNoValueType(Single.class)).isFalse();
assertThat(ReactiveWrappers.isNoValueType(Completable.class)).isTrue(); assertThat(ReactiveWrappers.isNoValueType(Completable.class)).isTrue();
assertThat(ReactiveWrappers.isNoValueType(Observable.class)).isFalse(); assertThat(ReactiveWrappers.isNoValueType(Observable.class)).isFalse();
assertThat(ReactiveWrappers.isNoValueType(Publisher.class)).isTrue(); assertThat(ReactiveWrappers.isNoValueType(Publisher.class)).isFalse();
assertThat(ReactiveWrappers.isNoValueType(io.reactivex.Single.class)).isFalse(); assertThat(ReactiveWrappers.isNoValueType(io.reactivex.Single.class)).isFalse();
assertThat(ReactiveWrappers.isNoValueType(io.reactivex.Maybe.class)).isFalse(); assertThat(ReactiveWrappers.isNoValueType(io.reactivex.Maybe.class)).isFalse();
assertThat(ReactiveWrappers.isNoValueType(Flowable.class)).isFalse(); assertThat(ReactiveWrappers.isNoValueType(Flowable.class)).isFalse();

Write Preview
Loading…
Cancel
Save